repo
string | pull_number
int64 | instance_id
string | issue_numbers
list | base_commit
string | patch
string | test_patch
string | problem_statement
string | hints_text
string | created_at
timestamp[s] | language
string | label
string |
|---|---|---|---|---|---|---|---|---|---|---|---|
prettier/plugin-ruby
| 802
|
prettier__plugin-ruby-802
|
[
"799",
"801"
] |
c4bf119fb0c3c90771e552b8cc99e89909f53608
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
## [Unreleased]
+### Changed
+
+- [#799](https://github.com/prettier/plugin-ruby/issues/799) - jscheid, kddeisz - Multi-byte characters shouldn't give invalid source string bounds.
+- [#801](https://github.com/prettier/plugin-ruby/issues/801) - jscheid, kddeisz - When converting a conditional to the modifier form, make sure to add parentheses if there is a chained method call.
+
## [1.5.0] - 2021-01-21
### Added
diff --git a/bin/sexp b/bin/sexp
--- a/bin/sexp
+++ b/bin/sexp
@@ -20,7 +20,15 @@ PP.prepend(
end
)
-source = File.file?(ARGV[0]) ? File.read(ARGV[0]) : ARGV[0].gsub('\\n', "\n")
+source =
+ if !ARGV[0]
+ File.read('test.rb')
+ elsif File.file?(ARGV[0])
+ File.read(ARGV[0])
+ else
+ ARGV[0].gsub('\\n', "\n")
+ end
+
parsed = Prettier::Parser.new(source).parse
puts '=== SOURCE === '
diff --git a/src/ruby/parser.rb b/src/ruby/parser.rb
--- a/src/ruby/parser.rb
+++ b/src/ruby/parser.rb
@@ -21,7 +21,40 @@ module Prettier
end
class Prettier::Parser < Ripper
- attr_reader :source, :lines, :scanner_events, :line_counts
+ # Represents a line in the source. If this class is being used, it means that
+ # every character in the string is 1 byte in length, so we can just return the
+ # start of the line + the index.
+ class SingleByteString
+ def initialize(start)
+ @start = start
+ end
+
+ def [](byteindex)
+ @start + byteindex
+ end
+ end
+
+ # Represents a line in the source. If this class is being used, it means that
+ # there are characters in the string that are multi-byte, so we will build up
+ # an array of indices, such that array[byteindex] will be equal to the index
+ # of the character within the string.
+ class MultiByteString
+ def initialize(start, line)
+ @indices = []
+
+ line
+ .each_char
+ .with_index(start) do |char, index|
+ char.bytesize.times { @indices << index }
+ end
+ end
+
+ def [](byteindex)
+ @indices[byteindex]
+ end
+ end
+
+ attr_reader :source, :lines, :scanner_events
# This is an attr_accessor so Stmts objects can grab comments out of this
# array and attach them to themselves.
@@ -40,9 +73,23 @@ def initialize(source, *args)
@heredocs = []
@scanner_events = []
- @line_counts = [0]
+ @line_counts = []
+
+ # Here we're going to build up a list of SingleByteString or MultiByteString
+ # objects. They're each going to represent a string in the source. They are
+ # used by the `char_pos` method to determine where we are in the source
+ # string.
+ last_index = 0
- @source.lines.each { |line| @line_counts << @line_counts.last + line.size }
+ @source.lines.each do |line|
+ if line.size == line.bytesize
+ @line_counts << SingleByteString.new(last_index)
+ else
+ @line_counts << MultiByteString.new(last_index, line)
+ end
+
+ last_index += line.size
+ end
end
def self.parse(source)
@@ -60,7 +107,7 @@ def self.parse(source)
# this line, then we add the number of columns into this line that we've gone
# through.
def char_pos
- line_counts[lineno - 1] + column
+ @line_counts[lineno - 1][column]
end
# As we build up a list of scanner events, we'll periodically need to go
diff --git a/src/utils/inlineEnsureParens.js b/src/utils/inlineEnsureParens.js
--- a/src/utils/inlineEnsureParens.js
+++ b/src/utils/inlineEnsureParens.js
@@ -1,4 +1,11 @@
-const needsParens = ["args", "assign", "assoc_new", "massign", "opassign"];
+const needsParens = [
+ "args",
+ "assign",
+ "assoc_new",
+ "call",
+ "massign",
+ "opassign"
+];
// If you have a modifier statement (for instance an inline if statement or an
// inline while loop) there are times when you need to wrap the entire statement
|
diff --git a/test/js/ruby/comments.test.js b/test/js/ruby/comments.test.js
--- a/test/js/ruby/comments.test.js
+++ b/test/js/ruby/comments.test.js
@@ -237,4 +237,15 @@ describe("comments", () => {
return expect(content).toMatchFormat();
});
});
+
+ test("works with multi-byte characters", () => {
+ const content = ruby(`
+ [
+ ['先生小'], #
+ ['小']
+ ]
+ `);
+
+ return expect(content).toMatchFormat();
+ });
});
diff --git a/test/js/ruby/nodes/conditionals.test.js b/test/js/ruby/nodes/conditionals.test.js
--- a/test/js/ruby/nodes/conditionals.test.js
+++ b/test/js/ruby/nodes/conditionals.test.js
@@ -166,6 +166,16 @@ describe("conditionals", () => {
expect(`hash[:key] = ${keyword} false then :value end`).toChangeFormat(
`hash[:key] = (:value ${keyword} false)`
));
+
+ test("wraps inline version with calls", () => {
+ const content = ruby(`
+ if true
+ false
+ end.to_s
+ `);
+
+ return expect(content).toChangeFormat("(false if true).to_s");
+ });
});
});
|
TypeError: childNodes.forEach is not a function
## Metadata
Prettier 2.2.1, @prettier/plugin-ruby 1.5.0, default options.
## Input
```ruby
[
['先生小'], #
['小'],
]
```
```
[error] /tmp/foo.rb: TypeError: childNodes.forEach is not a function
[error] at getSortedChildNodes (~/.config/yarn/global/node_modules/prettier/index.js:13931:14)
[error] at decorateComment (~/.config/yarn/global/node_modules/prettier/index.js:13947:22)
[error] at decorateComment (~/.config/yarn/global/node_modules/prettier/index.js:13963:7)
[error] at decorateComment (~/.config/yarn/global/node_modules/prettier/index.js:13963:7)
[error] at decorateComment (~/.config/yarn/global/node_modules/prettier/index.js:13963:7)
[error] at decorateComment (~/.config/yarn/global/node_modules/prettier/index.js:13963:7)
[error] at decorateComment (~/.config/yarn/global/node_modules/prettier/index.js:13963:7)
[error] at ~/.config/yarn/global/node_modules/prettier/index.js:14041:5
[error] at Array.forEach (<anonymous>)
[error] at Object.attach (~/.config/yarn/global/node_modules/prettier/index.js:14028:12)
```
Method chaining and conversion to conditional modifier
## Metadata
* Ruby version: ruby 2.6.3p62
* `@prettier/plugin-ruby` or `prettier` gem version: 1.5.0
* Options: defaults
## Input
```ruby
def foo
unless false
true
end.to_s
end
pp foo
```
(Prints `"true"`)
## Current output
```ruby
def foo
true unless false.to_s
end
pp foo
```
(Prints `nil`)
## Expected output
Not sure, maybe:
```ruby
def foo
(true unless false).to_s
end
pp foo
```
|
```
$ ruby --version
ruby 2.6.3p62 (2019-04-16 revision 67580) [universal.x86_64-darwin19]
```
| 2021-01-26T16:23:32
|
javascript
|
Hard
|
prettier/plugin-ruby
| 771
|
prettier__plugin-ruby-771
|
[
"768",
"768"
] |
7147ea39fbdd5717daabfa17fd7ccf27c74b4f90
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
### Changed
- [@nruth], [@kddeisz] - Ensure unary operators on method calls that are sending operators get the correct scanner events.
+- [@cvoege], [@kddeisz] - Do not add parentheses when they're not needed to non-breaking command_calls with ternary arguments.
+- [@valscion], [@kddeisz] - Print method chains more nicely off array and hash literals.
## [1.2.4] - 2021-01-03
diff --git a/src/ruby/nodes/calls.js b/src/ruby/nodes/calls.js
--- a/src/ruby/nodes/calls.js
+++ b/src/ruby/nodes/calls.js
@@ -24,6 +24,12 @@ function printCall(path, opts, print) {
// call syntax so if `call` is implicit, we don't print it out.
const messageDoc = messageNode === "call" ? "" : path.call(print, "body", 2);
+ // For certain left sides of the call nodes, we want to attach directly to
+ // the } or end.
+ if (noIndent.includes(receiverNode.type)) {
+ return concat([receiverDoc, operatorDoc, messageDoc]);
+ }
+
// The right side of the call node, as in everything including the operator
// and beyond.
const rightSideDoc = concat([
@@ -47,18 +53,10 @@ function printCall(path, opts, print) {
// If we're at the top of a chain, then we're going to print out a nice
// multi-line layout if this doesn't break into multiple lines.
if (!chained.includes(parentNode.type) && (node.chain || 0) >= 3) {
- let breakDoc = concat(node.breakDoc.concat(rightSideDoc));
- if (!noIndent.includes(node.firstReceiverType)) {
- breakDoc = indent(breakDoc);
- }
-
- return ifBreak(group(breakDoc), concat([receiverDoc, group(rightSideDoc)]));
- }
-
- // For certain left sides of the call nodes, we want to attach directly to
- // the } or end.
- if (noIndent.includes(receiverNode.type)) {
- return concat([receiverDoc, operatorDoc, messageDoc]);
+ return ifBreak(
+ group(indent(concat(node.breakDoc.concat(rightSideDoc)))),
+ concat([receiverDoc, group(rightSideDoc)])
+ );
}
return group(concat([receiverDoc, group(indent(rightSideDoc))]));
diff --git a/src/ruby/nodes/commands.js b/src/ruby/nodes/commands.js
--- a/src/ruby/nodes/commands.js
+++ b/src/ruby/nodes/commands.js
@@ -105,8 +105,13 @@ function printCommandCall(path, opts, print) {
let breakDoc;
if (hasTernaryArg(node.body[3])) {
- parts.push("(");
- breakDoc = parts.concat(indent(concat([softline, argDocs])), softline, ")");
+ breakDoc = parts.concat(
+ "(",
+ indent(concat([softline, argDocs])),
+ softline,
+ ")"
+ );
+ parts.push(" ");
} else if (skipArgsAlign(path)) {
parts.push(" ");
breakDoc = parts.concat(argDocs);
diff --git a/src/utils/noIndent.js b/src/utils/noIndent.js
--- a/src/utils/noIndent.js
+++ b/src/utils/noIndent.js
@@ -4,6 +4,7 @@ const noIndent = [
"heredoc",
"if",
"method_add_block",
+ "unless",
"xstring_literal"
];
|
diff --git a/test/js/ruby/nodes/calls.test.js b/test/js/ruby/nodes/calls.test.js
--- a/test/js/ruby/nodes/calls.test.js
+++ b/test/js/ruby/nodes/calls.test.js
@@ -92,10 +92,7 @@ describe("calls", () => {
${item},
${item},
${item}
- ]
- .map(&:foo?)
- .bbb
- .ccc
+ ].map(&:foo?).bbb.ccc
`);
return expect(content).toChangeFormat(expected);
diff --git a/test/js/ruby/nodes/conditionals.test.js b/test/js/ruby/nodes/conditionals.test.js
--- a/test/js/ruby/nodes/conditionals.test.js
+++ b/test/js/ruby/nodes/conditionals.test.js
@@ -357,6 +357,9 @@ describe("conditionals", () => {
return expect(content).toChangeFormat(expected);
});
+ test("does not add parens if within a command_call non-breaking", () =>
+ expect("foo.bar baz ? foo : bar").toMatchFormat());
+
test("adds parens if within a command_call", () => {
const content = `foo.bar baz ? ${long} : ${long}`;
const expected = ruby(`
|
Hash indented twice when method chain continues off the hash
## Metadata
* Ruby version: 2.6.5
* `@prettier/plugin-ruby` or `prettier` gem version: 1.2.4
* Options:
* [x] `rubyHashLabel`
* [x] `rubyModifier`
* [x] `rubySingleQuote`
* [ ] `rubyToProc`
* [ ] `trailingComma`: "none"
## Input
```ruby
{
'first' => 'a long-enough value so hash does not end up on one line',
'second' => ''
}.merge(something).merge(something_else)
```
## Current output
```ruby
{
'first' => 'a long-enough value so hash does not end up on one line',
'second' => ''
}
.merge(something)
.merge(something_else)
```
## Expected output
```ruby
{
'first' => 'a long-enough value so hash does not end up on one line',
'second' => ''
}
.merge(something)
.merge(something_else)
```
---
Thanks for this plugin! Now that #725 added support for `# prettier-ignore`, I've been able to enable it for larger portions of our application code with one small slice at a time :relaxed:
I spotted this strange formatting for a hash in one place where rubocop (yes, we also use rubocop with prettier) complained about the end result formatting and I agree with rubocop here that it does look strange.
I'm not sure if the "Expected output" is indeed what we'd like to have here, but at least that one would not make rubocop complain.
Hash indented twice when method chain continues off the hash
## Metadata
* Ruby version: 2.6.5
* `@prettier/plugin-ruby` or `prettier` gem version: 1.2.4
* Options:
* [x] `rubyHashLabel`
* [x] `rubyModifier`
* [x] `rubySingleQuote`
* [ ] `rubyToProc`
* [ ] `trailingComma`: "none"
## Input
```ruby
{
'first' => 'a long-enough value so hash does not end up on one line',
'second' => ''
}.merge(something).merge(something_else)
```
## Current output
```ruby
{
'first' => 'a long-enough value so hash does not end up on one line',
'second' => ''
}
.merge(something)
.merge(something_else)
```
## Expected output
```ruby
{
'first' => 'a long-enough value so hash does not end up on one line',
'second' => ''
}
.merge(something)
.merge(something_else)
```
---
Thanks for this plugin! Now that #725 added support for `# prettier-ignore`, I've been able to enable it for larger portions of our application code with one small slice at a time :relaxed:
I spotted this strange formatting for a hash in one place where rubocop (yes, we also use rubocop with prettier) complained about the end result formatting and I agree with rubocop here that it does look strange.
I'm not sure if the "Expected output" is indeed what we'd like to have here, but at least that one would not make rubocop complain.
|
Oops, sorry, submitted the issue before using a nicer title 😅
Oops, sorry, submitted the issue before using a nicer title 😅
| 2021-01-05T01:34:15
|
javascript
|
Hard
|
prettier/plugin-ruby
| 785
|
prettier__plugin-ruby-785
|
[
"776",
"784"
] |
4a2514ff21efe5dce09f8f9e7467a13ce62f91cb
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
## [Unreleased]
+### Added
+
+- [@ianks], [@kddeisz] - Use `netcat` to communicate to a parser server for better performance when formatting multiple files.
+
+### Changed
+
+- [@jeffcarbs], [@kddeisz] - Long strings with interpolated expressions should only break if the contents in the original source is broken.
+- [@johannesluedke], [@kddeisz] - Fix for rescues with inline comments.
+- [@johncsnyder], [@kddeisz] - Comments should not attach to nodes beyond a double newline.
+- [@blampe], [@kddeisz] - Comments inside of a broken method chain get dropped.
+- [@clarkdave], [@kddeisz] - Don't ignore Sorbet `sig` transformations.
+
## [1.3.0] - 2021-01-05
### Added
@@ -1107,6 +1119,7 @@ would previously result in `array[]`, but now prints properly.
[@bugthing]: https://github.com/bugthing
[@cbothner]: https://github.com/cbothner
[@christoomey]: https://github.com/christoomey
+[@clarkdave]: https://github.com/clarkdave
[@cldevs]: https://github.com/cldevs
[@codingitwrong]: https://github.com/CodingItWrong
[@coiti]: https://github.com/coiti
@@ -1126,7 +1139,9 @@ would previously result in `array[]`, but now prints properly.
[@jamescostian]: https://github.com/jamescostian
[@janklimo]: https://github.com/janklimo
[@jbielick]: https://github.com/jbielick
+[@jeffcarbs]: https://github.com/jeffcarbs
[@joeyjoejoejr]: https://github.com/joeyjoejoejr
+[@johannesluedke]: https://github.com/johannesluedke
[@johncsnyder]: https://github.com/johncsnyder
[@johnschoeman]: https://github.com/johnschoeman
[@joshuakgoldberg]: https://github.com/JoshuaKGoldberg
diff --git a/src/ruby/nodes/calls.js b/src/ruby/nodes/calls.js
--- a/src/ruby/nodes/calls.js
+++ b/src/ruby/nodes/calls.js
@@ -43,7 +43,7 @@ function printCall(path, opts, print) {
// If our parent node is a chained node then we're not going to group the
// right side of the expression, as we want to have a nice multi-line layout.
- if (chained.includes(parentNode.type)) {
+ if (chained.includes(parentNode.type) && !node.comments) {
parentNode.chain = (node.chain || 0) + 1;
parentNode.callChain = (node.callChain || 0) + 1;
parentNode.breakDoc = (node.breakDoc || [receiverDoc]).concat(rightSideDoc);
@@ -103,7 +103,7 @@ function printMethodAddArg(path, opts, print) {
// If our parent node is a chained node then we're not going to group the
// right side of the expression, as we want to have a nice multi-line layout.
- if (chained.includes(parentNode.type)) {
+ if (chained.includes(parentNode.type) && !node.comments) {
parentNode.chain = (node.chain || 0) + 1;
parentNode.breakDoc = (node.breakDoc || [methodDoc]).concat(argsDoc);
parentNode.firstReceiverType = node.firstReceiverType;
@@ -136,41 +136,12 @@ function printMethodAddArg(path, opts, print) {
return concat([methodDoc, argsDoc]);
}
-// Sorbet type annotations look like the following:
-//
-// {method_add_block
-// [{method_add_arg
-// [{fcall
-// [{@ident "sig"}]},
-// {args []}]},
-// {brace_block [nil, {stmts}]}}]}
-//
-function isSorbetTypeAnnotation(node) {
- const [callNode, blockNode] = node.body;
-
- return (
- callNode.type === "method_add_arg" &&
- callNode.body[0].type === "fcall" &&
- callNode.body[0].body[0].body === "sig" &&
- callNode.body[1].type === "args" &&
- callNode.body[1].body.length === 0 &&
- blockNode
- );
-}
-
function printMethodAddBlock(path, opts, print) {
const node = path.getValue();
const [callNode, blockNode] = node.body;
const [callDoc, blockDoc] = path.map(print, "body");
- // Very special handling here for sorbet type annotations. They look like Ruby
- // code, but they're not actually Ruby code, so we're not going to mess with
- // them at all.
- if (isSorbetTypeAnnotation(node)) {
- return opts.originalText.slice(opts.locStart(node), opts.locEnd(node));
- }
-
// Don't bother trying to do any kind of fancy toProc transform if the option
// is disabled.
if (opts.rubyToProc) {
diff --git a/src/ruby/nodes/rescue.js b/src/ruby/nodes/rescue.js
--- a/src/ruby/nodes/rescue.js
+++ b/src/ruby/nodes/rescue.js
@@ -26,28 +26,10 @@ function printEnsure(path, opts, print) {
}
function printRescue(path, opts, print) {
- const [exception, variable, _stmts, addition] = path.getValue().body;
const parts = ["rescue"];
- if (exception || variable) {
- if (exception) {
- if (Array.isArray(exception)) {
- // In this case, it's actually only the one exception (it's an array
- // of length 1).
- parts.push(" ", path.call(print, "body", 0, 0));
- } else {
- // Here we have multiple exceptions from which we're rescuing, so we
- // need to align them and join them together.
- const joiner = concat([",", line]);
- const exceptions = group(join(joiner, path.call(print, "body", 0)));
-
- parts.push(" ", align("rescue ".length, exceptions));
- }
- }
-
- if (variable) {
- parts.push(" => ", path.call(print, "body", 1));
- }
+ if (path.getValue().body[0]) {
+ parts.push(align("rescue ".length, path.call(print, "body", 0)));
} else {
// If you don't specify an error to rescue in a `begin/rescue` block, then
// implicitly you're rescuing from `StandardError`. In this case, we're
@@ -55,16 +37,40 @@ function printRescue(path, opts, print) {
parts.push(" StandardError");
}
- const rescueBody = path.call(print, "body", 2);
+ const bodystmt = path.call(print, "body", 1);
- if (rescueBody.parts.length > 0) {
- parts.push(indent(concat([hardline, rescueBody])));
+ if (bodystmt.parts.length > 0) {
+ parts.push(indent(concat([hardline, bodystmt])));
}
// This is the next clause on the `begin` statement, either another
// `rescue`, and `ensure`, or an `else` clause.
- if (addition) {
- parts.push(concat([hardline, path.call(print, "body", 3)]));
+ if (path.getValue().body[2]) {
+ parts.push(concat([hardline, path.call(print, "body", 2)]));
+ }
+
+ return group(concat(parts));
+}
+
+// This is a container node that we're adding into the AST that isn't present in
+// Ripper solely so that we have a nice place to attach inline comments.
+function printRescueEx(path, opts, print) {
+ const [exception, variable] = path.getValue().body;
+ const parts = [];
+
+ if (exception) {
+ let exceptionDoc = path.call(print, "body", 0);
+
+ if (Array.isArray(exceptionDoc)) {
+ const joiner = concat([",", line]);
+ exceptionDoc = group(join(joiner, exceptionDoc));
+ }
+
+ parts.push(" ", exceptionDoc);
+ }
+
+ if (variable) {
+ parts.push(" => ", path.call(print, "body", 1));
}
return group(concat(parts));
@@ -89,6 +95,7 @@ module.exports = {
ensure: printEnsure,
redo: literal("redo"),
rescue: printRescue,
+ rescue_ex: printRescueEx,
rescue_mod: printRescueMod,
retry: literal("retry")
};
diff --git a/src/ruby/nodes/statements.js b/src/ruby/nodes/statements.js
--- a/src/ruby/nodes/statements.js
+++ b/src/ruby/nodes/statements.js
@@ -79,6 +79,9 @@ module.exports = {
const { body } = path.getValue();
return concat([trim, "__END__", literalline, body]);
},
+ "@comment"(path, opts, _print) {
+ return opts.printer.printComment(path);
+ },
bodystmt: printBodyStmt,
paren: printParen,
program: (path, opts, print) =>
diff --git a/src/ruby/nodes/strings.js b/src/ruby/nodes/strings.js
--- a/src/ruby/nodes/strings.js
+++ b/src/ruby/nodes/strings.js
@@ -4,6 +4,7 @@ const {
hardline,
indent,
literalline,
+ removeLines,
softline,
join
} = require("../../prettier");
@@ -103,14 +104,14 @@ function printStringDVar(path, opts, print) {
}
function printStringEmbExpr(path, opts, print) {
+ const node = path.getValue();
const parts = path.call(print, "body", 0);
- // If the interpolated expression is inside of a heredoc or an xstring
- // literal (a string that gets sent to the command line) then we don't want
- // to automatically indent, as this can lead to some very odd looking
- // expressions
- if (["heredoc", "xstring_literal"].includes(path.getParentNode().type)) {
- return concat(["#{", parts, "}"]);
+ // If the contents of this embedded expression were originally on the same
+ // line in the source, then we're going to leave them in place and assume
+ // that's the way the developer wanted this expression represented.
+ if (node.sl === node.el) {
+ return concat(["#{", removeLines(parts), "}"]);
}
return group(
diff --git a/src/ruby/parser.rb b/src/ruby/parser.rb
--- a/src/ruby/parser.rb
+++ b/src/ruby/parser.rb
@@ -22,6 +22,10 @@ module Prettier; end
class Prettier::Parser < Ripper
attr_reader :source, :lines, :scanner_events, :line_counts
+ # This is an attr_accessor so Stmts objects can grab comments out of this
+ # array and attach them to themselves.
+ attr_accessor :comments
+
def initialize(source, *args)
super(source, *args)
@@ -125,6 +129,7 @@ def on_comment(value)
@comments << {
type: :@comment,
value: value[1..-1].chomp.force_encoding('UTF-8'),
+ inline: value.strip != lines[lineno - 1],
sl: lineno,
el: lineno,
sc: char_pos,
@@ -1768,8 +1773,8 @@ class Rescue < SimpleDelegator
def bind_end(ec)
merge!(ec: ec)
- stmts = self[:body][2]
- consequent = self[:body][3]
+ stmts = self[:body][1]
+ consequent = self[:body][2]
if consequent
consequent.bind_end(ec)
@@ -1784,16 +1789,30 @@ def bind_end(ec)
# inside of a bodystmt.
def on_rescue(exceptions, variable, stmts, consequent)
beging = find_scanner_event(:@kw, 'rescue')
+ exceptions = exceptions[0] if exceptions.is_a?(Array)
- last_exception = exceptions.is_a?(Array) ? exceptions[-1] : exceptions
- last_node = variable || last_exception || beging
-
+ last_node = variable || exceptions || beging
stmts.bind(find_next_statement_start(last_node[:ec]), char_pos)
+ # We add an additional inner node here that ripper doesn't provide so that
+ # we have a nice place to attach inline comment. But we only need it if we
+ # have an exception or a variable that we're rescuing.
+ rescue_ex =
+ if exceptions || variable
+ {
+ type: :rescue_ex,
+ body: [exceptions, variable],
+ sl: beging[:sl],
+ sc: beging[:ec] + 1,
+ el: last_node[:el],
+ ec: last_node[:ec]
+ }
+ end
+
Rescue.new(
beging.merge!(
type: :rescue,
- body: [exceptions, variable, stmts, consequent],
+ body: [rescue_ex, stmts, consequent],
el: lineno,
ec: char_pos
)
@@ -1892,12 +1911,21 @@ def on_sclass(target, bodystmt)
# propagate that onto void_stmt nodes inside the stmts in order to make sure
# all comments get printed appropriately.
class Stmts < SimpleDelegator
+ attr_reader :parser
+
+ def initialize(parser, values)
+ @parser = parser
+ __setobj__(values)
+ end
+
def bind(sc, ec)
merge!(sc: sc, ec: ec)
if self[:body][0][:type] == :void_stmt
self[:body][0].merge!(sc: sc, ec: sc)
end
+
+ attach_comments(sc, ec)
end
def bind_end(ec)
@@ -1914,6 +1942,22 @@ def <<(statement)
self[:body] << statement
self
end
+
+ private
+
+ def attach_comments(sc, ec)
+ attachable =
+ parser.comments.select do |comment|
+ comment[:type] == :@comment && !comment[:inline] &&
+ sc <= comment[:sc] && ec >= comment[:ec] &&
+ !comment[:value].include?('prettier-ignore')
+ end
+
+ return if attachable.empty?
+
+ parser.comments -= attachable
+ self[:body] = (self[:body] + attachable).sort_by! { |node| node[:sc] }
+ end
end
# stmts_new is a parser event that represents the beginning of a list of
@@ -1921,6 +1965,7 @@ def <<(statement)
# stmts_add events, which we'll append onto an array body.
def on_stmts_new
Stmts.new(
+ self,
type: :stmts,
body: [],
sl: lineno,
diff --git a/src/ruby/printer.js b/src/ruby/printer.js
--- a/src/ruby/printer.js
+++ b/src/ruby/printer.js
@@ -54,8 +54,6 @@ function getCommentChildNodes(node) {
switch (node.type) {
case "heredoc":
return [node.beging];
- case "rescue":
- return [].concat(node.body[0]).concat(node.body.slice(1));
case "aryptn":
return [node.body[0]]
.concat(node.body[1])
|
diff --git a/test/js/ruby/layout.test.js b/test/js/ruby/layout.test.js
--- a/test/js/ruby/layout.test.js
+++ b/test/js/ruby/layout.test.js
@@ -1,3 +1,5 @@
+const { ruby } = require("../utils");
+
describe("layout", () => {
test("turns multiple blank lines into just one blank line", () =>
expect("1\n\n\n\n\n2").toChangeFormat("1\n\n2"));
@@ -10,4 +12,26 @@ describe("layout", () => {
test("handles multiple newlines at the end of the file", () =>
expect("foo\n\n\n").toChangeFormat("foo"));
+
+ test("keeps comments in their place when nothing to attach to", () => {
+ const content = ruby(`
+ # Comment
+ def f
+ print 1
+ end
+
+ # Comment
+ # Comment
+
+ def g
+ print 2
+ end
+
+ # Comment
+ # Comment
+ # Comment
+ `);
+
+ return expect(content).toMatchFormat();
+ });
});
diff --git a/test/js/ruby/nodes/blocks.test.js b/test/js/ruby/nodes/blocks.test.js
--- a/test/js/ruby/nodes/blocks.test.js
+++ b/test/js/ruby/nodes/blocks.test.js
@@ -129,7 +129,4 @@ describe("blocks", () => {
test("does not split up args inside pipes", () =>
expect(`loop do |${long} = 1, a${long} = 2|\nend`).toMatchFormat());
});
-
- test("leaves sorbet type annotations in place", () =>
- expect(`sig { ${long} }`).toMatchFormat());
});
diff --git a/test/js/ruby/nodes/rescue.test.js b/test/js/ruby/nodes/rescue.test.js
--- a/test/js/ruby/nodes/rescue.test.js
+++ b/test/js/ruby/nodes/rescue.test.js
@@ -110,6 +110,30 @@ describe("rescue", () => {
return expect(content).toMatchFormat();
});
+ test("comment inline with multiple", () => {
+ const content = ruby(`
+ begin
+ foo
+ rescue Foo, Bar # foo
+ bar
+ end
+ `);
+
+ return expect(content).toMatchFormat();
+ });
+
+ test("comment inline with splat", () => {
+ const content = ruby(`
+ begin
+ foo
+ rescue Foo, *Bar # foo
+ bar
+ end
+ `);
+
+ return expect(content).toMatchFormat();
+ });
+
test("one error with a comment", () => {
const content = ruby(`
begin
diff --git a/test/js/ruby/nodes/strings.test.js b/test/js/ruby/nodes/strings.test.js
--- a/test/js/ruby/nodes/strings.test.js
+++ b/test/js/ruby/nodes/strings.test.js
@@ -105,14 +105,20 @@ describe("strings", () => {
test("very interpolated", () =>
expect(`"abc #{"abc #{abc} abc"} abc"`).toMatchFormat());
- test("breaks interpolation on #{ ... } and not some inner node", () =>
- expect(`"${long} #{foo[:bar]} ${long}"`).toChangeFormat(
- ruby(`
- "${long} #{
- foo[:bar]
- } ${long}"
- `)
- ));
+ test("long strings with interpolation do not break", () =>
+ expect(`"${long} #{foo[:bar]} ${long}"`).toMatchFormat());
+
+ test("long strings with interpolation that were broken do break", () => {
+ const content = ruby(`
+ <<~HERE
+ #{
+ ${long}
+ }
+ HERE
+ `);
+
+ return expect(content).toMatchFormat();
+ });
test("within a heredoc there is no indentation", () => {
const content = ruby(`
|
Interpolated expressions inside long strings wrap across multiple lines
Wrapping the interpolated ruby expressions (i.e. `#{something}`) in a long string across multiple lines is technically valid ruby but I don't think I've ever seen it in production code. This behavior is also different from the js/ts (see below).
## Metadata
* Ruby version: 2.7.2
* `@prettier/plugin-ruby` version: 1.3.0
* Options:
* [x] `rubyHashLabel`
* [x] `rubyModifier`
* [x] `rubySingleQuote`
* [ ] `rubyToProc`
* [x] `trailingComma`
## Input
```ruby
"Some really long string of text that goes beyond the configured #{variable_1} line length with interpolation #{variable_2}"
```
## Current output
```ruby
"Some really long string of text that goes beyond the configured #{
variable_1
} line length with interpolation #{variable_2}"
```
## Expected output
```ruby
"Some really long string of text that goes beyond the configured #{variable_1} line length with interpolation #{variable_2}"
```
## In javascript/typescript
This comparable line is kept as-is:
```javascript
`Some really long string of text that goes beyond the configured ${variable_1} line length with interpolation ${variable_2}`;
```
Sorbet type annotations are ignored
I can see that Sorbet type annotations are being explicitly ignored as of [fairly recently](https://github.com/prettier/plugin-ruby/pull/718) so this issue is about reversing that or turning it into an option.
The comment in ruby-prettier where Sorbet signatures are skipped says:
> They look like Ruby code, but they're not actually Ruby code, so we're not going to mess with them at all
But this is not the case; by design, Sorbet type signatures are 100% Ruby. From the [Sorbet docs](https://sorbet.org/docs/sigs):
> Signatures are valid Ruby syntax
We have ~700 signatures in our Ruby codebase and we never had any issues with them being formatted by prettier in previous versions. In fact, prettier is *fantastic* for Sorbet signatures precisely because it tidies them up. For example, you can write a signature like this:
```rb
sig{params(name: String, address: T::Hash[String, String], tracking: T::Boolean).returns(T::Boolean)}
def ship(name, address, tracking); end
```
And prettier would (in version 0.22) format it into this:
```rb
sig do
params(name: String, address: T::Hash[String, String], tracking: T::Boolean)
.returns(T::Boolean)
end
def ship(name, address, tracking); end
```
It's unclear why Sorbet signatures were skipped, but we'd love to have prettier format them again. If excluding them was a stylistic choice (i.e. some people may prefer their signatures remain entirely on one line, even if they breach the line length limit) perhaps it could be an option instead?
## Metadata
* Ruby version: 2.6.6
* `@prettier/plugin-ruby` or `prettier` gem version: 1.3.0
* Options:
* [all] `trailingComma`
|
Hi @clarkdave!
I actually did that out of an abundance of precaution. I just got nervous about changing them in case I would accidentally break them. I'd be fine reversing that decision if you're 100% sure.
Feel like making a contribution? I think it should basically just be the opposite of that PR that you linked.
Sure, I'll make a PR!
I'm confident that Sorbet types are 100% Ruby. My only thought is that some people may prefer, stylistically, that signatures always remain on a single line - but that seems like something that can be discussed in the future when there are more Sorbet+Prettier users. I know there's precedent for similar decisions from JS Prettier, e.g. `it(..., () => {` expressions always remaining on one line.
Ehh I'm fine with taking a stand on this and saying no to another option. At least it'll be consistent with the rest of the formatting.
| 2021-01-15T22:21:10
|
javascript
|
Hard
|
prettier/plugin-ruby
| 837
|
prettier__plugin-ruby-837
|
[
"836"
] |
da580de30ec55b6a401597a5a46cf92159d3f438
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
## [Unreleased]
+### Changed
+
+- [#835](https://github.com/prettier/plugin-ruby/issues/835) - valscion, kddeisz - Array splat operator should not get moved by leading comments.
+- [#836](https://github.com/prettier/plugin-ruby/issues/836) - valscion, kddeisz - Array splat operator should not get moved by trailing comments.
+
## [1.5.3] - 2021-02-28
### Changed
diff --git a/src/ruby/nodes/args.js b/src/ruby/nodes/args.js
--- a/src/ruby/nodes/args.js
+++ b/src/ruby/nodes/args.js
@@ -147,9 +147,16 @@ function printArgsAddStar(path, opts, print) {
// *values
// ]
//
+ // or if we have an array like:
+ //
+ // [
+ // *values # comment
+ // ]
+ //
// then we need to make sure we don't accidentally prepend the operator
// before the comment.
- docs[1].parts[2] = concat(["*", docs[1].parts[2]]);
+ const index = node.body[1].comments.filter(({ leading }) => leading).length;
+ docs[1].parts[index] = concat(["*", docs[1].parts[index]]);
} else {
// If we don't have any comments, we can just prepend the operator
docs[1] = concat(["*", docs[1]]);
|
diff --git a/test/js/ruby/nodes/method.test.js b/test/js/ruby/nodes/method.test.js
--- a/test/js/ruby/nodes/method.test.js
+++ b/test/js/ruby/nodes/method.test.js
@@ -249,6 +249,8 @@ describe("method", () => {
const content = ruby(`
foo(
# comment
+ # another comment
+ # even more comment
*values
)
`);
@@ -256,6 +258,19 @@ describe("method", () => {
return expect(content).toMatchFormat();
});
+ test("with trailing comments", () => {
+ const content = ruby(`
+ foo(
+ # comment
+ # another comment
+ *values # a trailing comment
+ # a whole other comment
+ )
+ `);
+
+ return expect(content).toMatchFormat();
+ });
+
test("with block", () => expect("foo(*bar, &block)").toMatchFormat());
test("with comments and block", () => {
|
Splat operator on literal array with trailing comments can format to broken Ruby code
## Metadata
- Ruby version: 2.6.5
- `@prettier/plugin-ruby` or `prettier` gem version: 1.5.3
- Options:
- [x] `rubyHashLabel`
- [x] `rubyModifier`
- [x] `rubySingleQuote`
- [ ] `rubyToProc`
- [ ] `trailingComma`
## Input
```ruby
expect(invoice.sorted_line_items).to eq([
*line_items_without_author_email,
line_items_with_author_email[2], # bar@example.com
*line_items_with_author_email.first(2) # foo@example.com
])
```
## Current output
```ruby
expect(invoice.sorted_line_items).to eq(
[
*line_items_without_author_email,
line_items_with_author_email[2], # bar@example.com
line_items_with_author_email.first(2)* # foo@example.com
]
)
```
## Expected output
```ruby
expect(invoice.sorted_line_items).to eq(
[
*line_items_without_author_email,
line_items_with_author_email[2], # bar@example.com
*line_items_with_author_email.first(2) # foo@example.com
]
)
```
---
The output is broken Ruby. This seems related to the behavior of splat operator, like #835 and #812
| 2021-03-04T15:55:19
|
javascript
|
Hard
|
|
vercel/nft
| 37
|
vercel__nft-37
|
[
"35"
] |
9bc82001c9a9d6b1361892675289e1f5feb45ad3
|
diff --git a/azure-prepare.js b/azure-prepare.js
--- a/azure-prepare.js
+++ b/azure-prepare.js
@@ -19,4 +19,4 @@ if (process.platform === 'win32') {
writeFileSync(join(__dirname, 'package.json'), JSON.stringify(pkg));
} else {
console.log('[azure-prepare] Expected current platform to be win32 but found ' + process.platform);
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
"axios": "^0.19.0",
"azure-storage": "^2.10.3",
"browserify-middleware": "^8.1.1",
+ "bull": "^3.10.0",
"canvas": "^2.5.0",
"chromeless": "^1.5.2",
"codecov": "^3.1.0",
diff --git a/src/utils/special-cases.js b/src/utils/special-cases.js
--- a/src/utils/special-cases.js
+++ b/src/utils/special-cases.js
@@ -8,6 +8,11 @@ const specialCases = {
emitAssetDirectory(path.resolve(path.dirname(id), 'runtime/'));
}
},
+ 'bull' ({ id, emitAssetDirectory }) {
+ if (id.endsWith('bull/lib/commands/index.js')) {
+ emitAssetDirectory(path.resolve(path.dirname(id)));
+ }
+ },
'google-gax' ({ id, ast, emitAssetDirectory }) {
if (id.endsWith('google-gax/build/src/grpc.js')) {
// const googleProtoFilesDir = path.normalize(google_proto_files_1.getProtoPath('..'));
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2728,6 +2728,22 @@ builtins@^1.0.3:
resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+bull@^3.10.0:
+ version "3.10.0"
+ resolved "https://registry.yarnpkg.com/bull/-/bull-3.10.0.tgz#5879b1201d0ed0c987fa1f42114d3dc5abf3da68"
+ integrity sha512-LbQsc7c+eYd7IaJD7tS373yKLYttjTfoPZ+9xYYlPM5+gutAjofSTsESOGGyaxyX2lE1dkg+eWhUK5kAPl5Zow==
+ dependencies:
+ cron-parser "^2.7.3"
+ debuglog "^1.0.0"
+ get-port "^5.0.0"
+ ioredis "^4.5.1"
+ lodash "^4.17.11"
+ p-timeout "^3.1.0"
+ promise.prototype.finally "^3.1.0"
+ semver "^6.1.1"
+ util.promisify "^1.0.0"
+ uuid "^3.2.1"
+
bun@^0.0.12:
version "0.0.12"
resolved "https://registry.yarnpkg.com/bun/-/bun-0.0.12.tgz#d54fae69f895557f275423bc14b404030b20a5fc"
@@ -3189,6 +3205,11 @@ cluster-key-slot@^1.0.6:
resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.0.12.tgz#d5deff2a520717bc98313979b687309b2d368e29"
integrity sha512-21O0kGmvED5OJ7ZTdqQ5lQQ+sjuez33R+d35jZKLwqUb5mqcPHUsxOSzj61+LHVtxGZd1kShbQM3MjB/gBJkVg==
+cluster-key-slot@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d"
+ integrity sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw==
+
cmd-shim@^2.0.2, cmd-shim@~2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
@@ -3645,6 +3666,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4, create-hmac@^1.1.7:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
+cron-parser@^2.7.3:
+ version "2.13.0"
+ resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.13.0.tgz#6f930bb6f2931790d2a9eec83b3ec276e27a6725"
+ integrity sha512-UWeIpnRb0eyoWPVk+pD3TDpNx3KCFQeezO224oJIkktBrcW6RoAPOx5zIKprZGfk6vcYSmA8yQXItejSaDBhbQ==
+ dependencies:
+ is-nan "^1.2.1"
+ moment-timezone "^0.5.25"
+
cross-spawn@^5.0.1:
version "5.1.0"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -3814,7 +3843,7 @@ debug@^3.1.0, debug@^3.2.6:
dependencies:
ms "^2.1.1"
-debuglog@^1.0.1:
+debuglog@^1.0.0, debuglog@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -3870,7 +3899,7 @@ defaults@^1.0.3:
dependencies:
clone "^1.0.2"
-define-properties@^1.1.2:
+define-properties@^1.1.1, define-properties@^1.1.2:
version "1.1.3"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -4285,7 +4314,7 @@ error-stack-parser@^2.0.2:
dependencies:
stackframe "^1.0.4"
-es-abstract@^1.5.0, es-abstract@^1.5.1:
+es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.9.0:
version "1.13.0"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
@@ -5265,6 +5294,13 @@ get-caller-file@^1.0.1:
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+get-port@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.0.0.tgz#aa22b6b86fd926dd7884de3e23332c9f70c031a6"
+ integrity sha512-imzMU0FjsZqNa6BqOjbbW6w5BivHIuQKopjpPqcnx0AVHJQKCxK1O+Ab3OrVXhrekqfVMjwA9ZYu062R+KcIsQ==
+ dependencies:
+ type-fest "^0.3.0"
+
get-stdin@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
@@ -6208,6 +6244,21 @@ ioredis@^4.11.1:
redis-parser "^3.0.0"
standard-as-callback "^2.0.1"
+ioredis@^4.5.1:
+ version "4.14.0"
+ resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.14.0.tgz#d0e83b1d308ca1ba6e849798bfe91583b560eaac"
+ integrity sha512-vGzyW9QTdGMjaAPUhMj48Z31mIO5qJLzkbsE5dg+orNi7L5Ph035htmkBZNDTDdDk7kp7e9UJUr+alhRuaWp8g==
+ dependencies:
+ cluster-key-slot "^1.1.0"
+ debug "^4.1.1"
+ denque "^1.1.0"
+ lodash.defaults "^4.2.0"
+ lodash.flatten "^4.4.0"
+ redis-commands "1.5.0"
+ redis-errors "^1.2.0"
+ redis-parser "^3.0.0"
+ standard-as-callback "^2.0.1"
+
ip-regex@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -6441,6 +6492,13 @@ is-lower-case@^1.1.0:
dependencies:
lower-case "^1.1.0"
+is-nan@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.2.1.tgz#9faf65b6fb6db24b7f5c0628475ea71f988401e2"
+ integrity sha1-n69ltvttskt/XAYoR16nH5iEAeI=
+ dependencies:
+ define-properties "^1.1.1"
+
is-negated-glob@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
@@ -9647,6 +9705,13 @@ p-timeout@^2.0.1:
dependencies:
p-finally "^1.0.0"
+p-timeout@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.1.0.tgz#198c1f503bb973e9b9727177a276c80afd6851f3"
+ integrity sha512-C27DYI+tCroT8J8cTEyySGydl2B7FlxrGNF5/wmMbl1V+jeehUCzEE/BVgzRebdm2K3ZitKOKx8YbdFumDyYmw==
+ dependencies:
+ p-finally "^1.0.0"
+
p-try@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -10316,6 +10381,15 @@ promise-retry@^1.1.1:
err-code "^1.0.0"
retry "^0.10.0"
+promise.prototype.finally@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.0.tgz#66f161b1643636e50e7cf201dc1b84a857f3864e"
+ integrity sha512-7p/K2f6dI+dM8yjRQEGrTQs5hTQixUAdOGpMEA3+pVxpX5oHKRSKAXyLw9Q9HUWDTdwtoo39dSHGQtN90HcEwQ==
+ dependencies:
+ define-properties "^1.1.2"
+ es-abstract "^1.9.0"
+ function-bind "^1.1.1"
+
promise@^7.0.1, promise@^7.0.3:
version "7.3.1"
resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -12877,6 +12951,11 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"
+type-fest@^0.3.0:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
+ integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
+
type-is@^1.6.16, type-is@~1.6.17, type-is@~1.6.18:
version "1.6.18"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
|
diff --git a/test/integration/bull.js b/test/integration/bull.js
new file mode 100644
--- /dev/null
+++ b/test/integration/bull.js
@@ -0,0 +1,11 @@
+const Queue = require('bull');
+// Create free tier on https://redislabs.com and assign redis://:password@hostname:port
+const pdfQueue = new Queue('pdf transcoding', process.env.BULL_REDIS_CONNECTION);
+
+pdfQueue.process(function(job, done) {
+ job.progress(42);
+ done();
+ pdfQueue.close();
+});
+
+pdfQueue.add({ pdf: 'http://example.com/file.pdf' });
|
Add support for `bull`
Example integration test:
```js
const Queue = require('bull');
const host = 'redis123.cloud.redislabs.com';
const port = 10883;
const password = 'abc123pswrd';
const pdfQueue = new Queue('pdf transcoding', { redis: { port, host, password }});
pdfQueue.process(function(job, done) {
job.progress(42);
job.progress(99);
done();
pdfQueue.close();
});
pdfQueue.add({ pdf: 'http://example.com/file.pdf' });
```
This currently fails to find any files in `node_modules/bull/**` like I would expect and fails with the following error:
```
TypeError: queue.client.updateDelaySet is not a function
```
|
An interesting thing to check with failures like this would be to compare
against ncc - will distinguish the easy bugs from the harder ones at least!
On Tue, Aug 6, 2019 at 17:53 Steven <notifications@github.com> wrote:
> Example integration test:
>
> const Queue = require('bull');const host = 'redis123.cloud.redislabs.com';const port = 10883;const password = 'abc123p@ssword';const pdfQueue = new Queue('pdf transcoding', { redis: { port, host, password }});
> pdfQueue.process(function(job, done){
> job.progress(42);
> job.progress(99);
> done();
> });
>
> This currently fails to find any files in node_modules/bull/** like I
> would expect and fails with the error:
>
> TypeError: queue.client.updateDelaySet is not a function
>
> —
> You are receiving this because you are subscribed to this thread.
> Reply to this email directly, view it on GitHub
> <https://github.com/zeit/node-file-trace/issues/35?email_source=notifications&email_token=AAESFSXIS4XJHISOTWHH6EDQDHXENA5CNFSM4IJ2R2O2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HDXYU3Q>,
> or mute the thread
> <https://github.com/notifications/unsubscribe-auth/AAESFSUCMBTPXXW3LJ5ZDULQDHXENANCNFSM4IJ2R2OQ>
> .
>
@guybedford Good point!
It also fails when using `ncc` with the following error:
```
TypeError: client.addJob is not a function
```
| 2019-08-07T01:18:12
|
javascript
|
Hard
|
pinojs/pino-pretty
| 316
|
pinojs__pino-pretty-316
|
[
"304"
] |
3d471da6a1fce2b68ea212b671c4eb2558076813
|
diff --git a/index.js b/index.js
--- a/index.js
+++ b/index.js
@@ -4,9 +4,7 @@ const { isColorSupported } = require('colorette')
const pump = require('pump')
const { Transform } = require('readable-stream')
const abstractTransport = require('pino-abstract-transport')
-const sonic = require('sonic-boom')
const sjs = require('secure-json-parse')
-
const colors = require('./lib/colors')
const { ERROR_LIKE_KEYS, MESSAGE_KEY, TIMESTAMP_KEY, LEVEL_KEY, LEVEL_NAMES } = require('./lib/constants')
const {
@@ -17,6 +15,7 @@ const {
prettifyMetadata,
prettifyObject,
prettifyTime,
+ buildSafeSonicBoom,
filterLog
} = require('./lib/utils')
@@ -227,7 +226,7 @@ function build (opts = {}) {
if (typeof opts.destination === 'object' && typeof opts.destination.write === 'function') {
destination = opts.destination
} else {
- destination = sonic({
+ destination = buildSafeSonicBoom({
dest: opts.destination || 1,
append: opts.append,
mkdir: opts.mkdir,
diff --git a/lib/utils.js b/lib/utils.js
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -2,7 +2,9 @@
const clone = require('rfdc')({ circles: true })
const dateformat = require('dateformat')
+const SonicBoom = require('sonic-boom')
const stringifySafe = require('fast-safe-stringify')
+const { isMainThread } = require('worker_threads')
const defaultColorizer = require('./colors')()
const {
DATE_FORMAT,
@@ -23,6 +25,7 @@ module.exports = {
prettifyMetadata,
prettifyObject,
prettifyTime,
+ buildSafeSonicBoom,
filterLog
}
@@ -580,3 +583,67 @@ function filterLog (log, ignoreKeys) {
})
return logCopy
}
+
+function noop () {}
+
+/**
+ * Creates a safe SonicBoom instance
+ *
+ * @param {object} opts Options for SonicBoom
+ *
+ * @returns {object} A new SonicBoom stream
+ */
+function buildSafeSonicBoom (opts) {
+ const stream = new SonicBoom(opts)
+ stream.on('error', filterBrokenPipe)
+ // if we are sync: false, we must flush on exit
+ if (!opts.sync && isMainThread) {
+ setupOnExit(stream)
+ }
+ return stream
+
+ function filterBrokenPipe (err) {
+ if (err.code === 'EPIPE') {
+ stream.write = noop
+ stream.end = noop
+ stream.flushSync = noop
+ stream.destroy = noop
+ return
+ }
+ stream.removeListener('error', filterBrokenPipe)
+ }
+}
+
+function setupOnExit (stream) {
+ /* istanbul ignore next */
+ if (global.WeakRef && global.WeakMap && global.FinalizationRegistry) {
+ // This is leak free, it does not leave event handlers
+ const onExit = require('on-exit-leak-free')
+
+ onExit.register(stream, autoEnd)
+
+ stream.on('close', function () {
+ onExit.unregister(stream)
+ })
+ }
+}
+
+/* istanbul ignore next */
+function autoEnd (stream, eventName) {
+ // This check is needed only on some platforms
+
+ if (stream.destroyed) {
+ return
+ }
+
+ if (eventName === 'beforeExit') {
+ // We still have an event loop, let's use it
+ stream.flush()
+ stream.on('drain', function () {
+ stream.end()
+ })
+ } else {
+ // We do not have an event loop, so flush synchronously
+ stream.flushSync()
+ }
+}
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
"dateformat": "^4.6.3",
"fast-safe-stringify": "^2.0.7",
"joycon": "^3.1.1",
+ "on-exit-leak-free": "^0.2.0",
"pino-abstract-transport": "^0.5.0",
"pump": "^3.0.0",
"readable-stream": "^3.6.0",
|
diff --git a/test/lib/utils.public.test.js b/test/lib/utils.public.test.js
--- a/test/lib/utils.public.test.js
+++ b/test/lib/utils.public.test.js
@@ -3,6 +3,9 @@
const tap = require('tap')
const getColorizer = require('../../lib/colors')
const utils = require('../../lib/utils')
+const rimraf = require('rimraf')
+const { join } = require('path')
+const fs = require('fs')
tap.test('prettifyErrorLog', t => {
const { prettifyErrorLog } = utils
@@ -428,3 +431,48 @@ tap.test('#filterLog with circular references', t => {
t.end()
})
+
+tap.test('buildSafeSonicBoom', t => {
+ const { buildSafeSonicBoom } = utils
+
+ function noop () {}
+
+ const file = () => {
+ const dest = join(__dirname, `${process.pid}-${process.hrtime().toString()}`)
+ const fd = fs.openSync(dest, 'w')
+ return { dest, fd }
+ }
+
+ t.test('should not write when error emitted and code is "EPIPE"', async t => {
+ t.plan(1)
+
+ const { fd, dest } = file()
+ const stream = buildSafeSonicBoom({ sync: true, fd, mkdir: true })
+ t.teardown(() => rimraf(dest, noop))
+
+ stream.emit('error', { code: 'EPIPE' })
+ stream.write('will not work')
+
+ const dataFile = fs.readFileSync(dest)
+ t.equal(dataFile.length, 0)
+ })
+
+ t.test('should stream.write works when error code is not "EPIPE"', async t => {
+ t.plan(3)
+ const { fd, dest } = file()
+ const stream = buildSafeSonicBoom({ sync: true, fd, mkdir: true })
+
+ t.teardown(() => rimraf(dest, noop))
+
+ stream.on('error', () => t.pass('error emitted'))
+
+ stream.emit('error', 'fake error description')
+
+ t.ok(stream.write('will work'))
+
+ const dataFile = fs.readFileSync(dest)
+ t.equal(dataFile.toString(), 'will work')
+ })
+
+ t.end()
+})
|
Dissapering logs with fatal
In this example the fatal log never appear:
```js
const pino = require('pino');
const pinoPretty = require('pino-pretty');
const logger = pino(
{ level: 'info' },
pinoPretty({
levelFirst: true,
colorize: true,
translateTime: 'yyyy-mm-dd HH:MM:ss',
})
);
logger.info('test 123');
logger.fatal(new Error('not visible'));
process.exit(1)
```
It's clearly `pino-pretty` issue, as it does not happen with raw pino.
`sync: true,` is workaround.
|
Thanks, this is working as expected! However we need to add the following block that's missing:
https://github.com/pinojs/pino/blob/f8696ab5fb0e5a819b6255af420b29fb075cbdee/lib/tools.js#L335-L373
hello, I am also facing this issue and I can't get the workaround to work; where exactly do you specify `sync: true`?
https://github.com/pinojs/pino-pretty#usage-with-jest
u need to have version `7.5.1` of `pino-pretty` for this work (with TS)
| 2022-03-14T14:21:50
|
javascript
|
Hard
|
pinojs/pino-pretty
| 434
|
pinojs__pino-pretty-434
|
[
"433"
] |
bf973c749b8516998e8aeab3dac39591db314586
|
diff --git a/index.js b/index.js
--- a/index.js
+++ b/index.js
@@ -162,7 +162,7 @@ function prettyFactory (options) {
line += ':'
}
- if (prettifiedMessage) {
+ if (prettifiedMessage !== undefined) {
if (line.length > 0) {
line = `${line} ${prettifiedMessage}`
} else {
@@ -186,7 +186,7 @@ function prettyFactory (options) {
if (singleLine) line += EOL
line += prettifiedErrorLog
} else if (!hideObject) {
- const skipKeys = [messageKey, levelKey, timestampKey].filter(key => typeof log[key] === 'string' || typeof log[key] === 'number')
+ const skipKeys = [messageKey, levelKey, timestampKey].filter(key => typeof log[key] === 'string' || typeof log[key] === 'number' || typeof log[key] === 'boolean')
const prettifiedObject = prettifyObject({
input: log,
skipKeys,
diff --git a/lib/utils.js b/lib/utils.js
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -280,7 +280,7 @@ function prettifyMessage ({ log, messageFormat, messageKey = MESSAGE_KEY, colori
return colorizer.message(msg)
}
if (messageKey in log === false) return undefined
- if (typeof log[messageKey] !== 'string') return undefined
+ if (typeof log[messageKey] !== 'string' && typeof log[messageKey] !== 'number' && typeof log[messageKey] !== 'boolean') return undefined
return colorizer.message(log[messageKey])
}
|
diff --git a/test/basic.test.js b/test/basic.test.js
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -118,6 +118,70 @@ test('basic prettifier tests', (t) => {
log.info('foo')
})
+ t.test('can print message key value when its a string', (t) => {
+ t.plan(1)
+ const pretty = prettyFactory()
+ const log = pino({}, new Writable({
+ write (chunk, enc, cb) {
+ const formatted = pretty(chunk.toString())
+ t.equal(
+ formatted,
+ `[${formattedEpoch}] INFO (${pid}): baz\n`
+ )
+ cb()
+ }
+ }))
+ log.info('baz')
+ })
+
+ t.test('can print message key value when its a number', (t) => {
+ t.plan(1)
+ const pretty = prettyFactory()
+ const log = pino({}, new Writable({
+ write (chunk, enc, cb) {
+ const formatted = pretty(chunk.toString())
+ t.equal(
+ formatted,
+ `[${formattedEpoch}] INFO (${pid}): 42\n`
+ )
+ cb()
+ }
+ }))
+ log.info(42)
+ })
+
+ t.test('can print message key value when its a Number(0)', (t) => {
+ t.plan(1)
+ const pretty = prettyFactory()
+ const log = pino({}, new Writable({
+ write (chunk, enc, cb) {
+ const formatted = pretty(chunk.toString())
+ t.equal(
+ formatted,
+ `[${formattedEpoch}] INFO (${pid}): 0\n`
+ )
+ cb()
+ }
+ }))
+ log.info(0)
+ })
+
+ t.test('can print message key value when its a boolean', (t) => {
+ t.plan(1)
+ const pretty = prettyFactory()
+ const log = pino({}, new Writable({
+ write (chunk, enc, cb) {
+ const formatted = pretty(chunk.toString())
+ t.equal(
+ formatted,
+ `[${formattedEpoch}] INFO (${pid}): true\n`
+ )
+ cb()
+ }
+ }))
+ log.info(true)
+ })
+
t.test('can use different message keys', (t) => {
t.plan(1)
const pretty = prettyFactory({ messageKey: 'bar' })
|
Pino Pretty does not output numbers but only strings.
I have a very simple log file with as below `app.log`
```
{"level":30,"time":"2023-06-19T04:01:56.478Z","pid":2484,"hostname":"YMLTITD2227","msg":77}
{"level":30,"time":"2023-06-19T04:01:56.478Z","pid":2484,"hostname":"YMLTITD2227","msg":"42"}
```
Notice that first message is number 77, while the other is string 42. If I do `cat app.log | npx pino-pretty`, I get the below output
```
[12:01:56.478] INFO (2484):
[12:01:56.478] INFO (2484): 42
```
It does NOT display the numbers, but only the strings. I was hoping that pino-pretty should be able to interpret numbers as strings.
|
Thanks for reporting! Would you like to send a Pull Request to address this issue? Remember to add unit tests.
| 2023-06-23T05:01:00
|
javascript
|
Easy
|
prettier/plugin-ruby
| 1,097
|
prettier__plugin-ruby-1097
|
[
"1096"
] |
7282507b3a6f44ff4c81b3d1adf4c63e961f1913
|
diff --git a/src/haml/parser.rb b/src/haml/parser.rb
--- a/src/haml/parser.rb
+++ b/src/haml/parser.rb
@@ -44,6 +44,12 @@ def parse_value(string, level = 0)
if hash
# Explicitly not using Enumerable#to_h here to support Ruby 2.5
hash.each_with_object({}) do |(key, value), response|
+ # For attributes that starts with @, wrap the attribute in quotes
+ # For other attributes, remove the quotes
+ # AlpineJS uses @-attributes
+ # {'type': 'submit'} => {type: 'submit'}
+ # {'@click': 'open'} => {'@click': 'open'}
+ key = "\'#{key}\'" if key.start_with?('@')
response[key] = parse_value(value, level + 1)
end
else
|
diff --git a/test/js/haml/tag.test.ts b/test/js/haml/tag.test.ts
--- a/test/js/haml/tag.test.ts
+++ b/test/js/haml/tag.test.ts
@@ -103,6 +103,10 @@ describe("tag", () => {
expect(content).toChangeFormat(expected);
});
+
+ test("attributes prefixed with @", () => {
+ expect(haml("%span{'@click': 'open = true'}")).toMatchFormat();
+ });
});
test("object reference", () => {
|
HAML attributes starting with `@` are incorrectly formatted
## Metadata
- Operating system: MacOS, Ubuntu (in Codespaces)
- Ruby version: latest
- Node version: latest
- `@prettier/plugin-ruby` or `prettier` gem version: latest
- Options:
- `rubyArrayLiteral` - `true`
- `rubyHashLabel` - `true`
- `rubyModifier` - `true`
- `rubySingleQuote` - `true`
- `rubyToProc` - `false`
- `trailingComma` - `"none"`
## Input
```haml
%span{'@click': 'open = true'}
```
## Current output
```ruby
%span{@click: 'open = true'}
```
## Expected output
```ruby
%span{'@click': 'open = true'}
```
## Context
Thanks for this project!
[AlpineJS](https://alpinejs.dev/) is a JavaScript framework we’re using in our Rails project, and makes extensive uses of “@-directives” like `@click`, `@change`, `@keydown`…
In HAML, such attributes need to be wrapped in quotes to be valid, however, this plugin strips them out. The attached PR (#1097) adds a failing spec to illustrate the issue and a tentative fix. This is my first contribution to this project, please let me know if I missed something!
| 2021-12-28T21:54:12
|
javascript
|
Hard
|
|
pinojs/pino-pretty
| 340
|
pinojs__pino-pretty-340
|
[
"339"
] |
e793e646a0b539b3a9aa8b5ab43e64a8d86b05d6
|
diff --git a/index.d.ts b/index.d.ts
--- a/index.d.ts
+++ b/index.d.ts
@@ -9,7 +9,7 @@
import { Transform } from 'stream';
import { OnUnknown } from 'pino-abstract-transport';
// @ts-ignore fall back to any if pino is not available, i.e. when running pino tests
-import { DestinationStream } from 'pino';
+import { DestinationStream, Level } from 'pino';
type LogDescriptor = Record<string, unknown>;
@@ -61,6 +61,11 @@ interface PrettyOptions_ {
* @default "time"
*/
timestampKey?: string;
+ /**
+ * The minimum log level to include in the output.
+ * @default "trace"
+ */
+ minimumLevel?: Level;
/**
* Format output of message, e.g. {level} - {pid} will output message: INFO - 1123
* @default false
|
diff --git a/test/types/pino-pretty.test-d.ts b/test/types/pino-pretty.test-d.ts
--- a/test/types/pino-pretty.test-d.ts
+++ b/test/types/pino-pretty.test-d.ts
@@ -21,6 +21,7 @@ const options: PinoPretty.PrettyOptions = {
levelFirst: false,
messageKey: "msg",
timestampKey: "timestamp",
+ minimumLevel: "trace",
translateTime: "UTC:h:MM:ss TT Z",
singleLine: false,
customPrettifiers: {
@@ -47,6 +48,7 @@ const options2: PrettyOptions = {
levelFirst: false,
messageKey: "msg",
timestampKey: "timestamp",
+ minimumLevel: "trace",
translateTime: "UTC:h:MM:ss TT Z",
singleLine: false,
customPrettifiers: {
|
Typings missing `minimumLevel`
`minimumLevel` is a valid option here:
https://github.com/pinojs/pino-pretty/blob/e793e646a0b539b3a9aa8b5ab43e64a8d86b05d6/index.js#L57
But it's not available in the typings:
Which I assume is because it isn't part of the default options set, so when the typings were written it was missed:
https://github.com/pinojs/pino-pretty/blob/e793e646a0b539b3a9aa8b5ab43e64a8d86b05d6/index.js#L30-L48
(psst... what is the default minimum level?)
|
Would you be open to send a PR for this? It would also need a tsd test.
Yep, just need to know what the default is for proper documentation.
Edt: Just seems to be trace. I'll PR this now.
| 2022-06-03T22:53:19
|
javascript
|
Easy
|
vercel/nft
| 481
|
vercel__nft-481
|
[
"471"
] |
a0746bdb71d0a994b54f6fa32e3bfd6378f2412c
|
diff --git a/package-lock.json b/package-lock.json
--- a/package-lock.json
+++ b/package-lock.json
@@ -79,7 +79,7 @@
"jugglingdb": "^2.0.1",
"koa": "^2.7.0",
"leveldown": "^5.6.0",
- "lighthouse": "^5.1.0",
+ "lighthouse": "^12.3.0",
"loopback": "^3.26.0",
"mailgun": "^0.5.0",
"mariadb": "^2.0.5",
@@ -3409,6 +3409,97 @@
"integrity": "sha512-2xCRM9q9FlzGZCdgDMJwc0gyUkWFtkosy7Xxr6sFgQwn+wMNIWd7xIvYNauU1r64B5L5rsGKy/n9TKJ0aAFeqQ==",
"dev": true
},
+ "node_modules/@formatjs/ecma402-abstract": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.3.tgz",
+ "integrity": "sha512-pJT1OkhplSmvvr6i3CWTPvC/FGC06MbN5TNBfRO6Ox62AEz90eMq+dVvtX9Bl3jxCEkS0tATzDarRZuOLw7oFg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@formatjs/fast-memoize": "2.2.6",
+ "@formatjs/intl-localematcher": "0.6.0",
+ "decimal.js": "10",
+ "tslib": "2"
+ }
+ },
+ "node_modules/@formatjs/ecma402-abstract/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD"
+ },
+ "node_modules/@formatjs/fast-memoize": {
+ "version": "2.2.6",
+ "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.6.tgz",
+ "integrity": "sha512-luIXeE2LJbQnnzotY1f2U2m7xuQNj2DA8Vq4ce1BY9ebRZaoPB1+8eZ6nXpLzsxuW5spQxr7LdCg+CApZwkqkw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "tslib": "2"
+ }
+ },
+ "node_modules/@formatjs/fast-memoize/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD"
+ },
+ "node_modules/@formatjs/icu-messageformat-parser": {
+ "version": "2.11.1",
+ "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.11.1.tgz",
+ "integrity": "sha512-o0AhSNaOfKoic0Sn1GkFCK4MxdRsw7mPJ5/rBpIqdvcC7MIuyUSW8WChUEvrK78HhNpYOgqCQbINxCTumJLzZA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "2.3.3",
+ "@formatjs/icu-skeleton-parser": "1.8.13",
+ "tslib": "2"
+ }
+ },
+ "node_modules/@formatjs/icu-messageformat-parser/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD"
+ },
+ "node_modules/@formatjs/icu-skeleton-parser": {
+ "version": "1.8.13",
+ "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.13.tgz",
+ "integrity": "sha512-N/LIdTvVc1TpJmMt2jVg0Fr1F7Q1qJPdZSCs19unMskCmVQ/sa0H9L8PWt13vq+gLdLg1+pPsvBLydL1Apahjg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@formatjs/ecma402-abstract": "2.3.3",
+ "tslib": "2"
+ }
+ },
+ "node_modules/@formatjs/icu-skeleton-parser/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD"
+ },
+ "node_modules/@formatjs/intl-localematcher": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.6.0.tgz",
+ "integrity": "sha512-4rB4g+3hESy1bHSBG3tDFaMY2CH67iT7yne1e+0CLTsGLDcmoEWWpJjjpWVaYgYfYuohIRuo0E+N536gd2ZHZA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "tslib": "2"
+ }
+ },
+ "node_modules/@formatjs/intl-localematcher/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD"
+ },
"node_modules/@formatjs/intl-pluralrules": {
"version": "1.5.9",
"resolved": "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-1.5.9.tgz",
@@ -3895,15 +3986,6 @@
"node": ">=12"
}
},
- "node_modules/@grpc/proto-loader/node_modules/yargs-parser": {
- "version": "21.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
- "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
- "dev": true,
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/@humanwhocodes/config-array": {
"version": "0.11.14",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
@@ -5551,6 +5633,16 @@
"node": ">=8.0.0"
}
},
+ "node_modules/@paulirish/trace_engine": {
+ "version": "0.0.39",
+ "resolved": "https://registry.npmjs.org/@paulirish/trace_engine/-/trace_engine-0.0.39.tgz",
+ "integrity": "sha512-2Y/ejHX5DDi5bjfWY/0c/BLVSfQ61Jw1Hy60Hnh0hfEO632D3FVctkzT4Q/lVAdvIPR0bUaok9JDTr1pu/OziA==",
+ "dev": true,
+ "license": "BSD-3-Clause",
+ "dependencies": {
+ "third-party-web": "latest"
+ }
+ },
"node_modules/@phc/format": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz",
@@ -5645,6 +5737,181 @@
"integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
"dev": true
},
+ "node_modules/@puppeteer/browsers": {
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.6.1.tgz",
+ "integrity": "sha512-aBSREisdsGH890S2rQqK82qmQYU3uFpSH8wcZWHgHzl3LfzsxAKbLNiAG9mO8v1Y0UICBeClICxPJvyr0rcuxg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "debug": "^4.4.0",
+ "extract-zip": "^2.0.1",
+ "progress": "^2.0.3",
+ "proxy-agent": "^6.5.0",
+ "semver": "^7.6.3",
+ "tar-fs": "^3.0.6",
+ "unbzip2-stream": "^1.4.3",
+ "yargs": "^17.7.2"
+ },
+ "bin": {
+ "browsers": "lib/cjs/main-cli.js"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@puppeteer/browsers/node_modules/cliui": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+ "dev": true,
+ "license": "ISC",
+ "dependencies": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.1",
+ "wrap-ansi": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@puppeteer/browsers/node_modules/debug": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+ "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ms": "^2.1.3"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@puppeteer/browsers/node_modules/extract-zip": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "debug": "^4.1.1",
+ "get-stream": "^5.1.0",
+ "yauzl": "^2.10.0"
+ },
+ "bin": {
+ "extract-zip": "cli.js"
+ },
+ "engines": {
+ "node": ">= 10.17.0"
+ },
+ "optionalDependencies": {
+ "@types/yauzl": "^2.9.1"
+ }
+ },
+ "node_modules/@puppeteer/browsers/node_modules/get-stream": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "pump": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@puppeteer/browsers/node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@puppeteer/browsers/node_modules/progress": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/@puppeteer/browsers/node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@puppeteer/browsers/node_modules/wrap-ansi": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
+ "node_modules/@puppeteer/browsers/node_modules/y18n": {
+ "version": "5.0.8",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+ "dev": true,
+ "license": "ISC",
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@puppeteer/browsers/node_modules/yargs": {
+ "version": "17.7.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "cliui": "^8.0.1",
+ "escalade": "^3.1.1",
+ "get-caller-file": "^2.0.5",
+ "require-directory": "^2.1.1",
+ "string-width": "^4.2.3",
+ "y18n": "^5.0.5",
+ "yargs-parser": "^21.1.1"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
"node_modules/@rdf-esm/data-model": {
"version": "0.5.4",
"resolved": "https://registry.npmjs.org/@rdf-esm/data-model/-/data-model-0.5.4.tgz",
@@ -5856,6 +6123,58 @@
"join-component": "^1.1.0"
}
},
+ "node_modules/@sentry-internal/tracing": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.120.3.tgz",
+ "integrity": "sha512-Ausx+Jw1pAMbIBHStoQ6ZqDZR60PsCByvHdw/jdH9AqPrNE9xlBSf9EwcycvmrzwyKspSLaB52grlje2cRIUMg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@sentry/core": "7.120.3",
+ "@sentry/types": "7.120.3",
+ "@sentry/utils": "7.120.3"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@sentry-internal/tracing/node_modules/@sentry/core": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.120.3.tgz",
+ "integrity": "sha512-vyy11fCGpkGK3qI5DSXOjgIboBZTriw0YDx/0KyX5CjIjDDNgp5AGgpgFkfZyiYiaU2Ww3iFuKo4wHmBusz1uA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@sentry/types": "7.120.3",
+ "@sentry/utils": "7.120.3"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@sentry-internal/tracing/node_modules/@sentry/types": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.120.3.tgz",
+ "integrity": "sha512-C4z+3kGWNFJ303FC+FxAd4KkHvxpNFYAFN8iMIgBwJdpIl25KZ8Q/VdGn0MLLUEHNLvjob0+wvwlcRBBNLXOow==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@sentry-internal/tracing/node_modules/@sentry/utils": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.120.3.tgz",
+ "integrity": "sha512-UDAOQJtJDxZHQ5Nm1olycBIsz2wdGX8SdzyGVHmD8EOQYAeDZQyIlQYohDe9nazdIOQLZCIc3fU0G9gqVLkaGQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@sentry/types": "7.120.3"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/@sentry/core": {
"version": "5.30.0",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz",
@@ -5886,6 +6205,59 @@
"node": ">=6"
}
},
+ "node_modules/@sentry/integrations": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.120.3.tgz",
+ "integrity": "sha512-6i/lYp0BubHPDTg91/uxHvNui427df9r17SsIEXa2eKDwQ9gW2qRx5IWgvnxs2GV/GfSbwcx4swUB3RfEWrXrQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@sentry/core": "7.120.3",
+ "@sentry/types": "7.120.3",
+ "@sentry/utils": "7.120.3",
+ "localforage": "^1.8.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@sentry/integrations/node_modules/@sentry/core": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.120.3.tgz",
+ "integrity": "sha512-vyy11fCGpkGK3qI5DSXOjgIboBZTriw0YDx/0KyX5CjIjDDNgp5AGgpgFkfZyiYiaU2Ww3iFuKo4wHmBusz1uA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@sentry/types": "7.120.3",
+ "@sentry/utils": "7.120.3"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@sentry/integrations/node_modules/@sentry/types": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.120.3.tgz",
+ "integrity": "sha512-C4z+3kGWNFJ303FC+FxAd4KkHvxpNFYAFN8iMIgBwJdpIl25KZ8Q/VdGn0MLLUEHNLvjob0+wvwlcRBBNLXOow==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@sentry/integrations/node_modules/@sentry/utils": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.120.3.tgz",
+ "integrity": "sha512-UDAOQJtJDxZHQ5Nm1olycBIsz2wdGX8SdzyGVHmD8EOQYAeDZQyIlQYohDe9nazdIOQLZCIc3fU0G9gqVLkaGQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@sentry/types": "7.120.3"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/@sentry/minimal": {
"version": "5.30.0",
"resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz",
@@ -7199,6 +7571,13 @@
"node": ">= 6"
}
},
+ "node_modules/@tootallnate/quickjs-emscripten": {
+ "version": "0.23.0",
+ "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+ "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/@tpluscode/rdf-ns-builders": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@tpluscode/rdf-ns-builders/-/rdf-ns-builders-2.0.1.tgz",
@@ -7846,6 +8225,17 @@
"integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
"dev": true
},
+ "node_modules/@types/yauzl": {
+ "version": "2.10.3",
+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
+ "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
"node_modules/@typescript-eslint/eslint-plugin": {
"version": "6.21.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
@@ -8530,13 +8920,14 @@
"follow-redirects": "^1.14.0"
}
},
- "node_modules/ansi-align": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
- "integrity": "sha512-TdlOggdA/zURfMYa7ABC66j+oqfMew58KpJMbUlH3bcZP1b+cBHIHDDn5uH9INsxrHBPjsqM0tDB4jPTF/vgJA==",
+ "node_modules/ansi-colors": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+ "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
"dev": true,
- "dependencies": {
- "string-width": "^2.0.0"
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
}
},
"node_modules/ansi-escapes": {
@@ -9393,12 +9784,32 @@
"node": ">=0.10.0"
}
},
+ "node_modules/ast-types": {
+ "version": "0.13.4",
+ "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+ "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "tslib": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/ast-types-flow": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
"integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==",
"dev": true
},
+ "node_modules/ast-types/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD"
+ },
"node_modules/async": {
"version": "3.2.5",
"resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
@@ -9652,10 +10063,11 @@
"dev": true
},
"node_modules/axe-core": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-3.3.0.tgz",
- "integrity": "sha512-54XaTd2VB7A6iBnXMUG2LnBOI7aRbnrVxC5Tz+rVUwYl9MX/cIJc/Ll32YUoFIE/e9UKWMZoQenQu9dFrQyZCg==",
+ "version": "4.10.2",
+ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz",
+ "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==",
"dev": true,
+ "license": "MPL-2.0",
"engines": {
"node": ">=4"
}
@@ -9764,6 +10176,13 @@
"safe-buffer": "~5.1.0"
}
},
+ "node_modules/b4a": {
+ "version": "1.6.7",
+ "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",
+ "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==",
+ "dev": true,
+ "license": "Apache-2.0"
+ },
"node_modules/babel-jest": {
"version": "29.7.0",
"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
@@ -9916,6 +10335,75 @@
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
},
+ "node_modules/bare-events": {
+ "version": "2.5.4",
+ "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz",
+ "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true
+ },
+ "node_modules/bare-fs": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.0.1.tgz",
+ "integrity": "sha512-ilQs4fm/l9eMfWY2dY0WCIUplSUp7U0CT1vrqMg1MUdeZl4fypu5UP0XcDBK5WBQPJAKP1b7XEodISmekH/CEg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "bare-events": "^2.0.0",
+ "bare-path": "^3.0.0",
+ "bare-stream": "^2.0.0"
+ },
+ "engines": {
+ "bare": ">=1.7.0"
+ }
+ },
+ "node_modules/bare-os": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.4.0.tgz",
+ "integrity": "sha512-9Ous7UlnKbe3fMi7Y+qh0DwAup6A1JkYgPnjvMDNOlmnxNRQvQ/7Nst+OnUQKzk0iAT0m9BisbDVp9gCv8+ETA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "engines": {
+ "bare": ">=1.6.0"
+ }
+ },
+ "node_modules/bare-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
+ "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "bare-os": "^3.0.1"
+ }
+ },
+ "node_modules/bare-stream": {
+ "version": "2.6.5",
+ "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz",
+ "integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "streamx": "^2.21.0"
+ },
+ "peerDependencies": {
+ "bare-buffer": "*",
+ "bare-events": "*"
+ },
+ "peerDependenciesMeta": {
+ "bare-buffer": {
+ "optional": true
+ },
+ "bare-events": {
+ "optional": true
+ }
+ }
+ },
"node_modules/base": {
"version": "0.11.2",
"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
@@ -10021,6 +10509,16 @@
"node": ">=6.0.0"
}
},
+ "node_modules/basic-ftp": {
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+ "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=10.0.0"
+ }
+ },
"node_modules/bcp47": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/bcp47/-/bcp47-1.1.2.tgz",
@@ -10396,95 +10894,6 @@
"license": "MIT",
"optional": true
},
- "node_modules/boxen": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
- "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
- "dev": true,
- "dependencies": {
- "ansi-align": "^2.0.0",
- "camelcase": "^4.0.0",
- "chalk": "^2.0.1",
- "cli-boxes": "^1.0.0",
- "string-width": "^2.0.0",
- "term-size": "^1.2.0",
- "widest-line": "^2.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/boxen/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/boxen/node_modules/camelcase": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
- "integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/boxen/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/boxen/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/boxen/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
- "dev": true
- },
- "node_modules/boxen/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/boxen/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"
- }
- },
"node_modules/brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -11378,12 +11787,6 @@
"integrity": "sha512-2sW7x0m/P7dqEnO0O87U7RTVQAaa7MELcd+Jd9FA6CYgYtwJ1TlDWIYMD8nuMkH1KoThsJogqgLyklrt9d/Azw==",
"dev": true
},
- "node_modules/canonicalize": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/canonicalize/-/canonicalize-1.0.8.tgz",
- "integrity": "sha512-0CNTVCLZggSh7bc5VkX5WWPWO+cyZbNd07IHIsSXLia/eAq+r836hgk+8BKoEh7949Mda87VUOitx5OddVj64A==",
- "dev": true
- },
"node_modules/canvas": {
"version": "2.11.2",
"resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
@@ -11560,18 +11963,6 @@
"node": ">=10"
}
},
- "node_modules/capture-stack-trace": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.2.tgz",
- "integrity": "sha512-X/WM2UQs6VMHUtjUDnZTRI+i1crWteJySFzr9UpGoQa4WQffXVTTXuekjl7TjZRlcF2XfjgITT0HxZ9RnxeT0w==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/caseless": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -11677,12 +12068,6 @@
"is-regex": "^1.0.3"
}
},
- "node_modules/chardet": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
- "integrity": "sha512-j/Toj7f1z98Hh2cYo2BVr85EpIRWqUi7rtRSGxh/cqUjqrnJe9l9UE7IUGd2vQ2p+kSHLkSzObQPZPLUC6TQwg==",
- "dev": true
- },
"node_modules/charenc": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
@@ -12063,6 +12448,20 @@
"node": ">= 0.12"
}
},
+ "node_modules/chromium-bidi": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.11.0.tgz",
+ "integrity": "sha512-6CJWHkNRoyZyjV9Rwv2lYONZf1Xm0IuDyNq97nwSsxxP3wf5Bwy15K5rOvVKMtJ127jJBmxFUanSAOjgFRxgrA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "mitt": "3.0.1",
+ "zod": "3.23.8"
+ },
+ "peerDependencies": {
+ "devtools-protocol": "*"
+ }
+ },
"node_modules/ci-info": {
"version": "3.9.0",
"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
@@ -12142,33 +12541,6 @@
"node": ">=4"
}
},
- "node_modules/cli-boxes": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
- "integrity": "sha512-3Fo5wu8Ytle8q9iCzS4D2MWVL2X7JVWRiS1BnXbTFDhS9c/REkM9vd1AmabsoZoY5/dGi5TT9iKL8Kb6DeBRQg==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/cli-cursor": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
- "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
- "dev": true,
- "dependencies": {
- "restore-cursor": "^2.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/cli-width": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
- "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
- "dev": true
- },
"node_modules/cliui": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
@@ -12516,43 +12888,60 @@
}
},
"node_modules/configstore": {
- "version": "3.1.5",
- "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.5.tgz",
- "integrity": "sha512-nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
+ "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
"dev": true,
+ "license": "BSD-2-Clause",
"dependencies": {
- "dot-prop": "^4.2.1",
+ "dot-prop": "^5.2.0",
"graceful-fs": "^4.1.2",
- "make-dir": "^1.0.0",
- "unique-string": "^1.0.0",
- "write-file-atomic": "^2.0.0",
- "xdg-basedir": "^3.0.0"
+ "make-dir": "^3.0.0",
+ "unique-string": "^2.0.0",
+ "write-file-atomic": "^3.0.0",
+ "xdg-basedir": "^4.0.0"
},
"engines": {
- "node": ">=4"
+ "node": ">=8"
}
},
"node_modules/configstore/node_modules/make-dir": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
- "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "pify": "^3.0.0"
+ "semver": "^6.0.0"
},
"engines": {
- "node": ">=4"
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/configstore/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "license": "ISC",
+ "bin": {
+ "semver": "bin/semver.js"
}
},
"node_modules/configstore/node_modules/write-file-atomic": {
- "version": "2.4.3",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
- "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+ "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
"dev": true,
+ "license": "ISC",
"dependencies": {
- "graceful-fs": "^4.1.11",
"imurmurhash": "^0.1.4",
- "signal-exit": "^3.0.2"
+ "is-typedarray": "^1.0.0",
+ "signal-exit": "^3.0.2",
+ "typedarray-to-buffer": "^3.1.5"
}
},
"node_modules/connection-parse": {
@@ -12784,18 +13173,6 @@
"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
"dev": true
},
- "node_modules/create-error-class": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
- "integrity": "sha512-gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==",
- "dev": true,
- "dependencies": {
- "capture-stack-trace": "^1.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/create-hash": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
@@ -12957,12 +13334,13 @@
"dev": true
},
"node_modules/crypto-random-string": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
- "integrity": "sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
+ "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": ">=4"
+ "node": ">=8"
}
},
"node_modules/cson-parser": {
@@ -12974,6 +13352,13 @@
"coffee-script": "^1.10.0"
}
},
+ "node_modules/csp_evaluator": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/csp_evaluator/-/csp_evaluator-1.1.1.tgz",
+ "integrity": "sha512-N3ASg0C4kNPUaNxt1XAvzHIVuzdtr8KLgfk1O8WDyimp1GisPAHESupArO2ieHk9QWbrJ/WkQODyh21Ps/xhxw==",
+ "dev": true,
+ "license": "Apache-2.0"
+ },
"node_modules/css-selector-parser": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.4.1.tgz",
@@ -13062,6 +13447,16 @@
"node": ">=0.10"
}
},
+ "node_modules/data-uri-to-buffer": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+ "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 14"
+ }
+ },
"node_modules/data-urls": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
@@ -13182,15 +13577,6 @@
"integrity": "sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==",
"dev": true
},
- "node_modules/deep-extend": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
- "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
- "dev": true,
- "engines": {
- "node": ">=4.0.0"
- }
- },
"node_modules/deep-is": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -13223,6 +13609,16 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/define-lazy-prop": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+ "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/define-properties": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
@@ -13261,6 +13657,21 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/degenerator": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+ "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ast-types": "^0.13.4",
+ "escodegen": "^2.1.0",
+ "esprima": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
"node_modules/delay": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz",
@@ -13356,12 +13767,6 @@
"npm": "1.2.8000 || >= 1.4.16"
}
},
- "node_modules/details-element-polyfill": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/details-element-polyfill/-/details-element-polyfill-2.4.0.tgz",
- "integrity": "sha512-jnZ/m0+b1gz3EcooitqL7oDEkKHEro659dt8bWB/T/HjiILucoQhHvvi5MEOAIFJXxxO+rIYJ/t3qCgfUOSU5g==",
- "dev": true
- },
"node_modules/detect-indent": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-7.0.1.tgz",
@@ -13414,6 +13819,13 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/devtools-protocol": {
+ "version": "0.0.1312386",
+ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
+ "integrity": "sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==",
+ "dev": true,
+ "license": "BSD-3-Clause"
+ },
"node_modules/dezalgo": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
@@ -13556,15 +13968,16 @@
}
},
"node_modules/dot-prop": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
- "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+ "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "is-obj": "^1.0.0"
+ "is-obj": "^2.0.0"
},
"engines": {
- "node": ">=4"
+ "node": ">=8"
}
},
"node_modules/dottie": {
@@ -13907,6 +14320,20 @@
"node": ">=10.13.0"
}
},
+ "node_modules/enquirer": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+ "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansi-colors": "^4.1.1",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8.6"
+ }
+ },
"node_modules/ent": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
@@ -15816,20 +16243,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/external-editor": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
- "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
- "dev": true,
- "dependencies": {
- "chardet": "^0.4.0",
- "iconv-lite": "^0.4.17",
- "tmp": "^0.0.33"
- },
- "engines": {
- "node": ">=0.12"
- }
- },
"node_modules/extglob": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
@@ -15949,6 +16362,13 @@
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"dev": true
},
+ "node_modules/fast-fifo": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+ "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/fast-glob": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
@@ -16113,18 +16533,6 @@
"readable-stream": "3"
}
},
- "node_modules/figures": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
- "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
- "dev": true,
- "dependencies": {
- "escape-string-regexp": "^1.0.5"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/file-contents": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/file-contents/-/file-contents-0.3.2.tgz",
@@ -17290,6 +17698,21 @@
"url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
}
},
+ "node_modules/get-uri": {
+ "version": "6.0.4",
+ "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.4.tgz",
+ "integrity": "sha512-E1b1lFFLvLgak2whF2xDBcOy6NLVGZBqqjJjsIhvopKfWWEi64pLVTWWehV8KlLerZkfNTA95sTe2OdJKm1OzQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "basic-ftp": "^5.0.2",
+ "data-uri-to-buffer": "^6.0.2",
+ "debug": "^4.3.4"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
"node_modules/get-value": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
@@ -17500,18 +17923,6 @@
"process": "^0.11.10"
}
},
- "node_modules/global-dirs": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
- "integrity": "sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==",
- "dev": true,
- "dependencies": {
- "ini": "^1.3.4"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/global-modules": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
@@ -18478,15 +18889,6 @@
"node": ">=12"
}
},
- "node_modules/highlights/node_modules/yargs-parser": {
- "version": "21.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
- "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
- "dev": true,
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/hmac-drbg": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -18615,10 +19017,14 @@
}
},
"node_modules/http-link-header": {
- "version": "0.8.0",
- "resolved": "https://registry.npmjs.org/http-link-header/-/http-link-header-0.8.0.tgz",
- "integrity": "sha512-qsh/wKe1Mk1vtYEFr+LpQBFWTO1gxZQBdii2D0Umj+IUQ23r5sT088Rhpq4XzpSyIpaX7vwjB8Rrtx8u9JTg+Q==",
- "dev": true
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/http-link-header/-/http-link-header-1.1.3.tgz",
+ "integrity": "sha512-3cZ0SRL8fb9MUlU3mKM61FcQvPfXx2dBrZW3Vbg5CXa8jFlK8OaEpePenLe1oEXQduhz8b0QjsqfS59QP4AJDQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.0.0"
+ }
},
"node_modules/http-parser-js": {
"version": "0.5.8",
@@ -18786,7 +19192,8 @@
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/image-ssim/-/image-ssim-0.2.0.tgz",
"integrity": "sha512-W7+sO6/yhxy83L0G7xR8YAc5Z5QFtYEXXRV6EaE8tuYBZJnA3gVgp3q7X7muhLZVodeb9UfvjSbwt9VJwjIYAg==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/immediate": {
"version": "3.3.0",
@@ -18821,15 +19228,6 @@
"node": ">=4"
}
},
- "node_modules/import-lazy": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
- "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/import-local": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
@@ -18925,120 +19323,6 @@
"source-map": "~0.5.3"
}
},
- "node_modules/inquirer": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
- "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
- "dev": true,
- "dependencies": {
- "ansi-escapes": "^3.0.0",
- "chalk": "^2.0.0",
- "cli-cursor": "^2.1.0",
- "cli-width": "^2.0.0",
- "external-editor": "^2.0.4",
- "figures": "^2.0.0",
- "lodash": "^4.3.0",
- "mute-stream": "0.0.7",
- "run-async": "^2.2.0",
- "rx-lite": "^4.0.8",
- "rx-lite-aggregates": "^4.0.8",
- "string-width": "^2.1.0",
- "strip-ansi": "^4.0.0",
- "through": "^2.3.6"
- }
- },
- "node_modules/inquirer/node_modules/ansi-escapes": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
- "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/inquirer/node_modules/ansi-regex": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
- "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/inquirer/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/inquirer/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/inquirer/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/inquirer/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
- "dev": true
- },
- "node_modules/inquirer/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/inquirer/node_modules/strip-ansi": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
- "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
- "dev": true,
- "dependencies": {
- "ansi-regex": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/inquirer/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"
- }
- },
"node_modules/insert-module-globals": {
"version": "7.2.1",
"resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz",
@@ -19090,26 +19374,24 @@
"dev": true
},
"node_modules/intl-messageformat": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-4.4.0.tgz",
- "integrity": "sha512-z+Bj2rS3LZSYU4+sNitdHrwnBhr0wO80ZJSW8EzKDBowwUe3Q/UsvgCGjrwa+HPzoGCLEb9HAjfJgo4j2Sac8w==",
+ "version": "10.7.15",
+ "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.15.tgz",
+ "integrity": "sha512-LRyExsEsefQSBjU2p47oAheoKz+EOJxSLDdjOaEjdriajfHsMXOmV/EhMvYSg9bAgCUHasuAC+mcUBe/95PfIg==",
"dev": true,
+ "license": "BSD-3-Clause",
"dependencies": {
- "intl-messageformat-parser": "^1.8.1"
+ "@formatjs/ecma402-abstract": "2.3.3",
+ "@formatjs/fast-memoize": "2.2.6",
+ "@formatjs/icu-messageformat-parser": "2.11.1",
+ "tslib": "2"
}
},
- "node_modules/intl-messageformat-parser": {
- "version": "1.8.1",
- "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.8.1.tgz",
- "integrity": "sha512-IMSCKVf0USrM/959vj3xac7s8f87sc+80Y/ipBzdKy4ifBv5Gsj2tZ41EAaURVg01QU71fYr77uA8Meh6kELbg==",
- "deprecated": "We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser",
- "dev": true
- },
- "node_modules/intl-pluralrules": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/intl-pluralrules/-/intl-pluralrules-1.3.1.tgz",
- "integrity": "sha512-sNYPls1Q4fyN0EGLFVJ7TIuaMWln01LupLozfIBt69rHK0DHehghMSz6ejfnSklgRddnyQSEaQPIU6d9TCKH3w==",
- "dev": true
+ "node_modules/intl-messageformat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD"
},
"node_modules/into-stream": {
"version": "3.1.0",
@@ -19363,24 +19645,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/is-ci": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
- "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
- "dev": true,
- "dependencies": {
- "ci-info": "^1.5.0"
- },
- "bin": {
- "is-ci": "bin.js"
- }
- },
- "node_modules/is-ci/node_modules/ci-info": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
- "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
- "dev": true
- },
"node_modules/is-core-module": {
"version": "2.13.1",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
@@ -19438,6 +19702,7 @@
"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
"dev": true,
+ "license": "MIT",
"bin": {
"is-docker": "cli.js"
},
@@ -19551,19 +19816,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/is-installed-globally": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
- "integrity": "sha512-ERNhMg+i/XgDwPIPF3u24qpajVreaiSuvpb1Uu0jugw7KKcxGyCX8cgp8P5fwTmAuXku6beDHHECdKArjlg7tw==",
- "dev": true,
- "dependencies": {
- "global-dirs": "^0.1.0",
- "is-path-inside": "^1.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/is-lower-case": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz",
@@ -19619,15 +19871,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/is-npm": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
- "integrity": "sha512-9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/is-number": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -19653,12 +19896,13 @@
}
},
"node_modules/is-obj": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
- "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+ "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": ">=0.10.0"
+ "node": ">=8"
}
},
"node_modules/is-object": {
@@ -19670,18 +19914,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/is-path-inside": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
- "integrity": "sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==",
- "dev": true,
- "dependencies": {
- "path-is-inside": "^1.0.1"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/is-plain-obj": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -19724,15 +19956,6 @@
"integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
"dev": true
},
- "node_modules/is-redirect": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
- "integrity": "sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/is-regex": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -20426,15 +20649,6 @@
"node": ">=12"
}
},
- "node_modules/jest-cli/node_modules/yargs-parser": {
- "version": "21.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
- "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
- "dev": true,
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/jest-config": {
"version": "29.7.0",
"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
@@ -20997,10 +21211,14 @@
"dev": true
},
"node_modules/js-library-detector": {
- "version": "5.9.0",
- "resolved": "https://registry.npmjs.org/js-library-detector/-/js-library-detector-5.9.0.tgz",
- "integrity": "sha512-0wYHRVJv8uVsylJhfQQaH2vOBYGehyZyJbtaHuchoTP3Mb6hqYvrA0hoMQ1ZhARLHzHJMbMc/nCr4D3pTNSCgw==",
- "dev": true
+ "version": "6.7.0",
+ "resolved": "https://registry.npmjs.org/js-library-detector/-/js-library-detector-6.7.0.tgz",
+ "integrity": "sha512-c80Qupofp43y4cJ7+8TTDN/AsDwLi5oOm/plBrWI+iQt485vKXCco+yVmOwEgdo9VOdsYTuV0UlTeetVPTriXA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ }
},
"node_modules/js-polyfills": {
"version": "0.1.43",
@@ -21236,110 +21454,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/jsonld": {
- "version": "1.8.1",
- "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.8.1.tgz",
- "integrity": "sha512-f0rusl5v8aPKS3jApT5fhYsdTC/JpyK1PoJ+ZtYYtZXoyb1J0Z///mJqLwrfL/g4NueFSqPymDYIi1CcSk7b8Q==",
- "dev": true,
- "dependencies": {
- "canonicalize": "^1.0.1",
- "rdf-canonize": "^1.0.2",
- "request": "^2.88.0",
- "semver": "^5.6.0",
- "xmldom": "0.1.19"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/jsonld/node_modules/semver": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
- "dev": true,
- "bin": {
- "semver": "bin/semver"
- }
- },
- "node_modules/jsonlint-mod": {
- "version": "1.7.6",
- "resolved": "https://registry.npmjs.org/jsonlint-mod/-/jsonlint-mod-1.7.6.tgz",
- "integrity": "sha512-oGuk6E1ehmIpw0w9ttgb2KsDQQgGXBzZczREW8OfxEm9eCQYL9/LCexSnh++0z3AiYGcXpBgqDSx9AAgzl/Bvg==",
- "dev": true,
- "dependencies": {
- "chalk": "^2.4.2",
- "JSV": "^4.0.2",
- "underscore": "^1.9.1"
- },
- "bin": {
- "jsonlint": "lib/cli.js"
- },
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/jsonlint-mod/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/jsonlint-mod/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/jsonlint-mod/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/jsonlint-mod/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
- "dev": true
- },
- "node_modules/jsonlint-mod/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/jsonlint-mod/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"
- }
- },
"node_modules/jsonparse": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz",
@@ -21472,15 +21586,6 @@
"promise": "^7.0.1"
}
},
- "node_modules/JSV": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
- "integrity": "sha512-ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw==",
- "dev": true,
- "engines": {
- "node": "*"
- }
- },
"node_modules/jsx-ast-utils": {
"version": "3.3.5",
"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
@@ -21701,18 +21806,6 @@
"node": ">=0.10"
}
},
- "node_modules/latest-version": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
- "integrity": "sha512-Be1YRHWWlZaSsrz2U+VInk+tO0EwLIyV+23RhWLINJYwg/UIikxjlj3MhH37/6/EDCAusjajvMkMMUXRaMWl/w==",
- "dev": true,
- "dependencies": {
- "package-json": "^4.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/lazy": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz",
@@ -21802,51 +21895,66 @@
"node": ">=6"
}
},
+ "node_modules/lie": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+ "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "immediate": "~3.0.5"
+ }
+ },
+ "node_modules/lie/node_modules/immediate": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/lighthouse": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/lighthouse/-/lighthouse-5.6.0.tgz",
- "integrity": "sha512-PQYeK6/P0p/JxP/zq8yfcPmuep/aeib5ykROTgzDHejMiuzYdD6k6MaSCv0ncwK+lj+Ld67Az+66rHqiPKHc6g==",
+ "version": "12.3.0",
+ "resolved": "https://registry.npmjs.org/lighthouse/-/lighthouse-12.3.0.tgz",
+ "integrity": "sha512-OaLE8DasnwQkn2CBo2lKtD+IQv42mNP3T+Vaw29I++rAh0Zpgc6SM15usdIYyzhRMR5EWFxze5Fyb+HENJSh2A==",
"dev": true,
+ "license": "Apache-2.0",
"dependencies": {
- "axe-core": "3.3.0",
- "chrome-launcher": "^0.11.2",
- "configstore": "^3.1.1",
- "cssstyle": "1.2.1",
- "details-element-polyfill": "^2.4.0",
- "http-link-header": "^0.8.0",
- "inquirer": "^3.3.0",
- "intl": "^1.2.5",
- "intl-messageformat": "^4.4.0",
- "intl-pluralrules": "^1.0.3",
- "jpeg-js": "0.1.2",
- "js-library-detector": "^5.5.0",
- "jsonld": "^1.5.0",
- "jsonlint-mod": "^1.7.5",
- "lighthouse-logger": "^1.2.0",
- "lodash.isequal": "^4.5.0",
- "lodash.set": "^4.3.2",
- "lookup-closest-locale": "6.0.4",
- "metaviewport-parser": "0.2.0",
- "mkdirp": "0.5.1",
- "open": "^6.4.0",
+ "@paulirish/trace_engine": "0.0.39",
+ "@sentry/node": "^7.0.0",
+ "axe-core": "^4.10.2",
+ "chrome-launcher": "^1.1.2",
+ "configstore": "^5.0.1",
+ "csp_evaluator": "1.1.1",
+ "devtools-protocol": "0.0.1312386",
+ "enquirer": "^2.3.6",
+ "http-link-header": "^1.1.1",
+ "intl-messageformat": "^10.5.3",
+ "jpeg-js": "^0.4.4",
+ "js-library-detector": "^6.7.0",
+ "lighthouse-logger": "^2.0.1",
+ "lighthouse-stack-packs": "1.12.2",
+ "lodash-es": "^4.17.21",
+ "lookup-closest-locale": "6.2.0",
+ "metaviewport-parser": "0.3.0",
+ "open": "^8.4.0",
"parse-cache-control": "1.0.1",
- "raven": "^2.2.1",
- "rimraf": "^2.6.1",
- "robots-parser": "^2.0.1",
+ "puppeteer-core": "^23.10.4",
+ "robots-parser": "^3.0.1",
"semver": "^5.3.0",
- "speedline-core": "1.4.2",
- "third-party-web": "^0.11.0",
- "update-notifier": "^2.5.0",
- "ws": "3.3.2",
- "yargs": "3.32.0",
- "yargs-parser": "7.0.0"
+ "speedline-core": "^1.4.3",
+ "third-party-web": "^0.26.1",
+ "tldts-icann": "^6.1.16",
+ "ws": "^7.0.0",
+ "yargs": "^17.3.1",
+ "yargs-parser": "^21.0.0"
},
"bin": {
- "chrome-debug": "lighthouse-core/scripts/manual-chrome-launcher.js",
- "lighthouse": "lighthouse-cli/index.js"
+ "chrome-debug": "core/scripts/manual-chrome-launcher.js",
+ "lighthouse": "cli/index.js",
+ "smokehouse": "cli/test/smokehouse/frontends/smokehouse-bin.js"
},
"engines": {
- "node": ">=10.13"
+ "node": ">=18.16"
}
},
"node_modules/lighthouse-logger": {
@@ -21874,104 +21982,132 @@
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"dev": true
},
- "node_modules/lighthouse/node_modules/ansi-regex": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
- "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+ "node_modules/lighthouse-stack-packs": {
+ "version": "1.12.2",
+ "resolved": "https://registry.npmjs.org/lighthouse-stack-packs/-/lighthouse-stack-packs-1.12.2.tgz",
+ "integrity": "sha512-Ug8feS/A+92TMTCK6yHYLwaFMuelK/hAKRMdldYkMNwv+d9PtWxjXEg6rwKtsUXTADajhdrhXyuNCJ5/sfmPFw==",
+ "dev": true,
+ "license": "Apache-2.0"
+ },
+ "node_modules/lighthouse/node_modules/@sentry/core": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.120.3.tgz",
+ "integrity": "sha512-vyy11fCGpkGK3qI5DSXOjgIboBZTriw0YDx/0KyX5CjIjDDNgp5AGgpgFkfZyiYiaU2Ww3iFuKo4wHmBusz1uA==",
"dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@sentry/types": "7.120.3",
+ "@sentry/utils": "7.120.3"
+ },
"engines": {
- "node": ">=0.10.0"
+ "node": ">=8"
}
},
- "node_modules/lighthouse/node_modules/camelcase": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
- "integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==",
+ "node_modules/lighthouse/node_modules/@sentry/node": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.120.3.tgz",
+ "integrity": "sha512-t+QtekZedEfiZjbkRAk1QWJPnJlFBH/ti96tQhEq7wmlk3VszDXraZvLWZA0P2vXyglKzbWRGkT31aD3/kX+5Q==",
"dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@sentry-internal/tracing": "7.120.3",
+ "@sentry/core": "7.120.3",
+ "@sentry/integrations": "7.120.3",
+ "@sentry/types": "7.120.3",
+ "@sentry/utils": "7.120.3"
+ },
"engines": {
- "node": ">=0.10.0"
+ "node": ">=8"
}
},
- "node_modules/lighthouse/node_modules/chrome-launcher": {
- "version": "0.11.2",
- "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.11.2.tgz",
- "integrity": "sha512-jx0kJDCXdB2ARcDMwNCtrf04oY1Up4rOmVu+fqJ5MTPOOIG8EhRcEU9NZfXZc6dMw9FU8o1r21PNp8V2M0zQ+g==",
+ "node_modules/lighthouse/node_modules/@sentry/types": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.120.3.tgz",
+ "integrity": "sha512-C4z+3kGWNFJ303FC+FxAd4KkHvxpNFYAFN8iMIgBwJdpIl25KZ8Q/VdGn0MLLUEHNLvjob0+wvwlcRBBNLXOow==",
"dev": true,
- "dependencies": {
- "@types/node": "*",
- "is-wsl": "^2.1.0",
- "lighthouse-logger": "^1.0.0",
- "mkdirp": "0.5.1",
- "rimraf": "^2.6.1"
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
}
},
- "node_modules/lighthouse/node_modules/cliui": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
- "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
+ "node_modules/lighthouse/node_modules/@sentry/utils": {
+ "version": "7.120.3",
+ "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.120.3.tgz",
+ "integrity": "sha512-UDAOQJtJDxZHQ5Nm1olycBIsz2wdGX8SdzyGVHmD8EOQYAeDZQyIlQYohDe9nazdIOQLZCIc3fU0G9gqVLkaGQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "string-width": "^1.0.1",
- "strip-ansi": "^3.0.1",
- "wrap-ansi": "^2.0.0"
+ "@sentry/types": "7.120.3"
+ },
+ "engines": {
+ "node": ">=8"
}
},
- "node_modules/lighthouse/node_modules/cssom": {
- "version": "0.3.8",
- "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
- "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
- "dev": true
- },
- "node_modules/lighthouse/node_modules/cssstyle": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.1.tgz",
- "integrity": "sha512-7DYm8qe+gPx/h77QlCyFmX80+fGaE/6A/Ekl0zaszYOubvySO2saYFdQ78P29D0UsULxFKCetDGNaNRUdSF+2A==",
+ "node_modules/lighthouse/node_modules/chrome-launcher": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-1.1.2.tgz",
+ "integrity": "sha512-YclTJey34KUm5jB1aEJCq807bSievi7Nb/TU4Gu504fUYi3jw3KCIaH6L7nFWQhdEgH3V+wCh+kKD1P5cXnfxw==",
"dev": true,
+ "license": "Apache-2.0",
"dependencies": {
- "cssom": "0.3.x"
+ "@types/node": "*",
+ "escape-string-regexp": "^4.0.0",
+ "is-wsl": "^2.2.0",
+ "lighthouse-logger": "^2.0.1"
+ },
+ "bin": {
+ "print-chrome-path": "bin/print-chrome-path.js"
+ },
+ "engines": {
+ "node": ">=12.13.0"
}
},
- "node_modules/lighthouse/node_modules/glob": {
- "version": "7.2.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
- "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
- "deprecated": "Glob versions prior to v9 are no longer supported",
+ "node_modules/lighthouse/node_modules/cliui": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
"dev": true,
"license": "ISC",
"dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.1.1",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.1",
+ "wrap-ansi": "^7.0.0"
},
"engines": {
- "node": "*"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
+ "node": ">=12"
}
},
- "node_modules/lighthouse/node_modules/invert-kv": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
- "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
+ "node_modules/lighthouse/node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/lighthouse/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,
+ "license": "MIT",
"engines": {
- "node": ">=0.10.0"
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/lighthouse/node_modules/is-fullwidth-code-point": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
- "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true,
- "dependencies": {
- "number-is-nan": "^1.0.0"
- },
+ "license": "MIT",
"engines": {
- "node": ">=0.10.0"
+ "node": ">=8"
}
},
"node_modules/lighthouse/node_modules/is-wsl": {
@@ -21979,6 +22115,7 @@
"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"is-docker": "^2.0.0"
},
@@ -21986,53 +22123,23 @@
"node": ">=8"
}
},
- "node_modules/lighthouse/node_modules/jpeg-js": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz",
- "integrity": "sha512-CiRVjMKBUp6VYtGwzRjrdnro41yMwKGOWdP9ATXqmixdz2n7KHNwdqthTYSSbOKj/Ha79Gct1sA8ZQpse55TYA==",
- "dev": true
- },
- "node_modules/lighthouse/node_modules/lcid": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
- "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
- "dev": true,
- "dependencies": {
- "invert-kv": "^1.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/lighthouse/node_modules/os-locale": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
- "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
+ "node_modules/lighthouse/node_modules/lighthouse-logger": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-2.0.1.tgz",
+ "integrity": "sha512-ioBrW3s2i97noEmnXxmUq7cjIcVRjT5HBpAYy8zE11CxU9HqlWHHeRxfeN1tn8F7OEMVPIC9x1f8t3Z7US9ehQ==",
"dev": true,
+ "license": "Apache-2.0",
"dependencies": {
- "lcid": "^1.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
+ "debug": "^2.6.9",
+ "marky": "^1.2.2"
}
},
- "node_modules/lighthouse/node_modules/rimraf": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
- "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+ "node_modules/lighthouse/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"dev": true,
- "dependencies": {
- "glob": "^7.1.3"
- },
- "bin": {
- "rimraf": "bin.js"
- }
- },
- "node_modules/lighthouse/node_modules/safe-buffer": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
- "dev": true
+ "license": "MIT"
},
"node_modules/lighthouse/node_modules/semver": {
"version": "5.7.2",
@@ -22044,74 +22151,87 @@
}
},
"node_modules/lighthouse/node_modules/string-width": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
- "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
- "dev": true,
- "dependencies": {
- "code-point-at": "^1.0.0",
- "is-fullwidth-code-point": "^1.0.0",
- "strip-ansi": "^3.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/lighthouse/node_modules/strip-ansi": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
- "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "ansi-regex": "^2.0.0"
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
},
"engines": {
- "node": ">=0.10.0"
+ "node": ">=8"
}
},
"node_modules/lighthouse/node_modules/wrap-ansi": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
- "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "string-width": "^1.0.1",
- "strip-ansi": "^3.0.1"
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
},
"engines": {
- "node": ">=0.10.0"
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
}
},
"node_modules/lighthouse/node_modules/ws": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
- "integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
+ "version": "7.5.10",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+ "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
"dev": true,
- "dependencies": {
- "async-limiter": "~1.0.0",
- "safe-buffer": "~5.1.0",
- "ultron": "~1.1.0"
+ "license": "MIT",
+ "engines": {
+ "node": ">=8.3.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": "^5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
}
},
"node_modules/lighthouse/node_modules/y18n": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
- "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
- "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,
+ "license": "ISC",
+ "engines": {
+ "node": ">=10"
+ }
},
"node_modules/lighthouse/node_modules/yargs": {
- "version": "3.32.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
- "integrity": "sha512-ONJZiimStfZzhKamYvR/xvmgW3uEkAUFSP91y2caTEPhzF6uP2JfPiVZcq66b/YR0C3uitxSV7+T1x8p5bkmMg==",
+ "version": "17.7.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "camelcase": "^2.0.1",
- "cliui": "^3.0.3",
- "decamelize": "^1.1.1",
- "os-locale": "^1.4.0",
- "string-width": "^1.0.1",
- "window-size": "^0.1.4",
- "y18n": "^3.2.0"
+ "cliui": "^8.0.1",
+ "escalade": "^3.1.1",
+ "get-caller-file": "^2.0.5",
+ "require-directory": "^2.1.1",
+ "string-width": "^4.2.3",
+ "y18n": "^5.0.5",
+ "yargs-parser": "^21.1.1"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/limiter": {
@@ -22173,6 +22293,16 @@
"node": ">=4"
}
},
+ "node_modules/localforage": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
+ "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "lie": "3.1.1"
+ }
+ },
"node_modules/locate-path": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -22191,6 +22321,13 @@
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"dev": true
},
+ "node_modules/lodash-es": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+ "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/lodash._reinterpolate": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
@@ -22245,12 +22382,6 @@
"integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
"dev": true
},
- "node_modules/lodash.isequal": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
- "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
- "dev": true
- },
"node_modules/lodash.isinteger": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
@@ -22294,12 +22425,6 @@
"integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
"dev": true
},
- "node_modules/lodash.set": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
- "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==",
- "dev": true
- },
"node_modules/lodash.sortby": {
"version": "4.7.0",
"resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -22373,10 +22498,11 @@
}
},
"node_modules/lookup-closest-locale": {
- "version": "6.0.4",
- "resolved": "https://registry.npmjs.org/lookup-closest-locale/-/lookup-closest-locale-6.0.4.tgz",
- "integrity": "sha512-bWoFbSGe6f1GvMGzj17LrwMX4FhDXDwZyH04ySVCPbtOJADcSRguZNKewoJ3Ful/MOxD/wRHvFPadk/kYZUbuQ==",
- "dev": true
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/lookup-closest-locale/-/lookup-closest-locale-6.2.0.tgz",
+ "integrity": "sha512-/c2kL+Vnp1jnV6K6RpDTHK3dgg0Tu2VVp+elEiJpjfS1UyY7AjOYHohRug6wT0OpoX2qFgNORndE9RqesfVxWQ==",
+ "dev": true,
+ "license": "MIT"
},
"node_modules/loopback": {
"version": "3.28.0",
@@ -22813,6 +22939,7 @@
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dev": true,
"dependencies": {
"yallist": "^4.0.0"
},
@@ -23167,10 +23294,11 @@
}
},
"node_modules/metaviewport-parser": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/metaviewport-parser/-/metaviewport-parser-0.2.0.tgz",
- "integrity": "sha512-qL5NtY18LGs7lvZCkj3ep2H4Pes9rIiSLZRUyfDdvVw7pWFA0eLwmqaIxApD74RGvUrNEtk9e5Wt1rT+VlCvGw==",
- "dev": true
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/metaviewport-parser/-/metaviewport-parser-0.3.0.tgz",
+ "integrity": "sha512-EoYJ8xfjQ6kpe9VbVHvZTZHiOl4HL1Z18CrZ+qahvLXT7ZO4YTC2JMyt5FaUp9JJp6J4Ybb/z7IsCXZt86/QkQ==",
+ "dev": true,
+ "license": "MIT"
},
"node_modules/methods": {
"version": "1.1.2",
@@ -23821,6 +23949,13 @@
"url": "https://github.com/sponsors/isaacs"
}
},
+ "node_modules/mitt": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+ "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/mixin-deep": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -24367,12 +24502,6 @@
"integrity": "sha512-oRIDTyZQU96nAiz2AQyngwx1e89iApl2hN5AOYwyxLUB47UYsU3Wv9lJWqH5y/QdiYkc5HQLi23ZNB3fELdHcQ==",
"dev": true
},
- "node_modules/mute-stream": {
- "version": "0.0.7",
- "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
- "integrity": "sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==",
- "dev": true
- },
"node_modules/mux-demux": {
"version": "3.7.9",
"resolved": "https://registry.npmjs.org/mux-demux/-/mux-demux-3.7.9.tgz",
@@ -24658,6 +24787,16 @@
"node": ">= 0.6"
}
},
+ "node_modules/netmask": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+ "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
"node_modules/next-tick": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
@@ -25255,12 +25394,31 @@
"dev": true
},
"node_modules/open": {
- "version": "6.4.0",
- "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
- "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
+ "version": "8.4.2",
+ "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+ "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "define-lazy-prop": "^2.0.0",
+ "is-docker": "^2.1.1",
+ "is-wsl": "^2.2.0"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/open/node_modules/is-wsl": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "is-wsl": "^1.1.0"
+ "is-docker": "^2.0.0"
},
"engines": {
"node": ">=8"
@@ -25475,15 +25633,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/os-tmpdir": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
- "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/outpipe": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/outpipe/-/outpipe-1.1.1.tgz",
@@ -25601,105 +25750,83 @@
"node": ">=6"
}
},
- "node_modules/package-json": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
- "integrity": "sha512-q/R5GrMek0vzgoomq6rm9OX+3PQve8sLwTirmK30YB3Cu0Bbt9OX9M/SIUnroN5BGJkzwGsFwDaRGD9EwBOlCA==",
+ "node_modules/pac-proxy-agent": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.1.0.tgz",
+ "integrity": "sha512-Z5FnLVVZSnX7WjBg0mhDtydeRZ1xMcATZThjySQUHqr+0ksP8kqaw23fNKkaaN/Z8gwLUs/W7xdl0I75eP2Xyw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "got": "^6.7.1",
- "registry-auth-token": "^3.0.1",
- "registry-url": "^3.0.3",
- "semver": "^5.1.0"
+ "@tootallnate/quickjs-emscripten": "^0.23.0",
+ "agent-base": "^7.1.2",
+ "debug": "^4.3.4",
+ "get-uri": "^6.0.1",
+ "http-proxy-agent": "^7.0.0",
+ "https-proxy-agent": "^7.0.6",
+ "pac-resolver": "^7.0.1",
+ "socks-proxy-agent": "^8.0.5"
},
"engines": {
- "node": ">=4"
+ "node": ">= 14"
}
},
- "node_modules/package-json-from-dist": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
- "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
- },
- "node_modules/package-json/node_modules/get-stream": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
- "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+ "node_modules/pac-proxy-agent/node_modules/agent-base": {
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+ "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": ">=4"
+ "node": ">= 14"
}
},
- "node_modules/package-json/node_modules/got": {
- "version": "6.7.1",
- "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
- "integrity": "sha512-Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg==",
+ "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+ "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "create-error-class": "^3.0.0",
- "duplexer3": "^0.1.4",
- "get-stream": "^3.0.0",
- "is-redirect": "^1.0.0",
- "is-retry-allowed": "^1.0.0",
- "is-stream": "^1.0.0",
- "lowercase-keys": "^1.0.0",
- "safe-buffer": "^5.0.1",
- "timed-out": "^4.0.0",
- "unzip-response": "^2.0.1",
- "url-parse-lax": "^1.0.0"
+ "agent-base": "^7.1.0",
+ "debug": "^4.3.4"
},
"engines": {
- "node": ">=4"
- }
- },
- "node_modules/package-json/node_modules/is-retry-allowed": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
- "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/package-json/node_modules/is-stream": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
- "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
+ "node": ">= 14"
}
},
- "node_modules/package-json/node_modules/prepend-http": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
- "integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
+ "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+ "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
"dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "agent-base": "^7.1.2",
+ "debug": "4"
+ },
"engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/package-json/node_modules/semver": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
- "dev": true,
- "bin": {
- "semver": "bin/semver"
+ "node": ">= 14"
}
},
- "node_modules/package-json/node_modules/url-parse-lax": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
- "integrity": "sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA==",
+ "node_modules/pac-resolver": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+ "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "prepend-http": "^1.0.1"
+ "degenerator": "^5.0.0",
+ "netmask": "^2.0.2"
},
"engines": {
- "node": ">=0.10.0"
+ "node": ">= 14"
}
},
+ "node_modules/package-json-from-dist": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
+ },
"node_modules/packet-reader": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
@@ -26060,12 +26187,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/path-is-inside": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
- "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
- "dev": true
- },
"node_modules/path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -27114,6 +27235,74 @@
"node": ">= 0.10"
}
},
+ "node_modules/proxy-agent": {
+ "version": "6.5.0",
+ "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
+ "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "agent-base": "^7.1.2",
+ "debug": "^4.3.4",
+ "http-proxy-agent": "^7.0.1",
+ "https-proxy-agent": "^7.0.6",
+ "lru-cache": "^7.14.1",
+ "pac-proxy-agent": "^7.1.0",
+ "proxy-from-env": "^1.1.0",
+ "socks-proxy-agent": "^8.0.5"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/proxy-agent/node_modules/agent-base": {
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+ "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/proxy-agent/node_modules/http-proxy-agent": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+ "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "agent-base": "^7.1.0",
+ "debug": "^4.3.4"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/proxy-agent/node_modules/https-proxy-agent": {
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+ "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "agent-base": "^7.1.2",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/proxy-agent/node_modules/lru-cache": {
+ "version": "7.18.3",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+ "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+ "dev": true,
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
+ },
"node_modules/proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -27361,6 +27550,71 @@
"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
"dev": true
},
+ "node_modules/puppeteer-core": {
+ "version": "23.11.1",
+ "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.11.1.tgz",
+ "integrity": "sha512-3HZ2/7hdDKZvZQ7dhhITOUg4/wOrDRjyK2ZBllRB0ZCOi9u0cwq1ACHDjBB+nX+7+kltHjQvBRdeY7+W0T+7Gg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@puppeteer/browsers": "2.6.1",
+ "chromium-bidi": "0.11.0",
+ "debug": "^4.4.0",
+ "devtools-protocol": "0.0.1367902",
+ "typed-query-selector": "^2.12.0",
+ "ws": "^8.18.0"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/puppeteer-core/node_modules/debug": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+ "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ms": "^2.1.3"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/puppeteer-core/node_modules/devtools-protocol": {
+ "version": "0.0.1367902",
+ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1367902.tgz",
+ "integrity": "sha512-XxtPuC3PGakY6PD7dG66/o8KwJ/LkH2/EKe19Dcw58w53dv4/vSQEkn/SzuyhHE2q4zPgCkxQBxus3VV4ql+Pg==",
+ "dev": true,
+ "license": "BSD-3-Clause"
+ },
+ "node_modules/puppeteer-core/node_modules/ws": {
+ "version": "8.18.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+ "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=10.0.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": ">=5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
+ }
+ },
"node_modules/pure-rand": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
@@ -27481,45 +27735,6 @@
"node": ">= 0.6"
}
},
- "node_modules/raven": {
- "version": "2.6.4",
- "resolved": "https://registry.npmjs.org/raven/-/raven-2.6.4.tgz",
- "integrity": "sha512-6PQdfC4+DQSFncowthLf+B6Hr0JpPsFBgTVYTAOq7tCmx/kR4SXbeawtPch20+3QfUcQDoJBLjWW1ybvZ4kXTw==",
- "deprecated": "Please upgrade to @sentry/node. See the migration guide https://bit.ly/3ybOlo7",
- "dev": true,
- "dependencies": {
- "cookie": "0.3.1",
- "md5": "^2.2.1",
- "stack-trace": "0.0.10",
- "timed-out": "4.0.1",
- "uuid": "3.3.2"
- },
- "bin": {
- "raven": "bin/raven"
- },
- "engines": {
- "node": ">= 4.0.0"
- }
- },
- "node_modules/raven/node_modules/cookie": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
- "integrity": "sha512-+IJOX0OqlHCszo2mBUq+SrEbCj6w7Kpffqx60zYbPTFaO4+yYgRjHwcZNpWvaTylDHaV7PPmBHzSecZiMhtPgw==",
- "dev": true,
- "engines": {
- "node": ">= 0.6"
- }
- },
- "node_modules/raven/node_modules/uuid": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
- "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
- "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.",
- "dev": true,
- "bin": {
- "uuid": "bin/uuid"
- }
- },
"node_modules/raw-body": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
@@ -27551,70 +27766,6 @@
"node": ">= 0.8"
}
},
- "node_modules/rc": {
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
- "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
- "dev": true,
- "dependencies": {
- "deep-extend": "^0.6.0",
- "ini": "~1.3.0",
- "minimist": "^1.2.0",
- "strip-json-comments": "~2.0.1"
- },
- "bin": {
- "rc": "cli.js"
- }
- },
- "node_modules/rc/node_modules/minimist": {
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
- "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
- "dev": true,
- "funding": {
- "url": "https://github.com/sponsors/ljharb"
- }
- },
- "node_modules/rc/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": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/rdf-canonize": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/rdf-canonize/-/rdf-canonize-1.2.0.tgz",
- "integrity": "sha512-MQdcRDz4+82nUrEb3hNQangBDpmep15uMmnWclGi/1KS0bNVc8oHpoNI0PFLHZsvwgwRzH31bO1JAScqUAstvw==",
- "dev": true,
- "dependencies": {
- "node-forge": "^0.10.0",
- "semver": "^6.3.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/rdf-canonize/node_modules/node-forge": {
- "version": "0.10.0",
- "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
- "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
- "dev": true,
- "engines": {
- "node": ">= 6.0.0"
- }
- },
- "node_modules/rdf-canonize/node_modules/semver": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
- "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
- "dev": true,
- "bin": {
- "semver": "bin/semver.js"
- }
- },
"node_modules/rdf-ext": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/rdf-ext/-/rdf-ext-1.3.5.tgz",
@@ -28248,28 +28399,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/registry-auth-token": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
- "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
- "dev": true,
- "dependencies": {
- "rc": "^1.1.6",
- "safe-buffer": "^5.0.1"
- }
- },
- "node_modules/registry-url": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
- "integrity": "sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==",
- "dev": true,
- "dependencies": {
- "rc": "^1.0.1"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/regjsparser": {
"version": "0.10.0",
"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz",
@@ -28603,40 +28732,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/restore-cursor": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
- "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
- "dev": true,
- "dependencies": {
- "onetime": "^2.0.0",
- "signal-exit": "^3.0.2"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/restore-cursor/node_modules/mimic-fn": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
- "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/restore-cursor/node_modules/onetime": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
- "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
- "dev": true,
- "dependencies": {
- "mimic-fn": "^1.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/restructure": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/restructure/-/restructure-2.0.1.tgz",
@@ -28750,18 +28845,13 @@
}
},
"node_modules/robots-parser": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/robots-parser/-/robots-parser-2.4.0.tgz",
- "integrity": "sha512-oO8f2SI04dJk3pbj2KOMJ4G6QfPAgqcGmrYGmansIcpRewIPT2ljWEt5I+ip6EgiyaLo+RXkkUWw74M25HDkMA==",
- "dev": true
- },
- "node_modules/run-async": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
- "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/robots-parser/-/robots-parser-3.0.1.tgz",
+ "integrity": "sha512-s+pyvQeIKIZ0dx5iJiQk1tPLJAWln39+MI5jtM8wnyws+G5azk+dMnMX0qfbqNetKKNgcWWOdi0sfm+FbQbgdQ==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": ">=0.12.0"
+ "node": ">=10.0.0"
}
},
"node_modules/run-parallel": {
@@ -28787,21 +28877,6 @@
"queue-microtask": "^1.2.2"
}
},
- "node_modules/rx-lite": {
- "version": "4.0.8",
- "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
- "integrity": "sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==",
- "dev": true
- },
- "node_modules/rx-lite-aggregates": {
- "version": "4.0.8",
- "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
- "integrity": "sha512-3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==",
- "dev": true,
- "dependencies": {
- "rx-lite": "*"
- }
- },
"node_modules/rxjs": {
"version": "6.6.7",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
@@ -29107,12 +29182,10 @@
}
},
"node_modules/semver": {
- "version": "7.5.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
- "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
+ "version": "7.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+ "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+ "license": "ISC",
"bin": {
"semver": "bin/semver.js"
},
@@ -29126,27 +29199,6 @@
"integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
"dev": true
},
- "node_modules/semver-diff": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
- "integrity": "sha512-gL8F8L4ORwsS0+iQ34yCYv///jsOq0ZL7WP55d1HnJ32o7tyFYEFQZQA22mrLIacZdU6xecaBBZ+uEiffGNyXw==",
- "dev": true,
- "dependencies": {
- "semver": "^5.0.3"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/semver-diff/node_modules/semver": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
- "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
- "dev": true,
- "bin": {
- "semver": "bin/semver"
- }
- },
"node_modules/send": {
"version": "0.19.0",
"resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
@@ -30159,6 +30211,31 @@
"npm": ">= 3.0.0"
}
},
+ "node_modules/socks-proxy-agent": {
+ "version": "8.0.5",
+ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+ "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "agent-base": "^7.1.2",
+ "debug": "^4.3.4",
+ "socks": "^2.8.3"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/socks-proxy-agent/node_modules/agent-base": {
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+ "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 14"
+ }
+ },
"node_modules/socks/node_modules/ip-address": {
"version": "9.0.5",
"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
@@ -30456,25 +30533,20 @@
}
},
"node_modules/speedline-core": {
- "version": "1.4.2",
- "resolved": "https://registry.npmjs.org/speedline-core/-/speedline-core-1.4.2.tgz",
- "integrity": "sha512-9/5CApkKKl6bS6jJ2D0DQllwz/1xq3cyJCR6DLgAQnkj5djCuq8NbflEdD2TI01p8qzS9qaKjzxM9cHT11ezmg==",
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/speedline-core/-/speedline-core-1.4.3.tgz",
+ "integrity": "sha512-DI7/OuAUD+GMpR6dmu8lliO2Wg5zfeh+/xsdyJZCzd8o5JgFUjCeLsBDuZjIQJdwXS3J0L/uZYrELKYqx+PXog==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@types/node": "*",
"image-ssim": "^0.2.0",
- "jpeg-js": "^0.1.2"
+ "jpeg-js": "^0.4.1"
},
"engines": {
- "node": ">=5.0"
+ "node": ">=8.0"
}
},
- "node_modules/speedline-core/node_modules/jpeg-js": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz",
- "integrity": "sha512-CiRVjMKBUp6VYtGwzRjrdnro41yMwKGOWdP9ATXqmixdz2n7KHNwdqthTYSSbOKj/Ha79Gct1sA8ZQpse55TYA==",
- "dev": true
- },
"node_modules/split-string": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -30589,15 +30661,6 @@
"stackframe": "^1.3.4"
}
},
- "node_modules/stack-trace": {
- "version": "0.0.10",
- "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
- "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
- "dev": true,
- "engines": {
- "node": "*"
- }
- },
"node_modules/stack-utils": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
@@ -30930,6 +30993,20 @@
"node": ">=0.8.0"
}
},
+ "node_modules/streamx": {
+ "version": "2.22.0",
+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz",
+ "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fast-fifo": "^1.3.2",
+ "text-decoder": "^1.1.0"
+ },
+ "optionalDependencies": {
+ "bare-events": "^2.2.0"
+ }
+ },
"node_modules/strict-uri-encode": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
@@ -31977,6 +32054,33 @@
"node": ">=18"
}
},
+ "node_modules/tar-fs": {
+ "version": "3.0.8",
+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.8.tgz",
+ "integrity": "sha512-ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "pump": "^3.0.0",
+ "tar-stream": "^3.1.5"
+ },
+ "optionalDependencies": {
+ "bare-fs": "^4.0.1",
+ "bare-path": "^3.0.0"
+ }
+ },
+ "node_modules/tar-stream": {
+ "version": "3.1.7",
+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+ "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "b4a": "^1.6.4",
+ "fast-fifo": "^1.2.0",
+ "streamx": "^2.15.0"
+ }
+ },
"node_modules/tar/node_modules/mkdirp": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
@@ -32021,123 +32125,6 @@
"uuid": "dist/bin/uuid"
}
},
- "node_modules/term-size": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
- "integrity": "sha512-7dPUZQGy/+m3/wjVz3ZW5dobSoD/02NxJpoXUX0WIyjfVS3l0c+b/+9phIDFA7FHzkYtwtMFgeGZ/Y8jVTeqQQ==",
- "dev": true,
- "dependencies": {
- "execa": "^0.7.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/term-size/node_modules/cross-spawn": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
- "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^4.0.1",
- "shebang-command": "^1.2.0",
- "which": "^1.2.9"
- }
- },
- "node_modules/term-size/node_modules/execa": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
- "integrity": "sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==",
- "dev": true,
- "dependencies": {
- "cross-spawn": "^5.0.1",
- "get-stream": "^3.0.0",
- "is-stream": "^1.1.0",
- "npm-run-path": "^2.0.0",
- "p-finally": "^1.0.0",
- "signal-exit": "^3.0.0",
- "strip-eof": "^1.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/term-size/node_modules/get-stream": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
- "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/term-size/node_modules/is-stream": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
- "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/term-size/node_modules/lru-cache": {
- "version": "4.1.5",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
- "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
- "dev": true,
- "dependencies": {
- "pseudomap": "^1.0.2",
- "yallist": "^2.1.2"
- }
- },
- "node_modules/term-size/node_modules/npm-run-path": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
- "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
- "dev": true,
- "dependencies": {
- "path-key": "^2.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/term-size/node_modules/path-key": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
- "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/term-size/node_modules/shebang-command": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
- "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
- "dev": true,
- "dependencies": {
- "shebang-regex": "^1.0.0"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/term-size/node_modules/shebang-regex": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
- "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/term-size/node_modules/yallist": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
- "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
- "dev": true
- },
"node_modules/test-exclude": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
@@ -32174,6 +32161,16 @@
"url": "https://github.com/sponsors/isaacs"
}
},
+ "node_modules/text-decoder": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz",
+ "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "b4a": "^1.6.4"
+ }
+ },
"node_modules/text-decoding": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz",
@@ -32195,10 +32192,11 @@
"peer": true
},
"node_modules/third-party-web": {
- "version": "0.11.1",
- "resolved": "https://registry.npmjs.org/third-party-web/-/third-party-web-0.11.1.tgz",
- "integrity": "sha512-PBS478cWhvCM8seuloomV5lGHvu2qMOCj8gq8wKOApdfAaGh9l2rYZkdsBDaQyQg/6plov3uodc6sZ/3c1lu/g==",
- "dev": true
+ "version": "0.26.5",
+ "resolved": "https://registry.npmjs.org/third-party-web/-/third-party-web-0.26.5.tgz",
+ "integrity": "sha512-tDuKQJUTfjvi9Fcrs1s6YAQAB9mzhTSbBZMfNgtWNmJlHuoFeXO6dzBFdGeCWRvYL50jQGK0jPsBZYxqZQJ2SA==",
+ "dev": true,
+ "license": "MIT"
},
"node_modules/throat": {
"version": "5.0.0",
@@ -32332,16 +32330,21 @@
"upper-case": "^1.0.3"
}
},
- "node_modules/tmp": {
- "version": "0.0.33",
- "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
- "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+ "node_modules/tldts-core": {
+ "version": "6.1.77",
+ "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.77.tgz",
+ "integrity": "sha512-bCaqm24FPk8OgBkM0u/SrEWJgHnhBWYqeBo6yUmcZJDCHt/IfyWBb+14CXdGi4RInMv4v7eUAin15W0DoA+Ytg==",
"dev": true,
+ "license": "MIT"
+ },
+ "node_modules/tldts-icann": {
+ "version": "6.1.77",
+ "resolved": "https://registry.npmjs.org/tldts-icann/-/tldts-icann-6.1.77.tgz",
+ "integrity": "sha512-cE3Z66CjhVHdzS7jqP3N/1jJZynUo4I6Q3JfIRbZnVAdSu5XQxfFnr+O8xz1DboxCdAQV7bwAMUmKOdg34Ke1g==",
+ "dev": true,
+ "license": "MIT",
"dependencies": {
- "os-tmpdir": "~1.0.2"
- },
- "engines": {
- "node": ">=0.6.0"
+ "tldts-core": "^6.1.77"
}
},
"node_modules/tmpl": {
@@ -33046,12 +33049,29 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/typed-query-selector": {
+ "version": "2.12.0",
+ "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz",
+ "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/typedarray": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
"dev": true
},
+ "node_modules/typedarray-to-buffer": {
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+ "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "is-typedarray": "^1.0.0"
+ }
+ },
"node_modules/typescript": {
"version": "5.7.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
@@ -33151,6 +33171,17 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/unbzip2-stream": {
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+ "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "buffer": "^5.2.1",
+ "through": "^2.3.8"
+ }
+ },
"node_modules/unc-path-regex": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -33328,15 +33359,16 @@
}
},
"node_modules/unique-string": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
- "integrity": "sha512-ODgiYu03y5g76A1I9Gt0/chLCzQjvzDy7DsZGsLOE/1MrF6wriEskSncj1+/C58Xk/kPZDppSctDybCwOSaGAg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
+ "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "crypto-random-string": "^1.0.0"
+ "crypto-random-string": "^2.0.0"
},
"engines": {
- "node": ">=4"
+ "node": ">=8"
}
},
"node_modules/unist-util-map": {
@@ -33471,15 +33503,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/unzip-response": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
- "integrity": "sha512-N0XH6lqDtFH84JxptQoZYmloF4nzrQqqrAymNj+/gW60AO2AZgOcf4O/nUXJcYfyQkqvMo9lSupBZmmgvuVXlw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/upath": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
@@ -33520,89 +33543,6 @@
"browserslist": ">= 4.21.0"
}
},
- "node_modules/update-notifier": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
- "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
- "dev": true,
- "dependencies": {
- "boxen": "^1.2.1",
- "chalk": "^2.0.1",
- "configstore": "^3.0.0",
- "import-lazy": "^2.1.0",
- "is-ci": "^1.0.10",
- "is-installed-globally": "^0.1.0",
- "is-npm": "^1.0.0",
- "latest-version": "^3.0.0",
- "semver-diff": "^2.0.0",
- "xdg-basedir": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/update-notifier/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/update-notifier/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/update-notifier/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/update-notifier/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
- "dev": true
- },
- "node_modules/update-notifier/node_modules/has-flag": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/update-notifier/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"
- }
- },
"node_modules/upper-case": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -34532,18 +34472,6 @@
"string-width": "^1.0.2 || 2 || 3 || 4"
}
},
- "node_modules/widest-line": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
- "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
- "dev": true,
- "dependencies": {
- "string-width": "^2.1.1"
- },
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/window-size": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
@@ -34701,12 +34629,13 @@
"dev": true
},
"node_modules/xdg-basedir": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
- "integrity": "sha512-1Dly4xqlulvPD3fZUQJLY+FUIeqN3N2MM3uqe4rCJftAvOjFa3jFGfctOgluGx4ahPbUCsZkmJILiP0Vi4T6lQ==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+ "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": ">=4"
+ "node": ">=8"
}
},
"node_modules/xhr": {
@@ -34769,16 +34698,6 @@
"integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
"dev": true
},
- "node_modules/xmldom": {
- "version": "0.1.19",
- "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz",
- "integrity": "sha512-pDyxjQSFQgNHkU+yjvoF+GXVGJU7e9EnOg/KcGMDihBIKjTsOeDYaECwC/O9bsUWKY+Sd9izfE43JXC46EOHKA==",
- "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
- "dev": true,
- "engines": {
- "node": ">=0.1"
- }
- },
"node_modules/xmlhttprequest-ssl": {
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz",
@@ -34834,7 +34753,8 @@
"node_modules/yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+ "dev": true
},
"node_modules/yamljs": {
"version": "0.3.0",
@@ -34895,21 +34815,13 @@
}
},
"node_modules/yargs-parser": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
- "integrity": "sha512-WhzC+xgstid9MbVUktco/bf+KJG+Uu6vMX0LN1sLJvwmbCQVxb4D8LzogobonKycNasCZLdOzTAk1SK7+K7swg==",
- "dev": true,
- "dependencies": {
- "camelcase": "^4.1.0"
- }
- },
- "node_modules/yargs-parser/node_modules/camelcase": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
- "integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==",
+ "version": "21.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
"dev": true,
+ "license": "ISC",
"engines": {
- "node": ">=4"
+ "node": ">=12"
}
},
"node_modules/yargs/node_modules/is-fullwidth-code-point": {
@@ -35027,6 +34939,16 @@
"engines": {
"node": ">= 10.2"
}
+ },
+ "node_modules/zod": {
+ "version": "3.23.8",
+ "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+ "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+ "dev": true,
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/colinhacks"
+ }
}
}
}
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
"jugglingdb": "^2.0.1",
"koa": "^2.7.0",
"leveldown": "^5.6.0",
- "lighthouse": "^5.1.0",
+ "lighthouse": "^12.3.0",
"loopback": "^3.26.0",
"mailgun": "^0.5.0",
"mariadb": "^2.0.5",
|
diff --git a/test/integration/lighthouse.js b/test/integration/lighthouse.js
--- a/test/integration/lighthouse.js
+++ b/test/integration/lighthouse.js
@@ -1 +1 @@
-require('lighthouse');
+require('lighthouse/core/index.cjs')
|
Bump lighthouse from version 5 to 12
Bump lighthouse from version 5 to 9
| 2025-02-16T12:55:42
|
javascript
|
Hard
|
|
vercel/nft
| 534
|
vercel__nft-534
|
[
"531"
] |
657e6b0869ba0b29acaab5e6c224bd7da3110baf
|
diff --git a/src/resolve-dependency.ts b/src/resolve-dependency.ts
--- a/src/resolve-dependency.ts
+++ b/src/resolve-dependency.ts
@@ -1,6 +1,7 @@
import { isAbsolute, resolve, sep } from 'path';
import { builtinModules } from 'module';
import { Job } from './node-file-trace';
+import { getNodeMajorVersion } from './utils/node-version';
// node resolver
// custom implementation to emit only needed package.json files for resolver
@@ -168,6 +169,7 @@ function getExportsTarget(
condition === 'default' ||
(condition === 'require' && cjsResolve) ||
(condition === 'import' && !cjsResolve) ||
+ (condition === 'module-sync' && getNodeMajorVersion() >= 22) ||
conditions.includes(condition)
) {
const target = getExportsTarget(
diff --git a/src/utils/node-version.ts b/src/utils/node-version.ts
new file mode 100644
--- /dev/null
+++ b/src/utils/node-version.ts
@@ -0,0 +1,7 @@
+/**
+ * Gets the major version of the current Node.js runtime
+ * @returns The major version number (e.g., 22 for Node.js v22.16.0)
+ */
+export function getNodeMajorVersion(): number {
+ return parseInt(process.versions.node.split('.')[0], 10);
+}
|
diff --git a/test/unit.test.js b/test/unit.test.js
--- a/test/unit.test.js
+++ b/test/unit.test.js
@@ -25,6 +25,8 @@ const skipOnWindows = [
'require-symlink',
];
const skipOnMac = [];
+const skipOnNode20AndBelow = ['module-sync-condition-es'];
+const skipOnNode22AndAbove = ['module-sync-condition-es-node20'];
if (process.platform === 'darwin' && process.arch === 'arm64') {
skipOnMac.push('microtime-node-gyp');
}
@@ -68,6 +70,7 @@ afterEach(resetFileIOMocks);
for (const { testName, isRoot } of unitTests) {
const testSuffix = `${testName} from ${isRoot ? 'root' : 'cwd'}`;
+ const nodeVersion = parseInt(process.versions.node.split('.')[0], 10);
if (
process.platform === 'win32' &&
(isRoot || skipOnWindows.includes(testName))
@@ -79,6 +82,14 @@ for (const { testName, isRoot } of unitTests) {
console.log(`Skipping unit test on macOS: ${testSuffix}`);
continue;
}
+ if (nodeVersion < 22 && skipOnNode20AndBelow.includes(testName)) {
+ console.log(`Skipping unit test on Node.js 20 or below: ${testSuffix}`);
+ continue;
+ }
+ if (nodeVersion >= 22 && skipOnNode22AndAbove.includes(testName)) {
+ console.log(`Skipping unit test on Node.js 22 or above: ${testSuffix}`);
+ continue;
+ }
const unitPath = join(__dirname, 'unit', testName);
it(`should correctly trace ${testSuffix}`, async () => {
diff --git a/test/unit/module-sync-condition-cjs/fallback.js b/test/unit/module-sync-condition-cjs/fallback.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-cjs/fallback.js
@@ -0,0 +1 @@
+export const test = 'fallback version';
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-cjs/import.js b/test/unit/module-sync-condition-cjs/import.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-cjs/import.js
@@ -0,0 +1 @@
+export const test = 'import version';
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-cjs/input.js b/test/unit/module-sync-condition-cjs/input.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-cjs/input.js
@@ -0,0 +1,2 @@
+import { test } from 'test-pkg-sync-es';
+console.log(test);
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-cjs/module-sync.js b/test/unit/module-sync-condition-cjs/module-sync.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-cjs/module-sync.js
@@ -0,0 +1 @@
+export const test = 'module-sync version';
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-cjs/output.js b/test/unit/module-sync-condition-cjs/output.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-cjs/output.js
@@ -0,0 +1,4 @@
+[
+ "test/unit/module-sync-condition-cjs/input.js",
+ "test/unit/module-sync-condition-cjs/package.json"
+]
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-cjs/package.json b/test/unit/module-sync-condition-cjs/package.json
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-cjs/package.json
@@ -0,0 +1,11 @@
+{
+ "name": "test-pkg-sync-cjs",
+ "type": "commonjs",
+ "exports": {
+ ".": {
+ "module-sync": "./module-sync.js",
+ "import": "./import.js",
+ "default": "./fallback.js"
+ }
+ }
+}
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es-node20/fallback.js b/test/unit/module-sync-condition-es-node20/fallback.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es-node20/fallback.js
@@ -0,0 +1 @@
+export const test = 'fallback version';
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es-node20/import.js b/test/unit/module-sync-condition-es-node20/import.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es-node20/import.js
@@ -0,0 +1 @@
+export const test = 'import version';
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es-node20/input.js b/test/unit/module-sync-condition-es-node20/input.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es-node20/input.js
@@ -0,0 +1,2 @@
+import { test } from 'test-pkg-sync-es';
+console.log(test);
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es-node20/module-sync.js b/test/unit/module-sync-condition-es-node20/module-sync.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es-node20/module-sync.js
@@ -0,0 +1 @@
+export const test = 'module-sync version';
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es-node20/output.js b/test/unit/module-sync-condition-es-node20/output.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es-node20/output.js
@@ -0,0 +1,5 @@
+[
+ "test/unit/module-sync-condition-es-node20/import.js",
+ "test/unit/module-sync-condition-es-node20/input.js",
+ "test/unit/module-sync-condition-es-node20/package.json"
+]
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es-node20/package.json b/test/unit/module-sync-condition-es-node20/package.json
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es-node20/package.json
@@ -0,0 +1,11 @@
+{
+ "name": "test-pkg-sync-es",
+ "type": "module",
+ "exports": {
+ ".": {
+ "module-sync": "./module-sync.js",
+ "import": "./import.js",
+ "default": "./fallback.js"
+ }
+ }
+}
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es/fallback.js b/test/unit/module-sync-condition-es/fallback.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es/fallback.js
@@ -0,0 +1 @@
+export const test = 'fallback version';
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es/import.js b/test/unit/module-sync-condition-es/import.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es/import.js
@@ -0,0 +1 @@
+export const test = 'import version';
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es/input.js b/test/unit/module-sync-condition-es/input.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es/input.js
@@ -0,0 +1,2 @@
+import { test } from 'test-pkg-sync-es';
+console.log(test);
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es/module-sync.js b/test/unit/module-sync-condition-es/module-sync.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es/module-sync.js
@@ -0,0 +1 @@
+export const test = 'module-sync version';
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es/output.js b/test/unit/module-sync-condition-es/output.js
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es/output.js
@@ -0,0 +1,5 @@
+[
+ "test/unit/module-sync-condition-es/input.js",
+ "test/unit/module-sync-condition-es/module-sync.js",
+ "test/unit/module-sync-condition-es/package.json"
+]
\ No newline at end of file
diff --git a/test/unit/module-sync-condition-es/package.json b/test/unit/module-sync-condition-es/package.json
new file mode 100644
--- /dev/null
+++ b/test/unit/module-sync-condition-es/package.json
@@ -0,0 +1,11 @@
+{
+ "name": "test-pkg-sync-es",
+ "type": "module",
+ "exports": {
+ ".": {
+ "module-sync": "./module-sync.js",
+ "import": "./import.js",
+ "default": "./fallback.js"
+ }
+ }
+}
\ No newline at end of file
|
Support for "module-sync" exports condition
Hello, we are currently using `@vercel/nft` to collect dependencies for our application. Thanks the capabilities it provides, which have saved us a significant amount of server resources and deployment time."
But recently we encountered a problem. When a package uses `module-sync` exports, some unexpected behaviors occur.
When using higher versions of Node 22, the exports of `module-sync` are used at runtime. However, the collected dependencies are `require`, `node` or `default`. These exported files may not be consistent with `module-sync`, so running with the collected dependencies might lead to issues where files cannot be found.
---
I would like to know if `@vercel/nft` will support the `module-sync` exports condition. If there are plans, I can try to provide a PR.
However, what I am currently unsure about is whether we should consider the situation where the build and deployment are on different Node versions. For example, the build uses Node 22 while the deployment uses Node 20. Although this is not a correct practice, it indeed exists widely. If we need to consider this difference, perhaps a configuration option should be provided, or there might already be an existing option that I am unaware of but can adapt to this scenario.
Please correct me if I have any misunderstandings.
|
We currently have thousands of projects depending on it, but most projects are not using Node 22 at runtime, so the issue has not been widely exposed yet. I am concerned that at some point it might have a significant impact. If possible, please provide me with a conclusion as soon as you can, so I can decide on the subsequent actions.
Thanks again for all the support~
The [Node.js documentation](https://nodejs.org/docs/latest-v24.x/api/cli.html#:~:text=The%20default%20Node.js%20conditions%20of%20%22node%22%2C%20%22default%22%2C%20%22import%22%2C%20and%20%22require%22%20will%20always%20apply%20as%20defined.) doesn't mention `module-sync` as a default condition so I don't think nft should default to it.
However, the caller can assign custom conditions here: https://github.com/vercel/nft/blob/main/readme.md#exports--imports
Awesome! Thank you for responding so quickly~
I tried this configuration, and it can make `module-sync` work as my needs.
btw, I saw some introduce in other Node.js documents, it seems to be a default condition.
- Node 22 release blog: https://nodejs.org/en/blog/release/v22.10.0#2024-10-16-version-22100-current-aduh95
- Node Packages API: https://nodejs.org/api/packages.html#conditional-exports
Correct me if I have any misunderstandings. Thank you for responding again.
Since its only supported by Node.js 22 or newer, I don't think it should be default behavior since we support back to 18.
https://github.com/vercel/nft/blob/95141d5b4b165d982ec9b6a876180f667e95e072/package.json#L144-L146
Oh interesting that we always include default/require/import so maybe we should add module-sync 🤔
https://github.com/vercel/nft/blob/95141d5b4b165d982ec9b6a876180f667e95e072/src/resolve-dependency.ts#L167-L172
I'm trying to think if there is other impact of adding this that might not be backwards compatible. Should it always be included like `default`?
We had same issue recently with Node 22 with only one package and it seems `module-sync` option is not wildly used.
@styfle Any concerns about adding that condition? It seems very safe to do and it there is concerns about older versions we can probably check `process.versions.node` to gate it only for node >= 22
Sounds good. Feel free to make a PR with a test and I'll take a look 👍
| 2025-07-22T18:04:45
|
javascript
|
Hard
|
prettier/plugin-ruby
| 813
|
prettier__plugin-ruby-813
|
[
"812"
] |
637b841734fca2ee6da8237a5625ae499b838d3a
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
## [Unreleased]
+### Changed
+
+- [#812](https://github.com/prettier/plugin-ruby/issues/812) - valscion, kddeisz - Splats and blocks within args that have comments attached should place their respective operators in the right place.
+
## [1.5.2] - 2021-02-03
### Changed
diff --git a/src/ruby/nodes/args.js b/src/ruby/nodes/args.js
--- a/src/ruby/nodes/args.js
+++ b/src/ruby/nodes/args.js
@@ -106,25 +106,66 @@ function printArgs(path, { rubyToProc }, print) {
return args;
}
+function printArgsAddBlock(path, opts, print) {
+ const node = path.getValue();
+ const parts = path.call(print, "body", 0);
+
+ if (node.body[1]) {
+ let blockDoc = path.call(print, "body", 1);
+
+ if (node.body[1].comments) {
+ // If we have a method call like:
+ //
+ // foo(
+ // # comment
+ // &block
+ // )
+ //
+ // then we need to make sure we don't accidentally prepend the operator
+ // before the comment.
+ blockDoc.parts[2] = concat(["&", blockDoc.parts[2]]);
+ } else {
+ // If we don't have any comments, we can just prepend the operator
+ blockDoc = concat(["&", blockDoc]);
+ }
+
+ parts.push(blockDoc);
+ }
+
+ return parts;
+}
+
+function printArgsAddStar(path, opts, print) {
+ const node = path.getValue();
+ const docs = path.map(print, "body");
+
+ if (node.body[1].comments) {
+ // If we have an array like:
+ //
+ // [
+ // # comment
+ // *values
+ // ]
+ //
+ // then we need to make sure we don't accidentally prepend the operator
+ // before the comment.
+ docs[1].parts[2] = concat(["*", docs[1].parts[2]]);
+ } else {
+ // If we don't have any comments, we can just prepend the operator
+ docs[1] = concat(["*", docs[1]]);
+ }
+
+ return docs[0].concat(docs[1]).concat(docs.slice(2));
+}
+
+function printBlockArg(path, opts, print) {
+ return concat(["&", path.call(print, "body", 0)]);
+}
+
module.exports = {
arg_paren: printArgParen,
args: printArgs,
- args_add_block: (path, opts, print) => {
- const parts = path.call(print, "body", 0);
-
- if (path.getValue().body[1]) {
- parts.push(concat(["&", path.call(print, "body", 1)]));
- }
-
- return parts;
- },
- args_add_star: (path, opts, print) => {
- const printed = path.map(print, "body");
- const parts = printed[0]
- .concat([concat(["*", printed[1]])])
- .concat(printed.slice(2));
-
- return parts;
- },
- blockarg: (path, opts, print) => concat(["&", path.call(print, "body", 0)])
+ args_add_block: printArgsAddBlock,
+ args_add_star: printArgsAddStar,
+ blockarg: printBlockArg
};
|
diff --git a/test/js/ruby/nodes/method.test.js b/test/js/ruby/nodes/method.test.js
--- a/test/js/ruby/nodes/method.test.js
+++ b/test/js/ruby/nodes/method.test.js
@@ -245,7 +245,29 @@ describe("method", () => {
test("between multi args", () =>
expect("foo(1, 2, *abc, 3, 4)").toMatchFormat());
+ test("with comments", () => {
+ const content = ruby(`
+ foo(
+ # comment
+ *values
+ )
+ `);
+
+ return expect(content).toMatchFormat();
+ });
+
test("with block", () => expect("foo(*bar, &block)").toMatchFormat());
+
+ test("with comments and block", () => {
+ const content = ruby(`
+ foo(
+ # comment
+ &block
+ )
+ `);
+
+ return expect(content).toMatchFormat();
+ });
});
describe("double splat", () => {
@@ -254,7 +276,7 @@ describe("method", () => {
test("with block", () => expect("foo(**bar, &block)").toMatchFormat());
test("with splat and block", () =>
- expect("foo(*bar, **baz, &lock)").toMatchFormat());
+ expect("foo(*bar, **baz, &block)").toMatchFormat());
test("after kwarg", () =>
expect("foo(kwarg: 1, **splat)").toMatchFormat());
|
Array splat operator gets pushed before a leading comment
## Metadata
* Ruby version: 2.6.5
* `@prettier/plugin-ruby` or `prettier` gem version: 1.5.1
* Options:
* [x] `rubyHashLabel`
* [x] `rubyModifier`
* [x] `rubySingleQuote`
* [ ] `rubyToProc`
* [ ] `trailingComma`
## Input
```ruby
[
# a comment
*anything
]
```
## Current output
```ruby
[
*# a comment
anything
]
```
## Expected output
```ruby
[
# a comment
*anything
]
```
|
Lol wat.
| 2021-02-04T21:34:44
|
javascript
|
Hard
|
pinojs/pino-pretty
| 308
|
pinojs__pino-pretty-308
|
[
"300"
] |
3ff7b1c3bdf3c0c093fbf783c18bf47e7d3e8ae2
|
diff --git a/Readme.md b/Readme.md
--- a/Readme.md
+++ b/Readme.md
@@ -252,7 +252,7 @@ The options accepted have keys corresponding to the options described in [CLI Ar
// You can also configure some SonicBoom options directly
sync: false, // by default we write asynchronously
append: true, // the file is opened with the 'a' flag
- mdkdir: true, // create the target destination
+ mkdir: true, // create the target destination
customPrettifiers: {}
@@ -262,6 +262,9 @@ The options accepted have keys corresponding to the options described in [CLI Ar
The `colorize` default follows
[`colorette.isColorSupported`](https://github.com/jorgebucaran/colorette#iscolorsupported).
+The defaults for `sync`, `append`, `mkdir` inherit from
+[`SonicBoom(opts)`](https://github.com/pinojs/sonic-boom#API).
+
`customPrettifiers` option provides the ability to add a custom prettify function
for specific log properties. `customPrettifiers` is an object, where keys are
log properties that will be prettified and value is the prettify function itself.
diff --git a/index.d.ts b/index.d.ts
--- a/index.d.ts
+++ b/index.d.ts
@@ -8,6 +8,7 @@
import { Transform } from 'stream';
import { OnUnknown } from 'pino-abstract-transport';
+import { DestinationStream } from 'pino';
type LogDescriptor = Record<string, unknown>;
@@ -106,6 +107,21 @@ interface PrettyOptions_ {
* @default false
*/
sync?: boolean;
+ /**
+ * The file, file descriptor, or stream to write to. Defaults to 1 (stdout).
+ * @default 1
+ */
+ destination?: string | number | DestinationStream | NodeJS.WritableStream;
+ /**
+ * Opens the file with the 'a' flag.
+ * @default true
+ */
+ append?: boolean;
+ /**
+ * Ensure directory for destination file exists.
+ * @default false
+ */
+ mkdir?: boolean;
/**
* Provides the ability to add a custom prettify function for specific log properties.
* `customPrettifiers` is an object, where keys are log properties that will be prettified
|
diff --git a/test/types/pino-pretty.test-d.ts b/test/types/pino-pretty.test-d.ts
--- a/test/types/pino-pretty.test-d.ts
+++ b/test/types/pino-pretty.test-d.ts
@@ -29,6 +29,8 @@ const options: PinoPretty.PrettyOptions = {
}
},
sync: false,
+ append: true,
+ mkdir: true,
};
const options2: PrettyOptions = {
@@ -52,6 +54,8 @@ const options2: PrettyOptions = {
}
},
sync: false,
+ append: true,
+ mkdir: true,
};
expectType<PrettyStream>(pretty(options));
|
TypeScript declarations missing `destination` option
In `index.d.ts` the `PrettyOptions_` interface is missing the `destination` property.
|
Would you like to send a Pull Request to address this issue? Remember to add unit tests. We use tsd.
Yes I will submit a PR probably later this week when I have time, if not already done by someone else.
| 2022-02-26T04:25:42
|
javascript
|
Hard
|
pinojs/pino-pretty
| 49
|
pinojs__pino-pretty-49
|
[
"48"
] |
8101d3bf5b31b05ea608160e56b01b2b44b2c0f1
|
diff --git a/index.js b/index.js
--- a/index.js
+++ b/index.js
@@ -120,7 +120,7 @@ module.exports = function prettyFactory (options) {
log.time = formatTime(log.time, opts.translateTime)
}
- var line = `[${log.time}]`
+ var line = log.time ? `[${log.time}]` : ''
const coloredLevel = levels.hasOwnProperty(log.level)
? color[log.level](levels[log.level])
@@ -128,7 +128,10 @@ module.exports = function prettyFactory (options) {
if (opts.levelFirst) {
line = `${coloredLevel} ${line}`
} else {
- line = `${line} ${coloredLevel}`
+ // If the line is not empty (timestamps are enabled) output it
+ // with a space after it - otherwise output the empty string
+ const lineOrEmpty = line && line + ' '
+ line = `${lineOrEmpty}${coloredLevel}`
}
if (log.name || log.pid || log.hostname) {
|
diff --git a/test/basic.test.js b/test/basic.test.js
--- a/test/basic.test.js
+++ b/test/basic.test.js
@@ -276,7 +276,7 @@ test('basic prettifier tests', (t) => {
const log = pino({ timestamp: null }, new Writable({
write (chunk, enc, cb) {
const formatted = pretty(chunk.toString())
- t.is(formatted, `[undefined] INFO (${pid} on ${hostname}): hello world\n`)
+ t.is(formatted, `INFO (${pid} on ${hostname}): hello world\n`)
cb()
}
}))
|
timestamp: false results in empty []
Hiya! I'm trying out `pino(-pretty)` and encountered an unexpected rendering. Here's what I'm seeing in my console:
```
[] INFO (my-logger): test
```
And here's the code to generate it:
```js
const logger = pino({
base: { name: my-logger },
prettyPrint: true,
timestamp: false
})
logger.info('test')
```
It looks like `timestamp` being set to false is properly omitting it from the log, but the `[<timestamp>]` square brackets are still being printed. As a library user, I would expect the square brackets to also be omitted, and to see this as the output:
```
INFO (my-logger): test
```
Let me know if I'm doing something weird or if there's anything I can do to help! ✨
<details>
<summary>Versions</summary>
```
❯ node -v
v10.13.0
❯ npm list pino pino-pretty
├── pino@5.9.0
└── pino-pretty@2.3.0
```
</details>
|
Judging by this test, it looks like this might be expected behavior:
https://github.com/pinojs/pino-pretty/blob/8101d3bf5b31b05ea608160e56b01b2b44b2c0f1/test/basic.test.js#L273-L284
With that in mind, would y'all be open to a PR that modifies the test (and behavior)?
```diff
- t.is(formatted, `[undefined] INFO (${pid} on ${hostname}): hello world\n`)
+ t.is(formatted, `INFO (${pid} on ${hostname}): hello world\n`)
```
Yep. Go for it.
| 2018-12-03T03:49:00
|
javascript
|
Hard
|
prettier/plugin-ruby
| 919
|
prettier__plugin-ruby-919
|
[
"917"
] |
bd6b8d5eef5e0c143e343efe69d9e5bffc3405ef
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
- [#863](https://github.com/prettier/plugin-ruby/issues/863) - azz, kddeisz - Fix up Sorbet `sig` block formatting when chaining method calls.
- [#908](https://github.com/prettier/plugin-ruby/issues/908) - Hansenq, kddeisz - Method chains with blocks should be properly indented.
- [#916](https://github.com/prettier/plugin-ruby/issues/916) - pbrisbin, kddeisz - Ensure all of the necessary files are present in the gem.
+- [#917](https://github.com/prettier/plugin-ruby/issues/917) - jscheid, kddeisz - Ensure hash keys with dynamic symbols don't strip their quotes.
## [1.6.0] - 2021-06-23
diff --git a/src/ruby/nodes/strings.js b/src/ruby/nodes/strings.js
--- a/src/ruby/nodes/strings.js
+++ b/src/ruby/nodes/strings.js
@@ -152,8 +152,10 @@ function printDynaSymbol(path, opts, print) {
if (isQuoteLocked(node)) {
if (node.quote.startsWith("%")) {
quote = opts.rubySingleQuote ? "'" : '"';
- } else {
+ } else if (node.quote.startsWith(":")) {
quote = node.quote.slice(1);
+ } else {
+ quote = node.quote;
}
} else {
quote = opts.rubySingleQuote && isSingleQuotable(node) ? "'" : '"';
|
diff --git a/test/js/globalSetup.js b/test/js/globalSetup.js
--- a/test/js/globalSetup.js
+++ b/test/js/globalSetup.js
@@ -9,7 +9,7 @@ process.env.RUBY_VERSION = spawnSync("ruby", args).stdout.toString().trim();
// it to get back the AST.
function globalSetup() {
if (!process.env.PRETTIER_RUBY_HOST) {
- process.env.PRETTIER_RUBY_HOST = `/tmp/prettier-ruby-test-${process.id}.sock`;
+ process.env.PRETTIER_RUBY_HOST = `/tmp/prettier-ruby-test-${process.pid}.sock`;
}
global.__ASYNC_PARSER__ = spawn("ruby", [
diff --git a/test/js/ruby/nodes/strings.test.js b/test/js/ruby/nodes/strings.test.js
--- a/test/js/ruby/nodes/strings.test.js
+++ b/test/js/ruby/nodes/strings.test.js
@@ -196,6 +196,9 @@ describe("strings", () => {
rubySingleQuote: false
}));
+ test("symbol literal as a hash key", () =>
+ expect("{ '\\d' => 1 }").toMatchFormat());
+
test("%s literal with newlines", () => {
const content = ruby(`
a = %s[
|
Strips quotes from hash key containing backslashes
## Metadata
- Operating system: MacOS
- Ruby version: `ruby 2.6.3p62`
- Node version: `v16.3.0`
- `@prettier/plugin-ruby` or `prettier` gem version: `1.6.0`
- Options: defaults
## Input
```ruby
{ '\d': 1 }
```
## Output
```ruby
{ \d: 1 }
```
... which is a syntax error with 2.6:
```test.rb:1: syntax error, unexpected backslash, expecting '}'```
FWIW this was working fine in 1.5.2.
| 2021-06-30T13:30:28
|
javascript
|
Hard
|
|
vercel/nft
| 475
|
vercel__nft-475
|
[
"474"
] |
8e03925a829b8663c12cbdd00043e497961546c1
|
diff --git a/package-lock.json b/package-lock.json
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,7 @@
"express": "^4.21.2",
"fast-glob": "^3.1.1",
"fetch-h2": "^2.2.0",
- "firebase": "^7",
+ "firebase": "^11.2.0",
"firebase-admin": "^12.0.0",
"fluent-ffmpeg": "^2.1.2",
"geo-tz": "^7.0.1",
@@ -2542,111 +2542,289 @@
"dev": true
},
"node_modules/@firebase/analytics": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.0.tgz",
- "integrity": "sha512-6qYEOPUVYrMhqvJ46Z5Uf1S4uULd6d7vGpMP5Qz+u8kIWuOQGcPdJKQap+Hla6Rq164or9gC2HRXuYXKlgWfpw==",
+ "version": "0.10.11",
+ "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.11.tgz",
+ "integrity": "sha512-zwuPiRE0+hgcS95JZbJ6DFQN4xYFO8IyGxpeePTV51YJMwCf3lkBa6FnZ/iXIqDKcBPMgMuuEZozI0BJWaLEYg==",
"dev": true,
"dependencies": {
- "@firebase/analytics-types": "0.4.0",
- "@firebase/component": "0.1.19",
- "@firebase/installations": "0.4.17",
- "@firebase/logger": "0.2.6",
- "@firebase/util": "0.3.2",
- "tslib": "^1.11.1"
+ "@firebase/component": "0.6.12",
+ "@firebase/installations": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
},
"peerDependencies": {
- "@firebase/app": "0.x",
- "@firebase/app-types": "0.x"
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/analytics-compat": {
+ "version": "0.2.17",
+ "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.17.tgz",
+ "integrity": "sha512-SJNVOeTvzdqZQvXFzj7yAirXnYcLDxh57wBFROfeowq/kRN1AqOw1tG6U4OiFOEhqi7s3xLze/LMkZatk2IEww==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/analytics": "0.10.11",
+ "@firebase/analytics-types": "0.8.3",
+ "@firebase/component": "0.6.12",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
}
},
+ "node_modules/@firebase/analytics-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/analytics-types": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.4.0.tgz",
- "integrity": "sha512-Jj2xW+8+8XPfWGkv9HPv/uR+Qrmq37NPYT352wf7MvE9LrstpLVmFg3LqG6MCRr5miLAom5sen2gZ+iOhVDeRA==",
+ "version": "0.8.3",
+ "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.8.3.tgz",
+ "integrity": "sha512-VrIp/d8iq2g501qO46uGz3hjbDb8xzYMrbu8Tp0ovzIzrvJZ2fvmj649gTjge/b7cCCcjT0H37g1gVtlNhnkbg==",
+ "dev": true
+ },
+ "node_modules/@firebase/analytics/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"dev": true
},
"node_modules/@firebase/app": {
- "version": "0.6.11",
- "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.6.11.tgz",
- "integrity": "sha512-FH++PaoyTzfTAVuJ0gITNYEIcjT5G+D0671La27MU8Vvr6MTko+5YUZ4xS9QItyotSeRF4rMJ1KR7G8LSyySiA==",
+ "version": "0.11.1",
+ "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.11.1.tgz",
+ "integrity": "sha512-Vz4DrNLPfDx3RwQf+4klXtu7OUYDO6xz2hlRyFawWskS7YqdtNzkDDxrqH20KDfjCF1lib46/NgchIj1+8h4wQ==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "idb": "7.1.1",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@firebase/app-check": {
+ "version": "0.8.11",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.8.11.tgz",
+ "integrity": "sha512-42zIfRI08/7bQqczAy7sY2JqZYEv3a1eNa4fLFdtJ54vNevbBIRSEA3fZgRqWFNHalh5ohsBXdrYgFqaRIuCcQ==",
"dev": true,
"dependencies": {
- "@firebase/app-types": "0.6.1",
- "@firebase/component": "0.1.19",
- "@firebase/logger": "0.2.6",
- "@firebase/util": "0.3.2",
- "dom-storage": "2.1.0",
- "tslib": "^1.11.1",
- "xmlhttprequest": "1.8.0"
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
}
},
+ "node_modules/@firebase/app-check-compat": {
+ "version": "0.3.18",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.3.18.tgz",
+ "integrity": "sha512-qjozwnwYmAIdrsVGrJk+hnF1WBois54IhZR6gO0wtZQoTvWL/GtiA2F31TIgAhF0ayUiZhztOv1RfC7YyrZGDQ==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/app-check": "0.8.11",
+ "@firebase/app-check-types": "0.5.3",
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/app-check-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/app-check-interop-types": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.1.tgz",
"integrity": "sha512-NILZbe6RH3X1pZmJnfOfY2gLIrlKmrkUMMrrK6VSXHcSE0eQv28xFEcw16D198i9JYZpy5Kwq394My62qCMaIw==",
"dev": true
},
+ "node_modules/@firebase/app-check-types": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check-types/-/app-check-types-0.5.3.tgz",
+ "integrity": "sha512-hyl5rKSj0QmwPdsAxrI5x1otDlByQ7bvNvVt8G/XPO2CSwE++rmSVf3VEhaeOR4J8ZFaF0Z0NDSmLejPweZ3ng==",
+ "dev": true
+ },
+ "node_modules/@firebase/app-check/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/app-compat": {
+ "version": "0.2.50",
+ "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.50.tgz",
+ "integrity": "sha512-7yD362icKgjoNvFxwth420TNZgqCfuTJ28yQCdpyjC2fXyaZHhAbxVKnHEXGTAaUKSHWxsIy46lBKGi/x/Mflw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/app": "0.11.1",
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@firebase/app-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/app-types": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.1.tgz",
- "integrity": "sha512-L/ZnJRAq7F++utfuoTKX4CLBG5YR7tFO3PLzG1/oXXKEezJ0kRL3CMRoueBEmTCzVb/6SIs2Qlaw++uDgi5Xyg==",
+ "version": "0.9.3",
+ "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.3.tgz",
+ "integrity": "sha512-kRVpIl4vVGJ4baogMDINbyrIOtOxqhkZQg4jTq3l8Lw6WSk0xfpEYzezFu+Kl4ve4fbPl79dvwRtaFqAC/ucCw==",
"dev": true
},
- "node_modules/@firebase/auth": {
- "version": "0.15.0",
- "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.15.0.tgz",
- "integrity": "sha512-IFuzhxS+HtOQl7+SZ/Mhaghy/zTU7CENsJFWbC16tv2wfLZbayKF5jYGdAU3VFLehgC8KjlcIWd10akc3XivfQ==",
+ "node_modules/@firebase/app/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/auth-compat": {
+ "version": "0.5.18",
+ "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.5.18.tgz",
+ "integrity": "sha512-dFBev8AMNb2AgIt9afwf/Ku4/0Wq9R9OFSeBB/xjyJt+RfQ9PnNWqU2oFphews23byLg6jle8twRA7iOYfRGRw==",
"dev": true,
"dependencies": {
- "@firebase/auth-types": "0.10.1"
+ "@firebase/auth": "1.9.0",
+ "@firebase/auth-types": "0.13.0",
+ "@firebase/component": "0.6.12",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
},
"peerDependencies": {
- "@firebase/app": "0.x"
+ "@firebase/app-compat": "0.x"
}
},
- "node_modules/@firebase/auth-interop-types": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz",
- "integrity": "sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw==",
+ "node_modules/@firebase/auth-compat/node_modules/@firebase/auth": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.9.0.tgz",
+ "integrity": "sha512-Xz2mbEYauF689qXG/4HppS2+/yGo9R7B6eNUBh3H2+XpAZTGdx8d8TFsW/BMTAK9Q95NB0pb1Bbvfx0lwofq8Q==",
"dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
"peerDependencies": {
- "@firebase/app-types": "0.x",
- "@firebase/util": "0.x"
+ "@firebase/app": "0.x",
+ "@react-native-async-storage/async-storage": "^1.18.1"
+ },
+ "peerDependenciesMeta": {
+ "@react-native-async-storage/async-storage": {
+ "optional": true
+ }
}
},
+ "node_modules/@firebase/auth-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/auth-interop-types": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.4.tgz",
+ "integrity": "sha512-JPgcXKCuO+CWqGDnigBtvo09HeBs5u/Ktc2GaFj2m01hLarbxthLNm7Fk8iOP1aqAtXV+fnnGj7U28xmk7IwVA==",
+ "dev": true
+ },
"node_modules/@firebase/auth-types": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.10.1.tgz",
- "integrity": "sha512-/+gBHb1O9x/YlG7inXfxff/6X3BPZt4zgBv4kql6HEmdzNQCodIRlEYnI+/da+lN+dha7PjaFH7C7ewMmfV7rw==",
+ "version": "0.13.0",
+ "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.13.0.tgz",
+ "integrity": "sha512-S/PuIjni0AQRLF+l9ck0YpsMOdE8GO2KU6ubmBB7P+7TJUCQDa3R1dlgYm9UzGbbePMZsp0xzB93f2b/CgxMOg==",
"dev": true,
"peerDependencies": {
"@firebase/app-types": "0.x",
- "@firebase/util": "0.x"
+ "@firebase/util": "1.x"
}
},
"node_modules/@firebase/component": {
- "version": "0.1.19",
- "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.1.19.tgz",
- "integrity": "sha512-L0S3g8eqaerg8y0zox3oOHSTwn/FE8RbcRHiurnbESvDViZtP5S5WnhuAPd7FnFxa8ElWK0z1Tr3ikzWDv1xdQ==",
+ "version": "0.6.12",
+ "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.12.tgz",
+ "integrity": "sha512-YnxqjtohLbnb7raXt2YuA44cC1wA9GiehM/cmxrsoxKlFxBLy2V0OkRSj9gpngAE0UoJ421Wlav9ycO7lTPAUw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@firebase/component/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/data-connect": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/@firebase/data-connect/-/data-connect-0.3.0.tgz",
+ "integrity": "sha512-inbLq0JyQD/d02Al3Lso0Hc8z1BVpB3dYSMFcQkeKhYyjn5bspLczLdasPbCOEUp8MOkLblLZhJuRs7Q/spFnw==",
"dev": true,
"dependencies": {
- "@firebase/util": "0.3.2",
- "tslib": "^1.11.1"
+ "@firebase/auth-interop-types": "0.2.4",
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
}
},
+ "node_modules/@firebase/data-connect/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/database": {
- "version": "0.6.13",
- "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.6.13.tgz",
- "integrity": "sha512-NommVkAPzU7CKd1gyehmi3lz0K78q0KOfiex7Nfy7MBMwknLm7oNqKovXSgQV1PCLvKXvvAplDSFhDhzIf9obA==",
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.0.12.tgz",
+ "integrity": "sha512-psFl5t6rSFHq3i3fnU1QQlc4BB9Hnhh8TgEqvQlPPm8kDLw8gYxvjqYw3c5CZW0+zKR837nwT6im/wtJUivMKw==",
"dev": true,
"dependencies": {
- "@firebase/auth-interop-types": "0.1.5",
- "@firebase/component": "0.1.19",
- "@firebase/database-types": "0.5.2",
- "@firebase/logger": "0.2.6",
- "@firebase/util": "0.3.2",
- "faye-websocket": "0.11.3",
- "tslib": "^1.11.1"
+ "@firebase/app-check-interop-types": "0.3.3",
+ "@firebase/auth-interop-types": "0.2.4",
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "faye-websocket": "0.11.4",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
}
},
"node_modules/@firebase/database-compat": {
@@ -2728,18 +2906,6 @@
"tslib": "^2.1.0"
}
},
- "node_modules/@firebase/database-compat/node_modules/faye-websocket": {
- "version": "0.11.4",
- "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
- "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
- "dev": true,
- "dependencies": {
- "websocket-driver": ">=0.5.1"
- },
- "engines": {
- "node": ">=0.8.0"
- }
- },
"node_modules/@firebase/database-compat/node_modules/tslib": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
@@ -2747,245 +2913,500 @@
"dev": true
},
"node_modules/@firebase/database-types": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.5.2.tgz",
- "integrity": "sha512-ap2WQOS3LKmGuVFKUghFft7RxXTyZTDr0Xd8y2aqmWsbJVjgozi0huL/EUMgTjGFrATAjcf2A7aNs8AKKZ2a8g==",
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.8.tgz",
+ "integrity": "sha512-6lPWIGeufhUq1heofZULyVvWFhD01TUrkkB9vyhmksjZ4XF7NaivQp9rICMk7QNhqwa+uDCaj4j+Q8qqcSVZ9g==",
"dev": true,
"dependencies": {
- "@firebase/app-types": "0.6.1"
+ "@firebase/app-types": "0.9.3",
+ "@firebase/util": "1.10.3"
}
},
+ "node_modules/@firebase/database/node_modules/@firebase/app-check-interop-types": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.3.tgz",
+ "integrity": "sha512-gAlxfPLT2j8bTI/qfe3ahl2I2YcBQ8cFIBdhAQA4I2f3TndcO+22YizyGYuttLHPQEpWkhmpFW60VCFEPg4g5A==",
+ "dev": true
+ },
+ "node_modules/@firebase/database/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/firestore": {
- "version": "1.18.0",
- "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.18.0.tgz",
- "integrity": "sha512-maMq4ltkrwjDRusR2nt0qS4wldHQMp+0IDSfXIjC+SNmjnWY/t/+Skn9U3Po+dB38xpz3i7nsKbs+8utpDnPSw==",
+ "version": "4.7.8",
+ "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.7.8.tgz",
+ "integrity": "sha512-eDvVJ/I5vSmIdGmLHJAK1OcviigIxjjia6i5/AkMFq6vZMt7CBXA0B5Xz9pGRCZ7WewFcsCbK1ZUQoYJ91+Cew==",
"dev": true,
"dependencies": {
- "@firebase/component": "0.1.19",
- "@firebase/firestore-types": "1.14.0",
- "@firebase/logger": "0.2.6",
- "@firebase/util": "0.3.2",
- "@firebase/webchannel-wrapper": "0.4.0",
- "@grpc/grpc-js": "^1.0.0",
- "@grpc/proto-loader": "^0.5.0",
- "node-fetch": "2.6.1",
- "tslib": "^1.11.1"
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "@firebase/webchannel-wrapper": "1.0.3",
+ "@grpc/grpc-js": "~1.9.0",
+ "@grpc/proto-loader": "^0.7.8",
+ "tslib": "^2.1.0"
},
"engines": {
- "node": "^8.13.0 || >=10.10.0"
+ "node": ">=18.0.0"
},
"peerDependencies": {
- "@firebase/app": "0.x",
- "@firebase/app-types": "0.x"
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/firestore-compat": {
+ "version": "0.3.43",
+ "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.3.43.tgz",
+ "integrity": "sha512-zxg7YS07XQnTetGs3GADM/eA6HB4vWUp+Av4iugmTbft0fQxuTSnGm7ifctaYuR7VMTPckU9CW+oFC9QUNSYvg==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/firestore": "4.7.8",
+ "@firebase/firestore-types": "3.0.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
}
},
+ "node_modules/@firebase/firestore-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/firestore-types": {
- "version": "1.14.0",
- "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-1.14.0.tgz",
- "integrity": "sha512-WF8IBwHzZDhwyOgQnmB0pheVrLNP78A8PGxk1nxb/Nrgh1amo4/zYvFMGgSsTeaQK37xMYS/g7eS948te/dJxw==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-3.0.3.tgz",
+ "integrity": "sha512-hD2jGdiWRxB/eZWF89xcK9gF8wvENDJkzpVFb4aGkzfEaKxVRD1kjz1t1Wj8VZEp2LCB53Yx1zD8mrhQu87R6Q==",
"dev": true,
"peerDependencies": {
- "@firebase/app-types": "0.x"
+ "@firebase/app-types": "0.x",
+ "@firebase/util": "1.x"
}
},
- "node_modules/@firebase/firestore/node_modules/node-fetch": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
- "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+ "node_modules/@firebase/firestore/node_modules/@grpc/grpc-js": {
+ "version": "1.9.15",
+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz",
+ "integrity": "sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==",
"dev": true,
+ "dependencies": {
+ "@grpc/proto-loader": "^0.7.8",
+ "@types/node": ">=12.12.47"
+ },
"engines": {
- "node": "4.x || >=6.0.0"
+ "node": "^8.13.0 || >=10.10.0"
}
},
+ "node_modules/@firebase/firestore/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/functions": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.5.1.tgz",
- "integrity": "sha512-yyjPZXXvzFPjkGRSqFVS5Hc2Y7Y48GyyMH+M3i7hLGe69r/59w6wzgXKqTiSYmyE1pxfjxU4a1YqBDHNkQkrYQ==",
+ "version": "0.12.2",
+ "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.12.2.tgz",
+ "integrity": "sha512-iKpFDoCYk/Qm+Qwv5ynRb9/yq64QOt0A0+t9NuekyAZnSoV56kSNq/PmsVmBauar5SlmEjhHk6QKdMBP9S0gXA==",
"dev": true,
"dependencies": {
- "@firebase/component": "0.1.19",
- "@firebase/functions-types": "0.3.17",
- "@firebase/messaging-types": "0.5.0",
- "node-fetch": "2.6.1",
- "tslib": "^1.11.1"
+ "@firebase/app-check-interop-types": "0.3.3",
+ "@firebase/auth-interop-types": "0.2.4",
+ "@firebase/component": "0.6.12",
+ "@firebase/messaging-interop-types": "0.2.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
},
"peerDependencies": {
- "@firebase/app": "0.x",
- "@firebase/app-types": "0.x"
+ "@firebase/app": "0.x"
}
},
+ "node_modules/@firebase/functions-compat": {
+ "version": "0.3.19",
+ "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.3.19.tgz",
+ "integrity": "sha512-uw4tR8NcJCDu86UD63Za8A8SgFgmAVFb1XsGlkuBY7gpLyZWEFavWnwRkZ/8cUwpqUhp/SptXFZ1WFJSnOokLw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/functions": "0.12.2",
+ "@firebase/functions-types": "0.6.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/functions-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/functions-types": {
- "version": "0.3.17",
- "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.3.17.tgz",
- "integrity": "sha512-DGR4i3VI55KnYk4IxrIw7+VG7Q3gA65azHnZxo98Il8IvYLr2UTBlSh72dTLlDf25NW51HqvJgYJDKvSaAeyHQ==",
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.6.3.tgz",
+ "integrity": "sha512-EZoDKQLUHFKNx6VLipQwrSMh01A1SaL3Wg6Hpi//x6/fJ6Ee4hrAeswK99I5Ht8roiniKHw4iO0B1Oxj5I4plg==",
"dev": true
},
- "node_modules/@firebase/functions/node_modules/node-fetch": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
- "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+ "node_modules/@firebase/functions/node_modules/@firebase/app-check-interop-types": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.3.tgz",
+ "integrity": "sha512-gAlxfPLT2j8bTI/qfe3ahl2I2YcBQ8cFIBdhAQA4I2f3TndcO+22YizyGYuttLHPQEpWkhmpFW60VCFEPg4g5A==",
+ "dev": true
+ },
+ "node_modules/@firebase/functions/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/installations": {
+ "version": "0.6.12",
+ "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.12.tgz",
+ "integrity": "sha512-ES/WpuAV2k2YtBTvdaknEo7IY8vaGjIjS3zhnHSAIvY9KwTR8XZFXOJoZ3nSkjN1A5R4MtEh+07drnzPDg9vaw==",
"dev": true,
- "engines": {
- "node": "4.x || >=6.0.0"
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/util": "1.10.3",
+ "idb": "7.1.1",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
}
},
- "node_modules/@firebase/installations": {
- "version": "0.4.17",
- "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.4.17.tgz",
- "integrity": "sha512-AE/TyzIpwkC4UayRJD419xTqZkKzxwk0FLht3Dci8WI2OEKHSwoZG9xv4hOBZebe+fDzoV2EzfatQY8c/6Avig==",
+ "node_modules/@firebase/installations-compat": {
+ "version": "0.2.12",
+ "resolved": "https://registry.npmjs.org/@firebase/installations-compat/-/installations-compat-0.2.12.tgz",
+ "integrity": "sha512-RhcGknkxmFu92F6Jb3rXxv6a4sytPjJGifRZj8MSURPuv2Xu+/AispCXEfY1ZraobhEHTG5HLGsP6R4l9qB5aA==",
"dev": true,
"dependencies": {
- "@firebase/component": "0.1.19",
- "@firebase/installations-types": "0.3.4",
- "@firebase/util": "0.3.2",
- "idb": "3.0.2",
- "tslib": "^1.11.1"
+ "@firebase/component": "0.6.12",
+ "@firebase/installations": "0.6.12",
+ "@firebase/installations-types": "0.5.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
},
"peerDependencies": {
- "@firebase/app": "0.x",
- "@firebase/app-types": "0.x"
+ "@firebase/app-compat": "0.x"
}
},
+ "node_modules/@firebase/installations-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/installations-types": {
- "version": "0.3.4",
- "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.3.4.tgz",
- "integrity": "sha512-RfePJFovmdIXb6rYwtngyxuEcWnOrzdZd9m7xAW0gRxDIjBT20n3BOhjpmgRWXo/DAxRmS7bRjWAyTHY9cqN7Q==",
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.5.3.tgz",
+ "integrity": "sha512-2FJI7gkLqIE0iYsNQ1P751lO3hER+Umykel+TkLwHj6plzWVxqvfclPUZhcKFVQObqloEBTmpi2Ozn7EkCABAA==",
"dev": true,
"peerDependencies": {
"@firebase/app-types": "0.x"
}
},
+ "node_modules/@firebase/installations/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/logger": {
- "version": "0.2.6",
- "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.2.6.tgz",
- "integrity": "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw==",
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.4.tgz",
+ "integrity": "sha512-mH0PEh1zoXGnaR8gD1DeGeNZtWFKbnz9hDO91dIml3iou1gpOnLqXQ2dJfB71dj6dpmUjcQ6phY3ZZJbjErr9g==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@firebase/logger/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"dev": true
},
"node_modules/@firebase/messaging": {
- "version": "0.7.1",
- "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.7.1.tgz",
- "integrity": "sha512-iev/ST9v0xd/8YpGYrZtDcqdD9J6ZWzSuceRn8EKy5vIgQvW/rk2eTQc8axzvDpQ36ZfphMYuhW6XuNrR3Pd2Q==",
+ "version": "0.12.16",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.16.tgz",
+ "integrity": "sha512-VJ8sCEIeP3+XkfbJA7410WhYGHdloYFZXoHe/vt+vNVDGw8JQPTQSVTRvjrUprEf5I4Tbcnpr2H34lS6zhCHSA==",
"dev": true,
"dependencies": {
- "@firebase/component": "0.1.19",
- "@firebase/installations": "0.4.17",
- "@firebase/messaging-types": "0.5.0",
- "@firebase/util": "0.3.2",
- "idb": "3.0.2",
- "tslib": "^1.11.1"
+ "@firebase/component": "0.6.12",
+ "@firebase/installations": "0.6.12",
+ "@firebase/messaging-interop-types": "0.2.3",
+ "@firebase/util": "1.10.3",
+ "idb": "7.1.1",
+ "tslib": "^2.1.0"
},
"peerDependencies": {
- "@firebase/app": "0.x",
- "@firebase/app-types": "0.x"
+ "@firebase/app": "0.x"
}
},
- "node_modules/@firebase/messaging-types": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.5.0.tgz",
- "integrity": "sha512-QaaBswrU6umJYb/ZYvjR5JDSslCGOH6D9P136PhabFAHLTR4TWjsaACvbBXuvwrfCXu10DtcjMxqfhdNIB1Xfg==",
+ "node_modules/@firebase/messaging-compat": {
+ "version": "0.2.16",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.2.16.tgz",
+ "integrity": "sha512-9HZZ88Ig3zQ0ok/Pwt4gQcNsOhoEy8hDHoGsV1am6ulgMuGuDVD2gl11Lere2ksL+msM12Lddi2x/7TCqmODZw==",
"dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/messaging": "0.12.16",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
"peerDependencies": {
- "@firebase/app-types": "0.x"
+ "@firebase/app-compat": "0.x"
}
},
+ "node_modules/@firebase/messaging-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/messaging-interop-types": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.3.tgz",
+ "integrity": "sha512-xfzFaJpzcmtDjycpDeCUj0Ge10ATFi/VHVIvEEjDNc3hodVBQADZ7BWQU7CuFpjSHE+eLuBI13z5F/9xOoGX8Q==",
+ "dev": true
+ },
+ "node_modules/@firebase/messaging/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/performance": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.4.2.tgz",
- "integrity": "sha512-irHTCVWJ/sxJo0QHg+yQifBeVu8ZJPihiTqYzBUz/0AGc51YSt49FZwqSfknvCN2+OfHaazz/ARVBn87g7Ex8g==",
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.7.0.tgz",
+ "integrity": "sha512-L91PwYuiJdKXKSRqsWNicvTppAJVzKjye03UlegeD6TkpKjb93T8AmJ9B0Mt0bcWHCNtnnRBCdSCvD2U9GZDjw==",
"dev": true,
"dependencies": {
- "@firebase/component": "0.1.19",
- "@firebase/installations": "0.4.17",
- "@firebase/logger": "0.2.6",
- "@firebase/performance-types": "0.0.13",
- "@firebase/util": "0.3.2",
- "tslib": "^1.11.1"
+ "@firebase/component": "0.6.12",
+ "@firebase/installations": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0",
+ "web-vitals": "^4.2.4"
},
"peerDependencies": {
- "@firebase/app": "0.x",
- "@firebase/app-types": "0.x"
+ "@firebase/app": "0.x"
}
},
+ "node_modules/@firebase/performance-compat": {
+ "version": "0.2.13",
+ "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.2.13.tgz",
+ "integrity": "sha512-pB0SMQj2TLQ6roDcX0YQDWvUnVgsVOl0VnUvyT/VBdCUuQYDHobZsPEuQsoEqmPA44KS/Gl0oyKqf+I8UPtRgw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/performance": "0.7.0",
+ "@firebase/performance-types": "0.2.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/performance-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/performance-types": {
- "version": "0.0.13",
- "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.0.13.tgz",
- "integrity": "sha512-6fZfIGjQpwo9S5OzMpPyqgYAUZcFzZxHFqOyNtorDIgNXq33nlldTL/vtaUZA8iT9TT5cJlCrF/jthKU7X21EA==",
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.2.3.tgz",
+ "integrity": "sha512-IgkyTz6QZVPAq8GSkLYJvwSLr3LS9+V6vNPQr0x4YozZJiLF5jYixj0amDtATf1X0EtYHqoPO48a9ija8GocxQ==",
"dev": true
},
- "node_modules/@firebase/polyfill": {
- "version": "0.3.36",
- "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.36.tgz",
- "integrity": "sha512-zMM9oSJgY6cT2jx3Ce9LYqb0eIpDE52meIzd/oe/y70F+v9u1LDqk5kUF5mf16zovGBWMNFmgzlsh6Wj0OsFtg==",
+ "node_modules/@firebase/performance/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/remote-config": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.5.0.tgz",
+ "integrity": "sha512-weiEbpBp5PBJTHUWR4GwI7ZacaAg68BKha5QnZ8Go65W4oQjEWqCW/rfskABI/OkrGijlL3CUmCB/SA6mVo0qA==",
"dev": true,
"dependencies": {
- "core-js": "3.6.5",
- "promise-polyfill": "8.1.3",
- "whatwg-fetch": "2.0.4"
+ "@firebase/component": "0.6.12",
+ "@firebase/installations": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
}
},
- "node_modules/@firebase/remote-config": {
- "version": "0.1.28",
- "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.1.28.tgz",
- "integrity": "sha512-4zSdyxpt94jAnFhO8toNjG8oMKBD+xTuBIcK+Nw8BdQWeJhEamgXlupdBARUk1uf3AvYICngHH32+Si/dMVTbw==",
+ "node_modules/@firebase/remote-config-compat": {
+ "version": "0.2.12",
+ "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.2.12.tgz",
+ "integrity": "sha512-91jLWPtubIuPBngg9SzwvNCWzhMLcyBccmt7TNZP+y1cuYFNOWWHKUXQ3IrxCLB7WwLqQaEu7fTDAjHsTyBsSw==",
"dev": true,
"dependencies": {
- "@firebase/component": "0.1.19",
- "@firebase/installations": "0.4.17",
- "@firebase/logger": "0.2.6",
- "@firebase/remote-config-types": "0.1.9",
- "@firebase/util": "0.3.2",
- "tslib": "^1.11.1"
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/remote-config": "0.5.0",
+ "@firebase/remote-config-types": "0.4.0",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
},
"peerDependencies": {
- "@firebase/app": "0.x",
- "@firebase/app-types": "0.x"
+ "@firebase/app-compat": "0.x"
}
},
+ "node_modules/@firebase/remote-config-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/remote-config-types": {
- "version": "0.1.9",
- "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.1.9.tgz",
- "integrity": "sha512-G96qnF3RYGbZsTRut7NBX0sxyczxt1uyCgXQuH/eAfUCngxjEGcZQnBdy6mvSdqdJh5mC31rWPO4v9/s7HwtzA==",
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.4.0.tgz",
+ "integrity": "sha512-7p3mRE/ldCNYt8fmWMQ/MSGRmXYlJ15Rvs9Rk17t8p0WwZDbeK7eRmoI1tvCPaDzn9Oqh+yD6Lw+sGLsLg4kKg==",
+ "dev": true
+ },
+ "node_modules/@firebase/remote-config/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"dev": true
},
"node_modules/@firebase/storage": {
- "version": "0.3.43",
- "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.3.43.tgz",
- "integrity": "sha512-Jp54jcuyimLxPhZHFVAhNbQmgTu3Sda7vXjXrNpPEhlvvMSq4yuZBR6RrZxe/OrNVprLHh/6lTCjwjOVSo3bWA==",
+ "version": "0.13.6",
+ "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.13.6.tgz",
+ "integrity": "sha512-BEJLYQzVgAoglRl5VRIRZ91RRBZgS/O37/PSGQJBYNuoLmFZUrtwrlLTOAwG776NlO9VQR+K2j15/36Lr2EqHA==",
"dev": true,
"dependencies": {
- "@firebase/component": "0.1.19",
- "@firebase/storage-types": "0.3.13",
- "@firebase/util": "0.3.2",
- "tslib": "^1.11.1"
+ "@firebase/component": "0.6.12",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
},
"peerDependencies": {
- "@firebase/app": "0.x",
- "@firebase/app-types": "0.x"
+ "@firebase/app": "0.x"
}
},
+ "node_modules/@firebase/storage-compat": {
+ "version": "0.3.16",
+ "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.3.16.tgz",
+ "integrity": "sha512-EeMuok/s0r938lEomia8XILEqSYULm7HcYZ/GTZLDWur0kMf2ktuPVZiTdRiwEV3Iki7FtQO5txrQ/0pLRVLAw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/storage": "0.13.6",
+ "@firebase/storage-types": "0.8.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/storage-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/storage-types": {
- "version": "0.3.13",
- "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.3.13.tgz",
- "integrity": "sha512-pL7b8d5kMNCCL0w9hF7pr16POyKkb3imOW7w0qYrhBnbyJTdVxMWZhb0HxCFyQWC0w3EiIFFmxoz8NTFZDEFog==",
+ "version": "0.8.3",
+ "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.8.3.tgz",
+ "integrity": "sha512-+Muk7g9uwngTpd8xn9OdF/D48uiQ7I1Fae7ULsWPuKoCH3HU7bfFPhxtJYzyhjdniowhuDpQcfPmuNRAqZEfvg==",
"dev": true,
"peerDependencies": {
"@firebase/app-types": "0.x",
- "@firebase/util": "0.x"
+ "@firebase/util": "1.x"
}
},
+ "node_modules/@firebase/storage/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/util": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.3.2.tgz",
- "integrity": "sha512-Dqs00++c8rwKky6KCKLLY2T1qYO4Q+X5t+lF7DInXDNF4ae1Oau35bkD+OpJ9u7l1pEv7KHowP6CUKuySCOc8g==",
+ "version": "1.10.3",
+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.10.3.tgz",
+ "integrity": "sha512-wfoF5LTy0m2ufUapV0ZnpcGQvuavTbJ5Qr1Ze9OJGL70cSMvhDyjS4w2121XdA3lGZSTOsDOyGhpoDtYwck85A==",
"dev": true,
"dependencies": {
- "tslib": "^1.11.1"
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
}
},
+ "node_modules/@firebase/util/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/vertexai": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@firebase/vertexai/-/vertexai-1.0.4.tgz",
+ "integrity": "sha512-Nkf/r4u166b4Id6zrrW0Qtg1KyZpQvvYchtkebamnHtIfY+Qnt51I/sx4Saos/WrmO8SnrSU850LfmJ7pehYXg==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/app-check-interop-types": "0.3.3",
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x",
+ "@firebase/app-types": "0.x"
+ }
+ },
+ "node_modules/@firebase/vertexai/node_modules/@firebase/app-check-interop-types": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.3.tgz",
+ "integrity": "sha512-gAlxfPLT2j8bTI/qfe3ahl2I2YcBQ8cFIBdhAQA4I2f3TndcO+22YizyGYuttLHPQEpWkhmpFW60VCFEPg4g5A==",
+ "dev": true
+ },
+ "node_modules/@firebase/vertexai/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/@firebase/webchannel-wrapper": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.4.0.tgz",
- "integrity": "sha512-8cUA/mg0S+BxIZ72TdZRsXKBP5n5uRcE3k29TZhZw6oIiHBt9JA7CTb/4pE1uKtE/q5NeTY2tBDcagoZ+1zjXQ==",
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-1.0.3.tgz",
+ "integrity": "sha512-2xCRM9q9FlzGZCdgDMJwc0gyUkWFtkosy7Xxr6sFgQwn+wMNIWd7xIvYNauU1r64B5L5rsGKy/n9TKJ0aAFeqQ==",
"dev": true
},
"node_modules/@formatjs/intl-pluralrules": {
@@ -3369,7 +3790,7 @@
"node": ">=12.10.0"
}
},
- "node_modules/@grpc/grpc-js/node_modules/@grpc/proto-loader": {
+ "node_modules/@grpc/proto-loader": {
"version": "0.7.13",
"resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz",
"integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==",
@@ -3387,7 +3808,7 @@
"node": ">=6"
}
},
- "node_modules/@grpc/grpc-js/node_modules/cliui": {
+ "node_modules/@grpc/proto-loader/node_modules/cliui": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
@@ -3401,7 +3822,7 @@
"node": ">=12"
}
},
- "node_modules/@grpc/grpc-js/node_modules/is-fullwidth-code-point": {
+ "node_modules/@grpc/proto-loader/node_modules/is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
@@ -3410,13 +3831,13 @@
"node": ">=8"
}
},
- "node_modules/@grpc/grpc-js/node_modules/long": {
- "version": "5.2.3",
- "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
- "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
+ "node_modules/@grpc/proto-loader/node_modules/long": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/long/-/long-5.3.0.tgz",
+ "integrity": "sha512-5vvY5yF1zF/kXk+L94FRiTDa1Znom46UjPCH6/XbSvS8zBKMFBHTJk8KDMqJ+2J6QezQFi7k1k8v21ClJYHPaw==",
"dev": true
},
- "node_modules/@grpc/grpc-js/node_modules/string-width": {
+ "node_modules/@grpc/proto-loader/node_modules/string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
@@ -3430,7 +3851,7 @@
"node": ">=8"
}
},
- "node_modules/@grpc/grpc-js/node_modules/wrap-ansi": {
+ "node_modules/@grpc/proto-loader/node_modules/wrap-ansi": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
@@ -3447,7 +3868,7 @@
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
}
},
- "node_modules/@grpc/grpc-js/node_modules/y18n": {
+ "node_modules/@grpc/proto-loader/node_modules/y18n": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
@@ -3456,7 +3877,7 @@
"node": ">=10"
}
},
- "node_modules/@grpc/grpc-js/node_modules/yargs": {
+ "node_modules/@grpc/proto-loader/node_modules/yargs": {
"version": "17.7.2",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
@@ -3474,7 +3895,7 @@
"node": ">=12"
}
},
- "node_modules/@grpc/grpc-js/node_modules/yargs-parser": {
+ "node_modules/@grpc/proto-loader/node_modules/yargs-parser": {
"version": "21.1.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
@@ -3483,45 +3904,6 @@
"node": ">=12"
}
},
- "node_modules/@grpc/proto-loader": {
- "version": "0.5.6",
- "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.6.tgz",
- "integrity": "sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ==",
- "dev": true,
- "dependencies": {
- "lodash.camelcase": "^4.3.0",
- "protobufjs": "^6.8.6"
- },
- "engines": {
- "node": ">=6"
- }
- },
- "node_modules/@grpc/proto-loader/node_modules/protobufjs": {
- "version": "6.11.4",
- "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.4.tgz",
- "integrity": "sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==",
- "dev": true,
- "hasInstallScript": true,
- "dependencies": {
- "@protobufjs/aspromise": "^1.1.2",
- "@protobufjs/base64": "^1.1.2",
- "@protobufjs/codegen": "^2.0.4",
- "@protobufjs/eventemitter": "^1.1.0",
- "@protobufjs/fetch": "^1.1.0",
- "@protobufjs/float": "^1.0.2",
- "@protobufjs/inquire": "^1.1.0",
- "@protobufjs/path": "^1.1.2",
- "@protobufjs/pool": "^1.1.0",
- "@protobufjs/utf8": "^1.1.0",
- "@types/long": "^4.0.1",
- "@types/node": ">=13.7.0",
- "long": "^4.0.0"
- },
- "bin": {
- "pbjs": "bin/pbjs",
- "pbts": "bin/pbts"
- }
- },
"node_modules/@humanwhocodes/config-array": {
"version": "0.11.14",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
@@ -12269,18 +12651,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/core-js": {
- "version": "3.6.5",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
- "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
- "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
- "dev": true,
- "hasInstallScript": true,
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/core-js"
- }
- },
"node_modules/core-js-pure": {
"version": "3.35.0",
"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.35.0.tgz",
@@ -13070,15 +13440,6 @@
"integrity": "sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==",
"dev": true
},
- "node_modules/dom-storage": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz",
- "integrity": "sha512-g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q==",
- "dev": true,
- "engines": {
- "node": "*"
- }
- },
"node_modules/dom-walk": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
@@ -15628,9 +15989,9 @@
}
},
"node_modules/faye-websocket": {
- "version": "0.11.3",
- "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
- "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+ "version": "0.11.4",
+ "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+ "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
"dev": true,
"dependencies": {
"websocket-driver": ">=0.5.1"
@@ -15880,28 +16241,39 @@
}
},
"node_modules/firebase": {
- "version": "7.24.0",
- "resolved": "https://registry.npmjs.org/firebase/-/firebase-7.24.0.tgz",
- "integrity": "sha512-j6jIyGFFBlwWAmrlUg9HyQ/x+YpsPkc/TTkbTyeLwwAJrpAmmEHNPT6O9xtAnMV4g7d3RqLL/u9//aZlbY4rQA==",
- "dev": true,
- "dependencies": {
- "@firebase/analytics": "0.6.0",
- "@firebase/app": "0.6.11",
- "@firebase/app-types": "0.6.1",
- "@firebase/auth": "0.15.0",
- "@firebase/database": "0.6.13",
- "@firebase/firestore": "1.18.0",
- "@firebase/functions": "0.5.1",
- "@firebase/installations": "0.4.17",
- "@firebase/messaging": "0.7.1",
- "@firebase/performance": "0.4.2",
- "@firebase/polyfill": "0.3.36",
- "@firebase/remote-config": "0.1.28",
- "@firebase/storage": "0.3.43",
- "@firebase/util": "0.3.2"
- },
- "engines": {
- "node": "^8.13.0 || >=10.10.0"
+ "version": "11.3.1",
+ "resolved": "https://registry.npmjs.org/firebase/-/firebase-11.3.1.tgz",
+ "integrity": "sha512-P4YVFM0Bm2d8aO61SCEMF8E1pYgieGLrmr/LFw7vs6sAMebwuwHt+Wug+1qL2fhAHWPwpWbCLsdJH8NQ+4Sw8Q==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/analytics": "0.10.11",
+ "@firebase/analytics-compat": "0.2.17",
+ "@firebase/app": "0.11.1",
+ "@firebase/app-check": "0.8.11",
+ "@firebase/app-check-compat": "0.3.18",
+ "@firebase/app-compat": "0.2.50",
+ "@firebase/app-types": "0.9.3",
+ "@firebase/auth": "1.9.0",
+ "@firebase/auth-compat": "0.5.18",
+ "@firebase/data-connect": "0.3.0",
+ "@firebase/database": "1.0.12",
+ "@firebase/database-compat": "2.0.3",
+ "@firebase/firestore": "4.7.8",
+ "@firebase/firestore-compat": "0.3.43",
+ "@firebase/functions": "0.12.2",
+ "@firebase/functions-compat": "0.3.19",
+ "@firebase/installations": "0.6.12",
+ "@firebase/installations-compat": "0.2.12",
+ "@firebase/messaging": "0.12.16",
+ "@firebase/messaging-compat": "0.2.16",
+ "@firebase/performance": "0.7.0",
+ "@firebase/performance-compat": "0.2.13",
+ "@firebase/remote-config": "0.5.0",
+ "@firebase/remote-config-compat": "0.2.12",
+ "@firebase/storage": "0.13.6",
+ "@firebase/storage-compat": "0.3.16",
+ "@firebase/util": "1.10.3",
+ "@firebase/vertexai": "1.0.4"
}
},
"node_modules/firebase-admin": {
@@ -15927,31 +16299,6 @@
"@google-cloud/storage": "^7.7.0"
}
},
- "node_modules/firebase-admin/node_modules/@firebase/app-types": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.1.tgz",
- "integrity": "sha512-nFGqTYsnDFn1oXf1tCwPAc+hQPxyvBT/QB7qDjwK+IDYThOn63nGhzdUTXxVD9Ca8gUY/e5PQMngeo0ZW/E3uQ==",
- "dev": true
- },
- "node_modules/firebase-admin/node_modules/@firebase/database-types": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.2.tgz",
- "integrity": "sha512-JRigr5JNLEHqOkI99tAGHDZF47469/cJz1tRAgGs8Feh+3ZmQy/vVChSqwMp2DuVUGp9PlmGsNSlpINJ/hDuIA==",
- "dev": true,
- "dependencies": {
- "@firebase/app-types": "0.9.1",
- "@firebase/util": "1.9.5"
- }
- },
- "node_modules/firebase-admin/node_modules/@firebase/util": {
- "version": "1.9.5",
- "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.5.tgz",
- "integrity": "sha512-PP4pAFISDxsf70l3pEy34Mf3GkkUcVQ3MdKp6aSVb7tcpfUQxnsdV7twDd8EkfB6zZylH6wpUAoangQDmCUMqw==",
- "dev": true,
- "dependencies": {
- "tslib": "^2.1.0"
- }
- },
"node_modules/firebase-admin/node_modules/@types/node": {
"version": "20.12.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz",
@@ -15961,12 +16308,6 @@
"undici-types": "~5.26.4"
}
},
- "node_modules/firebase-admin/node_modules/tslib": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
- "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
- "dev": true
- },
"node_modules/firebase-admin/node_modules/uuid": {
"version": "9.0.1",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
@@ -15980,6 +16321,53 @@
"uuid": "dist/bin/uuid"
}
},
+ "node_modules/firebase/node_modules/@firebase/auth": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.9.0.tgz",
+ "integrity": "sha512-Xz2mbEYauF689qXG/4HppS2+/yGo9R7B6eNUBh3H2+XpAZTGdx8d8TFsW/BMTAK9Q95NB0pb1Bbvfx0lwofq8Q==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x",
+ "@react-native-async-storage/async-storage": "^1.18.1"
+ },
+ "peerDependenciesMeta": {
+ "@react-native-async-storage/async-storage": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/firebase/node_modules/@firebase/database-compat": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-2.0.3.tgz",
+ "integrity": "sha512-uHGQrSUeJvsDfA+IyHW5O4vdRPsCksEzv4T4Jins+bmQgYy20ZESU4x01xrQCn/nzqKHuQMEW99CoCO7D+5NiQ==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/database": "1.0.12",
+ "@firebase/database-types": "1.0.8",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/firebase/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
"node_modules/first-mate": {
"version": "7.4.3",
"resolved": "https://registry.npmjs.org/first-mate/-/first-mate-7.4.3.tgz",
@@ -17119,24 +17507,6 @@
"node": ">=14"
}
},
- "node_modules/google-gax/node_modules/@grpc/proto-loader": {
- "version": "0.7.12",
- "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.12.tgz",
- "integrity": "sha512-DCVwMxqYzpUCiDMl7hQ384FqP4T3DbNpXU8pt681l3UWCip1WUiD5JrkImUwCB9a7f2cq4CUTmi5r/xIMRPY1Q==",
- "dev": true,
- "dependencies": {
- "lodash.camelcase": "^4.3.0",
- "long": "^5.0.0",
- "protobufjs": "^7.2.4",
- "yargs": "^17.7.2"
- },
- "bin": {
- "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
- },
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/google-gax/node_modules/@tootallnate/once": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
@@ -17146,20 +17516,6 @@
"node": ">= 10"
}
},
- "node_modules/google-gax/node_modules/cliui": {
- "version": "8.0.1",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
- "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
- "dev": true,
- "dependencies": {
- "string-width": "^4.2.0",
- "strip-ansi": "^6.0.1",
- "wrap-ansi": "^7.0.0"
- },
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/google-gax/node_modules/gcp-metadata": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.0.tgz",
@@ -17217,15 +17573,6 @@
"node": ">= 6"
}
},
- "node_modules/google-gax/node_modules/is-fullwidth-code-point": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
- "dev": true,
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/google-gax/node_modules/json-bigint": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
@@ -17235,12 +17582,6 @@
"bignumber.js": "^9.0.0"
}
},
- "node_modules/google-gax/node_modules/long": {
- "version": "5.2.3",
- "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
- "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
- "dev": true
- },
"node_modules/google-gax/node_modules/retry-request": {
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz",
@@ -17255,20 +17596,6 @@
"node": ">=14"
}
},
- "node_modules/google-gax/node_modules/string-width": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
- "dev": true,
- "dependencies": {
- "emoji-regex": "^8.0.0",
- "is-fullwidth-code-point": "^3.0.0",
- "strip-ansi": "^6.0.1"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/google-gax/node_modules/teeny-request": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz",
@@ -17298,59 +17625,6 @@
"uuid": "dist/bin/uuid"
}
},
- "node_modules/google-gax/node_modules/wrap-ansi": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
- "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
- "dev": true,
- "dependencies": {
- "ansi-styles": "^4.0.0",
- "string-width": "^4.1.0",
- "strip-ansi": "^6.0.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
- }
- },
- "node_modules/google-gax/node_modules/y18n": {
- "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/google-gax/node_modules/yargs": {
- "version": "17.7.2",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
- "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
- "dev": true,
- "dependencies": {
- "cliui": "^8.0.1",
- "escalade": "^3.1.1",
- "get-caller-file": "^2.0.5",
- "require-directory": "^2.1.1",
- "string-width": "^4.2.3",
- "y18n": "^5.0.5",
- "yargs-parser": "^21.1.1"
- },
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/google-gax/node_modules/yargs-parser": {
- "version": "21.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
- "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
- "dev": true,
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/google-p12-pem": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.5.tgz",
@@ -18299,9 +18573,9 @@
}
},
"node_modules/idb": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/idb/-/idb-3.0.2.tgz",
- "integrity": "sha512-+FLa/0sTXqyux0o6C+i2lOR0VoS60LU/jzUo5xjfY6+7sEEgy4Gz1O7yFBXvjd7N0NyIGWIRg8DcQSLEG+VSPw==",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
+ "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==",
"dev": true
},
"node_modules/ieee754": {
@@ -26479,12 +26753,6 @@
"asap": "~2.0.3"
}
},
- "node_modules/promise-polyfill": {
- "version": "8.1.3",
- "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.3.tgz",
- "integrity": "sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g==",
- "dev": true
- },
"node_modules/promise-the-world": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/promise-the-world/-/promise-the-world-1.0.1.tgz",
@@ -33711,6 +33979,12 @@
"integrity": "sha512-TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA==",
"dev": true
},
+ "node_modules/web-vitals": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-4.2.4.tgz",
+ "integrity": "sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==",
+ "dev": true
+ },
"node_modules/webidl-conversions": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
@@ -33823,12 +34097,6 @@
"iconv-lite": "0.4.24"
}
},
- "node_modules/whatwg-fetch": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
- "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==",
- "dev": true
- },
"node_modules/whatwg-mimetype": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
@@ -34210,15 +34478,6 @@
"node": ">=0.1"
}
},
- "node_modules/xmlhttprequest": {
- "version": "1.8.0",
- "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
- "integrity": "sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA==",
- "dev": true,
- "engines": {
- "node": ">=0.4.0"
- }
- },
"node_modules/xmlhttprequest-ssl": {
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz",
diff --git a/package-lock.json.backup b/package-lock.json.backup
new file mode 100644
--- /dev/null
+++ b/package-lock.json.backup
@@ -0,0 +1,34709 @@
+{
+ "name": "@vercel/nft",
+ "version": "0.0.0-development",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "@vercel/nft",
+ "version": "0.0.0-development",
+ "license": "MIT",
+ "dependencies": {
+ "@mapbox/node-pre-gyp": "^2.0.0",
+ "@rollup/pluginutils": "^5.1.3",
+ "acorn": "^8.6.0",
+ "acorn-import-attributes": "^1.9.5",
+ "async-sema": "^3.1.1",
+ "bindings": "^1.4.0",
+ "estree-walker": "2.0.2",
+ "glob": "^7.1.3",
+ "graceful-fs": "^4.2.9",
+ "node-gyp-build": "^4.2.2",
+ "picomatch": "^4.0.2",
+ "resolve-from": "^5.0.0"
+ },
+ "bin": {
+ "nft": "out/cli.js"
+ },
+ "devDependencies": {
+ "@azure/cosmos": "^2.1.7",
+ "@bugsnag/js": "^6.3.2",
+ "@datadog/pprof": "^5.2.0",
+ "@ffmpeg-installer/ffmpeg": "^1.1.0",
+ "@google-cloud/bigquery": "^4.1.4",
+ "@google-cloud/firestore": "^7.6.0",
+ "@opentelemetry/api": "^1.7.0",
+ "@sentry/node": "^5.5.0",
+ "@tpluscode/sparql-builder": "^0.3.12",
+ "@types/bindings": "^1.3.0",
+ "@types/estree": "^0.0.47",
+ "@types/glob": "^7.1.2",
+ "@types/graceful-fs": "^4.1.5",
+ "@types/node": "^14.14.37",
+ "@types/picomatch": "^3.0.1",
+ "@vercel/git-hooks": "^1.0.0",
+ "@vercel/style-guide": "^5.2.0",
+ "analytics-node": "^3.4.0-beta.1",
+ "apollo-server-express": "^2.14.2",
+ "argon2": "^0.31.1",
+ "auth0": "^3.0.1",
+ "axios": "^1.7.4",
+ "azure-storage": "^2.10.3",
+ "bcrypt": "^5.0.1",
+ "browserify-middleware": "^8.1.1",
+ "bull": "^3.10.0",
+ "bullmq": "^4.10.0",
+ "camaro": "^6.1.0",
+ "chromeless": "^1.5.2",
+ "consolidate": "^0.15.1",
+ "copy": "^0.3.2",
+ "cowsay": "^1.4.0",
+ "es-get-iterator": "^1.1.0",
+ "esbuild": "^0.25.0",
+ "esm": "^3.2.25",
+ "express": "^4.21.2",
+ "fast-glob": "^3.1.1",
+ "fetch-h2": "^2.2.0",
+ "firebase": "^11.2.0",
+ "firebase-admin": "^12.0.0",
+ "fluent-ffmpeg": "^2.1.2",
+ "geo-tz": "^7.0.1",
+ "geoip-lite": "^1.4.10",
+ "graphql": "^14.4.2",
+ "highlights": "^3.1.6",
+ "hot-shots": "^6.3.0",
+ "ioredis": "^4.11.1",
+ "isomorphic-unfetch": "^3.0.0",
+ "jest": "^29.7.0",
+ "jimp": "^0.22.12",
+ "jugglingdb": "^2.0.1",
+ "koa": "^2.7.0",
+ "leveldown": "^5.6.0",
+ "lighthouse": "^5.1.0",
+ "loopback": "^3.26.0",
+ "mailgun": "^0.5.0",
+ "mariadb": "^2.0.5",
+ "memcached": "^2.2.2",
+ "microtime": "^3.0.0",
+ "mongoose": "^6.13.6",
+ "mysql": "^2.17.1",
+ "oracledb": "^6.2.0",
+ "paraphrase": "1.8.0",
+ "passport": "^0.6.0",
+ "passport-google-oauth": "^2.0.0",
+ "passport-trakt": "^1.0.4",
+ "path-platform": "^0.11.15",
+ "pdf2json": "^2.0.0",
+ "pdfkit": "^0.14.0",
+ "pg": "^7.11.0",
+ "phantomjs-prebuilt": "^2.1.16",
+ "pixelmatch": "^5.2.1",
+ "playwright-core": "^1.17.1",
+ "polyfill-library": "3.93.0",
+ "prettier": "^3.2.5",
+ "prismjs": "^1.27.0",
+ "pug": "^3.0.1",
+ "react": "^16.14.0",
+ "react-dom": "^16.14.0",
+ "redis": "^3.1.1",
+ "remark-parse": "^10.0.0",
+ "remark-prism": "^1.3.6",
+ "rimraf": "^3.0.2",
+ "rxjs": "^6.5.2",
+ "saslprep": "^1.0.3",
+ "semver": "^7.5.2",
+ "sequelize": "^6.29.0",
+ "serialport": "^12.0.0",
+ "sharp": "^0.33.1",
+ "shiki": "^0.14.5",
+ "socket.io": "^2.4.0",
+ "socket.io-client": "^2.2.0",
+ "stripe": "^7.4.0",
+ "swig": "^1.4.2",
+ "tiny-json-http": "^7.1.2",
+ "twilio": "^4.20.0",
+ "typescript": "^5.7.2",
+ "uglify-js": "^3.6.0",
+ "unified": "^10.1.0",
+ "vm2": "^3.9.18",
+ "vue": "^2.6.10",
+ "vue-server-renderer": "^2.6.10",
+ "when": "^3.7.8",
+ "zeromq": "^6.0.0-beta.19"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@aashutoshrathi/word-wrap": {
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+ "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/@aminya/node-gyp-build": {
+ "version": "4.5.0-aminya.5",
+ "resolved": "https://registry.npmjs.org/@aminya/node-gyp-build/-/node-gyp-build-4.5.0-aminya.5.tgz",
+ "integrity": "sha512-TO7GldxDfSeSRNZVmhlm0liS2GX2o2Q/qTlcD3iD4ltTM6dir568LTRZ+ZDsDbLfMAkfhrbU+VuzNYImwYfczg==",
+ "dev": true,
+ "bin": {
+ "aminya-node-gyp-build": "bin.js",
+ "aminya-node-gyp-build-optional": "optional.js",
+ "aminya-node-gyp-build-test": "build-test.js"
+ }
+ },
+ "node_modules/@ampproject/remapping": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+ "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/gen-mapping": "^0.3.0",
+ "@jridgewell/trace-mapping": "^0.3.9"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@apollo/protobufjs": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.2.tgz",
+ "integrity": "sha512-vF+zxhPiLtkwxONs6YanSt1EpwpGilThpneExUN5K3tCymuxNnVq2yojTvnpRjv2QfsEIt/n7ozPIIzBLwGIDQ==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "@protobufjs/aspromise": "^1.1.2",
+ "@protobufjs/base64": "^1.1.2",
+ "@protobufjs/codegen": "^2.0.4",
+ "@protobufjs/eventemitter": "^1.1.0",
+ "@protobufjs/fetch": "^1.1.0",
+ "@protobufjs/float": "^1.0.2",
+ "@protobufjs/inquire": "^1.1.0",
+ "@protobufjs/path": "^1.1.2",
+ "@protobufjs/pool": "^1.1.0",
+ "@protobufjs/utf8": "^1.1.0",
+ "@types/long": "^4.0.0",
+ "@types/node": "^10.1.0",
+ "long": "^4.0.0"
+ },
+ "bin": {
+ "apollo-pbjs": "bin/pbjs",
+ "apollo-pbts": "bin/pbts"
+ }
+ },
+ "node_modules/@apollo/protobufjs/node_modules/@types/node": {
+ "version": "10.17.60",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
+ "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==",
+ "dev": true
+ },
+ "node_modules/@apollographql/apollo-tools": {
+ "version": "0.5.4",
+ "resolved": "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz",
+ "integrity": "sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8",
+ "npm": ">=6"
+ },
+ "peerDependencies": {
+ "graphql": "^14.2.1 || ^15.0.0 || ^16.0.0"
+ }
+ },
+ "node_modules/@apollographql/graphql-playground-html": {
+ "version": "1.6.27",
+ "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz",
+ "integrity": "sha512-tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw==",
+ "dev": true,
+ "dependencies": {
+ "xss": "^1.0.8"
+ }
+ },
+ "node_modules/@apollographql/graphql-upload-8-fork": {
+ "version": "8.1.4",
+ "resolved": "https://registry.npmjs.org/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.4.tgz",
+ "integrity": "sha512-lHAj/PUegYu02zza9Pg0bQQYH5I0ah1nyIzu2YIqOv41P0vu3GCBISAmQCfFHThK7N3dy7dLFPhoKcXlXRLPoQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/express": "*",
+ "@types/fs-capacitor": "^2.0.0",
+ "@types/koa": "*",
+ "busboy": "^0.3.1",
+ "fs-capacitor": "^2.0.4",
+ "http-errors": "^1.7.3",
+ "object-path": "^0.11.4"
+ },
+ "engines": {
+ "node": ">=8.5"
+ },
+ "peerDependencies": {
+ "graphql": "0.13.1 - 15"
+ }
+ },
+ "node_modules/@assemblyscript/loader": {
+ "version": "0.10.1",
+ "resolved": "https://registry.npmjs.org/@assemblyscript/loader/-/loader-0.10.1.tgz",
+ "integrity": "sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==",
+ "dev": true
+ },
+ "node_modules/@aws-crypto/sha256-browser": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
+ "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-crypto/sha256-js": "^5.2.0",
+ "@aws-crypto/supports-web-crypto": "^5.2.0",
+ "@aws-crypto/util": "^5.2.0",
+ "@aws-sdk/types": "^3.222.0",
+ "@aws-sdk/util-locate-window": "^3.0.0",
+ "@smithy/util-utf8": "^2.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+ "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+ "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/is-array-buffer": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+ "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/util-buffer-from": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/sha256-browser/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-crypto/sha256-js": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
+ "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-crypto/util": "^5.2.0",
+ "@aws-sdk/types": "^3.222.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/sha256-js/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-crypto/supports-web-crypto": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
+ "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-crypto/util": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
+ "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/types": "^3.222.0",
+ "@smithy/util-utf8": "^2.0.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+ "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+ "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/is-array-buffer": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+ "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/util-buffer-from": "^2.2.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@aws-crypto/util/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/client-cognito-identity": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.734.0.tgz",
+ "integrity": "sha512-qfieHPeLga8MXH1PabQtb9+5etkViUcI4t33dndLHNn46vMhzfTztzkNtjUgN3fg4SrOjnxZd33pR9lRquMRvA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-crypto/sha256-browser": "5.2.0",
+ "@aws-crypto/sha256-js": "5.2.0",
+ "@aws-sdk/core": "3.734.0",
+ "@aws-sdk/credential-provider-node": "3.734.0",
+ "@aws-sdk/middleware-host-header": "3.734.0",
+ "@aws-sdk/middleware-logger": "3.734.0",
+ "@aws-sdk/middleware-recursion-detection": "3.734.0",
+ "@aws-sdk/middleware-user-agent": "3.734.0",
+ "@aws-sdk/region-config-resolver": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@aws-sdk/util-endpoints": "3.734.0",
+ "@aws-sdk/util-user-agent-browser": "3.734.0",
+ "@aws-sdk/util-user-agent-node": "3.734.0",
+ "@smithy/config-resolver": "^4.0.1",
+ "@smithy/core": "^3.1.1",
+ "@smithy/fetch-http-handler": "^5.0.1",
+ "@smithy/hash-node": "^4.0.1",
+ "@smithy/invalid-dependency": "^4.0.1",
+ "@smithy/middleware-content-length": "^4.0.1",
+ "@smithy/middleware-endpoint": "^4.0.2",
+ "@smithy/middleware-retry": "^4.0.3",
+ "@smithy/middleware-serde": "^4.0.1",
+ "@smithy/middleware-stack": "^4.0.1",
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/node-http-handler": "^4.0.2",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/smithy-client": "^4.1.2",
+ "@smithy/types": "^4.1.0",
+ "@smithy/url-parser": "^4.0.1",
+ "@smithy/util-base64": "^4.0.0",
+ "@smithy/util-body-length-browser": "^4.0.0",
+ "@smithy/util-body-length-node": "^4.0.0",
+ "@smithy/util-defaults-mode-browser": "^4.0.3",
+ "@smithy/util-defaults-mode-node": "^4.0.3",
+ "@smithy/util-endpoints": "^3.0.1",
+ "@smithy/util-middleware": "^4.0.1",
+ "@smithy/util-retry": "^4.0.1",
+ "@smithy/util-utf8": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/client-cognito-identity/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/client-sso": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.734.0.tgz",
+ "integrity": "sha512-oerepp0mut9VlgTwnG5Ds/lb0C0b2/rQ+hL/rF6q+HGKPfGsCuPvFx1GtwGKCXd49ase88/jVgrhcA9OQbz3kg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-crypto/sha256-browser": "5.2.0",
+ "@aws-crypto/sha256-js": "5.2.0",
+ "@aws-sdk/core": "3.734.0",
+ "@aws-sdk/middleware-host-header": "3.734.0",
+ "@aws-sdk/middleware-logger": "3.734.0",
+ "@aws-sdk/middleware-recursion-detection": "3.734.0",
+ "@aws-sdk/middleware-user-agent": "3.734.0",
+ "@aws-sdk/region-config-resolver": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@aws-sdk/util-endpoints": "3.734.0",
+ "@aws-sdk/util-user-agent-browser": "3.734.0",
+ "@aws-sdk/util-user-agent-node": "3.734.0",
+ "@smithy/config-resolver": "^4.0.1",
+ "@smithy/core": "^3.1.1",
+ "@smithy/fetch-http-handler": "^5.0.1",
+ "@smithy/hash-node": "^4.0.1",
+ "@smithy/invalid-dependency": "^4.0.1",
+ "@smithy/middleware-content-length": "^4.0.1",
+ "@smithy/middleware-endpoint": "^4.0.2",
+ "@smithy/middleware-retry": "^4.0.3",
+ "@smithy/middleware-serde": "^4.0.1",
+ "@smithy/middleware-stack": "^4.0.1",
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/node-http-handler": "^4.0.2",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/smithy-client": "^4.1.2",
+ "@smithy/types": "^4.1.0",
+ "@smithy/url-parser": "^4.0.1",
+ "@smithy/util-base64": "^4.0.0",
+ "@smithy/util-body-length-browser": "^4.0.0",
+ "@smithy/util-body-length-node": "^4.0.0",
+ "@smithy/util-defaults-mode-browser": "^4.0.3",
+ "@smithy/util-defaults-mode-node": "^4.0.3",
+ "@smithy/util-endpoints": "^3.0.1",
+ "@smithy/util-middleware": "^4.0.1",
+ "@smithy/util-retry": "^4.0.1",
+ "@smithy/util-utf8": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/client-sso/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/core": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.734.0.tgz",
+ "integrity": "sha512-SxnDqf3vobdm50OLyAKfqZetv6zzwnSqwIwd3jrbopxxHKqNIM/I0xcYjD6Tn+mPig+u7iRKb9q3QnEooFTlmg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/core": "^3.1.1",
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/signature-v4": "^5.0.1",
+ "@smithy/smithy-client": "^4.1.2",
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-middleware": "^4.0.1",
+ "fast-xml-parser": "4.4.1",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/core/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/credential-provider-cognito-identity": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.734.0.tgz",
+ "integrity": "sha512-9/5SZsg7aZVssWFPWedRv9UNFMI3Vjf83DqVQUCzsSgpIQNtqlxC30WeFXtC/rP5ulOqmF5xHs9zv3bcETAzsg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/client-cognito-identity": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/credential-provider-cognito-identity/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/credential-provider-env": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.734.0.tgz",
+ "integrity": "sha512-gtRkzYTGafnm1FPpiNO8VBmJrYMoxhDlGPYDVcijzx3DlF8dhWnowuSBCxLSi+MJMx5hvwrX2A+e/q0QAeHqmw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/core": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/credential-provider-env/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/credential-provider-http": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.734.0.tgz",
+ "integrity": "sha512-JFSL6xhONsq+hKM8xroIPhM5/FOhiQ1cov0lZxhzZWj6Ai3UAjucy3zyIFDr9MgP1KfCYNdvyaUq9/o+HWvEDg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/core": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/fetch-http-handler": "^5.0.1",
+ "@smithy/node-http-handler": "^4.0.2",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/smithy-client": "^4.1.2",
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-stream": "^4.0.2",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/credential-provider-http/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/credential-provider-ini": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.734.0.tgz",
+ "integrity": "sha512-HEyaM/hWI7dNmb4NhdlcDLcgJvrilk8G4DQX6qz0i4pBZGC2l4iffuqP8K6ZQjUfz5/6894PzeFuhTORAMd+cg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/core": "3.734.0",
+ "@aws-sdk/credential-provider-env": "3.734.0",
+ "@aws-sdk/credential-provider-http": "3.734.0",
+ "@aws-sdk/credential-provider-process": "3.734.0",
+ "@aws-sdk/credential-provider-sso": "3.734.0",
+ "@aws-sdk/credential-provider-web-identity": "3.734.0",
+ "@aws-sdk/nested-clients": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/credential-provider-imds": "^4.0.1",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/shared-ini-file-loader": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/credential-provider-ini/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/credential-provider-node": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.734.0.tgz",
+ "integrity": "sha512-9NOSNbkPVb91JwaXOhyfahkzAwWdMsbWHL6fh5/PHlXYpsDjfIfT23I++toepNF2nODAJNLnOEHGYIxgNgf6jQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/credential-provider-env": "3.734.0",
+ "@aws-sdk/credential-provider-http": "3.734.0",
+ "@aws-sdk/credential-provider-ini": "3.734.0",
+ "@aws-sdk/credential-provider-process": "3.734.0",
+ "@aws-sdk/credential-provider-sso": "3.734.0",
+ "@aws-sdk/credential-provider-web-identity": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/credential-provider-imds": "^4.0.1",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/shared-ini-file-loader": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/credential-provider-node/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/credential-provider-process": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.734.0.tgz",
+ "integrity": "sha512-zvjsUo+bkYn2vjT+EtLWu3eD6me+uun+Hws1IyWej/fKFAqiBPwyeyCgU7qjkiPQSXqk1U9+/HG9IQ6Iiz+eBw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/core": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/shared-ini-file-loader": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/credential-provider-process/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/credential-provider-sso": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.734.0.tgz",
+ "integrity": "sha512-cCwwcgUBJOsV/ddyh1OGb4gKYWEaTeTsqaAK19hiNINfYV/DO9r4RMlnWAo84sSBfJuj9shUNsxzyoe6K7R92Q==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/client-sso": "3.734.0",
+ "@aws-sdk/core": "3.734.0",
+ "@aws-sdk/token-providers": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/shared-ini-file-loader": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/credential-provider-sso/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/credential-provider-web-identity": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.734.0.tgz",
+ "integrity": "sha512-t4OSOerc+ppK541/Iyn1AS40+2vT/qE+MFMotFkhCgCJbApeRF2ozEdnDN6tGmnl4ybcUuxnp9JWLjwDVlR/4g==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/core": "3.734.0",
+ "@aws-sdk/nested-clients": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/credential-providers": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.734.0.tgz",
+ "integrity": "sha512-3q76ngVxwX/kSRA0bjH7hUkIOVf/38aACmYpbwwr7jyRU3Cpbsj57W9YtRd7zS9/A4Jt6fYx7VFEA52ajyoGAQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/client-cognito-identity": "3.734.0",
+ "@aws-sdk/core": "3.734.0",
+ "@aws-sdk/credential-provider-cognito-identity": "3.734.0",
+ "@aws-sdk/credential-provider-env": "3.734.0",
+ "@aws-sdk/credential-provider-http": "3.734.0",
+ "@aws-sdk/credential-provider-ini": "3.734.0",
+ "@aws-sdk/credential-provider-node": "3.734.0",
+ "@aws-sdk/credential-provider-process": "3.734.0",
+ "@aws-sdk/credential-provider-sso": "3.734.0",
+ "@aws-sdk/credential-provider-web-identity": "3.734.0",
+ "@aws-sdk/nested-clients": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/core": "^3.1.1",
+ "@smithy/credential-provider-imds": "^4.0.1",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/credential-providers/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/middleware-host-header": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.734.0.tgz",
+ "integrity": "sha512-LW7RRgSOHHBzWZnigNsDIzu3AiwtjeI2X66v+Wn1P1u+eXssy1+up4ZY/h+t2sU4LU36UvEf+jrZti9c6vRnFw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/middleware-host-header/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/middleware-logger": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.734.0.tgz",
+ "integrity": "sha512-mUMFITpJUW3LcKvFok176eI5zXAUomVtahb9IQBwLzkqFYOrMJvWAvoV4yuxrJ8TlQBG8gyEnkb9SnhZvjg67w==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/middleware-logger/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/middleware-recursion-detection": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.734.0.tgz",
+ "integrity": "sha512-CUat2d9ITsFc2XsmeiRQO96iWpxSKYFjxvj27Hc7vo87YUHRnfMfnc8jw1EpxEwMcvBD7LsRa6vDNky6AjcrFA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/middleware-user-agent": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.734.0.tgz",
+ "integrity": "sha512-MFVzLWRkfFz02GqGPjqSOteLe5kPfElUrXZft1eElnqulqs6RJfVSpOV7mO90gu293tNAeggMWAVSGRPKIYVMg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/core": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@aws-sdk/util-endpoints": "3.734.0",
+ "@smithy/core": "^3.1.1",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/middleware-user-agent/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/nested-clients": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.734.0.tgz",
+ "integrity": "sha512-iph2XUy8UzIfdJFWo1r0Zng9uWj3253yvW9gljhtu+y/LNmNvSnJxQk1f3D2BC5WmcoPZqTS3UsycT3mLPSzWA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-crypto/sha256-browser": "5.2.0",
+ "@aws-crypto/sha256-js": "5.2.0",
+ "@aws-sdk/core": "3.734.0",
+ "@aws-sdk/middleware-host-header": "3.734.0",
+ "@aws-sdk/middleware-logger": "3.734.0",
+ "@aws-sdk/middleware-recursion-detection": "3.734.0",
+ "@aws-sdk/middleware-user-agent": "3.734.0",
+ "@aws-sdk/region-config-resolver": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@aws-sdk/util-endpoints": "3.734.0",
+ "@aws-sdk/util-user-agent-browser": "3.734.0",
+ "@aws-sdk/util-user-agent-node": "3.734.0",
+ "@smithy/config-resolver": "^4.0.1",
+ "@smithy/core": "^3.1.1",
+ "@smithy/fetch-http-handler": "^5.0.1",
+ "@smithy/hash-node": "^4.0.1",
+ "@smithy/invalid-dependency": "^4.0.1",
+ "@smithy/middleware-content-length": "^4.0.1",
+ "@smithy/middleware-endpoint": "^4.0.2",
+ "@smithy/middleware-retry": "^4.0.3",
+ "@smithy/middleware-serde": "^4.0.1",
+ "@smithy/middleware-stack": "^4.0.1",
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/node-http-handler": "^4.0.2",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/smithy-client": "^4.1.2",
+ "@smithy/types": "^4.1.0",
+ "@smithy/url-parser": "^4.0.1",
+ "@smithy/util-base64": "^4.0.0",
+ "@smithy/util-body-length-browser": "^4.0.0",
+ "@smithy/util-body-length-node": "^4.0.0",
+ "@smithy/util-defaults-mode-browser": "^4.0.3",
+ "@smithy/util-defaults-mode-node": "^4.0.3",
+ "@smithy/util-endpoints": "^3.0.1",
+ "@smithy/util-middleware": "^4.0.1",
+ "@smithy/util-retry": "^4.0.1",
+ "@smithy/util-utf8": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/nested-clients/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/region-config-resolver": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.734.0.tgz",
+ "integrity": "sha512-Lvj1kPRC5IuJBr9DyJ9T9/plkh+EfKLy+12s/mykOy1JaKHDpvj+XGy2YO6YgYVOb8JFtaqloid+5COtje4JTQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-config-provider": "^4.0.0",
+ "@smithy/util-middleware": "^4.0.1",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/region-config-resolver/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/token-providers": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.734.0.tgz",
+ "integrity": "sha512-2U6yWKrjWjZO8Y5SHQxkFvMVWHQWbS0ufqfAIBROqmIZNubOL7jXCiVdEFekz6MZ9LF2tvYGnOW4jX8OKDGfIw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/nested-clients": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/shared-ini-file-loader": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/token-providers/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/types": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.734.0.tgz",
+ "integrity": "sha512-o11tSPTT70nAkGV1fN9wm/hAIiLPyWX6SuGf+9JyTp7S/rC2cFWhR26MvA69nplcjNaXVzB0f+QFrLXXjOqCrg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/types/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/util-endpoints": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.734.0.tgz",
+ "integrity": "sha512-w2+/E88NUbqql6uCVAsmMxDQKu7vsKV0KqhlQb0lL+RCq4zy07yXYptVNs13qrnuTfyX7uPXkXrlugvK9R1Ucg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-endpoints": "^3.0.1",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/util-endpoints/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/util-locate-window": {
+ "version": "3.723.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.723.0.tgz",
+ "integrity": "sha512-Yf2CS10BqK688DRsrKI/EO6B8ff5J86NXe4C+VCysK7UOgN0l1zOTeTukZ3H8Q9tYYX3oaF1961o8vRkFm7Nmw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@aws-sdk/util-locate-window/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/util-user-agent-browser": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.734.0.tgz",
+ "integrity": "sha512-xQTCus6Q9LwUuALW+S76OL0jcWtMOVu14q+GoLnWPUM7QeUw963oQcLhF7oq0CtaLLKyl4GOUfcwc773Zmwwng==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/types": "^4.1.0",
+ "bowser": "^2.11.0",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/@aws-sdk/util-user-agent-browser/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@aws-sdk/util-user-agent-node": {
+ "version": "3.734.0",
+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.734.0.tgz",
+ "integrity": "sha512-c6Iinh+RVQKs6jYUFQ64htOU2HUXFQ3TVx+8Tu3EDF19+9vzWi9UukhIMH9rqyyEXIAkk9XL7avt8y2Uyw2dGA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@aws-sdk/middleware-user-agent": "3.734.0",
+ "@aws-sdk/types": "3.734.0",
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "aws-crt": ">=1.0.0"
+ },
+ "peerDependenciesMeta": {
+ "aws-crt": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@aws-sdk/util-user-agent-node/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@azure/cosmos": {
+ "version": "2.1.7",
+ "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-2.1.7.tgz",
+ "integrity": "sha512-kIfpgTM7q7o059NDQuGrr0ZrNUx7PaazUgyBLwu4rQhokVG3wWY2xsh1VzGJasPvkOBXxX3lHRmApQm3jY1CBA==",
+ "dev": true,
+ "dependencies": {
+ "binary-search-bounds": "2.0.3",
+ "create-hmac": "^1.1.7",
+ "priorityqueuejs": "1.0.0",
+ "semaphore": "1.0.5",
+ "stream-http": "^2.8.3",
+ "tslib": "^1.9.3",
+ "tunnel": "0.0.5"
+ }
+ },
+ "node_modules/@babel/code-frame": {
+ "version": "7.26.2",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+ "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-validator-identifier": "^7.25.9",
+ "js-tokens": "^4.0.0",
+ "picocolors": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/compat-data": {
+ "version": "7.26.3",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.3.tgz",
+ "integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/core": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+ "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
+ "dev": true,
+ "dependencies": {
+ "@ampproject/remapping": "^2.2.0",
+ "@babel/code-frame": "^7.26.0",
+ "@babel/generator": "^7.26.0",
+ "@babel/helper-compilation-targets": "^7.25.9",
+ "@babel/helper-module-transforms": "^7.26.0",
+ "@babel/helpers": "^7.26.0",
+ "@babel/parser": "^7.26.0",
+ "@babel/template": "^7.25.9",
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.26.0",
+ "convert-source-map": "^2.0.0",
+ "debug": "^4.1.0",
+ "gensync": "^1.0.0-beta.2",
+ "json5": "^2.2.3",
+ "semver": "^6.3.1"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/babel"
+ }
+ },
+ "node_modules/@babel/core/node_modules/convert-source-map": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+ "dev": true
+ },
+ "node_modules/@babel/core/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/@babel/eslint-parser": {
+ "version": "7.23.10",
+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.10.tgz",
+ "integrity": "sha512-3wSYDPZVnhseRnxRJH6ZVTNknBz76AEnyC+AYYhasjP3Yy23qz0ERR7Fcd2SHmYuSFJ2kY9gaaDd3vyqU09eSw==",
+ "dev": true,
+ "dependencies": {
+ "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+ "eslint-visitor-keys": "^2.1.0",
+ "semver": "^6.3.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.11.0",
+ "eslint": "^7.5.0 || ^8.0.0"
+ }
+ },
+ "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@babel/eslint-parser/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/@babel/generator": {
+ "version": "7.26.3",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz",
+ "integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
+ "dev": true,
+ "dependencies": {
+ "@babel/parser": "^7.26.3",
+ "@babel/types": "^7.26.3",
+ "@jridgewell/gen-mapping": "^0.3.5",
+ "@jridgewell/trace-mapping": "^0.3.25",
+ "jsesc": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-compilation-targets": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+ "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
+ "dev": true,
+ "dependencies": {
+ "@babel/compat-data": "^7.25.9",
+ "@babel/helper-validator-option": "^7.25.9",
+ "browserslist": "^4.24.0",
+ "lru-cache": "^5.1.1",
+ "semver": "^6.3.1"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+ "dev": true,
+ "dependencies": {
+ "yallist": "^3.0.2"
+ }
+ },
+ "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+ "dev": true
+ },
+ "node_modules/@babel/helper-module-imports": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+ "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-module-transforms": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+ "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-module-imports": "^7.25.9",
+ "@babel/helper-validator-identifier": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
+ }
+ },
+ "node_modules/@babel/helper-plugin-utils": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+ "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-string-parser": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+ "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-validator-identifier": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+ "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-validator-option": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+ "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helpers": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+ "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/template": "^7.25.9",
+ "@babel/types": "^7.26.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/parser": {
+ "version": "7.26.3",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+ "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.26.3"
+ },
+ "bin": {
+ "parser": "bin/babel-parser.js"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-async-generators": {
+ "version": "7.8.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-bigint": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+ "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-class-properties": {
+ "version": "7.12.13",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+ "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.12.13"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-class-static-block": {
+ "version": "7.14.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+ "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-import-attributes": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+ "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-import-meta": {
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+ "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.10.4"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-json-strings": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-jsx": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+ "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.10.4"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-numeric-separator": {
+ "version": "7.10.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.10.4"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-object-rest-spread": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-optional-chaining": {
+ "version": "7.8.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.8.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-private-property-in-object": {
+ "version": "7.14.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+ "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-top-level-await": {
+ "version": "7.14.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+ "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.14.5"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-typescript": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+ "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/runtime": {
+ "version": "7.23.7",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.7.tgz",
+ "integrity": "sha512-w06OXVOFso7LcbzMiDGt+3X7Rh7Ho8MmgPoWU3rarH+8upf+wSU/grlGbWzQyr3DkdN6ZeuMFjpdwW0Q+HxobA==",
+ "dev": true,
+ "dependencies": {
+ "regenerator-runtime": "^0.14.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/template": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+ "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.25.9",
+ "@babel/parser": "^7.25.9",
+ "@babel/types": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/traverse": {
+ "version": "7.26.4",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz",
+ "integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.26.2",
+ "@babel/generator": "^7.26.3",
+ "@babel/parser": "^7.26.3",
+ "@babel/template": "^7.25.9",
+ "@babel/types": "^7.26.3",
+ "debug": "^4.3.1",
+ "globals": "^11.1.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/types": {
+ "version": "7.26.3",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+ "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-string-parser": "^7.25.9",
+ "@babel/helper-validator-identifier": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@bcoe/v8-coverage": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+ "dev": true
+ },
+ "node_modules/@bugsnag/browser": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/@bugsnag/browser/-/browser-6.5.2.tgz",
+ "integrity": "sha512-XFKKorJc92ivLnlHHhLiPvkP03tZ5y7n0Z2xO6lOU7t+jWF5YapgwqQAda/TWvyYO38B/baWdnOpWMB3QmjhkA==",
+ "dev": true
+ },
+ "node_modules/@bugsnag/js": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/@bugsnag/js/-/js-6.5.2.tgz",
+ "integrity": "sha512-4ibw624fM5+Y/WSuo3T/MsJVtslsPV8X0MxFuRxdvpKVUXX216d8hN8E/bG4hr7aipqQOGhBYDqSzeL2wgmh0Q==",
+ "dev": true,
+ "dependencies": {
+ "@bugsnag/browser": "^6.5.2",
+ "@bugsnag/node": "^6.5.2"
+ }
+ },
+ "node_modules/@bugsnag/node": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/@bugsnag/node/-/node-6.5.2.tgz",
+ "integrity": "sha512-KQ1twKoOttMCYsHv7OXUVsommVcrk6RGQ5YoZGlTbREhccbzsvjbiXPKiY31Qc7OXKvaJwSXhnOKrQTpRleFUg==",
+ "dev": true,
+ "dependencies": {
+ "byline": "^5.0.0",
+ "error-stack-parser": "^2.0.2",
+ "iserror": "^0.0.2",
+ "pump": "^3.0.0",
+ "stack-generator": "^2.0.3"
+ }
+ },
+ "node_modules/@cspotcode/source-map-support": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+ "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "@jridgewell/trace-mapping": "0.3.9"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+ "version": "0.3.9",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+ "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "@jridgewell/resolve-uri": "^3.0.3",
+ "@jridgewell/sourcemap-codec": "^1.4.10"
+ }
+ },
+ "node_modules/@datadog/pprof": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@datadog/pprof/-/pprof-5.2.0.tgz",
+ "integrity": "sha512-pSwLARpNLAIV1JttxXOBRKTn/NQYXDy1PJaV458YFDdAYxnBqpsYTat3/nX+8V5GoN4SfdHDci3zqXM+Ym66gQ==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "delay": "^5.0.0",
+ "node-gyp-build": "<4.0",
+ "p-limit": "^3.1.0",
+ "pprof-format": "^2.1.0",
+ "source-map": "^0.7.4"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@datadog/pprof/node_modules/node-gyp-build": {
+ "version": "3.9.0",
+ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.9.0.tgz",
+ "integrity": "sha512-zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A==",
+ "dev": true,
+ "bin": {
+ "node-gyp-build": "bin.js",
+ "node-gyp-build-optional": "optional.js",
+ "node-gyp-build-test": "build-test.js"
+ }
+ },
+ "node_modules/@datadog/pprof/node_modules/source-map": {
+ "version": "0.7.4",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+ "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@emnapi/runtime": {
+ "version": "0.44.0",
+ "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-0.44.0.tgz",
+ "integrity": "sha512-ZX/etZEZw8DR7zAB1eVQT40lNo0jeqpb6dCgOvctB6FIQ5PoXfMuNY8+ayQfu8tNQbAB8gQWSSJupR8NxeiZXw==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.4.0"
+ }
+ },
+ "node_modules/@emnapi/runtime/node_modules/tslib": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+ "dev": true,
+ "optional": true
+ },
+ "node_modules/@esbuild/aix-ppc64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz",
+ "integrity": "sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "aix"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/android-arm": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.0.tgz",
+ "integrity": "sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/android-arm64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.0.tgz",
+ "integrity": "sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/android-x64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.0.tgz",
+ "integrity": "sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/darwin-arm64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.0.tgz",
+ "integrity": "sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/darwin-x64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.0.tgz",
+ "integrity": "sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/freebsd-arm64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.0.tgz",
+ "integrity": "sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/freebsd-x64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.0.tgz",
+ "integrity": "sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-arm": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.0.tgz",
+ "integrity": "sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-arm64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.0.tgz",
+ "integrity": "sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-ia32": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.0.tgz",
+ "integrity": "sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-loong64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.0.tgz",
+ "integrity": "sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==",
+ "cpu": [
+ "loong64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-mips64el": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.0.tgz",
+ "integrity": "sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==",
+ "cpu": [
+ "mips64el"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-ppc64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.0.tgz",
+ "integrity": "sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-riscv64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.0.tgz",
+ "integrity": "sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-s390x": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.0.tgz",
+ "integrity": "sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/linux-x64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.0.tgz",
+ "integrity": "sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/netbsd-arm64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.0.tgz",
+ "integrity": "sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/netbsd-x64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.0.tgz",
+ "integrity": "sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/openbsd-arm64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.0.tgz",
+ "integrity": "sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/openbsd-x64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.0.tgz",
+ "integrity": "sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/sunos-x64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.0.tgz",
+ "integrity": "sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "sunos"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/win32-arm64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.0.tgz",
+ "integrity": "sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/win32-ia32": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.0.tgz",
+ "integrity": "sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@esbuild/win32-x64": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.0.tgz",
+ "integrity": "sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@eslint-community/eslint-utils": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+ "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+ "dev": true,
+ "dependencies": {
+ "eslint-visitor-keys": "^3.3.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "peerDependencies": {
+ "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+ }
+ },
+ "node_modules/@eslint-community/regexpp": {
+ "version": "4.10.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
+ "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+ "dev": true,
+ "engines": {
+ "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+ }
+ },
+ "node_modules/@eslint/eslintrc": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+ "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "ajv": "^6.12.4",
+ "debug": "^4.3.2",
+ "espree": "^9.6.0",
+ "globals": "^13.19.0",
+ "ignore": "^5.2.0",
+ "import-fresh": "^3.2.1",
+ "js-yaml": "^4.1.0",
+ "minimatch": "^3.1.2",
+ "strip-json-comments": "^3.1.1"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/@eslint/eslintrc/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,
+ "peer": true
+ },
+ "node_modules/@eslint/eslintrc/node_modules/globals": {
+ "version": "13.24.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+ "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "type-fest": "^0.20.2"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "argparse": "^2.0.1"
+ },
+ "bin": {
+ "js-yaml": "bin/js-yaml.js"
+ }
+ },
+ "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@eslint/js": {
+ "version": "8.56.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
+ "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ }
+ },
+ "node_modules/@fastify/busboy": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.2.1.tgz",
+ "integrity": "sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==",
+ "dev": true,
+ "dependencies": {
+ "text-decoding": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@ffmpeg-installer/darwin-arm64": {
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/@ffmpeg-installer/darwin-arm64/-/darwin-arm64-4.1.5.tgz",
+ "integrity": "sha512-hYqTiP63mXz7wSQfuqfFwfLOfwwFChUedeCVKkBtl/cliaTM7/ePI9bVzfZ2c+dWu3TqCwLDRWNSJ5pqZl8otA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@ffmpeg-installer/darwin-x64": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/@ffmpeg-installer/darwin-x64/-/darwin-x64-4.1.0.tgz",
+ "integrity": "sha512-Z4EyG3cIFjdhlY8wI9aLUXuH8nVt7E9SlMVZtWvSPnm2sm37/yC2CwjUzyCQbJbySnef1tQwGG2Sx+uWhd9IAw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@ffmpeg-installer/ffmpeg": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@ffmpeg-installer/ffmpeg/-/ffmpeg-1.1.0.tgz",
+ "integrity": "sha512-Uq4rmwkdGxIa9A6Bd/VqqYbT7zqh1GrT5/rFwCwKM70b42W5gIjWeVETq6SdcL0zXqDtY081Ws/iJWhr1+xvQg==",
+ "dev": true,
+ "optionalDependencies": {
+ "@ffmpeg-installer/darwin-arm64": "4.1.5",
+ "@ffmpeg-installer/darwin-x64": "4.1.0",
+ "@ffmpeg-installer/linux-arm": "4.1.3",
+ "@ffmpeg-installer/linux-arm64": "4.1.4",
+ "@ffmpeg-installer/linux-ia32": "4.1.0",
+ "@ffmpeg-installer/linux-x64": "4.1.0",
+ "@ffmpeg-installer/win32-ia32": "4.1.0",
+ "@ffmpeg-installer/win32-x64": "4.1.0"
+ }
+ },
+ "node_modules/@ffmpeg-installer/linux-arm": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/@ffmpeg-installer/linux-arm/-/linux-arm-4.1.3.tgz",
+ "integrity": "sha512-NDf5V6l8AfzZ8WzUGZ5mV8O/xMzRag2ETR6+TlGIsMHp81agx51cqpPItXPib/nAZYmo55Bl2L6/WOMI3A5YRg==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@ffmpeg-installer/linux-arm64": {
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/@ffmpeg-installer/linux-arm64/-/linux-arm64-4.1.4.tgz",
+ "integrity": "sha512-dljEqAOD0oIM6O6DxBW9US/FkvqvQwgJ2lGHOwHDDwu/pX8+V0YsDL1xqHbj1DMX/+nP9rxw7G7gcUvGspSoKg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@ffmpeg-installer/linux-ia32": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/@ffmpeg-installer/linux-ia32/-/linux-ia32-4.1.0.tgz",
+ "integrity": "sha512-0LWyFQnPf+Ij9GQGD034hS6A90URNu9HCtQ5cTqo5MxOEc7Rd8gLXrJvn++UmxhU0J5RyRE9KRYstdCVUjkNOQ==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@ffmpeg-installer/linux-x64": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/@ffmpeg-installer/linux-x64/-/linux-x64-4.1.0.tgz",
+ "integrity": "sha512-Y5BWhGLU/WpQjOArNIgXD3z5mxxdV8c41C+U15nsE5yF8tVcdCGet5zPs5Zy3Ta6bU7haGpIzryutqCGQA/W8A==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@ffmpeg-installer/win32-ia32": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/@ffmpeg-installer/win32-ia32/-/win32-ia32-4.1.0.tgz",
+ "integrity": "sha512-FV2D7RlaZv/lrtdhaQ4oETwoFUsUjlUiasiZLDxhEUPdNDWcH1OU9K1xTvqz+OXLdsmYelUDuBS/zkMOTtlUAw==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@ffmpeg-installer/win32-x64": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/@ffmpeg-installer/win32-x64/-/win32-x64-4.1.0.tgz",
+ "integrity": "sha512-Drt5u2vzDnIONf4ZEkKtFlbvwj6rI3kxw1Ck9fpudmtgaZIHD4ucsWB2lCZBXRxJgXR+2IMSti+4rtM4C4rXgg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@financial-times/polyfill-useragent-normaliser": {
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.10.2.tgz",
+ "integrity": "sha512-/9xHARfrKdWHt1ZXoT+/GpKx2N7uX88U1m6tF61AYSGaJFYaFlSoL1I4WbQOGH4eTQVb1z0a9LfwXaWblpRTBg==",
+ "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+ "dev": true,
+ "dependencies": {
+ "@financial-times/useragent_parser": "^1.6.3",
+ "semver": "^7.1.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@financial-times/useragent_parser": {
+ "version": "1.6.3",
+ "resolved": "https://registry.npmjs.org/@financial-times/useragent_parser/-/useragent_parser-1.6.3.tgz",
+ "integrity": "sha512-TlQiXt/vS5ZwY0V3salvlyQzIzMGZEyw9inmJA25A8heL2kBVENbToiEc64R6ETNf5YHa2lwnc2I7iNHP9SqeQ==",
+ "dev": true
+ },
+ "node_modules/@firebase/analytics": {
+ "version": "0.10.11",
+ "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.11.tgz",
+ "integrity": "sha512-zwuPiRE0+hgcS95JZbJ6DFQN4xYFO8IyGxpeePTV51YJMwCf3lkBa6FnZ/iXIqDKcBPMgMuuEZozI0BJWaLEYg==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/installations": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/analytics-compat": {
+ "version": "0.2.17",
+ "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.17.tgz",
+ "integrity": "sha512-SJNVOeTvzdqZQvXFzj7yAirXnYcLDxh57wBFROfeowq/kRN1AqOw1tG6U4OiFOEhqi7s3xLze/LMkZatk2IEww==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/analytics": "0.10.11",
+ "@firebase/analytics-types": "0.8.3",
+ "@firebase/component": "0.6.12",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/analytics-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/analytics-types": {
+ "version": "0.8.3",
+ "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.8.3.tgz",
+ "integrity": "sha512-VrIp/d8iq2g501qO46uGz3hjbDb8xzYMrbu8Tp0ovzIzrvJZ2fvmj649gTjge/b7cCCcjT0H37g1gVtlNhnkbg==",
+ "dev": true
+ },
+ "node_modules/@firebase/analytics/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/app": {
+ "version": "0.11.1",
+ "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.11.1.tgz",
+ "integrity": "sha512-Vz4DrNLPfDx3RwQf+4klXtu7OUYDO6xz2hlRyFawWskS7YqdtNzkDDxrqH20KDfjCF1lib46/NgchIj1+8h4wQ==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "idb": "7.1.1",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@firebase/app-check": {
+ "version": "0.8.11",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.8.11.tgz",
+ "integrity": "sha512-42zIfRI08/7bQqczAy7sY2JqZYEv3a1eNa4fLFdtJ54vNevbBIRSEA3fZgRqWFNHalh5ohsBXdrYgFqaRIuCcQ==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/app-check-compat": {
+ "version": "0.3.18",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.3.18.tgz",
+ "integrity": "sha512-qjozwnwYmAIdrsVGrJk+hnF1WBois54IhZR6gO0wtZQoTvWL/GtiA2F31TIgAhF0ayUiZhztOv1RfC7YyrZGDQ==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/app-check": "0.8.11",
+ "@firebase/app-check-types": "0.5.3",
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/app-check-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/app-check-interop-types": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.1.tgz",
+ "integrity": "sha512-NILZbe6RH3X1pZmJnfOfY2gLIrlKmrkUMMrrK6VSXHcSE0eQv28xFEcw16D198i9JYZpy5Kwq394My62qCMaIw==",
+ "dev": true
+ },
+ "node_modules/@firebase/app-check-types": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check-types/-/app-check-types-0.5.3.tgz",
+ "integrity": "sha512-hyl5rKSj0QmwPdsAxrI5x1otDlByQ7bvNvVt8G/XPO2CSwE++rmSVf3VEhaeOR4J8ZFaF0Z0NDSmLejPweZ3ng==",
+ "dev": true
+ },
+ "node_modules/@firebase/app-check/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/app-compat": {
+ "version": "0.2.50",
+ "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.50.tgz",
+ "integrity": "sha512-7yD362icKgjoNvFxwth420TNZgqCfuTJ28yQCdpyjC2fXyaZHhAbxVKnHEXGTAaUKSHWxsIy46lBKGi/x/Mflw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/app": "0.11.1",
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@firebase/app-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/app-types": {
+ "version": "0.9.3",
+ "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.3.tgz",
+ "integrity": "sha512-kRVpIl4vVGJ4baogMDINbyrIOtOxqhkZQg4jTq3l8Lw6WSk0xfpEYzezFu+Kl4ve4fbPl79dvwRtaFqAC/ucCw==",
+ "dev": true
+ },
+ "node_modules/@firebase/app/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/auth-compat": {
+ "version": "0.5.18",
+ "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.5.18.tgz",
+ "integrity": "sha512-dFBev8AMNb2AgIt9afwf/Ku4/0Wq9R9OFSeBB/xjyJt+RfQ9PnNWqU2oFphews23byLg6jle8twRA7iOYfRGRw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/auth": "1.9.0",
+ "@firebase/auth-types": "0.13.0",
+ "@firebase/component": "0.6.12",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/auth-compat/node_modules/@firebase/auth": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.9.0.tgz",
+ "integrity": "sha512-Xz2mbEYauF689qXG/4HppS2+/yGo9R7B6eNUBh3H2+XpAZTGdx8d8TFsW/BMTAK9Q95NB0pb1Bbvfx0lwofq8Q==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x",
+ "@react-native-async-storage/async-storage": "^1.18.1"
+ },
+ "peerDependenciesMeta": {
+ "@react-native-async-storage/async-storage": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@firebase/auth-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/auth-interop-types": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.4.tgz",
+ "integrity": "sha512-JPgcXKCuO+CWqGDnigBtvo09HeBs5u/Ktc2GaFj2m01hLarbxthLNm7Fk8iOP1aqAtXV+fnnGj7U28xmk7IwVA==",
+ "dev": true
+ },
+ "node_modules/@firebase/auth-types": {
+ "version": "0.13.0",
+ "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.13.0.tgz",
+ "integrity": "sha512-S/PuIjni0AQRLF+l9ck0YpsMOdE8GO2KU6ubmBB7P+7TJUCQDa3R1dlgYm9UzGbbePMZsp0xzB93f2b/CgxMOg==",
+ "dev": true,
+ "peerDependencies": {
+ "@firebase/app-types": "0.x",
+ "@firebase/util": "1.x"
+ }
+ },
+ "node_modules/@firebase/component": {
+ "version": "0.6.12",
+ "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.12.tgz",
+ "integrity": "sha512-YnxqjtohLbnb7raXt2YuA44cC1wA9GiehM/cmxrsoxKlFxBLy2V0OkRSj9gpngAE0UoJ421Wlav9ycO7lTPAUw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@firebase/component/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/data-connect": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/@firebase/data-connect/-/data-connect-0.3.0.tgz",
+ "integrity": "sha512-inbLq0JyQD/d02Al3Lso0Hc8z1BVpB3dYSMFcQkeKhYyjn5bspLczLdasPbCOEUp8MOkLblLZhJuRs7Q/spFnw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/auth-interop-types": "0.2.4",
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/data-connect/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/database": {
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.0.12.tgz",
+ "integrity": "sha512-psFl5t6rSFHq3i3fnU1QQlc4BB9Hnhh8TgEqvQlPPm8kDLw8gYxvjqYw3c5CZW0+zKR837nwT6im/wtJUivMKw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/app-check-interop-types": "0.3.3",
+ "@firebase/auth-interop-types": "0.2.4",
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "faye-websocket": "0.11.4",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@firebase/database-compat": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-1.0.4.tgz",
+ "integrity": "sha512-GEEDAvsSMAkqy0BIFSVtFzoOIIcKHFfDM4aXHtWL/JCaNn4OOjH7td73jDfN3ALvpIN4hQki0FcxQ89XjqaTjQ==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.6",
+ "@firebase/database": "1.0.4",
+ "@firebase/database-types": "1.0.2",
+ "@firebase/logger": "0.4.1",
+ "@firebase/util": "1.9.5",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@firebase/database-compat/node_modules/@firebase/app-types": {
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.1.tgz",
+ "integrity": "sha512-nFGqTYsnDFn1oXf1tCwPAc+hQPxyvBT/QB7qDjwK+IDYThOn63nGhzdUTXxVD9Ca8gUY/e5PQMngeo0ZW/E3uQ==",
+ "dev": true
+ },
+ "node_modules/@firebase/database-compat/node_modules/@firebase/auth-interop-types": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.2.tgz",
+ "integrity": "sha512-k3NA28Jfoo0+o391bFjoV9X5QLnUL1WbLhZZRbTQhZdmdGYJfX8ixtNNlHsYQ94bwG0QRbsmvkzDnzuhHrV11w==",
+ "dev": true
+ },
+ "node_modules/@firebase/database-compat/node_modules/@firebase/component": {
+ "version": "0.6.6",
+ "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.6.tgz",
+ "integrity": "sha512-pp7sWqHmAAlA3os6ERgoM3k5Cxff510M9RLXZ9Mc8KFKMBc2ct3RkZTWUF7ixJNvMiK/iNgRLPDrLR2gtRJ9iQ==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/util": "1.9.5",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@firebase/database-compat/node_modules/@firebase/database": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.0.4.tgz",
+ "integrity": "sha512-k84cXh+dtpzvY6yOhfyr1B+I1vjvSMtmlqotE0lTNVylc8m5nmOohjzpTLEQDrBWvwACX/VP5fEyajAdmnOKqA==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/app-check-interop-types": "0.3.1",
+ "@firebase/auth-interop-types": "0.2.2",
+ "@firebase/component": "0.6.6",
+ "@firebase/logger": "0.4.1",
+ "@firebase/util": "1.9.5",
+ "faye-websocket": "0.11.4",
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@firebase/database-compat/node_modules/@firebase/database-types": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.2.tgz",
+ "integrity": "sha512-JRigr5JNLEHqOkI99tAGHDZF47469/cJz1tRAgGs8Feh+3ZmQy/vVChSqwMp2DuVUGp9PlmGsNSlpINJ/hDuIA==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/app-types": "0.9.1",
+ "@firebase/util": "1.9.5"
+ }
+ },
+ "node_modules/@firebase/database-compat/node_modules/@firebase/logger": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.1.tgz",
+ "integrity": "sha512-tTIixB5UJbG9ZHSGZSZdX7THr3KWOLrejZ9B7jYsm6fpwgRNngKznQKA2wgYVyvBc1ta7dGFh9NtJ8n7qfiYIw==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@firebase/database-compat/node_modules/@firebase/util": {
+ "version": "1.9.5",
+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.5.tgz",
+ "integrity": "sha512-PP4pAFISDxsf70l3pEy34Mf3GkkUcVQ3MdKp6aSVb7tcpfUQxnsdV7twDd8EkfB6zZylH6wpUAoangQDmCUMqw==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ }
+ },
+ "node_modules/@firebase/database-compat/node_modules/tslib": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+ "dev": true
+ },
+ "node_modules/@firebase/database-types": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.8.tgz",
+ "integrity": "sha512-6lPWIGeufhUq1heofZULyVvWFhD01TUrkkB9vyhmksjZ4XF7NaivQp9rICMk7QNhqwa+uDCaj4j+Q8qqcSVZ9g==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/app-types": "0.9.3",
+ "@firebase/util": "1.10.3"
+ }
+ },
+ "node_modules/@firebase/database/node_modules/@firebase/app-check-interop-types": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.3.tgz",
+ "integrity": "sha512-gAlxfPLT2j8bTI/qfe3ahl2I2YcBQ8cFIBdhAQA4I2f3TndcO+22YizyGYuttLHPQEpWkhmpFW60VCFEPg4g5A==",
+ "dev": true
+ },
+ "node_modules/@firebase/database/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/firestore": {
+ "version": "4.7.8",
+ "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.7.8.tgz",
+ "integrity": "sha512-eDvVJ/I5vSmIdGmLHJAK1OcviigIxjjia6i5/AkMFq6vZMt7CBXA0B5Xz9pGRCZ7WewFcsCbK1ZUQoYJ91+Cew==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "@firebase/webchannel-wrapper": "1.0.3",
+ "@grpc/grpc-js": "~1.9.0",
+ "@grpc/proto-loader": "^0.7.8",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/firestore-compat": {
+ "version": "0.3.43",
+ "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.3.43.tgz",
+ "integrity": "sha512-zxg7YS07XQnTetGs3GADM/eA6HB4vWUp+Av4iugmTbft0fQxuTSnGm7ifctaYuR7VMTPckU9CW+oFC9QUNSYvg==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/firestore": "4.7.8",
+ "@firebase/firestore-types": "3.0.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/firestore-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/firestore-types": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-3.0.3.tgz",
+ "integrity": "sha512-hD2jGdiWRxB/eZWF89xcK9gF8wvENDJkzpVFb4aGkzfEaKxVRD1kjz1t1Wj8VZEp2LCB53Yx1zD8mrhQu87R6Q==",
+ "dev": true,
+ "peerDependencies": {
+ "@firebase/app-types": "0.x",
+ "@firebase/util": "1.x"
+ }
+ },
+ "node_modules/@firebase/firestore/node_modules/@grpc/grpc-js": {
+ "version": "1.9.15",
+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz",
+ "integrity": "sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==",
+ "dev": true,
+ "dependencies": {
+ "@grpc/proto-loader": "^0.7.8",
+ "@types/node": ">=12.12.47"
+ },
+ "engines": {
+ "node": "^8.13.0 || >=10.10.0"
+ }
+ },
+ "node_modules/@firebase/firestore/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/functions": {
+ "version": "0.12.2",
+ "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.12.2.tgz",
+ "integrity": "sha512-iKpFDoCYk/Qm+Qwv5ynRb9/yq64QOt0A0+t9NuekyAZnSoV56kSNq/PmsVmBauar5SlmEjhHk6QKdMBP9S0gXA==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/app-check-interop-types": "0.3.3",
+ "@firebase/auth-interop-types": "0.2.4",
+ "@firebase/component": "0.6.12",
+ "@firebase/messaging-interop-types": "0.2.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/functions-compat": {
+ "version": "0.3.19",
+ "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.3.19.tgz",
+ "integrity": "sha512-uw4tR8NcJCDu86UD63Za8A8SgFgmAVFb1XsGlkuBY7gpLyZWEFavWnwRkZ/8cUwpqUhp/SptXFZ1WFJSnOokLw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/functions": "0.12.2",
+ "@firebase/functions-types": "0.6.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/functions-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/functions-types": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.6.3.tgz",
+ "integrity": "sha512-EZoDKQLUHFKNx6VLipQwrSMh01A1SaL3Wg6Hpi//x6/fJ6Ee4hrAeswK99I5Ht8roiniKHw4iO0B1Oxj5I4plg==",
+ "dev": true
+ },
+ "node_modules/@firebase/functions/node_modules/@firebase/app-check-interop-types": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.3.tgz",
+ "integrity": "sha512-gAlxfPLT2j8bTI/qfe3ahl2I2YcBQ8cFIBdhAQA4I2f3TndcO+22YizyGYuttLHPQEpWkhmpFW60VCFEPg4g5A==",
+ "dev": true
+ },
+ "node_modules/@firebase/functions/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/installations": {
+ "version": "0.6.12",
+ "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.12.tgz",
+ "integrity": "sha512-ES/WpuAV2k2YtBTvdaknEo7IY8vaGjIjS3zhnHSAIvY9KwTR8XZFXOJoZ3nSkjN1A5R4MtEh+07drnzPDg9vaw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/util": "1.10.3",
+ "idb": "7.1.1",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/installations-compat": {
+ "version": "0.2.12",
+ "resolved": "https://registry.npmjs.org/@firebase/installations-compat/-/installations-compat-0.2.12.tgz",
+ "integrity": "sha512-RhcGknkxmFu92F6Jb3rXxv6a4sytPjJGifRZj8MSURPuv2Xu+/AispCXEfY1ZraobhEHTG5HLGsP6R4l9qB5aA==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/installations": "0.6.12",
+ "@firebase/installations-types": "0.5.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/installations-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/installations-types": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.5.3.tgz",
+ "integrity": "sha512-2FJI7gkLqIE0iYsNQ1P751lO3hER+Umykel+TkLwHj6plzWVxqvfclPUZhcKFVQObqloEBTmpi2Ozn7EkCABAA==",
+ "dev": true,
+ "peerDependencies": {
+ "@firebase/app-types": "0.x"
+ }
+ },
+ "node_modules/@firebase/installations/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/logger": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.4.tgz",
+ "integrity": "sha512-mH0PEh1zoXGnaR8gD1DeGeNZtWFKbnz9hDO91dIml3iou1gpOnLqXQ2dJfB71dj6dpmUjcQ6phY3ZZJbjErr9g==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@firebase/logger/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/messaging": {
+ "version": "0.12.16",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.16.tgz",
+ "integrity": "sha512-VJ8sCEIeP3+XkfbJA7410WhYGHdloYFZXoHe/vt+vNVDGw8JQPTQSVTRvjrUprEf5I4Tbcnpr2H34lS6zhCHSA==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/installations": "0.6.12",
+ "@firebase/messaging-interop-types": "0.2.3",
+ "@firebase/util": "1.10.3",
+ "idb": "7.1.1",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/messaging-compat": {
+ "version": "0.2.16",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.2.16.tgz",
+ "integrity": "sha512-9HZZ88Ig3zQ0ok/Pwt4gQcNsOhoEy8hDHoGsV1am6ulgMuGuDVD2gl11Lere2ksL+msM12Lddi2x/7TCqmODZw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/messaging": "0.12.16",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/messaging-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/messaging-interop-types": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.3.tgz",
+ "integrity": "sha512-xfzFaJpzcmtDjycpDeCUj0Ge10ATFi/VHVIvEEjDNc3hodVBQADZ7BWQU7CuFpjSHE+eLuBI13z5F/9xOoGX8Q==",
+ "dev": true
+ },
+ "node_modules/@firebase/messaging/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/performance": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.7.0.tgz",
+ "integrity": "sha512-L91PwYuiJdKXKSRqsWNicvTppAJVzKjye03UlegeD6TkpKjb93T8AmJ9B0Mt0bcWHCNtnnRBCdSCvD2U9GZDjw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/installations": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0",
+ "web-vitals": "^4.2.4"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/performance-compat": {
+ "version": "0.2.13",
+ "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.2.13.tgz",
+ "integrity": "sha512-pB0SMQj2TLQ6roDcX0YQDWvUnVgsVOl0VnUvyT/VBdCUuQYDHobZsPEuQsoEqmPA44KS/Gl0oyKqf+I8UPtRgw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/performance": "0.7.0",
+ "@firebase/performance-types": "0.2.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/performance-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/performance-types": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.2.3.tgz",
+ "integrity": "sha512-IgkyTz6QZVPAq8GSkLYJvwSLr3LS9+V6vNPQr0x4YozZJiLF5jYixj0amDtATf1X0EtYHqoPO48a9ija8GocxQ==",
+ "dev": true
+ },
+ "node_modules/@firebase/performance/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/remote-config": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.5.0.tgz",
+ "integrity": "sha512-weiEbpBp5PBJTHUWR4GwI7ZacaAg68BKha5QnZ8Go65W4oQjEWqCW/rfskABI/OkrGijlL3CUmCB/SA6mVo0qA==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/installations": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/remote-config-compat": {
+ "version": "0.2.12",
+ "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.2.12.tgz",
+ "integrity": "sha512-91jLWPtubIuPBngg9SzwvNCWzhMLcyBccmt7TNZP+y1cuYFNOWWHKUXQ3IrxCLB7WwLqQaEu7fTDAjHsTyBsSw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/remote-config": "0.5.0",
+ "@firebase/remote-config-types": "0.4.0",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/remote-config-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/remote-config-types": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.4.0.tgz",
+ "integrity": "sha512-7p3mRE/ldCNYt8fmWMQ/MSGRmXYlJ15Rvs9Rk17t8p0WwZDbeK7eRmoI1tvCPaDzn9Oqh+yD6Lw+sGLsLg4kKg==",
+ "dev": true
+ },
+ "node_modules/@firebase/remote-config/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/storage": {
+ "version": "0.13.6",
+ "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.13.6.tgz",
+ "integrity": "sha512-BEJLYQzVgAoglRl5VRIRZ91RRBZgS/O37/PSGQJBYNuoLmFZUrtwrlLTOAwG776NlO9VQR+K2j15/36Lr2EqHA==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x"
+ }
+ },
+ "node_modules/@firebase/storage-compat": {
+ "version": "0.3.16",
+ "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.3.16.tgz",
+ "integrity": "sha512-EeMuok/s0r938lEomia8XILEqSYULm7HcYZ/GTZLDWur0kMf2ktuPVZiTdRiwEV3Iki7FtQO5txrQ/0pLRVLAw==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/storage": "0.13.6",
+ "@firebase/storage-types": "0.8.3",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app-compat": "0.x"
+ }
+ },
+ "node_modules/@firebase/storage-compat/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/storage-types": {
+ "version": "0.8.3",
+ "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.8.3.tgz",
+ "integrity": "sha512-+Muk7g9uwngTpd8xn9OdF/D48uiQ7I1Fae7ULsWPuKoCH3HU7bfFPhxtJYzyhjdniowhuDpQcfPmuNRAqZEfvg==",
+ "dev": true,
+ "peerDependencies": {
+ "@firebase/app-types": "0.x",
+ "@firebase/util": "1.x"
+ }
+ },
+ "node_modules/@firebase/storage/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/util": {
+ "version": "1.10.3",
+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.10.3.tgz",
+ "integrity": "sha512-wfoF5LTy0m2ufUapV0ZnpcGQvuavTbJ5Qr1Ze9OJGL70cSMvhDyjS4w2121XdA3lGZSTOsDOyGhpoDtYwck85A==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@firebase/util/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/vertexai": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@firebase/vertexai/-/vertexai-1.0.4.tgz",
+ "integrity": "sha512-Nkf/r4u166b4Id6zrrW0Qtg1KyZpQvvYchtkebamnHtIfY+Qnt51I/sx4Saos/WrmO8SnrSU850LfmJ7pehYXg==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/app-check-interop-types": "0.3.3",
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x",
+ "@firebase/app-types": "0.x"
+ }
+ },
+ "node_modules/@firebase/vertexai/node_modules/@firebase/app-check-interop-types": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.3.tgz",
+ "integrity": "sha512-gAlxfPLT2j8bTI/qfe3ahl2I2YcBQ8cFIBdhAQA4I2f3TndcO+22YizyGYuttLHPQEpWkhmpFW60VCFEPg4g5A==",
+ "dev": true
+ },
+ "node_modules/@firebase/vertexai/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/@firebase/webchannel-wrapper": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-1.0.3.tgz",
+ "integrity": "sha512-2xCRM9q9FlzGZCdgDMJwc0gyUkWFtkosy7Xxr6sFgQwn+wMNIWd7xIvYNauU1r64B5L5rsGKy/n9TKJ0aAFeqQ==",
+ "dev": true
+ },
+ "node_modules/@formatjs/intl-pluralrules": {
+ "version": "1.5.9",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-1.5.9.tgz",
+ "integrity": "sha512-37E1ZG+Oqo3qrpUfumzNcFTV+V+NCExmTkkQ9Zw4FSlvJ4WhbbeYdieVapUVz9M0cLy8XrhCkfuM/Kn03iKReg==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/intl-utils": "^2.3.0"
+ }
+ },
+ "node_modules/@formatjs/intl-relativetimeformat": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-3.1.0.tgz",
+ "integrity": "sha512-xSW9RMJtZZTGAlT7qCom+0INLYgshowpBN0Xf+j4kME+U/g/ogTVRFeGvCZX3nDQ21vdTHAabR3AIGQRX7NU1g==",
+ "dev": true,
+ "dependencies": {
+ "@formatjs/intl-utils": "^1.1.0"
+ }
+ },
+ "node_modules/@formatjs/intl-relativetimeformat/node_modules/@formatjs/intl-utils": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl-utils/-/intl-utils-1.6.0.tgz",
+ "integrity": "sha512-5D0C4tQgNFJNaJ17BYum0GfAcKNK3oa1VWzgkv/AN7i52fg4r69ZLcpEGpf6tZiX9Qld8CDwTQOeFt6fuOqgVw==",
+ "deprecated": "the package is rather renamed to @formatjs/ecma-abstract with some changes in functionality (primarily selectUnit is removed and we don't plan to make any further changes to this package",
+ "dev": true
+ },
+ "node_modules/@formatjs/intl-utils": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@formatjs/intl-utils/-/intl-utils-2.3.0.tgz",
+ "integrity": "sha512-KWk80UPIzPmUg+P0rKh6TqspRw0G6eux1PuJr+zz47ftMaZ9QDwbGzHZbtzWkl5hgayM/qrKRutllRC7D/vVXQ==",
+ "deprecated": "the package is rather renamed to @formatjs/ecma-abstract with some changes in functionality (primarily selectUnit is removed and we don't plan to make any further changes to this package",
+ "dev": true
+ },
+ "node_modules/@google-cloud/bigquery": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/@google-cloud/bigquery/-/bigquery-4.7.0.tgz",
+ "integrity": "sha512-u3VN1VUWcbVaW2vH5v2t0Zn5RSC4Hj3VCpf6sUO5xqcNTcHQyrjSd21aIBk28HgQO1H+9Gd1E0tGBfknGNONHw==",
+ "dev": true,
+ "dependencies": {
+ "@google-cloud/common": "^2.0.0",
+ "@google-cloud/paginator": "^2.0.0",
+ "@google-cloud/promisify": "^1.0.0",
+ "arrify": "^2.0.1",
+ "big.js": "^5.2.2",
+ "duplexify": "^4.0.0",
+ "extend": "^3.0.2",
+ "is": "^3.3.0",
+ "stream-events": "^1.0.5",
+ "string-format-obj": "^1.1.1",
+ "uuid": "^3.3.2"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/@google-cloud/common": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-2.4.0.tgz",
+ "integrity": "sha512-zWFjBS35eI9leAHhjfeOYlK5Plcuj/77EzstnrJIZbKgF/nkqjcQuGiMCpzCwOfPyUbz8ZaEOYgbHa759AKbjg==",
+ "dev": true,
+ "dependencies": {
+ "@google-cloud/projectify": "^1.0.0",
+ "@google-cloud/promisify": "^1.0.0",
+ "arrify": "^2.0.0",
+ "duplexify": "^3.6.0",
+ "ent": "^2.2.0",
+ "extend": "^3.0.2",
+ "google-auth-library": "^5.5.0",
+ "retry-request": "^4.0.0",
+ "teeny-request": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/@google-cloud/common/node_modules/duplexify": {
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+ "dev": true,
+ "dependencies": {
+ "end-of-stream": "^1.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.0",
+ "stream-shift": "^1.0.0"
+ }
+ },
+ "node_modules/@google-cloud/common/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/@google-cloud/common/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/@google-cloud/common/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/@google-cloud/common/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/@google-cloud/firestore": {
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-7.6.0.tgz",
+ "integrity": "sha512-WUDbaLY8UnPxgwsyIaxj6uxCtSDAaUyvzWJykNH5rZ9i92/SZCsPNNMN0ajrVpAR81hPIL4amXTaMJ40y5L+Yg==",
+ "dev": true,
+ "dependencies": {
+ "fast-deep-equal": "^3.1.1",
+ "functional-red-black-tree": "^1.0.1",
+ "google-gax": "^4.3.1",
+ "protobufjs": "^7.2.6"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@google-cloud/paginator": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-2.0.3.tgz",
+ "integrity": "sha512-kp/pkb2p/p0d8/SKUu4mOq8+HGwF8NPzHWkj+VKrIPQPyMRw8deZtrO/OcSiy9C/7bpfU5Txah5ltUNfPkgEXg==",
+ "dev": true,
+ "dependencies": {
+ "arrify": "^2.0.0",
+ "extend": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/@google-cloud/projectify": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-1.0.4.tgz",
+ "integrity": "sha512-ZdzQUN02eRsmTKfBj9FDL0KNDIFNjBn/d6tHQmA/+FImH5DO6ZV8E7FzxMgAUiVAUq41RFAkb25p1oHOZ8psfg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/@google-cloud/promisify": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-1.0.4.tgz",
+ "integrity": "sha512-VccZDcOql77obTnFh0TbNED/6ZbbmHDf8UMNnzO1d5g9V0Htfm4k5cllY8P1tJsRKC3zWYGRLaViiupcgVjBoQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/@google-cloud/storage": {
+ "version": "7.9.0",
+ "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.9.0.tgz",
+ "integrity": "sha512-PlFl7g3r91NmXtZHXsSEfTZES5ysD3SSBWmX4iBdQ2TFH7tN/Vn/IhnVELCHtgh1vc+uYPZ7XvRYaqtDCdghIA==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "@google-cloud/paginator": "^5.0.0",
+ "@google-cloud/projectify": "^4.0.0",
+ "@google-cloud/promisify": "^4.0.0",
+ "abort-controller": "^3.0.0",
+ "async-retry": "^1.3.3",
+ "compressible": "^2.0.12",
+ "duplexify": "^4.1.3",
+ "ent": "^2.2.0",
+ "fast-xml-parser": "^4.3.0",
+ "gaxios": "^6.0.2",
+ "google-auth-library": "^9.6.3",
+ "mime": "^3.0.0",
+ "mime-types": "^2.0.8",
+ "p-limit": "^3.0.1",
+ "retry-request": "^7.0.0",
+ "teeny-request": "^9.0.0",
+ "uuid": "^8.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/@google-cloud/paginator": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.0.tgz",
+ "integrity": "sha512-87aeg6QQcEPxGCOthnpUjvw4xAZ57G7pL8FS0C4e/81fr3FjkpUpibf1s2v5XGyGhUVGF4Jfg7yEcxqn2iUw1w==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "arrify": "^2.0.0",
+ "extend": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/@google-cloud/projectify": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-4.0.0.tgz",
+ "integrity": "sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==",
+ "dev": true,
+ "optional": true,
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/@google-cloud/promisify": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.0.0.tgz",
+ "integrity": "sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==",
+ "dev": true,
+ "optional": true,
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/@tootallnate/once": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+ "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+ "dev": true,
+ "optional": true,
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/gcp-metadata": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.0.tgz",
+ "integrity": "sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "gaxios": "^6.0.0",
+ "json-bigint": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/google-auth-library": {
+ "version": "9.7.0",
+ "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.7.0.tgz",
+ "integrity": "sha512-I/AvzBiUXDzLOy4iIZ2W+Zq33W4lcukQv1nl7C8WUA6SQwyQwUwu3waNmWNAvzds//FG8SZ+DnKnW/2k6mQS8A==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "base64-js": "^1.3.0",
+ "ecdsa-sig-formatter": "^1.0.11",
+ "gaxios": "^6.1.1",
+ "gcp-metadata": "^6.1.0",
+ "gtoken": "^7.0.0",
+ "jws": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/gtoken": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
+ "integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "gaxios": "^6.0.0",
+ "jws": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/http-proxy-agent": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+ "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "@tootallnate/once": "2",
+ "agent-base": "6",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/json-bigint": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+ "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "bignumber.js": "^9.0.0"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/retry-request": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz",
+ "integrity": "sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "@types/request": "^2.48.8",
+ "extend": "^3.0.2",
+ "teeny-request": "^9.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/teeny-request": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz",
+ "integrity": "sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "http-proxy-agent": "^5.0.0",
+ "https-proxy-agent": "^5.0.0",
+ "node-fetch": "^2.6.9",
+ "stream-events": "^1.0.5",
+ "uuid": "^9.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/teeny-request/node_modules/uuid": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+ "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+ "dev": true,
+ "funding": [
+ "https://github.com/sponsors/broofa",
+ "https://github.com/sponsors/ctavan"
+ ],
+ "optional": true,
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/@google-cloud/storage/node_modules/uuid": {
+ "version": "8.3.2",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+ "dev": true,
+ "optional": true,
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/@grpc/grpc-js": {
+ "version": "1.10.9",
+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.10.9.tgz",
+ "integrity": "sha512-5tcgUctCG0qoNyfChZifz2tJqbRbXVO9J7X6duFcOjY3HUNCxg5D0ZCK7EP9vIcZ0zRpLU9bWkyCqVCLZ46IbQ==",
+ "dev": true,
+ "dependencies": {
+ "@grpc/proto-loader": "^0.7.13",
+ "@js-sdsl/ordered-map": "^4.4.2"
+ },
+ "engines": {
+ "node": ">=12.10.0"
+ }
+ },
+ "node_modules/@grpc/proto-loader": {
+ "version": "0.7.13",
+ "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz",
+ "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==",
+ "dev": true,
+ "dependencies": {
+ "lodash.camelcase": "^4.3.0",
+ "long": "^5.0.0",
+ "protobufjs": "^7.2.5",
+ "yargs": "^17.7.2"
+ },
+ "bin": {
+ "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/@grpc/proto-loader/node_modules/cliui": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.1",
+ "wrap-ansi": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@grpc/proto-loader/node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@grpc/proto-loader/node_modules/long": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/long/-/long-5.3.0.tgz",
+ "integrity": "sha512-5vvY5yF1zF/kXk+L94FRiTDa1Znom46UjPCH6/XbSvS8zBKMFBHTJk8KDMqJ+2J6QezQFi7k1k8v21ClJYHPaw==",
+ "dev": true
+ },
+ "node_modules/@grpc/proto-loader/node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@grpc/proto-loader/node_modules/wrap-ansi": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
+ "node_modules/@grpc/proto-loader/node_modules/y18n": {
+ "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/@grpc/proto-loader/node_modules/yargs": {
+ "version": "17.7.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+ "dev": true,
+ "dependencies": {
+ "cliui": "^8.0.1",
+ "escalade": "^3.1.1",
+ "get-caller-file": "^2.0.5",
+ "require-directory": "^2.1.1",
+ "string-width": "^4.2.3",
+ "y18n": "^5.0.5",
+ "yargs-parser": "^21.1.1"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@grpc/proto-loader/node_modules/yargs-parser": {
+ "version": "21.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@humanwhocodes/config-array": {
+ "version": "0.11.14",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
+ "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "@humanwhocodes/object-schema": "^2.0.2",
+ "debug": "^4.3.1",
+ "minimatch": "^3.0.5"
+ },
+ "engines": {
+ "node": ">=10.10.0"
+ }
+ },
+ "node_modules/@humanwhocodes/module-importer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+ "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": ">=12.22"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/nzakas"
+ }
+ },
+ "node_modules/@humanwhocodes/object-schema": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
+ "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/@img/sharp-darwin-arm64": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.1.tgz",
+ "integrity": "sha512-esr2BZ1x0bo+wl7Gx2hjssYhjrhUsD88VQulI0FrG8/otRQUOxLWHMBd1Y1qo2Gfg2KUvXNpT0ASnV9BzJCexw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "glibc": ">=2.26",
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ },
+ "optionalDependencies": {
+ "@img/sharp-libvips-darwin-arm64": "1.0.0"
+ }
+ },
+ "node_modules/@img/sharp-darwin-x64": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.1.tgz",
+ "integrity": "sha512-YrnuB3bXuWdG+hJlXtq7C73lF8ampkhU3tMxg5Hh+E7ikxbUVOU9nlNtVTloDXz6pRHt2y2oKJq7DY/yt+UXYw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "glibc": ">=2.26",
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ },
+ "optionalDependencies": {
+ "@img/sharp-libvips-darwin-x64": "1.0.0"
+ }
+ },
+ "node_modules/@img/sharp-libvips-darwin-arm64": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.0.tgz",
+ "integrity": "sha512-VzYd6OwnUR81sInf3alj1wiokY50DjsHz5bvfnsFpxs5tqQxESoHtJO6xyksDs3RIkyhMWq2FufXo6GNSU9BMw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "macos": ">=11",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
+ "node_modules/@img/sharp-libvips-darwin-x64": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.0.tgz",
+ "integrity": "sha512-dD9OznTlHD6aovRswaPNEy8dKtSAmNo4++tO7uuR4o5VxbVAOoEQ1uSmN4iFAdQneTHws1lkTZeiXPrcCkh6IA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "macos": ">=10.13",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
+ "node_modules/@img/sharp-libvips-linux-arm": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.0.tgz",
+ "integrity": "sha512-VwgD2eEikDJUk09Mn9Dzi1OW2OJFRQK+XlBTkUNmAWPrtj8Ly0yq05DFgu1VCMx2/DqCGQVi5A1dM9hTmxf3uw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "glibc": ">=2.28",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
+ "node_modules/@img/sharp-libvips-linux-arm64": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.0.tgz",
+ "integrity": "sha512-xTYThiqEZEZc0PRU90yVtM3KE7lw1bKdnDQ9kCTHWbqWyHOe4NpPOtMGy27YnN51q0J5dqRrvicfPbALIOeAZA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "glibc": ">=2.26",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
+ "node_modules/@img/sharp-libvips-linux-s390x": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.0.tgz",
+ "integrity": "sha512-o9E46WWBC6JsBlwU4QyU9578G77HBDT1NInd+aERfxeOPbk0qBZHgoDsQmA2v9TbqJRWzoBPx1aLOhprBMgPjw==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "glibc": ">=2.28",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
+ "node_modules/@img/sharp-libvips-linux-x64": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.0.tgz",
+ "integrity": "sha512-naldaJy4hSVhWBgEjfdBY85CAa4UO+W1nx6a1sWStHZ7EUfNiuBTTN2KUYT5dH1+p/xij1t2QSXfCiFJoC5S/Q==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "glibc": ">=2.26",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
+ "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.0.tgz",
+ "integrity": "sha512-OdorplCyvmSAPsoJLldtLh3nLxRrkAAAOHsGWGDYfN0kh730gifK+UZb3dWORRa6EusNqCTjfXV4GxvgJ/nPDQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "musl": ">=1.2.2",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
+ "node_modules/@img/sharp-libvips-linuxmusl-x64": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.0.tgz",
+ "integrity": "sha512-FW8iK6rJrg+X2jKD0Ajhjv6y74lToIBEvkZhl42nZt563FfxkCYacrXZtd+q/sRQDypQLzY5WdLkVTbJoPyqNg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "musl": ">=1.2.2",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
+ "node_modules/@img/sharp-linux-arm": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.1.tgz",
+ "integrity": "sha512-Ii4X1vnzzI4j0+cucsrYA5ctrzU9ciXERfJR633S2r39CiD8npqH2GMj63uFZRCFt3E687IenAdbwIpQOJ5BNA==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "glibc": ">=2.28",
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ },
+ "optionalDependencies": {
+ "@img/sharp-libvips-linux-arm": "1.0.0"
+ }
+ },
+ "node_modules/@img/sharp-linux-arm64": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.1.tgz",
+ "integrity": "sha512-59B5GRO2d5N3tIfeGHAbJps7cLpuWEQv/8ySd9109ohQ3kzyCACENkFVAnGPX00HwPTQcaBNF7HQYEfZyZUFfw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "glibc": ">=2.26",
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ },
+ "optionalDependencies": {
+ "@img/sharp-libvips-linux-arm64": "1.0.0"
+ }
+ },
+ "node_modules/@img/sharp-linux-s390x": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.1.tgz",
+ "integrity": "sha512-tRGrb2pHnFUXpOAj84orYNxHADBDIr0J7rrjwQrTNMQMWA4zy3StKmMvwsI7u3dEZcgwuMMooIIGWEWOjnmG8A==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "glibc": ">=2.28",
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ },
+ "optionalDependencies": {
+ "@img/sharp-libvips-linux-s390x": "1.0.0"
+ }
+ },
+ "node_modules/@img/sharp-linux-x64": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.1.tgz",
+ "integrity": "sha512-4y8osC0cAc1TRpy02yn5omBeloZZwS62fPZ0WUAYQiLhSFSpWJfY/gMrzKzLcHB9ulUV6ExFiu2elMaixKDbeg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "glibc": ">=2.26",
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ },
+ "optionalDependencies": {
+ "@img/sharp-libvips-linux-x64": "1.0.0"
+ }
+ },
+ "node_modules/@img/sharp-linuxmusl-arm64": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.1.tgz",
+ "integrity": "sha512-D3lV6clkqIKUizNS8K6pkuCKNGmWoKlBGh5p0sLO2jQERzbakhu4bVX1Gz+RS4vTZBprKlWaf+/Rdp3ni2jLfA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "musl": ">=1.2.2",
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ },
+ "optionalDependencies": {
+ "@img/sharp-libvips-linuxmusl-arm64": "1.0.0"
+ }
+ },
+ "node_modules/@img/sharp-linuxmusl-x64": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.1.tgz",
+ "integrity": "sha512-LOGKNu5w8uu1evVqUAUKTix2sQu1XDRIYbsi5Q0c/SrXhvJ4QyOx+GaajxmOg5PZSsSnCYPSmhjHHsRBx06/wQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "musl": ">=1.2.2",
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ },
+ "optionalDependencies": {
+ "@img/sharp-libvips-linuxmusl-x64": "1.0.0"
+ }
+ },
+ "node_modules/@img/sharp-wasm32": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.1.tgz",
+ "integrity": "sha512-vWI/sA+0p+92DLkpAMb5T6I8dg4z2vzCUnp8yvxHlwBpzN8CIcO3xlSXrLltSvK6iMsVMNswAv+ub77rsf25lA==",
+ "cpu": [
+ "wasm32"
+ ],
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "@emnapi/runtime": "^0.44.0"
+ },
+ "engines": {
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
+ "node_modules/@img/sharp-win32-ia32": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.1.tgz",
+ "integrity": "sha512-/xhYkylsKL05R+NXGJc9xr2Tuw6WIVl2lubFJaFYfW4/MQ4J+dgjIo/T4qjNRizrqs/szF/lC9a5+updmY9jaQ==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
+ "node_modules/@img/sharp-win32-x64": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.1.tgz",
+ "integrity": "sha512-XaM69X0n6kTEsp9tVYYLhXdg7Qj32vYJlAKRutxUsm1UlgQNx6BOhHwZPwukCGXBU2+tH87ip2eV1I/E8MQnZg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
+ "npm": ">=9.6.5",
+ "pnpm": ">=7.1.0",
+ "yarn": ">=3.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ }
+ },
+ "node_modules/@ioredis/commands": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz",
+ "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==",
+ "dev": true
+ },
+ "node_modules/@isaacs/cliui": {
+ "version": "8.0.2",
+ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+ "dependencies": {
+ "string-width": "^5.1.2",
+ "string-width-cjs": "npm:string-width@^4.2.0",
+ "strip-ansi": "^7.0.1",
+ "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+ "wrap-ansi": "^8.1.0",
+ "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+ "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+ "version": "9.2.2",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+ },
+ "node_modules/@isaacs/cliui/node_modules/string-width": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+ "dependencies": {
+ "eastasianwidth": "^0.2.0",
+ "emoji-regex": "^9.2.2",
+ "strip-ansi": "^7.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+ "dependencies": {
+ "ansi-regex": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+ "dependencies": {
+ "ansi-styles": "^6.1.0",
+ "string-width": "^5.0.1",
+ "strip-ansi": "^7.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/fs-minipass": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+ "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+ "dependencies": {
+ "minipass": "^7.0.4"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@istanbuljs/load-nyc-config": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+ "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+ "dev": true,
+ "dependencies": {
+ "camelcase": "^5.3.1",
+ "find-up": "^4.1.0",
+ "get-package-type": "^0.1.0",
+ "js-yaml": "^3.13.1",
+ "resolve-from": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@istanbuljs/schema": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+ "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/@jest/console": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+ "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+ "dev": true,
+ "dependencies": {
+ "@jest/types": "^29.6.3",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "jest-message-util": "^29.7.0",
+ "jest-util": "^29.7.0",
+ "slash": "^3.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jest/core": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+ "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+ "dev": true,
+ "dependencies": {
+ "@jest/console": "^29.7.0",
+ "@jest/reporters": "^29.7.0",
+ "@jest/test-result": "^29.7.0",
+ "@jest/transform": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "@types/node": "*",
+ "ansi-escapes": "^4.2.1",
+ "chalk": "^4.0.0",
+ "ci-info": "^3.2.0",
+ "exit": "^0.1.2",
+ "graceful-fs": "^4.2.9",
+ "jest-changed-files": "^29.7.0",
+ "jest-config": "^29.7.0",
+ "jest-haste-map": "^29.7.0",
+ "jest-message-util": "^29.7.0",
+ "jest-regex-util": "^29.6.3",
+ "jest-resolve": "^29.7.0",
+ "jest-resolve-dependencies": "^29.7.0",
+ "jest-runner": "^29.7.0",
+ "jest-runtime": "^29.7.0",
+ "jest-snapshot": "^29.7.0",
+ "jest-util": "^29.7.0",
+ "jest-validate": "^29.7.0",
+ "jest-watcher": "^29.7.0",
+ "micromatch": "^4.0.4",
+ "pretty-format": "^29.7.0",
+ "slash": "^3.0.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ },
+ "peerDependencies": {
+ "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+ },
+ "peerDependenciesMeta": {
+ "node-notifier": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@jest/environment": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+ "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+ "dev": true,
+ "dependencies": {
+ "@jest/fake-timers": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "@types/node": "*",
+ "jest-mock": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jest/expect": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+ "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+ "dev": true,
+ "dependencies": {
+ "expect": "^29.7.0",
+ "jest-snapshot": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jest/expect-utils": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+ "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+ "dev": true,
+ "dependencies": {
+ "jest-get-type": "^29.6.3"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jest/fake-timers": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+ "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+ "dev": true,
+ "dependencies": {
+ "@jest/types": "^29.6.3",
+ "@sinonjs/fake-timers": "^10.0.2",
+ "@types/node": "*",
+ "jest-message-util": "^29.7.0",
+ "jest-mock": "^29.7.0",
+ "jest-util": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jest/globals": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+ "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+ "dev": true,
+ "dependencies": {
+ "@jest/environment": "^29.7.0",
+ "@jest/expect": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "jest-mock": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jest/reporters": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+ "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+ "dev": true,
+ "dependencies": {
+ "@bcoe/v8-coverage": "^0.2.3",
+ "@jest/console": "^29.7.0",
+ "@jest/test-result": "^29.7.0",
+ "@jest/transform": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "@jridgewell/trace-mapping": "^0.3.18",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "collect-v8-coverage": "^1.0.0",
+ "exit": "^0.1.2",
+ "glob": "^7.1.3",
+ "graceful-fs": "^4.2.9",
+ "istanbul-lib-coverage": "^3.0.0",
+ "istanbul-lib-instrument": "^6.0.0",
+ "istanbul-lib-report": "^3.0.0",
+ "istanbul-lib-source-maps": "^4.0.0",
+ "istanbul-reports": "^3.1.3",
+ "jest-message-util": "^29.7.0",
+ "jest-util": "^29.7.0",
+ "jest-worker": "^29.7.0",
+ "slash": "^3.0.0",
+ "string-length": "^4.0.1",
+ "strip-ansi": "^6.0.0",
+ "v8-to-istanbul": "^9.0.1"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ },
+ "peerDependencies": {
+ "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+ },
+ "peerDependenciesMeta": {
+ "node-notifier": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@jest/schemas": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+ "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+ "dev": true,
+ "dependencies": {
+ "@sinclair/typebox": "^0.27.8"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jest/source-map": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+ "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/trace-mapping": "^0.3.18",
+ "callsites": "^3.0.0",
+ "graceful-fs": "^4.2.9"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jest/test-result": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+ "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+ "dev": true,
+ "dependencies": {
+ "@jest/console": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "collect-v8-coverage": "^1.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jest/test-sequencer": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+ "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+ "dev": true,
+ "dependencies": {
+ "@jest/test-result": "^29.7.0",
+ "graceful-fs": "^4.2.9",
+ "jest-haste-map": "^29.7.0",
+ "slash": "^3.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jest/transform": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+ "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/core": "^7.11.6",
+ "@jest/types": "^29.6.3",
+ "@jridgewell/trace-mapping": "^0.3.18",
+ "babel-plugin-istanbul": "^6.1.1",
+ "chalk": "^4.0.0",
+ "convert-source-map": "^2.0.0",
+ "fast-json-stable-stringify": "^2.1.0",
+ "graceful-fs": "^4.2.9",
+ "jest-haste-map": "^29.7.0",
+ "jest-regex-util": "^29.6.3",
+ "jest-util": "^29.7.0",
+ "micromatch": "^4.0.4",
+ "pirates": "^4.0.4",
+ "slash": "^3.0.0",
+ "write-file-atomic": "^4.0.2"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jest/transform/node_modules/convert-source-map": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+ "dev": true
+ },
+ "node_modules/@jest/types": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+ "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+ "dev": true,
+ "dependencies": {
+ "@jest/schemas": "^29.6.3",
+ "@types/istanbul-lib-coverage": "^2.0.0",
+ "@types/istanbul-reports": "^3.0.0",
+ "@types/node": "*",
+ "@types/yargs": "^17.0.8",
+ "chalk": "^4.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jimp/bmp": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.22.12.tgz",
+ "integrity": "sha512-aeI64HD0npropd+AR76MCcvvRaa+Qck6loCOS03CkkxGHN5/r336qTM5HPUdHKMDOGzqknuVPA8+kK1t03z12g==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12",
+ "bmp-js": "^0.1.0"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/core": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.22.12.tgz",
+ "integrity": "sha512-l0RR0dOPyzMKfjUW1uebzueFEDtCOj9fN6pyTYWWOM/VS4BciXQ1VVrJs8pO3kycGYZxncRKhCoygbNr8eEZQA==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12",
+ "any-base": "^1.1.0",
+ "buffer": "^5.2.0",
+ "exif-parser": "^0.1.12",
+ "file-type": "^16.5.4",
+ "isomorphic-fetch": "^3.0.0",
+ "pixelmatch": "^4.0.2",
+ "tinycolor2": "^1.6.0"
+ }
+ },
+ "node_modules/@jimp/core/node_modules/pixelmatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz",
+ "integrity": "sha512-J8B6xqiO37sU/gkcMglv6h5Jbd9xNER7aHzpfRdNmV4IbQBzBpe4l9XmbG+xPF/znacgu2jfEw+wHffaq/YkXA==",
+ "dev": true,
+ "dependencies": {
+ "pngjs": "^3.0.0"
+ },
+ "bin": {
+ "pixelmatch": "bin/pixelmatch"
+ }
+ },
+ "node_modules/@jimp/core/node_modules/pngjs": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
+ "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/@jimp/custom": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.22.12.tgz",
+ "integrity": "sha512-xcmww1O/JFP2MrlGUMd3Q78S3Qu6W3mYTXYuIqFq33EorgYHV/HqymHfXy9GjiCJ7OI+7lWx6nYFOzU7M4rd1Q==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/core": "^0.22.12"
+ }
+ },
+ "node_modules/@jimp/gif": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.22.12.tgz",
+ "integrity": "sha512-y6BFTJgch9mbor2H234VSjd9iwAhaNf/t3US5qpYIs0TSbAvM02Fbc28IaDETj9+4YB4676sz4RcN/zwhfu1pg==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12",
+ "gifwrap": "^0.10.1",
+ "omggif": "^1.0.9"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/jpeg": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.22.12.tgz",
+ "integrity": "sha512-Rq26XC/uQWaQKyb/5lksCTCxXhtY01NJeBN+dQv5yNYedN0i7iYu+fXEoRsfaJ8xZzjoANH8sns7rVP4GE7d/Q==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12",
+ "jpeg-js": "^0.4.4"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-blit": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.22.12.tgz",
+ "integrity": "sha512-xslz2ZoFZOPLY8EZ4dC29m168BtDx95D6K80TzgUi8gqT7LY6CsajWO0FAxDwHz6h0eomHMfyGX0stspBrTKnQ==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-blur": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.22.12.tgz",
+ "integrity": "sha512-S0vJADTuh1Q9F+cXAwFPlrKWzDj2F9t/9JAbUvaaDuivpyWuImEKXVz5PUZw2NbpuSHjwssbTpOZ8F13iJX4uw==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-circle": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.22.12.tgz",
+ "integrity": "sha512-SWVXx1yiuj5jZtMijqUfvVOJBwOifFn0918ou4ftoHgegc5aHWW5dZbYPjvC9fLpvz7oSlptNl2Sxr1zwofjTg==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-color": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.22.12.tgz",
+ "integrity": "sha512-xImhTE5BpS8xa+mAN6j4sMRWaUgUDLoaGHhJhpC+r7SKKErYDR0WQV4yCE4gP+N0gozD0F3Ka1LUSaMXrn7ZIA==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12",
+ "tinycolor2": "^1.6.0"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-contain": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.22.12.tgz",
+ "integrity": "sha512-Eo3DmfixJw3N79lWk8q/0SDYbqmKt1xSTJ69yy8XLYQj9svoBbyRpSnHR+n9hOw5pKXytHwUW6nU4u1wegHNoQ==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5",
+ "@jimp/plugin-blit": ">=0.3.5",
+ "@jimp/plugin-resize": ">=0.3.5",
+ "@jimp/plugin-scale": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-cover": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.22.12.tgz",
+ "integrity": "sha512-z0w/1xH/v/knZkpTNx+E8a7fnasQ2wHG5ze6y5oL2dhH1UufNua8gLQXlv8/W56+4nJ1brhSd233HBJCo01BXA==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5",
+ "@jimp/plugin-crop": ">=0.3.5",
+ "@jimp/plugin-resize": ">=0.3.5",
+ "@jimp/plugin-scale": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-crop": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.22.12.tgz",
+ "integrity": "sha512-FNuUN0OVzRCozx8XSgP9MyLGMxNHHJMFt+LJuFjn1mu3k0VQxrzqbN06yIl46TVejhyAhcq5gLzqmSCHvlcBVw==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-displace": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.22.12.tgz",
+ "integrity": "sha512-qpRM8JRicxfK6aPPqKZA6+GzBwUIitiHaZw0QrJ64Ygd3+AsTc7BXr+37k2x7QcyCvmKXY4haUrSIsBug4S3CA==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-dither": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.22.12.tgz",
+ "integrity": "sha512-jYgGdSdSKl1UUEanX8A85v4+QUm+PE8vHFwlamaKk89s+PXQe7eVE3eNeSZX4inCq63EHL7cX580dMqkoC3ZLw==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-fisheye": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.22.12.tgz",
+ "integrity": "sha512-LGuUTsFg+fOp6KBKrmLkX4LfyCy8IIsROwoUvsUPKzutSqMJnsm3JGDW2eOmWIS/jJpPaeaishjlxvczjgII+Q==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-flip": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.22.12.tgz",
+ "integrity": "sha512-m251Rop7GN8W0Yo/rF9LWk6kNclngyjIJs/VXHToGQ6EGveOSTSQaX2Isi9f9lCDLxt+inBIb7nlaLLxnvHX8Q==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5",
+ "@jimp/plugin-rotate": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-gaussian": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.22.12.tgz",
+ "integrity": "sha512-sBfbzoOmJ6FczfG2PquiK84NtVGeScw97JsCC3rpQv1PHVWyW+uqWFF53+n3c8Y0P2HWlUjflEla2h/vWShvhg==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-invert": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.22.12.tgz",
+ "integrity": "sha512-N+6rwxdB+7OCR6PYijaA/iizXXodpxOGvT/smd/lxeXsZ/empHmFFFJ/FaXcYh19Tm04dGDaXcNF/dN5nm6+xQ==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-mask": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.22.12.tgz",
+ "integrity": "sha512-4AWZg+DomtpUA099jRV8IEZUfn1wLv6+nem4NRJC7L/82vxzLCgXKTxvNvBcNmJjT9yS1LAAmiJGdWKXG63/NA==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-normalize": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.22.12.tgz",
+ "integrity": "sha512-0So0rexQivnWgnhacX4cfkM2223YdExnJTTy6d06WbkfZk5alHUx8MM3yEzwoCN0ErO7oyqEWRnEkGC+As1FtA==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-print": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.22.12.tgz",
+ "integrity": "sha512-c7TnhHlxm87DJeSnwr/XOLjJU/whoiKYY7r21SbuJ5nuH+7a78EW1teOaj5gEr2wYEd7QtkFqGlmyGXY/YclyQ==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12",
+ "load-bmfont": "^1.4.1"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5",
+ "@jimp/plugin-blit": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-resize": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.22.12.tgz",
+ "integrity": "sha512-3NyTPlPbTnGKDIbaBgQ3HbE6wXbAlFfxHVERmrbqAi8R3r6fQPxpCauA8UVDnieg5eo04D0T8nnnNIX//i/sXg==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-rotate": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.22.12.tgz",
+ "integrity": "sha512-9YNEt7BPAFfTls2FGfKBVgwwLUuKqy+E8bDGGEsOqHtbuhbshVGxN2WMZaD4gh5IDWvR+emmmPPWGgaYNYt1gA==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5",
+ "@jimp/plugin-blit": ">=0.3.5",
+ "@jimp/plugin-crop": ">=0.3.5",
+ "@jimp/plugin-resize": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-scale": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.22.12.tgz",
+ "integrity": "sha512-dghs92qM6MhHj0HrV2qAwKPMklQtjNpoYgAB94ysYpsXslhRTiPisueSIELRwZGEr0J0VUxpUY7HgJwlSIgGZw==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5",
+ "@jimp/plugin-resize": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-shadow": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.22.12.tgz",
+ "integrity": "sha512-FX8mTJuCt7/3zXVoeD/qHlm4YH2bVqBuWQHXSuBK054e7wFRnRnbSLPUqAwSeYP3lWqpuQzJtgiiBxV3+WWwTg==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5",
+ "@jimp/plugin-blur": ">=0.3.5",
+ "@jimp/plugin-resize": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/plugin-threshold": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.22.12.tgz",
+ "integrity": "sha512-4x5GrQr1a/9L0paBC/MZZJjjgjxLYrqSmWd+e+QfAEPvmRxdRoQ5uKEuNgXnm9/weHQBTnQBQsOY2iFja+XGAw==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5",
+ "@jimp/plugin-color": ">=0.8.0",
+ "@jimp/plugin-resize": ">=0.8.0"
+ }
+ },
+ "node_modules/@jimp/plugins": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.22.12.tgz",
+ "integrity": "sha512-yBJ8vQrDkBbTgQZLty9k4+KtUQdRjsIDJSPjuI21YdVeqZxYywifHl4/XWILoTZsjTUASQcGoH0TuC0N7xm3ww==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/plugin-blit": "^0.22.12",
+ "@jimp/plugin-blur": "^0.22.12",
+ "@jimp/plugin-circle": "^0.22.12",
+ "@jimp/plugin-color": "^0.22.12",
+ "@jimp/plugin-contain": "^0.22.12",
+ "@jimp/plugin-cover": "^0.22.12",
+ "@jimp/plugin-crop": "^0.22.12",
+ "@jimp/plugin-displace": "^0.22.12",
+ "@jimp/plugin-dither": "^0.22.12",
+ "@jimp/plugin-fisheye": "^0.22.12",
+ "@jimp/plugin-flip": "^0.22.12",
+ "@jimp/plugin-gaussian": "^0.22.12",
+ "@jimp/plugin-invert": "^0.22.12",
+ "@jimp/plugin-mask": "^0.22.12",
+ "@jimp/plugin-normalize": "^0.22.12",
+ "@jimp/plugin-print": "^0.22.12",
+ "@jimp/plugin-resize": "^0.22.12",
+ "@jimp/plugin-rotate": "^0.22.12",
+ "@jimp/plugin-scale": "^0.22.12",
+ "@jimp/plugin-shadow": "^0.22.12",
+ "@jimp/plugin-threshold": "^0.22.12",
+ "timm": "^1.6.1"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/png": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.22.12.tgz",
+ "integrity": "sha512-Mrp6dr3UTn+aLK8ty/dSKELz+Otdz1v4aAXzV5q53UDD2rbB5joKVJ/ChY310B+eRzNxIovbUF1KVrUsYdE8Hg==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/utils": "^0.22.12",
+ "pngjs": "^6.0.0"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/tiff": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.22.12.tgz",
+ "integrity": "sha512-E1LtMh4RyJsoCAfAkBRVSYyZDTtLq9p9LUiiYP0vPtXyxX4BiYBUYihTLSBlCQg5nF2e4OpQg7SPrLdJ66u7jg==",
+ "dev": true,
+ "dependencies": {
+ "utif2": "^4.0.1"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/types": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.22.12.tgz",
+ "integrity": "sha512-wwKYzRdElE1MBXFREvCto5s699izFHNVvALUv79GXNbsOVqlwlOxlWJ8DuyOGIXoLP4JW/m30YyuTtfUJgMRMA==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/bmp": "^0.22.12",
+ "@jimp/gif": "^0.22.12",
+ "@jimp/jpeg": "^0.22.12",
+ "@jimp/png": "^0.22.12",
+ "@jimp/tiff": "^0.22.12",
+ "timm": "^1.6.1"
+ },
+ "peerDependencies": {
+ "@jimp/custom": ">=0.3.5"
+ }
+ },
+ "node_modules/@jimp/utils": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.22.12.tgz",
+ "integrity": "sha512-yJ5cWUknGnilBq97ZXOyOS0HhsHOyAyjHwYfHxGbSyMTohgQI6sVyE8KPgDwH8HHW/nMKXk8TrSwAE71zt716Q==",
+ "dev": true,
+ "dependencies": {
+ "regenerator-runtime": "^0.13.3"
+ }
+ },
+ "node_modules/@jimp/utils/node_modules/regenerator-runtime": {
+ "version": "0.13.11",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+ "dev": true
+ },
+ "node_modules/@josephg/resolvable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@josephg/resolvable/-/resolvable-1.0.1.tgz",
+ "integrity": "sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg==",
+ "dev": true
+ },
+ "node_modules/@jridgewell/gen-mapping": {
+ "version": "0.3.8",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+ "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/set-array": "^1.2.1",
+ "@jridgewell/sourcemap-codec": "^1.4.10",
+ "@jridgewell/trace-mapping": "^0.3.24"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/resolve-uri": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+ "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/set-array": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+ "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/sourcemap-codec": {
+ "version": "1.4.15",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+ "dev": true
+ },
+ "node_modules/@jridgewell/trace-mapping": {
+ "version": "0.3.25",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+ "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/resolve-uri": "^3.1.0",
+ "@jridgewell/sourcemap-codec": "^1.4.14"
+ }
+ },
+ "node_modules/@js-sdsl/ordered-map": {
+ "version": "4.4.2",
+ "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
+ "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==",
+ "dev": true,
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/js-sdsl"
+ }
+ },
+ "node_modules/@mapbox/node-pre-gyp": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-2.0.0.tgz",
+ "integrity": "sha512-llMXd39jtP0HpQLVI37Bf1m2ADlEb35GYSh1SDSLsBhR+5iCxiNGlT31yqbNtVHygHAtMy6dWFERpU2JgufhPg==",
+ "license": "BSD-3-Clause",
+ "dependencies": {
+ "consola": "^3.2.3",
+ "detect-libc": "^2.0.0",
+ "https-proxy-agent": "^7.0.5",
+ "node-fetch": "^2.6.7",
+ "nopt": "^8.0.0",
+ "semver": "^7.5.3",
+ "tar": "^7.4.0"
+ },
+ "bin": {
+ "node-pre-gyp": "bin/node-pre-gyp"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+ "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+ "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+ "dependencies": {
+ "agent-base": "^7.1.2",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/@microsoft/tsdoc": {
+ "version": "0.14.2",
+ "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz",
+ "integrity": "sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==",
+ "dev": true
+ },
+ "node_modules/@microsoft/tsdoc-config": {
+ "version": "0.16.2",
+ "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.16.2.tgz",
+ "integrity": "sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==",
+ "dev": true,
+ "dependencies": {
+ "@microsoft/tsdoc": "0.14.2",
+ "ajv": "~6.12.6",
+ "jju": "~1.4.0",
+ "resolve": "~1.19.0"
+ }
+ },
+ "node_modules/@microsoft/tsdoc-config/node_modules/resolve": {
+ "version": "1.19.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+ "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+ "dev": true,
+ "dependencies": {
+ "is-core-module": "^2.1.0",
+ "path-parse": "^1.0.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/@mongodb-js/saslprep": {
+ "version": "1.1.9",
+ "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz",
+ "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "sparse-bitfield": "^3.0.3"
+ }
+ },
+ "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz",
+ "integrity": "sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz",
+ "integrity": "sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz",
+ "integrity": "sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz",
+ "integrity": "sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz",
+ "integrity": "sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz",
+ "integrity": "sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+ "version": "5.1.1-v1",
+ "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+ "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+ "dev": true,
+ "dependencies": {
+ "eslint-scope": "5.1.1"
+ }
+ },
+ "node_modules/@nodelib/fs.scandir": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+ "dev": true,
+ "dependencies": {
+ "@nodelib/fs.stat": "2.0.5",
+ "run-parallel": "^1.1.9"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@nodelib/fs.stat": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+ "dev": true,
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@nodelib/fs.walk": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+ "dev": true,
+ "dependencies": {
+ "@nodelib/fs.scandir": "2.1.5",
+ "fastq": "^1.6.0"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@opentelemetry/api": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.8.0.tgz",
+ "integrity": "sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.0.0"
+ }
+ },
+ "node_modules/@phc/format": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz",
+ "integrity": "sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@pkgjs/parseargs": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+ "optional": true,
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@pkgr/core": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+ "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
+ "dev": true,
+ "engines": {
+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/unts"
+ }
+ },
+ "node_modules/@protobufjs/aspromise": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+ "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
+ "dev": true
+ },
+ "node_modules/@protobufjs/base64": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+ "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+ "dev": true
+ },
+ "node_modules/@protobufjs/codegen": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+ "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
+ "dev": true
+ },
+ "node_modules/@protobufjs/eventemitter": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+ "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==",
+ "dev": true
+ },
+ "node_modules/@protobufjs/fetch": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+ "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+ "dev": true,
+ "dependencies": {
+ "@protobufjs/aspromise": "^1.1.1",
+ "@protobufjs/inquire": "^1.1.0"
+ }
+ },
+ "node_modules/@protobufjs/float": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+ "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
+ "dev": true
+ },
+ "node_modules/@protobufjs/inquire": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+ "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==",
+ "dev": true
+ },
+ "node_modules/@protobufjs/path": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+ "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
+ "dev": true
+ },
+ "node_modules/@protobufjs/pool": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+ "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
+ "dev": true
+ },
+ "node_modules/@protobufjs/utf8": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
+ "dev": true
+ },
+ "node_modules/@rdf-esm/data-model": {
+ "version": "0.5.4",
+ "resolved": "https://registry.npmjs.org/@rdf-esm/data-model/-/data-model-0.5.4.tgz",
+ "integrity": "sha512-EINrtebCO6aT9e8vLmkaFFs317sCRj9cdFlKexvZA+7bLwcKrmcQLwC+nnnyBurtypHzWlokbLvp1SZHQWiH3w==",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/data-model": "^1.2"
+ },
+ "bin": {
+ "rdfjs-data-model-test": "bin/test.js"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@rdf-esm/namespace": {
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/@rdf-esm/namespace/-/namespace-0.5.5.tgz",
+ "integrity": "sha512-JF26H4Mx+N93qIOu3KMsjdUW6As+dhvq9wP2Q03fjiS4l1rG+gKwfKUop8CHtVETVeDcNsO3+Srrq0wiQgAPDw==",
+ "dev": true,
+ "dependencies": {
+ "@rdf-esm/data-model": "^0.5.1",
+ "@rdfjs/namespace": "^1.1.0",
+ "@types/rdfjs__namespace": "*"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@rdf-esm/term-map": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/@rdf-esm/term-map/-/term-map-0.5.1.tgz",
+ "integrity": "sha512-Yq/5hBFt90q/eru2i9NVBxAayaGI/oWTPH1+6VoFueiaKSVl4Pf4lMX98/Hg/si5Ql0gG4B4wqBbFItl4LDI0A==",
+ "dev": true,
+ "dependencies": {
+ "@rdf-esm/to-ntriples": "^0.6.0",
+ "@rdfjs/term-map": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@rdf-esm/term-map/node_modules/@rdf-esm/to-ntriples": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/@rdf-esm/to-ntriples/-/to-ntriples-0.6.0.tgz",
+ "integrity": "sha512-984lPZhKmFuLuJ74Q8SqtwzDDS43V98QXjpvu6jmlXEF2xQHwItmQk0AZ9Cyf26f3EiTVfLn3JHGWwkB0AK8IQ==",
+ "deprecated": "Use @rdfjs/to-ntriples",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/to-ntriples": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@rdf-esm/term-set": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/@rdf-esm/term-set/-/term-set-0.5.0.tgz",
+ "integrity": "sha512-vWh8VtGUX1n4pEHmr/NyNzE0+yqCOcx3vUYbMVpk0Q0mgAB2n3+8yl/RXE8203z3PXsS4C1UPlO6YCSPbQS2rw==",
+ "dev": true,
+ "dependencies": {
+ "@rdf-esm/to-ntriples": "^0.5.0",
+ "@rdfjs/term-set": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@rdf-esm/to-ntriples": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/@rdf-esm/to-ntriples/-/to-ntriples-0.5.0.tgz",
+ "integrity": "sha512-VIcqRv68V/s0NS6bFy58CcsHwV0UCM/DHhAc1MYLB/yue1nyhKsX4uyu/SB5gbbY2r4BIH4G6O+arxf59KzgwQ==",
+ "deprecated": "Use @rdfjs/to-ntriples",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@rdfjs/data-model": {
+ "version": "1.3.4",
+ "resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-1.3.4.tgz",
+ "integrity": "sha512-iKzNcKvJotgbFDdti7GTQDCYmL7GsGldkYStiP0K8EYtN7deJu5t7U11rKTz+nR7RtesUggT+lriZ7BakFv8QQ==",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/types": ">=1.0.1"
+ },
+ "bin": {
+ "rdfjs-data-model-test": "bin/test.js"
+ }
+ },
+ "node_modules/@rdfjs/dataset": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-1.1.1.tgz",
+ "integrity": "sha512-BNwCSvG0cz0srsG5esq6CQKJc1m8g/M0DZpLuiEp0MMpfwguXX7VeS8TCg4UUG3DV/DqEvhy83ZKSEjdsYseeA==",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/data-model": "^1.2.0"
+ },
+ "bin": {
+ "rdfjs-dataset-test": "bin/test.js"
+ }
+ },
+ "node_modules/@rdfjs/namespace": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rdfjs/namespace/-/namespace-1.1.0.tgz",
+ "integrity": "sha512-utO5rtaOKxk8B90qzaQ0N+J5WrCI28DtfAY/zExCmXE7cOfC5uRI/oMKbLaVEPj2P7uArekt/T4IPATtj7Tjug==",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/data-model": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/@rdfjs/parser-n3": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/@rdfjs/parser-n3/-/parser-n3-1.1.4.tgz",
+ "integrity": "sha512-PUKSNlfD2Zq3GcQZuOF2ndfrLbc+N96FUe2gNIzARlR2er0BcOHBHEFUJvVGg1Xmsg3hVKwfg0nwn1JZ7qKKMw==",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/data-model": "^1.0.1",
+ "@rdfjs/sink": "^1.0.2",
+ "n3": "^1.3.5",
+ "readable-stream": "^3.6.0",
+ "readable-to-readable": "^0.1.0"
+ }
+ },
+ "node_modules/@rdfjs/sink": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@rdfjs/sink/-/sink-1.0.3.tgz",
+ "integrity": "sha512-2KfYa8mAnptRNeogxhQqkWNXqfYVWO04jQThtXKepySrIwYmz83+WlevQtA4VDLFe+kFd2TwgL29ekPe5XVUfA==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/@rdfjs/term-map": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rdfjs/term-map/-/term-map-1.1.0.tgz",
+ "integrity": "sha512-utCLVQEZdEL664XoYuBQwMIk0Q5MD6qNPEt12DcmuAlQUS0b0kQ+WL50wyJP1BpWYjOJLokIVTUtphZWnj25BQ==",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/to-ntriples": "^2.0.0"
+ }
+ },
+ "node_modules/@rdfjs/term-set": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rdfjs/term-set/-/term-set-1.1.0.tgz",
+ "integrity": "sha512-QQ4yzVe1Rvae/GN9SnOhweHNpaxQtnAjeOVciP/yJ0Gfxtbphy2tM56ZsRLV04Qq5qMcSclZIe6irYyEzx/UwQ==",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/to-ntriples": "^2.0.0"
+ }
+ },
+ "node_modules/@rdfjs/to-ntriples": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@rdfjs/to-ntriples/-/to-ntriples-2.0.0.tgz",
+ "integrity": "sha512-nDhpfhx6W6HKsy4HjyLp3H1nbrX1CiUCWhWQwKcYZX1s9GOjcoQTwY7GUUbVec0hzdJDQBR6gnjxtENBDt482Q==",
+ "dev": true
+ },
+ "node_modules/@rdfjs/types": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rdfjs/types/-/types-1.1.0.tgz",
+ "integrity": "sha512-5zm8bN2/CC634dTcn/0AhTRLaQRjXDZs3QfcAsQKNturHT7XVWcKy/8p3P5gXl+YkZTAmy7T5M/LyiT/jbkENw==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@rollup/pluginutils": {
+ "version": "5.1.4",
+ "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
+ "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
+ "dependencies": {
+ "@types/estree": "^1.0.0",
+ "estree-walker": "^2.0.2",
+ "picomatch": "^4.0.2"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ },
+ "peerDependencies": {
+ "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+ },
+ "peerDependenciesMeta": {
+ "rollup": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@rollup/pluginutils/node_modules/@types/estree": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+ "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
+ },
+ "node_modules/@rushstack/eslint-patch": {
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.7.2.tgz",
+ "integrity": "sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA==",
+ "dev": true
+ },
+ "node_modules/@segment/loosely-validate-event": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz",
+ "integrity": "sha512-ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw==",
+ "dev": true,
+ "dependencies": {
+ "component-type": "^1.2.1",
+ "join-component": "^1.1.0"
+ }
+ },
+ "node_modules/@sentry/core": {
+ "version": "5.30.0",
+ "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz",
+ "integrity": "sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==",
+ "dev": true,
+ "dependencies": {
+ "@sentry/hub": "5.30.0",
+ "@sentry/minimal": "5.30.0",
+ "@sentry/types": "5.30.0",
+ "@sentry/utils": "5.30.0",
+ "tslib": "^1.9.3"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/@sentry/hub": {
+ "version": "5.30.0",
+ "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz",
+ "integrity": "sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==",
+ "dev": true,
+ "dependencies": {
+ "@sentry/types": "5.30.0",
+ "@sentry/utils": "5.30.0",
+ "tslib": "^1.9.3"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/@sentry/minimal": {
+ "version": "5.30.0",
+ "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz",
+ "integrity": "sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==",
+ "dev": true,
+ "dependencies": {
+ "@sentry/hub": "5.30.0",
+ "@sentry/types": "5.30.0",
+ "tslib": "^1.9.3"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/@sentry/node": {
+ "version": "5.30.0",
+ "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.30.0.tgz",
+ "integrity": "sha512-Br5oyVBF0fZo6ZS9bxbJZG4ApAjRqAnqFFurMVJJdunNb80brh7a5Qva2kjhm+U6r9NJAB5OmDyPkA1Qnt+QVg==",
+ "dev": true,
+ "dependencies": {
+ "@sentry/core": "5.30.0",
+ "@sentry/hub": "5.30.0",
+ "@sentry/tracing": "5.30.0",
+ "@sentry/types": "5.30.0",
+ "@sentry/utils": "5.30.0",
+ "cookie": "^0.4.1",
+ "https-proxy-agent": "^5.0.0",
+ "lru_map": "^0.3.3",
+ "tslib": "^1.9.3"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/@sentry/tracing": {
+ "version": "5.30.0",
+ "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.30.0.tgz",
+ "integrity": "sha512-dUFowCr0AIMwiLD7Fs314Mdzcug+gBVo/+NCMyDw8tFxJkwWAKl7Qa2OZxLQ0ZHjakcj1hNKfCQJ9rhyfOl4Aw==",
+ "dev": true,
+ "dependencies": {
+ "@sentry/hub": "5.30.0",
+ "@sentry/minimal": "5.30.0",
+ "@sentry/types": "5.30.0",
+ "@sentry/utils": "5.30.0",
+ "tslib": "^1.9.3"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/@sentry/types": {
+ "version": "5.30.0",
+ "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz",
+ "integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/@sentry/utils": {
+ "version": "5.30.0",
+ "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz",
+ "integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==",
+ "dev": true,
+ "dependencies": {
+ "@sentry/types": "5.30.0",
+ "tslib": "^1.9.3"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/@serialport/binding-mock": {
+ "version": "10.2.2",
+ "resolved": "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-10.2.2.tgz",
+ "integrity": "sha512-HAFzGhk9OuFMpuor7aT5G1ChPgn5qSsklTFOTUX72Rl6p0xwcSVsRtG/xaGp6bxpN7fI9D/S8THLBWbBgS6ldw==",
+ "dev": true,
+ "dependencies": {
+ "@serialport/bindings-interface": "^1.2.1",
+ "debug": "^4.3.3"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
+ "node_modules/@serialport/bindings-cpp": {
+ "version": "12.0.1",
+ "resolved": "https://registry.npmjs.org/@serialport/bindings-cpp/-/bindings-cpp-12.0.1.tgz",
+ "integrity": "sha512-r2XOwY2dDvbW7dKqSPIk2gzsr6M6Qpe9+/Ngs94fNaNlcTRCV02PfaoDmRgcubpNVVcLATlxSxPTIDw12dbKOg==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "@serialport/bindings-interface": "1.2.2",
+ "@serialport/parser-readline": "11.0.0",
+ "debug": "4.3.4",
+ "node-addon-api": "7.0.0",
+ "node-gyp-build": "4.6.0"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/bindings-cpp/node_modules/@serialport/parser-delimiter": {
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-11.0.0.tgz",
+ "integrity": "sha512-aZLJhlRTjSmEwllLG7S4J8s8ctRAS0cbvCpO87smLvl3e4BgzbVgF6Z6zaJd3Aji2uSiYgfedCdNc4L6W+1E2g==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/bindings-cpp/node_modules/@serialport/parser-readline": {
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-11.0.0.tgz",
+ "integrity": "sha512-rRAivhRkT3YO28WjmmG4FQX6L+KMb5/ikhyylRfzWPw0nSXy97+u07peS9CbHqaNvJkMhH1locp2H36aGMOEIA==",
+ "dev": true,
+ "dependencies": {
+ "@serialport/parser-delimiter": "11.0.0"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/bindings-cpp/node_modules/node-gyp-build": {
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
+ "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==",
+ "dev": true,
+ "bin": {
+ "node-gyp-build": "bin.js",
+ "node-gyp-build-optional": "optional.js",
+ "node-gyp-build-test": "build-test.js"
+ }
+ },
+ "node_modules/@serialport/bindings-interface": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@serialport/bindings-interface/-/bindings-interface-1.2.2.tgz",
+ "integrity": "sha512-CJaUd5bLvtM9c5dmO9rPBHPXTa9R2UwpkJ0wdh9JCYcbrPWsKz+ErvR0hBLeo7NPeiFdjFO4sonRljiw4d2XiA==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22 || ^14.13 || >=16"
+ }
+ },
+ "node_modules/@serialport/parser-byte-length": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-12.0.0.tgz",
+ "integrity": "sha512-0ei0txFAj+s6FTiCJFBJ1T2hpKkX8Md0Pu6dqMrYoirjPskDLJRgZGLqoy3/lnU1bkvHpnJO+9oJ3PB9v8rNlg==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/parser-cctalk": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-12.0.0.tgz",
+ "integrity": "sha512-0PfLzO9t2X5ufKuBO34DQKLXrCCqS9xz2D0pfuaLNeTkyGUBv426zxoMf3rsMRodDOZNbFblu3Ae84MOQXjnZw==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/parser-delimiter": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-12.0.0.tgz",
+ "integrity": "sha512-gu26tVt5lQoybhorLTPsH2j2LnX3AOP2x/34+DUSTNaUTzu2fBXw+isVjQJpUBFWu6aeQRZw5bJol5X9Gxjblw==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/parser-inter-byte-timeout": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-12.0.0.tgz",
+ "integrity": "sha512-GnCh8K0NAESfhCuXAt+FfBRz1Cf9CzIgXfp7SdMgXwrtuUnCC/yuRTUFWRvuzhYKoAo1TL0hhUo77SFHUH1T/w==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/parser-packet-length": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-packet-length/-/parser-packet-length-12.0.0.tgz",
+ "integrity": "sha512-p1hiCRqvGHHLCN/8ZiPUY/G0zrxd7gtZs251n+cfNTn+87rwcdUeu9Dps3Aadx30/sOGGFL6brIRGK4l/t7MuQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.6.0"
+ }
+ },
+ "node_modules/@serialport/parser-readline": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-12.0.0.tgz",
+ "integrity": "sha512-O7cywCWC8PiOMvo/gglEBfAkLjp/SENEML46BXDykfKP5mTPM46XMaX1L0waWU6DXJpBgjaL7+yX6VriVPbN4w==",
+ "dev": true,
+ "dependencies": {
+ "@serialport/parser-delimiter": "12.0.0"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/parser-ready": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-12.0.0.tgz",
+ "integrity": "sha512-ygDwj3O4SDpZlbrRUraoXIoIqb8sM7aMKryGjYTIF0JRnKeB1ys8+wIp0RFMdFbO62YriUDextHB5Um5cKFSWg==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/parser-regex": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-12.0.0.tgz",
+ "integrity": "sha512-dCAVh4P/pZrLcPv9NJ2mvPRBg64L5jXuiRxIlyxxdZGH4WubwXVXY/kBTihQmiAMPxbT3yshSX8f2+feqWsxqA==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/parser-slip-encoder": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-slip-encoder/-/parser-slip-encoder-12.0.0.tgz",
+ "integrity": "sha512-0APxDGR9YvJXTRfY+uRGhzOhTpU5akSH183RUcwzN7QXh8/1jwFsFLCu0grmAUfi+fItCkR+Xr1TcNJLR13VNA==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/parser-spacepacket": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/parser-spacepacket/-/parser-spacepacket-12.0.0.tgz",
+ "integrity": "sha512-dozONxhPC/78pntuxpz/NOtVps8qIc/UZzdc/LuPvVsqCoJXiRxOg6ZtCP/W58iibJDKPZPAWPGYeZt9DJxI+Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@serialport/stream": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/@serialport/stream/-/stream-12.0.0.tgz",
+ "integrity": "sha512-9On64rhzuqKdOQyiYLYv2lQOh3TZU/D3+IWCR5gk0alPel2nwpp4YwDEGiUBfrQZEdQ6xww0PWkzqth4wqwX3Q==",
+ "dev": true,
+ "dependencies": {
+ "@serialport/bindings-interface": "1.2.2",
+ "debug": "4.3.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/@sinclair/typebox": {
+ "version": "0.27.8",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+ "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+ "dev": true
+ },
+ "node_modules/@sindresorhus/is": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
+ "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@sinonjs/commons": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+ "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+ "dev": true,
+ "dependencies": {
+ "type-detect": "4.0.8"
+ }
+ },
+ "node_modules/@sinonjs/fake-timers": {
+ "version": "10.3.0",
+ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+ "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+ "dev": true,
+ "dependencies": {
+ "@sinonjs/commons": "^3.0.0"
+ }
+ },
+ "node_modules/@smithy/abort-controller": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.1.tgz",
+ "integrity": "sha512-fiUIYgIgRjMWznk6iLJz35K2YxSLHzLBA/RC6lBrKfQ8fHbPfvk7Pk9UvpKoHgJjI18MnbPuEju53zcVy6KF1g==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/abort-controller/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/config-resolver": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.0.1.tgz",
+ "integrity": "sha512-Igfg8lKu3dRVkTSEm98QpZUvKEOa71jDX4vKRcvJVyRc3UgN3j7vFMf0s7xLQhYmKa8kyJGQgUJDOV5V3neVlQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-config-provider": "^4.0.0",
+ "@smithy/util-middleware": "^4.0.1",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/config-resolver/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/core": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.1.2.tgz",
+ "integrity": "sha512-htwQXkbdF13uwwDevz9BEzL5ABK+1sJpVQXywwGSH973AVOvisHNfpcB8A8761G6XgHoS2kHPqc9DqHJ2gp+/Q==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/middleware-serde": "^4.0.2",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-body-length-browser": "^4.0.0",
+ "@smithy/util-middleware": "^4.0.1",
+ "@smithy/util-stream": "^4.0.2",
+ "@smithy/util-utf8": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/core/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/credential-provider-imds": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.1.tgz",
+ "integrity": "sha512-l/qdInaDq1Zpznpmev/+52QomsJNZ3JkTl5yrTl02V6NBgJOQ4LY0SFw/8zsMwj3tLe8vqiIuwF6nxaEwgf6mg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "@smithy/url-parser": "^4.0.1",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/credential-provider-imds/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/fetch-http-handler": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.1.tgz",
+ "integrity": "sha512-3aS+fP28urrMW2KTjb6z9iFow6jO8n3MFfineGbndvzGZit3taZhKWtTorf+Gp5RpFDDafeHlhfsGlDCXvUnJA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/querystring-builder": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-base64": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/fetch-http-handler/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/hash-node": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.1.tgz",
+ "integrity": "sha512-TJ6oZS+3r2Xu4emVse1YPB3Dq3d8RkZDKcPr71Nj/lJsdAP1c7oFzYqEn1IBc915TsgLl2xIJNuxCz+gLbLE0w==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-buffer-from": "^4.0.0",
+ "@smithy/util-utf8": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/hash-node/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/invalid-dependency": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.1.tgz",
+ "integrity": "sha512-gdudFPf4QRQ5pzj7HEnu6FhKRi61BfH/Gk5Yf6O0KiSbr1LlVhgjThcvjdu658VE6Nve8vaIWB8/fodmS1rBPQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/invalid-dependency/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/is-array-buffer": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz",
+ "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/is-array-buffer/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/middleware-content-length": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.1.tgz",
+ "integrity": "sha512-OGXo7w5EkB5pPiac7KNzVtfCW2vKBTZNuCctn++TTSOMpe6RZO/n6WEC1AxJINn3+vWLKW49uad3lo/u0WJ9oQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/middleware-content-length/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/middleware-endpoint": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.0.3.tgz",
+ "integrity": "sha512-YdbmWhQF5kIxZjWqPIgboVfi8i5XgiYMM7GGKFMTvBei4XjNQfNv8sukT50ITvgnWKKKpOtp0C0h7qixLgb77Q==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/core": "^3.1.2",
+ "@smithy/middleware-serde": "^4.0.2",
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/shared-ini-file-loader": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "@smithy/url-parser": "^4.0.1",
+ "@smithy/util-middleware": "^4.0.1",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/middleware-endpoint/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/middleware-retry": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.0.4.tgz",
+ "integrity": "sha512-wmxyUBGHaYUqul0wZiset4M39SMtDBOtUr2KpDuftKNN74Do9Y36Go6Eqzj9tL0mIPpr31ulB5UUtxcsCeGXsQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/service-error-classification": "^4.0.1",
+ "@smithy/smithy-client": "^4.1.3",
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-middleware": "^4.0.1",
+ "@smithy/util-retry": "^4.0.1",
+ "tslib": "^2.6.2",
+ "uuid": "^9.0.1"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/middleware-retry/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/middleware-retry/node_modules/uuid": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+ "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+ "dev": true,
+ "funding": [
+ "https://github.com/sponsors/broofa",
+ "https://github.com/sponsors/ctavan"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/@smithy/middleware-serde": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.0.2.tgz",
+ "integrity": "sha512-Sdr5lOagCn5tt+zKsaW+U2/iwr6bI9p08wOkCp6/eL6iMbgdtc2R5Ety66rf87PeohR0ExI84Txz9GYv5ou3iQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/middleware-serde/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/middleware-stack": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.0.1.tgz",
+ "integrity": "sha512-dHwDmrtR/ln8UTHpaIavRSzeIk5+YZTBtLnKwDW3G2t6nAupCiQUvNzNoHBpik63fwUaJPtlnMzXbQrNFWssIA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/middleware-stack/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/node-config-provider": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.0.1.tgz",
+ "integrity": "sha512-8mRTjvCtVET8+rxvmzRNRR0hH2JjV0DFOmwXPrISmTIJEfnCBugpYYGAsCj8t41qd+RB5gbheSQ/6aKZCQvFLQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/shared-ini-file-loader": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/node-config-provider/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/node-http-handler": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.0.2.tgz",
+ "integrity": "sha512-X66H9aah9hisLLSnGuzRYba6vckuFtGE+a5DcHLliI/YlqKrGoxhisD5XbX44KyoeRzoNlGr94eTsMVHFAzPOw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/abort-controller": "^4.0.1",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/querystring-builder": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/node-http-handler/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/property-provider": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.1.tgz",
+ "integrity": "sha512-o+VRiwC2cgmk/WFV0jaETGOtX16VNPp2bSQEzu0whbReqE1BMqsP2ami2Vi3cbGVdKu1kq9gQkDAGKbt0WOHAQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/property-provider/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/protocol-http": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.0.1.tgz",
+ "integrity": "sha512-TE4cpj49jJNB/oHyh/cRVEgNZaoPaxd4vteJNB0yGidOCVR0jCw/hjPVsT8Q8FRmj8Bd3bFZt8Dh7xGCT+xMBQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/protocol-http/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/querystring-builder": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.1.tgz",
+ "integrity": "sha512-wU87iWZoCbcqrwszsOewEIuq+SU2mSoBE2CcsLwE0I19m0B2gOJr1MVjxWcDQYOzHbR1xCk7AcOBbGFUYOKvdg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-uri-escape": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/querystring-builder/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/querystring-parser": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.1.tgz",
+ "integrity": "sha512-Ma2XC7VS9aV77+clSFylVUnPZRindhB7BbmYiNOdr+CHt/kZNJoPP0cd3QxCnCFyPXC4eybmyE98phEHkqZ5Jw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/querystring-parser/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/service-error-classification": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.1.tgz",
+ "integrity": "sha512-3JNjBfOWpj/mYfjXJHB4Txc/7E4LVq32bwzE7m28GN79+M1f76XHflUaSUkhOriprPDzev9cX/M+dEB80DNDKA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/shared-ini-file-loader": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.1.tgz",
+ "integrity": "sha512-hC8F6qTBbuHRI/uqDgqqi6J0R4GtEZcgrZPhFQnMhfJs3MnUTGSnR1NSJCJs5VWlMydu0kJz15M640fJlRsIOw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/shared-ini-file-loader/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/signature-v4": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.0.1.tgz",
+ "integrity": "sha512-nCe6fQ+ppm1bQuw5iKoeJ0MJfz2os7Ic3GBjOkLOPtavbD1ONoyE3ygjBfz2ythFWm4YnRm6OxW+8p/m9uCoIA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/is-array-buffer": "^4.0.0",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-hex-encoding": "^4.0.0",
+ "@smithy/util-middleware": "^4.0.1",
+ "@smithy/util-uri-escape": "^4.0.0",
+ "@smithy/util-utf8": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/signature-v4/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/smithy-client": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.1.3.tgz",
+ "integrity": "sha512-A2Hz85pu8BJJaYFdX8yb1yocqigyqBzn+OVaVgm+Kwi/DkN8vhN2kbDVEfADo6jXf5hPKquMLGA3UINA64UZ7A==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/core": "^3.1.2",
+ "@smithy/middleware-endpoint": "^4.0.3",
+ "@smithy/middleware-stack": "^4.0.1",
+ "@smithy/protocol-http": "^5.0.1",
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-stream": "^4.0.2",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/smithy-client/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/types": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.1.0.tgz",
+ "integrity": "sha512-enhjdwp4D7CXmwLtD6zbcDMbo6/T6WtuuKCY49Xxc6OMOmUWlBEBDREsxxgV2LIdeQPW756+f97GzcgAwp3iLw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/types/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/url-parser": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.1.tgz",
+ "integrity": "sha512-gPXcIEUtw7VlK8f/QcruNXm7q+T5hhvGu9tl63LsJPZ27exB6dtNwvh2HIi0v7JcXJ5emBxB+CJxwaLEdJfA+g==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/querystring-parser": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/url-parser/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-base64": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.0.0.tgz",
+ "integrity": "sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/util-buffer-from": "^4.0.0",
+ "@smithy/util-utf8": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-base64/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-body-length-browser": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.0.0.tgz",
+ "integrity": "sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-body-length-browser/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-body-length-node": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz",
+ "integrity": "sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-body-length-node/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-buffer-from": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.0.0.tgz",
+ "integrity": "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/is-array-buffer": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-buffer-from/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-config-provider": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz",
+ "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-config-provider/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-defaults-mode-browser": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.4.tgz",
+ "integrity": "sha512-Ej1bV5sbrIfH++KnWxjjzFNq9nyP3RIUq2c9Iqq7SmMO/idUR24sqvKH2LUQFTSPy/K7G4sB2m8n7YYlEAfZaw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/smithy-client": "^4.1.3",
+ "@smithy/types": "^4.1.0",
+ "bowser": "^2.11.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-defaults-mode-browser/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-defaults-mode-node": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.4.tgz",
+ "integrity": "sha512-HE1I7gxa6yP7ZgXPCFfZSDmVmMtY7SHqzFF55gM/GPegzZKaQWZZ+nYn9C2Cc3JltCMyWe63VPR3tSFDEvuGjw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/config-resolver": "^4.0.1",
+ "@smithy/credential-provider-imds": "^4.0.1",
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/property-provider": "^4.0.1",
+ "@smithy/smithy-client": "^4.1.3",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-defaults-mode-node/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-endpoints": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.1.tgz",
+ "integrity": "sha512-zVdUENQpdtn9jbpD9SCFK4+aSiavRb9BxEtw9ZGUR1TYo6bBHbIoi7VkrFQ0/RwZlzx0wRBaRmPclj8iAoJCLA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/node-config-provider": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-endpoints/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-hex-encoding": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.0.0.tgz",
+ "integrity": "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-hex-encoding/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-middleware": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.0.1.tgz",
+ "integrity": "sha512-HiLAvlcqhbzhuiOa0Lyct5IIlyIz0PQO5dnMlmQ/ubYM46dPInB+3yQGkfxsk6Q24Y0n3/JmcA1v5iEhmOF5mA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-middleware/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-retry": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.1.tgz",
+ "integrity": "sha512-WmRHqNVwn3kI3rKk1LsKcVgPBG6iLTBGC1iYOV3GQegwJ3E8yjzHytPt26VNzOWr1qu0xE03nK0Ug8S7T7oufw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/service-error-classification": "^4.0.1",
+ "@smithy/types": "^4.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-retry/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-stream": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.0.2.tgz",
+ "integrity": "sha512-0eZ4G5fRzIoewtHtwaYyl8g2C+osYOT4KClXgfdNEDAgkbe2TYPqcnw4GAWabqkZCax2ihRGPe9LZnsPdIUIHA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/fetch-http-handler": "^5.0.1",
+ "@smithy/node-http-handler": "^4.0.2",
+ "@smithy/types": "^4.1.0",
+ "@smithy/util-base64": "^4.0.0",
+ "@smithy/util-buffer-from": "^4.0.0",
+ "@smithy/util-hex-encoding": "^4.0.0",
+ "@smithy/util-utf8": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-stream/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-uri-escape": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz",
+ "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-uri-escape/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@smithy/util-utf8": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.0.0.tgz",
+ "integrity": "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "dependencies": {
+ "@smithy/util-buffer-from": "^4.0.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/@smithy/util-utf8/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD",
+ "optional": true
+ },
+ "node_modules/@swc/helpers": {
+ "version": "0.3.17",
+ "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.3.17.tgz",
+ "integrity": "sha512-tb7Iu+oZ+zWJZ3HJqwx8oNwSDIU440hmVMDPhpACWQWnrZHK99Bxs70gT1L2dnr5Hg50ZRWEFkQCAnOVVV0z1Q==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.4.0"
+ }
+ },
+ "node_modules/@swc/helpers/node_modules/tslib": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+ "dev": true
+ },
+ "node_modules/@tokenizer/token": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
+ "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
+ "dev": true
+ },
+ "node_modules/@tootallnate/once": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/@tpluscode/rdf-ns-builders": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@tpluscode/rdf-ns-builders/-/rdf-ns-builders-2.0.1.tgz",
+ "integrity": "sha512-P/pwfjhcj/JOZF3epheHiDd/f9tSkceydQBqBuqThpNX2NIg+4BSgwtG2YfKBa24mmGFfyzN6RVeFclhA8wZBw==",
+ "dev": true,
+ "dependencies": {
+ "@rdf-esm/data-model": "^0.5.4",
+ "@rdf-esm/namespace": "^0.5.1",
+ "@rdfjs/types": "*",
+ "commander": "^7.2.0",
+ "fs-extra": "^10.0.0"
+ },
+ "bin": {
+ "rdf-ns-builders": "bin/index.js"
+ },
+ "peerDependencies": {
+ "@zazuko/rdf-vocabularies": "*",
+ "clownface": "^1",
+ "safe-identifier": "^0.4.2",
+ "ts-morph": ">=11",
+ "ts-node": ">= 8"
+ }
+ },
+ "node_modules/@tpluscode/rdf-string": {
+ "version": "0.2.27",
+ "resolved": "https://registry.npmjs.org/@tpluscode/rdf-string/-/rdf-string-0.2.27.tgz",
+ "integrity": "sha512-+h7FdEE9AwP+B0kA2u0lScWq0+wIfpAcsau6cHZRQfToTCQjq+xo5eyGqzC96SmVfULl73DHys5DE/VOtA3Ewg==",
+ "dev": true,
+ "dependencies": {
+ "@rdf-esm/data-model": "^0.5.3",
+ "@rdf-esm/term-map": "^0.5.0",
+ "@rdfjs/types": "*",
+ "@tpluscode/rdf-ns-builders": "^2",
+ "@zazuko/rdf-vocabularies": ">=2023.01.17"
+ }
+ },
+ "node_modules/@tpluscode/sparql-builder": {
+ "version": "0.3.31",
+ "resolved": "https://registry.npmjs.org/@tpluscode/sparql-builder/-/sparql-builder-0.3.31.tgz",
+ "integrity": "sha512-Q5D5sdo2hx2yfP/8mf6B2vEFJydpC/2qVqZqsl8jyFys8CYVGQY8+JcbiiLwZsxgQ4rJOrsf6hxjtlaOKggLCA==",
+ "dev": true,
+ "dependencies": {
+ "@rdf-esm/data-model": "^0.5.4",
+ "@rdf-esm/term-set": "^0.5.0",
+ "@rdfjs/types": "*",
+ "@tpluscode/rdf-ns-builders": "^2.0.0",
+ "@tpluscode/rdf-string": "^0.2.27",
+ "@types/sparql-http-client": "^2",
+ "debug": "^4.1.1"
+ },
+ "peerDependencies": {
+ "sparql-http-client": "^2.2.0"
+ }
+ },
+ "node_modules/@ts-morph/common": {
+ "version": "0.22.0",
+ "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.22.0.tgz",
+ "integrity": "sha512-HqNBuV/oIlMKdkLshXd1zKBqNQCsuPEsgQOkfFQ/eUKjRlwndXW1AjN9LVkBEIukm00gGXSRmfkl0Wv5VXLnlw==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "fast-glob": "^3.3.2",
+ "minimatch": "^9.0.3",
+ "mkdirp": "^3.0.1",
+ "path-browserify": "^1.0.1"
+ }
+ },
+ "node_modules/@ts-morph/common/node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "node_modules/@ts-morph/common/node_modules/minimatch": {
+ "version": "9.0.3",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+ "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/@ts-morph/common/node_modules/mkdirp": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+ "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+ "dev": true,
+ "peer": true,
+ "bin": {
+ "mkdirp": "dist/cjs/src/bin.js"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/@ts-morph/common/node_modules/path-browserify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+ "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/@tsconfig/node10": {
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+ "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/@tsconfig/node12": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+ "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/@tsconfig/node14": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+ "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/@tsconfig/node16": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+ "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/@turf/boolean-point-in-polygon": {
+ "version": "6.5.0",
+ "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.5.0.tgz",
+ "integrity": "sha512-DtSuVFB26SI+hj0SjrvXowGTUCHlgevPAIsukssW6BG5MlNSBQAo70wpICBNJL6RjukXg8d2eXaAWuD/CqL00A==",
+ "dev": true,
+ "dependencies": {
+ "@turf/helpers": "^6.5.0",
+ "@turf/invariant": "^6.5.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/turf"
+ }
+ },
+ "node_modules/@turf/helpers": {
+ "version": "6.5.0",
+ "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-6.5.0.tgz",
+ "integrity": "sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw==",
+ "dev": true,
+ "funding": {
+ "url": "https://opencollective.com/turf"
+ }
+ },
+ "node_modules/@turf/invariant": {
+ "version": "6.5.0",
+ "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz",
+ "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==",
+ "dev": true,
+ "dependencies": {
+ "@turf/helpers": "^6.5.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/turf"
+ }
+ },
+ "node_modules/@types/accepts": {
+ "version": "1.3.7",
+ "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz",
+ "integrity": "sha512-Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/babel__core": {
+ "version": "7.20.5",
+ "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+ "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/parser": "^7.20.7",
+ "@babel/types": "^7.20.7",
+ "@types/babel__generator": "*",
+ "@types/babel__template": "*",
+ "@types/babel__traverse": "*"
+ }
+ },
+ "node_modules/@types/babel__generator": {
+ "version": "7.6.8",
+ "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+ "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.0.0"
+ }
+ },
+ "node_modules/@types/babel__template": {
+ "version": "7.4.4",
+ "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+ "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+ "dev": true,
+ "dependencies": {
+ "@babel/parser": "^7.1.0",
+ "@babel/types": "^7.0.0"
+ }
+ },
+ "node_modules/@types/babel__traverse": {
+ "version": "7.20.6",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+ "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.20.7"
+ }
+ },
+ "node_modules/@types/bindings": {
+ "version": "1.5.5",
+ "resolved": "https://registry.npmjs.org/@types/bindings/-/bindings-1.5.5.tgz",
+ "integrity": "sha512-y59PRZBTo2/HuN94qRjyJD+465vGoXMsqz9MMJDbtJL9oT5/B+tAL6c3k10epIinC2/BBkLqKzKC6keukl8wdQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/body-parser": {
+ "version": "1.19.0",
+ "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz",
+ "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/connect": "*",
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/caseless": {
+ "version": "0.12.5",
+ "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.5.tgz",
+ "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==",
+ "dev": true
+ },
+ "node_modules/@types/connect": {
+ "version": "3.4.38",
+ "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+ "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/content-disposition": {
+ "version": "0.5.8",
+ "resolved": "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.8.tgz",
+ "integrity": "sha512-QVSSvno3dE0MgO76pJhmv4Qyi/j0Yk9pBp0Y7TJ2Tlj+KCgJWY6qX7nnxCOLkZ3VYRSIk1WTxCvwUSdx6CCLdg==",
+ "dev": true
+ },
+ "node_modules/@types/cookies": {
+ "version": "0.7.10",
+ "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.10.tgz",
+ "integrity": "sha512-hmUCjAk2fwZVPPkkPBcI7jGLIR5mg4OVoNMBwU6aVsMm/iNPY7z9/R+x2fSwLt/ZXoGua6C5Zy2k5xOo9jUyhQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/connect": "*",
+ "@types/express": "*",
+ "@types/keygrip": "*",
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/cors": {
+ "version": "2.8.10",
+ "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz",
+ "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==",
+ "dev": true
+ },
+ "node_modules/@types/debug": {
+ "version": "4.1.12",
+ "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+ "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/ms": "*"
+ }
+ },
+ "node_modules/@types/estree": {
+ "version": "0.0.47",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz",
+ "integrity": "sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==",
+ "dev": true
+ },
+ "node_modules/@types/express": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+ "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/body-parser": "*",
+ "@types/express-serve-static-core": "^4.17.33",
+ "@types/qs": "*",
+ "@types/serve-static": "*"
+ }
+ },
+ "node_modules/@types/express-serve-static-core": {
+ "version": "4.17.41",
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz",
+ "integrity": "sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*",
+ "@types/qs": "*",
+ "@types/range-parser": "*",
+ "@types/send": "*"
+ }
+ },
+ "node_modules/@types/fs-capacitor": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz",
+ "integrity": "sha512-FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/geojson": {
+ "version": "7946.0.13",
+ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz",
+ "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==",
+ "dev": true
+ },
+ "node_modules/@types/glob": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+ "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+ "dev": true,
+ "dependencies": {
+ "@types/minimatch": "*",
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/graceful-fs": {
+ "version": "4.1.9",
+ "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+ "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/http-assert": {
+ "version": "1.5.5",
+ "resolved": "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.5.tgz",
+ "integrity": "sha512-4+tE/lwdAahgZT1g30Jkdm9PzFRde0xwxBNUyRsCitRvCQB90iuA2uJYdUnhnANRcqGXaWOGY4FEoxeElNAK2g==",
+ "dev": true
+ },
+ "node_modules/@types/http-errors": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+ "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
+ "dev": true
+ },
+ "node_modules/@types/istanbul-lib-coverage": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+ "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+ "dev": true
+ },
+ "node_modules/@types/istanbul-lib-report": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+ "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+ "dev": true,
+ "dependencies": {
+ "@types/istanbul-lib-coverage": "*"
+ }
+ },
+ "node_modules/@types/istanbul-reports": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+ "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/istanbul-lib-report": "*"
+ }
+ },
+ "node_modules/@types/json-schema": {
+ "version": "7.0.15",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+ "dev": true
+ },
+ "node_modules/@types/json5": {
+ "version": "0.0.29",
+ "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+ "dev": true
+ },
+ "node_modules/@types/jsonwebtoken": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.5.tgz",
+ "integrity": "sha512-VRLSGzik+Unrup6BsouBeHsf4d1hOEgYWTm/7Nmw1sXoN1+tRly/Gy/po3yeahnP4jfnQWWAhQAqcNfH7ngOkA==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/keygrip": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.6.tgz",
+ "integrity": "sha512-lZuNAY9xeJt7Bx4t4dx0rYCDqGPW8RXhQZK1td7d4H6E9zYbLoOtjBvfwdTKpsyxQI/2jv+armjX/RW+ZNpXOQ==",
+ "dev": true
+ },
+ "node_modules/@types/koa": {
+ "version": "2.13.12",
+ "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.13.12.tgz",
+ "integrity": "sha512-vAo1KuDSYWFDB4Cs80CHvfmzSQWeUb909aQib0C0aFx4sw0K9UZFz2m5jaEP+b3X1+yr904iQiruS0hXi31jbw==",
+ "dev": true,
+ "dependencies": {
+ "@types/accepts": "*",
+ "@types/content-disposition": "*",
+ "@types/cookies": "*",
+ "@types/http-assert": "*",
+ "@types/http-errors": "*",
+ "@types/keygrip": "*",
+ "@types/koa-compose": "*",
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/koa-compose": {
+ "version": "3.2.8",
+ "resolved": "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.8.tgz",
+ "integrity": "sha512-4Olc63RY+MKvxMwVknCUDhRQX1pFQoBZ/lXcRLP69PQkEpze/0cr8LNqJQe5NFb/b19DWi2a5bTi2VAlQzhJuA==",
+ "dev": true,
+ "dependencies": {
+ "@types/koa": "*"
+ }
+ },
+ "node_modules/@types/long": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
+ "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==",
+ "dev": true
+ },
+ "node_modules/@types/mdast": {
+ "version": "3.0.15",
+ "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz",
+ "integrity": "sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/unist": "^2"
+ }
+ },
+ "node_modules/@types/mime": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+ "dev": true
+ },
+ "node_modules/@types/minimatch": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+ "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+ "dev": true
+ },
+ "node_modules/@types/ms": {
+ "version": "0.7.34",
+ "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
+ "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==",
+ "dev": true
+ },
+ "node_modules/@types/node": {
+ "version": "14.18.63",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+ "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
+ "dev": true
+ },
+ "node_modules/@types/normalize-package-data": {
+ "version": "2.4.4",
+ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+ "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
+ "dev": true
+ },
+ "node_modules/@types/picomatch": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-3.0.1.tgz",
+ "integrity": "sha512-1MRgzpzY0hOp9pW/kLRxeQhUWwil6gnrUYd3oEpeYBqp/FexhaCPv3F8LsYr47gtUU45fO2cm1dbwkSrHEo8Uw==",
+ "dev": true
+ },
+ "node_modules/@types/qs": {
+ "version": "6.9.11",
+ "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.11.tgz",
+ "integrity": "sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==",
+ "dev": true
+ },
+ "node_modules/@types/range-parser": {
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+ "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+ "dev": true
+ },
+ "node_modules/@types/rdfjs__namespace": {
+ "version": "2.0.10",
+ "resolved": "https://registry.npmjs.org/@types/rdfjs__namespace/-/rdfjs__namespace-2.0.10.tgz",
+ "integrity": "sha512-xoVzEIOxcpyteEmzaj94MSBbrBFs+vqv05joMhzLEiPRwsBBDnhkdBCaaDxR1Tf7wOW0kB2R1IYe4C3vEBFPgA==",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/types": "*"
+ }
+ },
+ "node_modules/@types/request": {
+ "version": "2.48.12",
+ "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.12.tgz",
+ "integrity": "sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==",
+ "dev": true,
+ "dependencies": {
+ "@types/caseless": "*",
+ "@types/node": "*",
+ "@types/tough-cookie": "*",
+ "form-data": "^2.5.0"
+ }
+ },
+ "node_modules/@types/request/node_modules/form-data": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+ "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+ "dev": true,
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.6",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 0.12"
+ }
+ },
+ "node_modules/@types/semver": {
+ "version": "7.5.7",
+ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz",
+ "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==",
+ "dev": true
+ },
+ "node_modules/@types/send": {
+ "version": "0.17.4",
+ "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+ "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+ "dev": true,
+ "dependencies": {
+ "@types/mime": "^1",
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/serve-static": {
+ "version": "1.15.5",
+ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz",
+ "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/http-errors": "*",
+ "@types/mime": "*",
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/sparql-http-client": {
+ "version": "2.2.13",
+ "resolved": "https://registry.npmjs.org/@types/sparql-http-client/-/sparql-http-client-2.2.13.tgz",
+ "integrity": "sha512-KWIGh/ZGNuxgaSD3YjMUqyI2wQpEH7WUjlqTNv2OXHEEZJS9nwNaaiUtslnpSaVKUbVtyNFrmR44aeW5jU9hJQ==",
+ "dev": true,
+ "dependencies": {
+ "rdf-js": "^4.0.2"
+ }
+ },
+ "node_modules/@types/stack-utils": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+ "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+ "dev": true
+ },
+ "node_modules/@types/tough-cookie": {
+ "version": "4.0.5",
+ "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
+ "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
+ "dev": true
+ },
+ "node_modules/@types/unist": {
+ "version": "2.0.10",
+ "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz",
+ "integrity": "sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==",
+ "dev": true
+ },
+ "node_modules/@types/validator": {
+ "version": "13.11.7",
+ "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.11.7.tgz",
+ "integrity": "sha512-q0JomTsJ2I5Mv7dhHhQLGjMvX0JJm5dyZ1DXQySIUzU1UlwzB8bt+R6+LODUbz0UDIOvEzGc28tk27gBJw2N8Q==",
+ "dev": true
+ },
+ "node_modules/@types/webidl-conversions": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
+ "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/@types/whatwg-url": {
+ "version": "8.2.2",
+ "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz",
+ "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/node": "*",
+ "@types/webidl-conversions": "*"
+ }
+ },
+ "node_modules/@types/ws": {
+ "version": "7.4.7",
+ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.7.tgz",
+ "integrity": "sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/yargs": {
+ "version": "17.0.33",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+ "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+ "dev": true,
+ "dependencies": {
+ "@types/yargs-parser": "*"
+ }
+ },
+ "node_modules/@types/yargs-parser": {
+ "version": "21.0.3",
+ "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+ "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+ "dev": true
+ },
+ "node_modules/@typescript-eslint/eslint-plugin": {
+ "version": "6.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz",
+ "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==",
+ "dev": true,
+ "dependencies": {
+ "@eslint-community/regexpp": "^4.5.1",
+ "@typescript-eslint/scope-manager": "6.21.0",
+ "@typescript-eslint/type-utils": "6.21.0",
+ "@typescript-eslint/utils": "6.21.0",
+ "@typescript-eslint/visitor-keys": "6.21.0",
+ "debug": "^4.3.4",
+ "graphemer": "^1.4.0",
+ "ignore": "^5.2.4",
+ "natural-compare": "^1.4.0",
+ "semver": "^7.5.4",
+ "ts-api-utils": "^1.0.1"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
+ "eslint": "^7.0.0 || ^8.0.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@typescript-eslint/parser": {
+ "version": "6.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz",
+ "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/scope-manager": "6.21.0",
+ "@typescript-eslint/types": "6.21.0",
+ "@typescript-eslint/typescript-estree": "6.21.0",
+ "@typescript-eslint/visitor-keys": "6.21.0",
+ "debug": "^4.3.4"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^7.0.0 || ^8.0.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@typescript-eslint/scope-manager": {
+ "version": "6.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
+ "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "6.21.0",
+ "@typescript-eslint/visitor-keys": "6.21.0"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/@typescript-eslint/type-utils": {
+ "version": "6.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz",
+ "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/typescript-estree": "6.21.0",
+ "@typescript-eslint/utils": "6.21.0",
+ "debug": "^4.3.4",
+ "ts-api-utils": "^1.0.1"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^7.0.0 || ^8.0.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@typescript-eslint/types": {
+ "version": "6.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz",
+ "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==",
+ "dev": true,
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/@typescript-eslint/typescript-estree": {
+ "version": "6.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz",
+ "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "6.21.0",
+ "@typescript-eslint/visitor-keys": "6.21.0",
+ "debug": "^4.3.4",
+ "globby": "^11.1.0",
+ "is-glob": "^4.0.3",
+ "minimatch": "9.0.3",
+ "semver": "^7.5.4",
+ "ts-api-utils": "^1.0.1"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "dependencies": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/typescript-estree/node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/@typescript-eslint/typescript-estree/node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+ "version": "9.0.3",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+ "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+ "dev": true,
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/@typescript-eslint/utils": {
+ "version": "6.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz",
+ "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==",
+ "dev": true,
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.4.0",
+ "@types/json-schema": "^7.0.12",
+ "@types/semver": "^7.5.0",
+ "@typescript-eslint/scope-manager": "6.21.0",
+ "@typescript-eslint/types": "6.21.0",
+ "@typescript-eslint/typescript-estree": "6.21.0",
+ "semver": "^7.5.4"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^7.0.0 || ^8.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/visitor-keys": {
+ "version": "6.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz",
+ "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "6.21.0",
+ "eslint-visitor-keys": "^3.4.1"
+ },
+ "engines": {
+ "node": "^16.0.0 || >=18.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/@ungap/structured-clone": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+ "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/@vercel/git-hooks": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@vercel/git-hooks/-/git-hooks-1.0.0.tgz",
+ "integrity": "sha512-OxDFAAdyiJ/H0b8zR9rFCu3BIb78LekBXOphOYG3snV4ULhKFX387pBPpqZ9HLiRTejBWBxYEahkw79tuIgdAA==",
+ "dev": true,
+ "hasInstallScript": true
+ },
+ "node_modules/@vercel/style-guide": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/@vercel/style-guide/-/style-guide-5.2.0.tgz",
+ "integrity": "sha512-fNSKEaZvSkiBoF6XEefs8CcgAV9K9e+MbcsDZjUsktHycKdA0jvjAzQi1W/FzLS+Nr5zZ6oejCwq/97dHUKe0g==",
+ "dev": true,
+ "dependencies": {
+ "@babel/core": "^7.22.11",
+ "@babel/eslint-parser": "^7.22.11",
+ "@rushstack/eslint-patch": "^1.3.3",
+ "@typescript-eslint/eslint-plugin": "^6.5.0",
+ "@typescript-eslint/parser": "^6.5.0",
+ "eslint-config-prettier": "^9.0.0",
+ "eslint-import-resolver-alias": "^1.1.2",
+ "eslint-import-resolver-typescript": "^3.6.0",
+ "eslint-plugin-eslint-comments": "^3.2.0",
+ "eslint-plugin-import": "^2.28.1",
+ "eslint-plugin-jest": "^27.2.3",
+ "eslint-plugin-jsx-a11y": "^6.7.1",
+ "eslint-plugin-playwright": "^0.16.0",
+ "eslint-plugin-react": "^7.33.2",
+ "eslint-plugin-react-hooks": "^4.6.0",
+ "eslint-plugin-testing-library": "^6.0.1",
+ "eslint-plugin-tsdoc": "^0.2.17",
+ "eslint-plugin-unicorn": "^48.0.1",
+ "prettier-plugin-packagejson": "^2.4.5"
+ },
+ "engines": {
+ "node": ">=16"
+ },
+ "peerDependencies": {
+ "@next/eslint-plugin-next": ">=12.3.0 <15",
+ "eslint": ">=8.48.0 <9",
+ "prettier": ">=3.0.0 <4",
+ "typescript": ">=4.8.0 <6"
+ },
+ "peerDependenciesMeta": {
+ "@next/eslint-plugin-next": {
+ "optional": true
+ },
+ "eslint": {
+ "optional": true
+ },
+ "prettier": {
+ "optional": true
+ },
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@vue/compiler-sfc": {
+ "version": "2.7.16",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
+ "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/parser": "^7.23.5",
+ "postcss": "^8.4.14",
+ "source-map": "^0.6.1"
+ },
+ "optionalDependencies": {
+ "prettier": "^1.18.2 || ^2.0.0"
+ }
+ },
+ "node_modules/@vue/compiler-sfc/node_modules/prettier": {
+ "version": "2.8.8",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+ "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+ "dev": true,
+ "optional": true,
+ "bin": {
+ "prettier": "bin-prettier.js"
+ },
+ "engines": {
+ "node": ">=10.13.0"
+ },
+ "funding": {
+ "url": "https://github.com/prettier/prettier?sponsor=1"
+ }
+ },
+ "node_modules/@vue/compiler-sfc/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/@webcomponents/template": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/@webcomponents/template/-/template-1.5.1.tgz",
+ "integrity": "sha512-3e8bx+bgRhyuRwFrDGu7CalILomo11ixuMzVGvpXSxL8lX+ijCIG6J3kS4O/7nElVuKE7vkuXB1xD+RICDNCCg==",
+ "dev": true
+ },
+ "node_modules/@wry/equality": {
+ "version": "0.1.11",
+ "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.1.11.tgz",
+ "integrity": "sha512-mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^1.9.3"
+ }
+ },
+ "node_modules/@zazuko/node-fetch": {
+ "version": "2.6.6",
+ "resolved": "https://registry.npmjs.org/@zazuko/node-fetch/-/node-fetch-2.6.6.tgz",
+ "integrity": "sha512-mrEqq7BJyNBlK5oT7U1S0EfLbFPpVHLXQJswhrN8Mv/3BKmWIBtMBaphK8AXF7XEhgK9vzRs/f3AIG8oHlPdpg==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "whatwg-url": "^5.0.0"
+ },
+ "engines": {
+ "node": "4.x || >=6.0.0"
+ }
+ },
+ "node_modules/@zazuko/node-fetch/node_modules/tr46": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/@zazuko/node-fetch/node_modules/webidl-conversions": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/@zazuko/node-fetch/node_modules/whatwg-url": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+ "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "tr46": "~0.0.3",
+ "webidl-conversions": "^3.0.0"
+ }
+ },
+ "node_modules/@zazuko/rdf-vocabularies": {
+ "version": "2023.1.19",
+ "resolved": "https://registry.npmjs.org/@zazuko/rdf-vocabularies/-/rdf-vocabularies-2023.1.19.tgz",
+ "integrity": "sha512-/vC/Ok8etIi4kflbOAoRr9JV95auJaUREV9lrWP3wDEMfhu8jVYogwi/OD1yA2pH6KIYPS2+z7LN1jxOe3G56g==",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/parser-n3": "^1.1.4",
+ "commander": "^5.0.0",
+ "pkg-dir": "^5.0.0",
+ "rdf-ext": "^1.3.5",
+ "readable-stream": "^3.6.0",
+ "string-to-stream": "^3.0.1"
+ },
+ "bin": {
+ "rdf-vocab": "bin/vocab.js"
+ }
+ },
+ "node_modules/@zazuko/rdf-vocabularies/node_modules/commander": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+ "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/abab": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+ "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+ "deprecated": "Use your platform's native atob() and btoa() methods instead",
+ "dev": true
+ },
+ "node_modules/abbrev": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+ "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+ "engines": {
+ "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+ }
+ },
+ "node_modules/abort-controller": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+ "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+ "dev": true,
+ "dependencies": {
+ "event-target-shim": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=6.5"
+ }
+ },
+ "node_modules/abstract-leveldown": {
+ "version": "6.2.3",
+ "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
+ "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
+ "dev": true,
+ "dependencies": {
+ "buffer": "^5.5.0",
+ "immediate": "^3.2.3",
+ "level-concat-iterator": "~2.0.0",
+ "level-supports": "~1.0.0",
+ "xtend": "~4.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/abstract-leveldown/node_modules/buffer": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+ "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"
+ }
+ ],
+ "dependencies": {
+ "base64-js": "^1.3.1",
+ "ieee754": "^1.1.13"
+ }
+ },
+ "node_modules/accept-language": {
+ "version": "3.0.18",
+ "resolved": "https://registry.npmjs.org/accept-language/-/accept-language-3.0.18.tgz",
+ "integrity": "sha512-sUofgqBPzgfcF20sPoBYGQ1IhQLt2LSkxTnlQSuLF3n5gPEqd5AimbvOvHEi0T1kLMiGVqPWzI5a9OteBRth3A==",
+ "dev": true,
+ "dependencies": {
+ "bcp47": "^1.1.2",
+ "stable": "^0.1.6"
+ }
+ },
+ "node_modules/accepts": {
+ "version": "1.3.8",
+ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+ "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+ "dev": true,
+ "dependencies": {
+ "mime-types": "~2.1.34",
+ "negotiator": "0.6.3"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/acorn": {
+ "version": "8.11.3",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+ "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+ "bin": {
+ "acorn": "bin/acorn"
+ },
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/acorn-globals": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+ "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+ "dev": true,
+ "dependencies": {
+ "acorn": "^7.1.1",
+ "acorn-walk": "^7.1.1"
+ }
+ },
+ "node_modules/acorn-globals/node_modules/acorn": {
+ "version": "7.4.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+ "dev": true,
+ "bin": {
+ "acorn": "bin/acorn"
+ },
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/acorn-import-attributes": {
+ "version": "1.9.5",
+ "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+ "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+ "peerDependencies": {
+ "acorn": "^8"
+ }
+ },
+ "node_modules/acorn-jsx": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+ "dev": true,
+ "peer": true,
+ "peerDependencies": {
+ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+ }
+ },
+ "node_modules/acorn-node": {
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
+ "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
+ "dev": true,
+ "dependencies": {
+ "acorn": "^7.0.0",
+ "acorn-walk": "^7.0.0",
+ "xtend": "^4.0.2"
+ }
+ },
+ "node_modules/acorn-node/node_modules/acorn": {
+ "version": "7.4.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+ "dev": true,
+ "bin": {
+ "acorn": "bin/acorn"
+ },
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/acorn-walk": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+ "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/after": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+ "integrity": "sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==",
+ "dev": true
+ },
+ "node_modules/agent-base": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+ "dev": true,
+ "dependencies": {
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6.0.0"
+ }
+ },
+ "node_modules/ajv": {
+ "version": "6.12.6",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "dev": true,
+ "dependencies": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/epoberezkin"
+ }
+ },
+ "node_modules/align-text": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+ "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2",
+ "longest": "^1.0.1",
+ "repeat-string": "^1.5.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/already": {
+ "version": "1.13.2",
+ "resolved": "https://registry.npmjs.org/already/-/already-1.13.2.tgz",
+ "integrity": "sha512-GU0ZqMhSetZeDlivqttmAmd2UpCbPSucziaDJcCN2NdOTedzaJTqZZwHHuGJvp0Us1wzQG0vSqFqax1SqgH8Aw==",
+ "dev": true,
+ "dependencies": {
+ "throat": "^5.0.0"
+ }
+ },
+ "node_modules/amdefine": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+ "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.2"
+ }
+ },
+ "node_modules/analytics-node": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/analytics-node/-/analytics-node-3.5.0.tgz",
+ "integrity": "sha512-XgQq6ejZHCehUSnZS4V7QJPLIP7S9OAWwQDYl4WTLtsRvc5fCxIwzK/yihzmIW51v9PnyBmrl9dMcqvwfOE8WA==",
+ "dev": true,
+ "dependencies": {
+ "@segment/loosely-validate-event": "^2.0.0",
+ "axios": "^0.21.1",
+ "axios-retry": "^3.0.2",
+ "lodash.isstring": "^4.0.1",
+ "md5": "^2.2.1",
+ "ms": "^2.0.0",
+ "remove-trailing-slash": "^0.1.0",
+ "uuid": "^3.2.1"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/analytics-node/node_modules/axios": {
+ "version": "0.21.4",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+ "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+ "dev": true,
+ "dependencies": {
+ "follow-redirects": "^1.14.0"
+ }
+ },
+ "node_modules/ansi-align": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
+ "integrity": "sha512-TdlOggdA/zURfMYa7ABC66j+oqfMew58KpJMbUlH3bcZP1b+cBHIHDDn5uH9INsxrHBPjsqM0tDB4jPTF/vgJA==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^2.0.0"
+ }
+ },
+ "node_modules/ansi-escapes": {
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+ "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+ "dev": true,
+ "dependencies": {
+ "type-fest": "^0.21.3"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/ansi-green": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-green/-/ansi-green-0.1.1.tgz",
+ "integrity": "sha512-WJ70OI4jCaMy52vGa/ypFSKFb/TrYNPaQ2xco5nUwE0C5H8piume/uAZNNdXXiMQ6DbRmiE7l8oNBHu05ZKkrw==",
+ "dev": true,
+ "dependencies": {
+ "ansi-wrap": "0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/ansi-regex": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/ansi-sequence-parser": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-sequence-parser/-/ansi-sequence-parser-1.1.1.tgz",
+ "integrity": "sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==",
+ "dev": true
+ },
+ "node_modules/ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dependencies": {
+ "color-convert": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/ansi-wrap": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+ "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/any-base": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/any-base/-/any-base-1.1.0.tgz",
+ "integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg==",
+ "dev": true
+ },
+ "node_modules/anymatch": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+ "dev": true,
+ "dependencies": {
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/anymatch/node_modules/picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
+ "node_modules/apollo-cache-control": {
+ "version": "0.15.0",
+ "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.15.0.tgz",
+ "integrity": "sha512-U2uYvHZsWmR6s6CD5zlq3PepfbUAM8953CeVM2Y2QYMtJ8i4CYplEPbIWb3zTIXSPbIPeWGddM56pChI6Iz3zA==",
+ "deprecated": "The functionality provided by the `apollo-cache-control` package is built in to `apollo-server-core` starting with Apollo Server 3. See https://www.apollographql.com/docs/apollo-server/migration/#cachecontrol for details.",
+ "dev": true,
+ "dependencies": {
+ "apollo-server-env": "^3.2.0",
+ "apollo-server-plugin-base": "^0.14.0"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependencies": {
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/apollo-datasource": {
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.10.0.tgz",
+ "integrity": "sha512-wrLhuoM2MtA0KA0+3qyioe0H2FjAxjTvuFOlNCk6WberA887m0MQlWULZImCWTkKuN+zEAMerHfxN+F+W8+lBA==",
+ "deprecated": "The `apollo-datasource` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+ "dev": true,
+ "dependencies": {
+ "apollo-server-caching": "^0.7.0",
+ "apollo-server-env": "^3.2.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/apollo-graphql": {
+ "version": "0.9.7",
+ "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.9.7.tgz",
+ "integrity": "sha512-bezL9ItUWUGHTm1bI/XzIgiiZbhXpsC7uxk4UxFPmcVJwJsDc3ayZ99oXxAaK+3Rbg/IoqrHckA6CwmkCsbaSA==",
+ "dev": true,
+ "dependencies": {
+ "core-js-pure": "^3.10.2",
+ "lodash.sortby": "^4.7.0",
+ "sha.js": "^2.4.11"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "peerDependencies": {
+ "graphql": "^14.2.1 || ^15.0.0"
+ }
+ },
+ "node_modules/apollo-link": {
+ "version": "1.2.14",
+ "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.14.tgz",
+ "integrity": "sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg==",
+ "dev": true,
+ "dependencies": {
+ "apollo-utilities": "^1.3.0",
+ "ts-invariant": "^0.4.0",
+ "tslib": "^1.9.3",
+ "zen-observable-ts": "^0.8.21"
+ },
+ "peerDependencies": {
+ "graphql": "^0.11.3 || ^0.12.3 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/apollo-reporting-protobuf": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.8.0.tgz",
+ "integrity": "sha512-B3XmnkH6Y458iV6OsA7AhfwvTgeZnFq9nPVjbxmLKnvfkEl8hYADtz724uPa0WeBiD7DSFcnLtqg9yGmCkBohg==",
+ "deprecated": "The `apollo-reporting-protobuf` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/usage-reporting-protobuf` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+ "dev": true,
+ "dependencies": {
+ "@apollo/protobufjs": "1.2.2"
+ }
+ },
+ "node_modules/apollo-server-caching": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.7.0.tgz",
+ "integrity": "sha512-MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw==",
+ "deprecated": "This package is part of the legacy caching implementation used by Apollo Server v2 and v3, and is no longer maintained. We recommend you switch to the newer Keyv-based implementation (which is compatible with all versions of Apollo Server). See https://www.apollographql.com/docs/apollo-server/v3/performance/cache-backends#legacy-caching-implementation for more details.",
+ "dev": true,
+ "dependencies": {
+ "lru-cache": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/apollo-server-core": {
+ "version": "2.26.2",
+ "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.26.2.tgz",
+ "integrity": "sha512-r8jOhf1jElaxsNsALFMy/MLiJCqSa1ZiwxkerVYbsEkyWrpD1Khy0extDkTBrfa6uK8CatX7xK9U413bYNhJFA==",
+ "deprecated": "The `apollo-server-core` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+ "dev": true,
+ "dependencies": {
+ "@apollographql/apollo-tools": "^0.5.0",
+ "@apollographql/graphql-playground-html": "1.6.27",
+ "@apollographql/graphql-upload-8-fork": "^8.1.4",
+ "@josephg/resolvable": "^1.0.0",
+ "@types/ws": "^7.0.0",
+ "apollo-cache-control": "^0.15.0",
+ "apollo-datasource": "^0.10.0",
+ "apollo-graphql": "^0.9.0",
+ "apollo-reporting-protobuf": "^0.8.0",
+ "apollo-server-caching": "^0.7.0",
+ "apollo-server-env": "^3.2.0",
+ "apollo-server-errors": "^2.5.0",
+ "apollo-server-plugin-base": "^0.14.0",
+ "apollo-server-types": "^0.10.0",
+ "apollo-tracing": "^0.16.0",
+ "async-retry": "^1.2.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "graphql-extensions": "^0.16.0",
+ "graphql-tag": "^2.11.0",
+ "graphql-tools": "^4.0.8",
+ "loglevel": "^1.6.7",
+ "lru-cache": "^6.0.0",
+ "sha.js": "^2.4.11",
+ "subscriptions-transport-ws": "^0.9.19",
+ "uuid": "^8.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "peerDependencies": {
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/apollo-server-core/node_modules/uuid": {
+ "version": "8.3.2",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+ "dev": true,
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/apollo-server-env": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.2.0.tgz",
+ "integrity": "sha512-V+kO5e6vUo2JwqV1/Ng71ZE3J6x1hCOC+nID2/++bCYl0/fPY9iLChbBNSgN/uoFcjhgmBchOv+m4o0Nie/TFQ==",
+ "deprecated": "The `apollo-server-env` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/utils.fetcher` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+ "dev": true,
+ "dependencies": {
+ "node-fetch": "^2.6.1",
+ "util.promisify": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/apollo-server-errors": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.5.0.tgz",
+ "integrity": "sha512-lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA==",
+ "deprecated": "The `apollo-server-errors` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ },
+ "peerDependencies": {
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/apollo-server-express": {
+ "version": "2.26.2",
+ "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.26.2.tgz",
+ "integrity": "sha512-8KaDwc6/DMK6e5KmP4AGH/NNY7OhEOFxusz3JZ/Du08a+PN8c/JmaEAwQ0aTNpySb5PWpv6xeXRPPwNfaPK9IQ==",
+ "deprecated": "The `apollo-server-express` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+ "dev": true,
+ "dependencies": {
+ "@apollographql/graphql-playground-html": "1.6.27",
+ "@types/accepts": "^1.3.5",
+ "@types/body-parser": "1.19.0",
+ "@types/cors": "2.8.10",
+ "@types/express": "^4.17.12",
+ "@types/express-serve-static-core": "^4.17.21",
+ "accepts": "^1.3.5",
+ "apollo-server-core": "^2.26.2",
+ "apollo-server-types": "^0.10.0",
+ "body-parser": "^1.18.3",
+ "cors": "^2.8.5",
+ "express": "^4.17.1",
+ "graphql-subscriptions": "^1.0.0",
+ "graphql-tools": "^4.0.8",
+ "parseurl": "^1.3.2",
+ "subscriptions-transport-ws": "^0.9.19",
+ "type-is": "^1.6.16"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "peerDependencies": {
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/apollo-server-plugin-base": {
+ "version": "0.14.0",
+ "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.14.0.tgz",
+ "integrity": "sha512-nTNSFuBhZURGjtWptdVqwemYUOdsvABj/GSKzeNvepiEubiv4N0rt4Gvy1inHDiMbo98wQTdF/7XohNcB9A77g==",
+ "deprecated": "The `apollo-server-plugin-base` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+ "dev": true,
+ "dependencies": {
+ "apollo-server-types": "^0.10.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "peerDependencies": {
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/apollo-server-types": {
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.10.0.tgz",
+ "integrity": "sha512-LsB3epw1X3Co/HGiKHCGtzWG35J59gG8Ypx0p22+wgdM9AVDm1ylsNGZy+osNIVJc1lUJf3nF5kZ90vA866K/w==",
+ "deprecated": "The `apollo-server-types` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.",
+ "dev": true,
+ "dependencies": {
+ "apollo-reporting-protobuf": "^0.8.0",
+ "apollo-server-caching": "^0.7.0",
+ "apollo-server-env": "^3.2.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "peerDependencies": {
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/apollo-tracing": {
+ "version": "0.16.0",
+ "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.16.0.tgz",
+ "integrity": "sha512-Oy8kTggB+fJ/hHXwHyMpuTl5KW7u1XetKFDErZVOobUKc2zjc/NgWiC/s7SGYZCgfLodBjvwfa6rMcvLkz7c0w==",
+ "deprecated": "The `apollo-tracing` package is no longer part of Apollo Server 3. See https://www.apollographql.com/docs/apollo-server/migration/#tracing for details",
+ "dev": true,
+ "dependencies": {
+ "apollo-server-env": "^3.2.0",
+ "apollo-server-plugin-base": "^0.14.0"
+ },
+ "engines": {
+ "node": ">=4.0"
+ },
+ "peerDependencies": {
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/apollo-utilities": {
+ "version": "1.3.4",
+ "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.3.4.tgz",
+ "integrity": "sha512-pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig==",
+ "dev": true,
+ "dependencies": {
+ "@wry/equality": "^0.1.2",
+ "fast-json-stable-stringify": "^2.0.0",
+ "ts-invariant": "^0.4.0",
+ "tslib": "^1.10.0"
+ },
+ "peerDependencies": {
+ "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/aproba": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+ "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+ "dev": true
+ },
+ "node_modules/are-we-there-yet": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+ "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+ "deprecated": "This package is no longer supported.",
+ "dev": true,
+ "dependencies": {
+ "delegates": "^1.0.0",
+ "readable-stream": "^3.6.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/arg": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+ "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/argon2": {
+ "version": "0.31.2",
+ "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.31.2.tgz",
+ "integrity": "sha512-QSnJ8By5Mth60IEte45w9Y7v6bWcQw3YhRtJKKN8oNCxnTLDiv/AXXkDPf2srTMfxFVn3QJdVv2nhXESsUa+Yg==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "@mapbox/node-pre-gyp": "^1.0.11",
+ "@phc/format": "^1.0.0",
+ "node-addon-api": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/argon2/node_modules/@mapbox/node-pre-gyp": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+ "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+ "dev": true,
+ "dependencies": {
+ "detect-libc": "^2.0.0",
+ "https-proxy-agent": "^5.0.0",
+ "make-dir": "^3.1.0",
+ "node-fetch": "^2.6.7",
+ "nopt": "^5.0.0",
+ "npmlog": "^5.0.1",
+ "rimraf": "^3.0.2",
+ "semver": "^7.3.5",
+ "tar": "^6.1.11"
+ },
+ "bin": {
+ "node-pre-gyp": "bin/node-pre-gyp"
+ }
+ },
+ "node_modules/argon2/node_modules/abbrev": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+ "dev": true
+ },
+ "node_modules/argon2/node_modules/chownr": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+ "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/argon2/node_modules/make-dir": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+ "dev": true,
+ "dependencies": {
+ "semver": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/argon2/node_modules/make-dir/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/argon2/node_modules/minipass": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+ "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/argon2/node_modules/minizlib": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+ "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+ "dev": true,
+ "dependencies": {
+ "minipass": "^3.0.0",
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/argon2/node_modules/minizlib/node_modules/minipass": {
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+ "dev": true,
+ "dependencies": {
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/argon2/node_modules/mkdirp": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+ "dev": true,
+ "bin": {
+ "mkdirp": "bin/cmd.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/argon2/node_modules/nopt": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+ "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+ "dev": true,
+ "dependencies": {
+ "abbrev": "1"
+ },
+ "bin": {
+ "nopt": "bin/nopt.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/argon2/node_modules/tar": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+ "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+ "dev": true,
+ "dependencies": {
+ "chownr": "^2.0.0",
+ "fs-minipass": "^2.0.0",
+ "minipass": "^5.0.0",
+ "minizlib": "^2.1.1",
+ "mkdirp": "^1.0.3",
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/argparse": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+ "dev": true,
+ "dependencies": {
+ "sprintf-js": "~1.0.2"
+ }
+ },
+ "node_modules/aria-query": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+ "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+ "dev": true,
+ "dependencies": {
+ "dequal": "^2.0.3"
+ }
+ },
+ "node_modules/arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+ "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/arr-flatten": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+ "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/arr-union": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+ "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/array-buffer-byte-length": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
+ "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.5",
+ "is-array-buffer": "^3.0.4"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/array-flatten": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+ "dev": true
+ },
+ "node_modules/array-includes": {
+ "version": "3.1.7",
+ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
+ "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1",
+ "get-intrinsic": "^1.2.1",
+ "is-string": "^1.0.7"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/array-source": {
+ "version": "0.0.4",
+ "resolved": "https://registry.npmjs.org/array-source/-/array-source-0.0.4.tgz",
+ "integrity": "sha512-frNdc+zBn80vipY+GdcJkLEbMWj3xmzArYApmUGxoiV8uAu/ygcs9icPdsGdA26h0MkHUMW6EN2piIvVx+M5Mw==",
+ "dev": true
+ },
+ "node_modules/array-union": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/array-unique": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+ "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/array.prototype.filter": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz",
+ "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1",
+ "es-array-method-boxes-properly": "^1.0.0",
+ "is-string": "^1.0.7"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/array.prototype.findlastindex": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz",
+ "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.5",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.22.3",
+ "es-errors": "^1.3.0",
+ "es-shim-unscopables": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/array.prototype.flat": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+ "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1",
+ "es-shim-unscopables": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/array.prototype.flatmap": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+ "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1",
+ "es-shim-unscopables": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/array.prototype.reduce": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz",
+ "integrity": "sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1",
+ "es-array-method-boxes-properly": "^1.0.0",
+ "is-string": "^1.0.7"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/array.prototype.tosorted": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz",
+ "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.5",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.22.3",
+ "es-errors": "^1.1.0",
+ "es-shim-unscopables": "^1.0.2"
+ }
+ },
+ "node_modules/arraybuffer.prototype.slice": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
+ "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+ "dev": true,
+ "dependencies": {
+ "array-buffer-byte-length": "^1.0.1",
+ "call-bind": "^1.0.5",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.22.3",
+ "es-errors": "^1.2.1",
+ "get-intrinsic": "^1.2.3",
+ "is-array-buffer": "^3.0.4",
+ "is-shared-array-buffer": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/arraybuffer.slice": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+ "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+ "dev": true
+ },
+ "node_modules/arrify": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+ "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/asap": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+ "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+ "dev": true
+ },
+ "node_modules/asn1": {
+ "version": "0.2.6",
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+ "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+ "dev": true,
+ "dependencies": {
+ "safer-buffer": "~2.1.0"
+ }
+ },
+ "node_modules/asn1.js": {
+ "version": "5.4.1",
+ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^4.0.0",
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0",
+ "safer-buffer": "^2.1.0"
+ }
+ },
+ "node_modules/asn1.js/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
+ "node_modules/assert": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
+ "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
+ "dev": true,
+ "dependencies": {
+ "object.assign": "^4.1.4",
+ "util": "^0.10.4"
+ }
+ },
+ "node_modules/assert-never": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz",
+ "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==",
+ "dev": true
+ },
+ "node_modules/assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8"
+ }
+ },
+ "node_modules/assign-symbols": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+ "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/ast-types-flow": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
+ "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==",
+ "dev": true
+ },
+ "node_modules/async": {
+ "version": "3.2.5",
+ "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+ "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
+ "dev": true
+ },
+ "node_modules/async-array-reduce": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/async-array-reduce/-/async-array-reduce-0.2.1.tgz",
+ "integrity": "sha512-/ywTADOcaEnwiAnOEi0UB/rAcIq5bTFfCV9euv3jLYFUMmy6KvKccTQUnLlp8Ensmfj43wHSmbGiPqjsZ6RhNA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/async-each": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
+ "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "individual",
+ "url": "https://paulmillr.com/funding/"
+ }
+ ]
+ },
+ "node_modules/async-limiter": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+ "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+ "dev": true
+ },
+ "node_modules/async-retry": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz",
+ "integrity": "sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==",
+ "dev": true,
+ "dependencies": {
+ "retry": "0.13.1"
+ }
+ },
+ "node_modules/async-sema": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/async-sema/-/async-sema-3.1.1.tgz",
+ "integrity": "sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg=="
+ },
+ "node_modules/asynciterator.prototype": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz",
+ "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==",
+ "dev": true,
+ "dependencies": {
+ "has-symbols": "^1.0.3"
+ }
+ },
+ "node_modules/asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+ "dev": true
+ },
+ "node_modules/atob": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+ "dev": true,
+ "bin": {
+ "atob": "bin/atob.js"
+ },
+ "engines": {
+ "node": ">= 4.5.0"
+ }
+ },
+ "node_modules/audio-context-polyfill": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/audio-context-polyfill/-/audio-context-polyfill-1.0.0.tgz",
+ "integrity": "sha512-Ex1jZc8e3AIiOBm8Tn0oS4yZ8aT5VCLygaov+fxJ4ymgUB2GPqW5DtQ8NBpR2dfvSR6RjWvMU8+nDwIE/he49w==",
+ "dev": true
+ },
+ "node_modules/auth0": {
+ "version": "3.7.2",
+ "resolved": "https://registry.npmjs.org/auth0/-/auth0-3.7.2.tgz",
+ "integrity": "sha512-8XwCi5e0CC08A4+l3eTmx/arXjGUlXrLd6/LUBvQfedmI8w4jiNc9pd7dyBUgR00EzhcbcrdNEQo5jkU3hMIJg==",
+ "dev": true,
+ "dependencies": {
+ "axios": "^1.6.2",
+ "form-data": "^3.0.1",
+ "jsonwebtoken": "^9.0.0",
+ "jwks-rsa": "^3.0.1",
+ "lru-memoizer": "^2.1.4",
+ "rest-facade": "^1.16.3",
+ "retry": "^0.13.1",
+ "uuid": "^9.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/auth0/node_modules/uuid": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+ "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+ "dev": true,
+ "funding": [
+ "https://github.com/sponsors/broofa",
+ "https://github.com/sponsors/ctavan"
+ ],
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/available-typed-arrays": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz",
+ "integrity": "sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/aws-sdk": {
+ "version": "2.1528.0",
+ "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1528.0.tgz",
+ "integrity": "sha512-QyV8fTJJAqnBAbAGkRKgXfI/NvxAoeJHjEFVXDo77hv13cJZKOdBTe9dV56ztS4R1twDJxHibXdDi7IeBrag2w==",
+ "dev": true,
+ "dependencies": {
+ "buffer": "4.9.2",
+ "events": "1.1.1",
+ "ieee754": "1.1.13",
+ "jmespath": "0.16.0",
+ "querystring": "0.2.0",
+ "sax": "1.2.1",
+ "url": "0.10.3",
+ "util": "^0.12.4",
+ "uuid": "8.0.0",
+ "xml2js": "0.5.0"
+ },
+ "engines": {
+ "node": ">= 10.0.0"
+ }
+ },
+ "node_modules/aws-sdk/node_modules/buffer": {
+ "version": "4.9.2",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+ "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+ "dev": true,
+ "dependencies": {
+ "base64-js": "^1.0.2",
+ "ieee754": "^1.1.4",
+ "isarray": "^1.0.0"
+ }
+ },
+ "node_modules/aws-sdk/node_modules/events": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+ "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.x"
+ }
+ },
+ "node_modules/aws-sdk/node_modules/ieee754": {
+ "version": "1.1.13",
+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+ "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+ "dev": true
+ },
+ "node_modules/aws-sdk/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/aws-sdk/node_modules/punycode": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+ "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+ "dev": true
+ },
+ "node_modules/aws-sdk/node_modules/url": {
+ "version": "0.10.3",
+ "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+ "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
+ "dev": true,
+ "dependencies": {
+ "punycode": "1.3.2",
+ "querystring": "0.2.0"
+ }
+ },
+ "node_modules/aws-sdk/node_modules/util": {
+ "version": "0.12.5",
+ "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+ "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.3",
+ "is-arguments": "^1.0.4",
+ "is-generator-function": "^1.0.7",
+ "is-typed-array": "^1.1.3",
+ "which-typed-array": "^1.1.2"
+ }
+ },
+ "node_modules/aws-sdk/node_modules/uuid": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
+ "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==",
+ "dev": true,
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/aws-sdk/node_modules/xml2js": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+ "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+ "dev": true,
+ "dependencies": {
+ "sax": ">=0.6.0",
+ "xmlbuilder": "~11.0.0"
+ },
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/aws-sdk/node_modules/xmlbuilder": {
+ "version": "11.0.1",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+ "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/aws-sign2": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+ "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/aws4": {
+ "version": "1.12.0",
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
+ "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
+ "dev": true
+ },
+ "node_modules/axe-core": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-3.3.0.tgz",
+ "integrity": "sha512-54XaTd2VB7A6iBnXMUG2LnBOI7aRbnrVxC5Tz+rVUwYl9MX/cIJc/Ll32YUoFIE/e9UKWMZoQenQu9dFrQyZCg==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/axios": {
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+ "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
+ "dev": true,
+ "dependencies": {
+ "follow-redirects": "^1.15.6",
+ "form-data": "^4.0.0",
+ "proxy-from-env": "^1.1.0"
+ }
+ },
+ "node_modules/axios-retry": {
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-3.9.1.tgz",
+ "integrity": "sha512-8PJDLJv7qTTMMwdnbMvrLYuvB47M81wRtxQmEdV5w4rgbTXTt+vtPkXwajOfOdSyv/wZICJOC+/UhXH4aQ/R+w==",
+ "dev": true,
+ "dependencies": {
+ "@babel/runtime": "^7.15.4",
+ "is-retry-allowed": "^2.2.0"
+ }
+ },
+ "node_modules/axios/node_modules/form-data": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+ "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+ "dev": true,
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/axobject-query": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
+ "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
+ "dev": true,
+ "dependencies": {
+ "dequal": "^2.0.3"
+ }
+ },
+ "node_modules/azure-storage": {
+ "version": "2.10.7",
+ "resolved": "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.7.tgz",
+ "integrity": "sha512-4oeFGtn3Ziw/fGs/zkoIpKKtygnCVIcZwzJ7UQzKTxhkGQqVCByOFbYqMGYR3L+wOsunX9lNfD0jc51SQuKSSA==",
+ "deprecated": "Please note: newer packages @azure/storage-blob, @azure/storage-queue and @azure/storage-file are available as of November 2019 and @azure/data-tables is available as of June 2021. While the legacy azure-storage package will continue to receive critical bug fixes, we strongly encourage you to upgrade. Migration guide can be found: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/storage/MigrationGuide.md",
+ "dev": true,
+ "dependencies": {
+ "browserify-mime": "^1.2.9",
+ "extend": "^3.0.2",
+ "json-edm-parser": "~0.1.2",
+ "json-schema": "~0.4.0",
+ "md5.js": "^1.3.4",
+ "readable-stream": "^2.0.0",
+ "request": "^2.86.0",
+ "underscore": "^1.12.1",
+ "uuid": "^3.0.0",
+ "validator": "^13.7.0",
+ "xml2js": "~0.2.8",
+ "xmlbuilder": "^9.0.7"
+ },
+ "engines": {
+ "node": ">= 0.8.26"
+ }
+ },
+ "node_modules/azure-storage/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/azure-storage/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/azure-storage/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/azure-storage/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/babel-jest": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+ "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+ "dev": true,
+ "dependencies": {
+ "@jest/transform": "^29.7.0",
+ "@types/babel__core": "^7.1.14",
+ "babel-plugin-istanbul": "^6.1.1",
+ "babel-preset-jest": "^29.6.3",
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.9",
+ "slash": "^3.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.8.0"
+ }
+ },
+ "node_modules/babel-plugin-istanbul": {
+ "version": "6.1.1",
+ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+ "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.0.0",
+ "@istanbuljs/load-nyc-config": "^1.0.0",
+ "@istanbuljs/schema": "^0.1.2",
+ "istanbul-lib-instrument": "^5.0.4",
+ "test-exclude": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+ "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/core": "^7.12.3",
+ "@babel/parser": "^7.14.7",
+ "@istanbuljs/schema": "^0.1.2",
+ "istanbul-lib-coverage": "^3.2.0",
+ "semver": "^6.3.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/babel-plugin-istanbul/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/babel-plugin-jest-hoist": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+ "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/template": "^7.3.3",
+ "@babel/types": "^7.3.3",
+ "@types/babel__core": "^7.1.14",
+ "@types/babel__traverse": "^7.0.6"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/babel-preset-current-node-syntax": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+ "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/plugin-syntax-async-generators": "^7.8.4",
+ "@babel/plugin-syntax-bigint": "^7.8.3",
+ "@babel/plugin-syntax-class-properties": "^7.12.13",
+ "@babel/plugin-syntax-class-static-block": "^7.14.5",
+ "@babel/plugin-syntax-import-attributes": "^7.24.7",
+ "@babel/plugin-syntax-import-meta": "^7.10.4",
+ "@babel/plugin-syntax-json-strings": "^7.8.3",
+ "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+ "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+ "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+ "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+ "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+ "@babel/plugin-syntax-top-level-await": "^7.14.5"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
+ }
+ },
+ "node_modules/babel-preset-jest": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+ "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+ "dev": true,
+ "dependencies": {
+ "babel-plugin-jest-hoist": "^29.6.3",
+ "babel-preset-current-node-syntax": "^1.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
+ }
+ },
+ "node_modules/babel-walk": {
+ "version": "3.0.0-canary-5",
+ "resolved": "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz",
+ "integrity": "sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/types": "^7.9.6"
+ },
+ "engines": {
+ "node": ">= 10.0.0"
+ }
+ },
+ "node_modules/backo2": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+ "integrity": "sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==",
+ "dev": true
+ },
+ "node_modules/bail": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
+ "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
+ "dev": true,
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
+ "node_modules/balanced-match": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+ },
+ "node_modules/base": {
+ "version": "0.11.2",
+ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+ "dev": true,
+ "dependencies": {
+ "cache-base": "^1.0.1",
+ "class-utils": "^0.3.5",
+ "component-emitter": "^1.2.1",
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.1",
+ "mixin-deep": "^1.2.0",
+ "pascalcase": "^0.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/base/node_modules/define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/base/node_modules/is-descriptor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+ "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^1.0.1",
+ "is-data-descriptor": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/base/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/Base64": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/Base64/-/Base64-1.3.0.tgz",
+ "integrity": "sha512-7BjEEmnnW5pm6mBXKQ8CfQFeVjSoFnB507R86mKaJqa2i8CvosDy/dj+9RpbD0A22XQ+hGb0FHO+226C0QXRGw==",
+ "dev": true
+ },
+ "node_modules/base64-arraybuffer": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz",
+ "integrity": "sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6.0"
+ }
+ },
+ "node_modules/base64-js": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+ "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"
+ }
+ ]
+ },
+ "node_modules/base64id": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+ "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+ "dev": true,
+ "engines": {
+ "node": "^4.5.0 || >= 5.9"
+ }
+ },
+ "node_modules/base64url": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
+ "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/bcp47": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/bcp47/-/bcp47-1.1.2.tgz",
+ "integrity": "sha512-JnkkL4GUpOvvanH9AZPX38CxhiLsXMBicBY2IAtqiVN8YulGDQybUydWA4W6yAMtw6iShtw+8HEF6cfrTHU+UQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/bcrypt": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.1.tgz",
+ "integrity": "sha512-AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "@mapbox/node-pre-gyp": "^1.0.11",
+ "node-addon-api": "^5.0.0"
+ },
+ "engines": {
+ "node": ">= 10.0.0"
+ }
+ },
+ "node_modules/bcrypt-pbkdf": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+ "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+ "dev": true,
+ "dependencies": {
+ "tweetnacl": "^0.14.3"
+ }
+ },
+ "node_modules/bcrypt/node_modules/@mapbox/node-pre-gyp": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+ "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+ "dev": true,
+ "dependencies": {
+ "detect-libc": "^2.0.0",
+ "https-proxy-agent": "^5.0.0",
+ "make-dir": "^3.1.0",
+ "node-fetch": "^2.6.7",
+ "nopt": "^5.0.0",
+ "npmlog": "^5.0.1",
+ "rimraf": "^3.0.2",
+ "semver": "^7.3.5",
+ "tar": "^6.1.11"
+ },
+ "bin": {
+ "node-pre-gyp": "bin/node-pre-gyp"
+ }
+ },
+ "node_modules/bcrypt/node_modules/abbrev": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+ "dev": true
+ },
+ "node_modules/bcrypt/node_modules/chownr": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+ "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/bcrypt/node_modules/make-dir": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+ "dev": true,
+ "dependencies": {
+ "semver": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/bcrypt/node_modules/make-dir/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/bcrypt/node_modules/minipass": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+ "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/bcrypt/node_modules/minizlib": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+ "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+ "dev": true,
+ "dependencies": {
+ "minipass": "^3.0.0",
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/bcrypt/node_modules/minizlib/node_modules/minipass": {
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+ "dev": true,
+ "dependencies": {
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/bcrypt/node_modules/mkdirp": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+ "dev": true,
+ "bin": {
+ "mkdirp": "bin/cmd.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/bcrypt/node_modules/node-addon-api": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
+ "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==",
+ "dev": true
+ },
+ "node_modules/bcrypt/node_modules/nopt": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+ "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+ "dev": true,
+ "dependencies": {
+ "abbrev": "1"
+ },
+ "bin": {
+ "nopt": "bin/nopt.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/bcrypt/node_modules/tar": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+ "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+ "dev": true,
+ "dependencies": {
+ "chownr": "^2.0.0",
+ "fs-minipass": "^2.0.0",
+ "minipass": "^5.0.0",
+ "minizlib": "^2.1.1",
+ "mkdirp": "^1.0.3",
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/bcryptjs": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
+ "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==",
+ "dev": true
+ },
+ "node_modules/big.js": {
+ "version": "5.2.2",
+ "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/bignumber.js": {
+ "version": "9.1.2",
+ "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
+ "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/binary-extensions": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+ "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/binary-search-bounds": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.3.tgz",
+ "integrity": "sha512-GMGnMG7owGQwTBNWdOnWvU6KC2k/lULWdbdXq95kxJHdTzeDa9x8QNwMXCv/7pfPGx9Zdi1nmCDZ0j+Tmk+vRg==",
+ "dev": true
+ },
+ "node_modules/bindings": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+ "dependencies": {
+ "file-uri-to-path": "1.0.0"
+ }
+ },
+ "node_modules/bl": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
+ "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "^2.3.5",
+ "safe-buffer": "^5.1.1"
+ }
+ },
+ "node_modules/bl/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/bl/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/bl/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/bl/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/blob": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
+ "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
+ "dev": true
+ },
+ "node_modules/bluebird": {
+ "version": "3.7.2",
+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+ "dev": true
+ },
+ "node_modules/bmp-js": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz",
+ "integrity": "sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==",
+ "dev": true
+ },
+ "node_modules/bn.js": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+ "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+ "dev": true
+ },
+ "node_modules/body-parser": {
+ "version": "1.20.3",
+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+ "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "bytes": "3.1.2",
+ "content-type": "~1.0.5",
+ "debug": "2.6.9",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
+ "http-errors": "2.0.0",
+ "iconv-lite": "0.4.24",
+ "on-finished": "2.4.1",
+ "qs": "6.13.0",
+ "raw-body": "2.5.2",
+ "type-is": "~1.6.18",
+ "unpipe": "1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8",
+ "npm": "1.2.8000 || >= 1.4.16"
+ }
+ },
+ "node_modules/body-parser/node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/body-parser/node_modules/http-errors": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+ "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+ "dev": true,
+ "dependencies": {
+ "depd": "2.0.0",
+ "inherits": "2.0.4",
+ "setprototypeof": "1.2.0",
+ "statuses": "2.0.1",
+ "toidentifier": "1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/body-parser/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true
+ },
+ "node_modules/bops": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/bops/-/bops-1.0.0.tgz",
+ "integrity": "sha512-vVai54aP4LqbM+KNB1giwMo9nHvlV7pc7+iUNHYDTQe6WWI9L/jeSPBC89kUz3xA8qD7sZLldHxOXip1npWbmw==",
+ "dev": true,
+ "dependencies": {
+ "base64-js": "1.0.2",
+ "to-utf8": "0.0.1"
+ }
+ },
+ "node_modules/bops/node_modules/base64-js": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.0.2.tgz",
+ "integrity": "sha512-ZXBDPMt/v/8fsIqn+Z5VwrhdR6jVka0bYobHdGia0Nxi7BJ9i/Uvml3AocHIBtIIBhZjBw5MR0aR4ROs/8+SNg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/bowser": {
+ "version": "2.11.0",
+ "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
+ "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true
+ },
+ "node_modules/boxen": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
+ "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
+ "dev": true,
+ "dependencies": {
+ "ansi-align": "^2.0.0",
+ "camelcase": "^4.0.0",
+ "chalk": "^2.0.1",
+ "cli-boxes": "^1.0.0",
+ "string-width": "^2.0.0",
+ "term-size": "^1.2.0",
+ "widest-line": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/boxen/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/boxen/node_modules/camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/boxen/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/boxen/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/boxen/node_modules/color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+ "dev": true
+ },
+ "node_modules/boxen/node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/boxen/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"
+ }
+ },
+ "node_modules/brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "dependencies": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "node_modules/braces": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+ "dev": true,
+ "dependencies": {
+ "fill-range": "^7.1.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/brorand": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+ "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
+ "dev": true
+ },
+ "node_modules/brotli": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.3.tgz",
+ "integrity": "sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==",
+ "dev": true,
+ "dependencies": {
+ "base64-js": "^1.1.2"
+ }
+ },
+ "node_modules/browser-pack": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
+ "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
+ "dev": true,
+ "dependencies": {
+ "combine-source-map": "~0.8.0",
+ "defined": "^1.0.0",
+ "JSONStream": "^1.0.3",
+ "safe-buffer": "^5.1.1",
+ "through2": "^2.0.0",
+ "umd": "^3.0.0"
+ },
+ "bin": {
+ "browser-pack": "bin/cmd.js"
+ }
+ },
+ "node_modules/browser-process-hrtime": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+ "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+ "dev": true
+ },
+ "node_modules/browser-resolve": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz",
+ "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==",
+ "dev": true,
+ "dependencies": {
+ "resolve": "^1.17.0"
+ }
+ },
+ "node_modules/browserify": {
+ "version": "16.5.2",
+ "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.5.2.tgz",
+ "integrity": "sha512-TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g==",
+ "dev": true,
+ "dependencies": {
+ "assert": "^1.4.0",
+ "browser-pack": "^6.0.1",
+ "browser-resolve": "^2.0.0",
+ "browserify-zlib": "~0.2.0",
+ "buffer": "~5.2.1",
+ "cached-path-relative": "^1.0.0",
+ "concat-stream": "^1.6.0",
+ "console-browserify": "^1.1.0",
+ "constants-browserify": "~1.0.0",
+ "crypto-browserify": "^3.0.0",
+ "defined": "^1.0.0",
+ "deps-sort": "^2.0.0",
+ "domain-browser": "^1.2.0",
+ "duplexer2": "~0.1.2",
+ "events": "^2.0.0",
+ "glob": "^7.1.0",
+ "has": "^1.0.0",
+ "htmlescape": "^1.1.0",
+ "https-browserify": "^1.0.0",
+ "inherits": "~2.0.1",
+ "insert-module-globals": "^7.0.0",
+ "JSONStream": "^1.0.3",
+ "labeled-stream-splicer": "^2.0.0",
+ "mkdirp-classic": "^0.5.2",
+ "module-deps": "^6.2.3",
+ "os-browserify": "~0.3.0",
+ "parents": "^1.0.1",
+ "path-browserify": "~0.0.0",
+ "process": "~0.11.0",
+ "punycode": "^1.3.2",
+ "querystring-es3": "~0.2.0",
+ "read-only-stream": "^2.0.0",
+ "readable-stream": "^2.0.2",
+ "resolve": "^1.1.4",
+ "shasum": "^1.0.0",
+ "shell-quote": "^1.6.1",
+ "stream-browserify": "^2.0.0",
+ "stream-http": "^3.0.0",
+ "string_decoder": "^1.1.1",
+ "subarg": "^1.0.0",
+ "syntax-error": "^1.1.1",
+ "through2": "^2.0.0",
+ "timers-browserify": "^1.0.1",
+ "tty-browserify": "0.0.1",
+ "url": "~0.11.0",
+ "util": "~0.10.1",
+ "vm-browserify": "^1.0.0",
+ "xtend": "^4.0.0"
+ },
+ "bin": {
+ "browserify": "bin/cmd.js"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/browserify-aes": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+ "dev": true,
+ "dependencies": {
+ "buffer-xor": "^1.0.3",
+ "cipher-base": "^1.0.0",
+ "create-hash": "^1.1.0",
+ "evp_bytestokey": "^1.0.3",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/browserify-cipher": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+ "dev": true,
+ "dependencies": {
+ "browserify-aes": "^1.0.4",
+ "browserify-des": "^1.0.0",
+ "evp_bytestokey": "^1.0.0"
+ }
+ },
+ "node_modules/browserify-des": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+ "dev": true,
+ "dependencies": {
+ "cipher-base": "^1.0.1",
+ "des.js": "^1.0.0",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+ }
+ },
+ "node_modules/browserify-middleware": {
+ "version": "8.1.1",
+ "resolved": "https://registry.npmjs.org/browserify-middleware/-/browserify-middleware-8.1.1.tgz",
+ "integrity": "sha512-bHGQGZfncV92HmgIxr0PzY1fAIv4rBJx5rChG7veGl4aCLWu8lbRsLPYcKMbaI6jyimyqZv+RwuOZPDxvreNNw==",
+ "dev": true,
+ "dependencies": {
+ "browserify": "^16.0.0",
+ "ms": "^2.1.1",
+ "prepare-response": "^2.1.1",
+ "promise": "^7.0.3",
+ "uglify-es": "^3.3.9",
+ "watchify": "^3.3.0"
+ }
+ },
+ "node_modules/browserify-mime": {
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz",
+ "integrity": "sha512-uz+ItyJXBLb6wgon1ELEiVowJBEsy03PUWGRQU7cxxx9S+DW2hujPp+DaMYEOClRPzsn7NB99NtJ6pGnt8y+CQ==",
+ "dev": true
+ },
+ "node_modules/browserify-rsa": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+ "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^5.0.0",
+ "randombytes": "^2.0.1"
+ }
+ },
+ "node_modules/browserify-sign": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+ "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^5.2.1",
+ "browserify-rsa": "^4.1.0",
+ "create-hash": "^1.2.0",
+ "create-hmac": "^1.1.7",
+ "elliptic": "^6.5.4",
+ "inherits": "^2.0.4",
+ "parse-asn1": "^5.1.6",
+ "readable-stream": "^3.6.2",
+ "safe-buffer": "^5.2.1"
+ },
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/browserify-zlib": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+ "dev": true,
+ "dependencies": {
+ "pako": "~1.0.5"
+ }
+ },
+ "node_modules/browserify/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/browserify/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/browserify/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/browserify/node_modules/stream-http": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
+ "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==",
+ "dev": true,
+ "dependencies": {
+ "builtin-status-codes": "^3.0.0",
+ "inherits": "^2.0.4",
+ "readable-stream": "^3.6.0",
+ "xtend": "^4.0.2"
+ }
+ },
+ "node_modules/browserify/node_modules/stream-http/node_modules/readable-stream": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/browserify/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/browserslist": {
+ "version": "4.24.3",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
+ "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/browserslist"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/browserslist"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "dependencies": {
+ "caniuse-lite": "^1.0.30001688",
+ "electron-to-chromium": "^1.5.73",
+ "node-releases": "^2.0.19",
+ "update-browserslist-db": "^1.1.1"
+ },
+ "bin": {
+ "browserslist": "cli.js"
+ },
+ "engines": {
+ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+ }
+ },
+ "node_modules/bser": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+ "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+ "dev": true,
+ "dependencies": {
+ "node-int64": "^0.4.0"
+ }
+ },
+ "node_modules/bson": {
+ "version": "4.7.2",
+ "resolved": "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz",
+ "integrity": "sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "buffer": "^5.6.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/bson/node_modules/buffer": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+ "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"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "base64-js": "^1.3.1",
+ "ieee754": "^1.1.13"
+ }
+ },
+ "node_modules/buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+ "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+ "dev": true,
+ "dependencies": {
+ "base64-js": "^1.0.2",
+ "ieee754": "^1.1.4"
+ }
+ },
+ "node_modules/buffer-crc32": {
+ "version": "0.2.13",
+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/buffer-equal": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
+ "integrity": "sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/buffer-equal-constant-time": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+ "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+ "dev": true
+ },
+ "node_modules/buffer-from": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+ "dev": true
+ },
+ "node_modules/buffer-writer": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
+ "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/buffer-xor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+ "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
+ "dev": true
+ },
+ "node_modules/builtin-modules": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+ "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/builtin-status-codes": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+ "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
+ "dev": true
+ },
+ "node_modules/bull": {
+ "version": "3.29.3",
+ "resolved": "https://registry.npmjs.org/bull/-/bull-3.29.3.tgz",
+ "integrity": "sha512-MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg==",
+ "dev": true,
+ "dependencies": {
+ "cron-parser": "^2.13.0",
+ "debuglog": "^1.0.0",
+ "get-port": "^5.1.1",
+ "ioredis": "^4.27.0",
+ "lodash": "^4.17.21",
+ "p-timeout": "^3.2.0",
+ "promise.prototype.finally": "^3.1.2",
+ "semver": "^7.3.2",
+ "util.promisify": "^1.0.1",
+ "uuid": "^8.3.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/bull/node_modules/uuid": {
+ "version": "8.3.2",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+ "dev": true,
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/bullmq": {
+ "version": "4.17.0",
+ "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-4.17.0.tgz",
+ "integrity": "sha512-URnHgB01rlCP8RTpmW3kFnvv3vdd2aI1OcBMYQwnqODxGiJUlz9MibDVXE83mq7ee1eS1IvD9lMQqGszX6E5Pw==",
+ "dev": true,
+ "dependencies": {
+ "cron-parser": "^4.6.0",
+ "glob": "^8.0.3",
+ "ioredis": "^5.3.2",
+ "lodash": "^4.17.21",
+ "msgpackr": "^1.6.2",
+ "node-abort-controller": "^3.1.1",
+ "semver": "^7.5.4",
+ "tslib": "^2.0.0",
+ "uuid": "^9.0.0"
+ }
+ },
+ "node_modules/bullmq/node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "dependencies": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "node_modules/bullmq/node_modules/cron-parser": {
+ "version": "4.9.0",
+ "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz",
+ "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==",
+ "dev": true,
+ "dependencies": {
+ "luxon": "^3.2.1"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
+ "node_modules/bullmq/node_modules/denque": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
+ "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/bullmq/node_modules/glob": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+ "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+ "dev": true,
+ "dependencies": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^5.0.1",
+ "once": "^1.3.0"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/bullmq/node_modules/ioredis": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz",
+ "integrity": "sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==",
+ "dev": true,
+ "dependencies": {
+ "@ioredis/commands": "^1.1.1",
+ "cluster-key-slot": "^1.1.0",
+ "debug": "^4.3.4",
+ "denque": "^2.1.0",
+ "lodash.defaults": "^4.2.0",
+ "lodash.isarguments": "^3.1.0",
+ "redis-errors": "^1.2.0",
+ "redis-parser": "^3.0.0",
+ "standard-as-callback": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=12.22.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/ioredis"
+ }
+ },
+ "node_modules/bullmq/node_modules/minimatch": {
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+ "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+ "dev": true,
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/bullmq/node_modules/tslib": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+ "dev": true
+ },
+ "node_modules/bullmq/node_modules/uuid": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+ "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+ "dev": true,
+ "funding": [
+ "https://github.com/sponsors/broofa",
+ "https://github.com/sponsors/ctavan"
+ ],
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/busboy": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.3.1.tgz",
+ "integrity": "sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==",
+ "dev": true,
+ "dependencies": {
+ "dicer": "0.3.0"
+ },
+ "engines": {
+ "node": ">=4.5.0"
+ }
+ },
+ "node_modules/byline": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz",
+ "integrity": "sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/bytes": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+ "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/cache-base": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+ "dev": true,
+ "dependencies": {
+ "collection-visit": "^1.0.0",
+ "component-emitter": "^1.2.1",
+ "get-value": "^2.0.6",
+ "has-value": "^1.0.0",
+ "isobject": "^3.0.1",
+ "set-value": "^2.0.0",
+ "to-object-path": "^0.3.0",
+ "union-value": "^1.0.0",
+ "unset-value": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/cache-base/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/cache-content-type": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz",
+ "integrity": "sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==",
+ "dev": true,
+ "dependencies": {
+ "mime-types": "^2.1.18",
+ "ylru": "^1.2.0"
+ },
+ "engines": {
+ "node": ">= 6.0.0"
+ }
+ },
+ "node_modules/cacheable-request": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
+ "integrity": "sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ==",
+ "dev": true,
+ "dependencies": {
+ "clone-response": "1.0.2",
+ "get-stream": "3.0.0",
+ "http-cache-semantics": "3.8.1",
+ "keyv": "3.0.0",
+ "lowercase-keys": "1.0.0",
+ "normalize-url": "2.0.1",
+ "responselike": "1.0.2"
+ }
+ },
+ "node_modules/cacheable-request/node_modules/get-stream": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+ "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/cacheable-request/node_modules/lowercase-keys": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+ "integrity": "sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/cached-path-relative": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz",
+ "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==",
+ "dev": true
+ },
+ "node_modules/call-bind": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+ "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+ "dev": true,
+ "dependencies": {
+ "es-define-property": "^1.0.0",
+ "es-errors": "^1.3.0",
+ "function-bind": "^1.1.2",
+ "get-intrinsic": "^1.2.4",
+ "set-function-length": "^1.2.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/call-bind-apply-helpers": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
+ "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "es-errors": "^1.3.0",
+ "function-bind": "^1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/call-bound": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+ "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "call-bind-apply-helpers": "^1.0.1",
+ "get-intrinsic": "^1.2.6"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/callback-stream": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz",
+ "integrity": "sha512-sAZ9kODla+mGACBZ1IpTCAisKoGnv6PykW7fPk1LrM+mMepE18Yz0515yoVcrZy7dQsTUp3uZLQ/9Sx1RnLoHw==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.1",
+ "readable-stream": "> 1.0.0 < 3.0.0"
+ }
+ },
+ "node_modules/callback-stream/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/callback-stream/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/callback-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/callback-stream/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/callguard": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/callguard/-/callguard-2.0.0.tgz",
+ "integrity": "sha512-I3nd+fuj20FK1qu00ImrbH+II+8ULS6ioYr9igqR1xyqySoqc3DiHEyUM0mkoAdKeLGg2CtGnO8R3VRQX5krpQ==",
+ "dev": true
+ },
+ "node_modules/callsites": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/camaro": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/camaro/-/camaro-6.2.1.tgz",
+ "integrity": "sha512-VZw/bIe+17BMgnX5f6AT/UOJCBTNOQ7nX3m7Yk4zn+ILDmFfQ0o7k8tuNUxhInWHxBT70fuQ2AAkdlSLxp0S/Q==",
+ "dev": true,
+ "dependencies": {
+ "piscina": "^3.2.0"
+ },
+ "engines": {
+ "node": ">= 12.0.0"
+ }
+ },
+ "node_modules/camel-case": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-1.2.2.tgz",
+ "integrity": "sha512-rUug78lL8mqStaLehmH2F0LxMJ2TM9fnPFxb+gFkgyUjUM/1o2wKTQtalypHnkb2cFwH/DENBw7YEAOYLgSMxQ==",
+ "dev": true,
+ "dependencies": {
+ "sentence-case": "^1.1.1",
+ "upper-case": "^1.1.1"
+ }
+ },
+ "node_modules/camelcase": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/caniuse-lite": {
+ "version": "1.0.30001690",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz",
+ "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/browserslist"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ]
+ },
+ "node_modules/canonical-json": {
+ "version": "0.0.4",
+ "resolved": "https://registry.npmjs.org/canonical-json/-/canonical-json-0.0.4.tgz",
+ "integrity": "sha512-2sW7x0m/P7dqEnO0O87U7RTVQAaa7MELcd+Jd9FA6CYgYtwJ1TlDWIYMD8nuMkH1KoThsJogqgLyklrt9d/Azw==",
+ "dev": true
+ },
+ "node_modules/canonicalize": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/canonicalize/-/canonicalize-1.0.8.tgz",
+ "integrity": "sha512-0CNTVCLZggSh7bc5VkX5WWPWO+cyZbNd07IHIsSXLia/eAq+r836hgk+8BKoEh7949Mda87VUOitx5OddVj64A==",
+ "dev": true
+ },
+ "node_modules/canvas": {
+ "version": "2.11.2",
+ "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+ "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "@mapbox/node-pre-gyp": "^1.0.0",
+ "nan": "^2.17.0",
+ "simple-get": "^3.0.3"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/canvas/node_modules/@mapbox/node-pre-gyp": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+ "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "detect-libc": "^2.0.0",
+ "https-proxy-agent": "^5.0.0",
+ "make-dir": "^3.1.0",
+ "node-fetch": "^2.6.7",
+ "nopt": "^5.0.0",
+ "npmlog": "^5.0.1",
+ "rimraf": "^3.0.2",
+ "semver": "^7.3.5",
+ "tar": "^6.1.11"
+ },
+ "bin": {
+ "node-pre-gyp": "bin/node-pre-gyp"
+ }
+ },
+ "node_modules/canvas/node_modules/abbrev": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+ "dev": true,
+ "optional": true,
+ "peer": true
+ },
+ "node_modules/canvas/node_modules/chownr": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+ "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/canvas/node_modules/make-dir": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "semver": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/canvas/node_modules/make-dir/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/canvas/node_modules/minipass": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+ "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/canvas/node_modules/minizlib": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+ "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "minipass": "^3.0.0",
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/canvas/node_modules/minizlib/node_modules/minipass": {
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/canvas/node_modules/mkdirp": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "bin": {
+ "mkdirp": "bin/cmd.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/canvas/node_modules/nopt": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+ "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "abbrev": "1"
+ },
+ "bin": {
+ "nopt": "bin/nopt.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/canvas/node_modules/tar": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+ "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "chownr": "^2.0.0",
+ "fs-minipass": "^2.0.0",
+ "minipass": "^5.0.0",
+ "minizlib": "^2.1.1",
+ "mkdirp": "^1.0.3",
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/capture-stack-trace": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.2.tgz",
+ "integrity": "sha512-X/WM2UQs6VMHUtjUDnZTRI+i1crWteJySFzr9UpGoQa4WQffXVTTXuekjl7TjZRlcF2XfjgITT0HxZ9RnxeT0w==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/caseless": {
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+ "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
+ "dev": true
+ },
+ "node_modules/center-align": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+ "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
+ "dev": true,
+ "dependencies": {
+ "align-text": "^0.1.3",
+ "lazy-cache": "^1.0.3"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/center-align/node_modules/lazy-cache": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+ "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/centra": {
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/centra/-/centra-2.7.0.tgz",
+ "integrity": "sha512-PbFMgMSrmgx6uxCdm57RUos9Tc3fclMvhLSATYN39XsDV29B89zZ3KA89jmY0vwSGazyU+uerqwa6t+KaodPcg==",
+ "dev": true,
+ "dependencies": {
+ "follow-redirects": "^1.15.6"
+ }
+ },
+ "node_modules/chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/chalk?sponsor=1"
+ }
+ },
+ "node_modules/change-case": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/change-case/-/change-case-2.3.1.tgz",
+ "integrity": "sha512-3HE5jrTqqn9jeKzD0+yWi7FU4OMicLbwB57ph4bpwEn5jGi3hZug5WjZjnBD2RY7YyTKAAck86ACfShXUWJKLg==",
+ "dev": true,
+ "dependencies": {
+ "camel-case": "^1.1.1",
+ "constant-case": "^1.1.0",
+ "dot-case": "^1.1.0",
+ "is-lower-case": "^1.1.0",
+ "is-upper-case": "^1.1.0",
+ "lower-case": "^1.1.1",
+ "lower-case-first": "^1.0.0",
+ "param-case": "^1.1.0",
+ "pascal-case": "^1.1.0",
+ "path-case": "^1.1.0",
+ "sentence-case": "^1.1.1",
+ "snake-case": "^1.1.0",
+ "swap-case": "^1.1.0",
+ "title-case": "^1.1.0",
+ "upper-case": "^1.1.1",
+ "upper-case-first": "^1.1.0"
+ }
+ },
+ "node_modules/char-regex": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+ "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/character-entities": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
+ "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==",
+ "dev": true,
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
+ "node_modules/character-parser": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
+ "integrity": "sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==",
+ "dev": true,
+ "dependencies": {
+ "is-regex": "^1.0.3"
+ }
+ },
+ "node_modules/chardet": {
+ "version": "0.4.2",
+ "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+ "integrity": "sha512-j/Toj7f1z98Hh2cYo2BVr85EpIRWqUi7rtRSGxh/cqUjqrnJe9l9UE7IUGd2vQ2p+kSHLkSzObQPZPLUC6TQwg==",
+ "dev": true
+ },
+ "node_modules/charenc": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+ "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/chokidar": {
+ "version": "2.1.8",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+ "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+ "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies",
+ "dev": true,
+ "dependencies": {
+ "anymatch": "^2.0.0",
+ "async-each": "^1.0.1",
+ "braces": "^2.3.2",
+ "glob-parent": "^3.1.0",
+ "inherits": "^2.0.3",
+ "is-binary-path": "^1.0.0",
+ "is-glob": "^4.0.0",
+ "normalize-path": "^3.0.0",
+ "path-is-absolute": "^1.0.0",
+ "readdirp": "^2.2.1",
+ "upath": "^1.1.1"
+ },
+ "optionalDependencies": {
+ "fsevents": "^1.2.7"
+ }
+ },
+ "node_modules/chokidar/node_modules/anymatch": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+ "dev": true,
+ "dependencies": {
+ "micromatch": "^3.1.4",
+ "normalize-path": "^2.1.1"
+ }
+ },
+ "node_modules/chokidar/node_modules/anymatch/node_modules/normalize-path": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+ "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+ "dev": true,
+ "dependencies": {
+ "remove-trailing-separator": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/braces": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+ "dev": true,
+ "dependencies": {
+ "arr-flatten": "^1.1.0",
+ "array-unique": "^0.3.2",
+ "extend-shallow": "^2.0.1",
+ "fill-range": "^4.0.0",
+ "isobject": "^3.0.1",
+ "repeat-element": "^1.1.2",
+ "snapdragon": "^0.8.1",
+ "snapdragon-node": "^2.0.1",
+ "split-string": "^3.0.2",
+ "to-regex": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/define-property": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^1.0.2",
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/fill-range": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+ "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+ "dev": true,
+ "dependencies": {
+ "extend-shallow": "^2.0.1",
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1",
+ "to-regex-range": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/fsevents": {
+ "version": "1.2.13",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+ "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+ "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "dependencies": {
+ "bindings": "^1.5.0",
+ "nan": "^2.12.1"
+ },
+ "engines": {
+ "node": ">= 4.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/glob-parent": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+ "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+ "dev": true,
+ "dependencies": {
+ "is-glob": "^3.1.0",
+ "path-dirname": "^1.0.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/glob-parent/node_modules/is-glob": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+ "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/is-descriptor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+ "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^1.0.1",
+ "is-data-descriptor": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/chokidar/node_modules/is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "dependencies": {
+ "is-plain-object": "^2.0.4"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/micromatch": {
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+ "dev": true,
+ "dependencies": {
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "braces": "^2.3.1",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "extglob": "^2.0.4",
+ "fragment-cache": "^0.2.1",
+ "kind-of": "^6.0.2",
+ "nanomatch": "^1.2.9",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/micromatch/node_modules/extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+ "dev": true,
+ "dependencies": {
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/micromatch/node_modules/kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chokidar/node_modules/to-regex-range": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+ "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+ "dev": true,
+ "dependencies": {
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/chownr": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+ "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/chrome-launcher": {
+ "version": "0.10.7",
+ "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.10.7.tgz",
+ "integrity": "sha512-IoQLp64s2n8OQuvKZwt77CscVj3UlV2Dj7yZtd1EBMld9mSdGcsGy9fN5hd/r4vJuWZR09it78n1+A17gB+AIQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*",
+ "is-wsl": "^1.1.0",
+ "lighthouse-logger": "^1.0.0",
+ "mkdirp": "0.5.1",
+ "rimraf": "^2.6.1"
+ }
+ },
+ "node_modules/chrome-launcher/node_modules/rimraf": {
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+ "dev": true,
+ "dependencies": {
+ "glob": "^7.1.3"
+ },
+ "bin": {
+ "rimraf": "bin.js"
+ }
+ },
+ "node_modules/chrome-remote-interface": {
+ "version": "0.25.7",
+ "resolved": "https://registry.npmjs.org/chrome-remote-interface/-/chrome-remote-interface-0.25.7.tgz",
+ "integrity": "sha512-6zI6LbR2IiGmduFZededaerEr9hHXabxT/L+fRrdq65a0CfyLMzpq0BKuZiqN0Upqcacsb6q2POj7fmobwBsEA==",
+ "dev": true,
+ "dependencies": {
+ "commander": "2.11.x",
+ "ws": "3.3.x"
+ },
+ "bin": {
+ "chrome-remote-interface": "bin/client.js"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/chrome-remote-interface/node_modules/commander": {
+ "version": "2.11.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+ "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+ "dev": true
+ },
+ "node_modules/chromeless": {
+ "version": "1.5.2",
+ "resolved": "https://registry.npmjs.org/chromeless/-/chromeless-1.5.2.tgz",
+ "integrity": "sha512-lxQHERZOP1aD+8Uvj+P4xM72e4aNous5igOvs+w6gRrcOZ6oIuYaSTJWMuhnTSgQzhg0APsAsIQq+a+k/2Yvow==",
+ "dev": true,
+ "dependencies": {
+ "aws-sdk": "^2.177.0",
+ "bluebird": "^3.5.1",
+ "chrome-launcher": "^0.10.0",
+ "chrome-remote-interface": "^0.25.5",
+ "cuid": "^2.1.0",
+ "form-data": "^2.3.1",
+ "got": "^8.0.0",
+ "mqtt": "^2.15.0"
+ },
+ "engines": {
+ "node": ">= 6.10.0"
+ }
+ },
+ "node_modules/chromeless/node_modules/form-data": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
+ "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+ "dev": true,
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.6",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 0.12"
+ }
+ },
+ "node_modules/ci-info": {
+ "version": "3.9.0",
+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+ "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/sibiraj-s"
+ }
+ ],
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/cipher-base": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/cjs-module-lexer": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
+ "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
+ "dev": true
+ },
+ "node_modules/class-utils": {
+ "version": "0.3.6",
+ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+ "dev": true,
+ "dependencies": {
+ "arr-union": "^3.1.0",
+ "define-property": "^0.2.5",
+ "isobject": "^3.0.0",
+ "static-extend": "^0.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/class-utils/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/classnames": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+ "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
+ "dev": true
+ },
+ "node_modules/cldrjs": {
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/cldrjs/-/cldrjs-0.5.5.tgz",
+ "integrity": "sha512-KDwzwbmLIPfCgd8JERVDpQKrUUM1U4KpFJJg2IROv89rF172lLufoJnqJ/Wea6fXL5bO6WjuLMzY8V52UWPvkA==",
+ "dev": true
+ },
+ "node_modules/clean-regexp": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
+ "integrity": "sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==",
+ "dev": true,
+ "dependencies": {
+ "escape-string-regexp": "^1.0.5"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/cli-boxes": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
+ "integrity": "sha512-3Fo5wu8Ytle8q9iCzS4D2MWVL2X7JVWRiS1BnXbTFDhS9c/REkM9vd1AmabsoZoY5/dGi5TT9iKL8Kb6DeBRQg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/cli-cursor": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+ "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
+ "dev": true,
+ "dependencies": {
+ "restore-cursor": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/cli-width": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+ "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
+ "dev": true
+ },
+ "node_modules/cliui": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^6.2.0"
+ }
+ },
+ "node_modules/cliui/node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/cliui/node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/clone": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+ "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8"
+ }
+ },
+ "node_modules/clone-response": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+ "integrity": "sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==",
+ "dev": true,
+ "dependencies": {
+ "mimic-response": "^1.0.0"
+ }
+ },
+ "node_modules/clone-stats": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+ "integrity": "sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==",
+ "dev": true
+ },
+ "node_modules/clownface": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/clownface/-/clownface-1.5.1.tgz",
+ "integrity": "sha512-Ko8N/UFsnhEGmPlyE1bUFhbRhVgDbxqlIjcqxtLysc4dWaY0A7iCdg3savhAxs7Lheb7FCygIyRh7ADYZWVIng==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "@rdfjs/data-model": "^1.1.0",
+ "@rdfjs/namespace": "^1.0.0"
+ }
+ },
+ "node_modules/cluster-key-slot": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz",
+ "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/co": {
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+ "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+ "dev": true,
+ "engines": {
+ "iojs": ">= 1.0.0",
+ "node": ">= 0.12.0"
+ }
+ },
+ "node_modules/code-block-writer": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz",
+ "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/code-point-at": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+ "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/coffee-script": {
+ "version": "1.12.7",
+ "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
+ "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
+ "deprecated": "CoffeeScript on NPM has moved to \"coffeescript\" (no hyphen)",
+ "dev": true,
+ "bin": {
+ "cake": "bin/cake",
+ "coffee": "bin/coffee"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/collect-v8-coverage": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+ "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+ "dev": true
+ },
+ "node_modules/collection-visit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+ "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+ "dev": true,
+ "dependencies": {
+ "map-visit": "^1.0.0",
+ "object-visit": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/color": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
+ "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
+ "dev": true,
+ "dependencies": {
+ "color-convert": "^2.0.1",
+ "color-string": "^1.9.0"
+ },
+ "engines": {
+ "node": ">=12.5.0"
+ }
+ },
+ "node_modules/color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dependencies": {
+ "color-name": "~1.1.4"
+ },
+ "engines": {
+ "node": ">=7.0.0"
+ }
+ },
+ "node_modules/color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+ },
+ "node_modules/color-string": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+ "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+ "dev": true,
+ "dependencies": {
+ "color-name": "^1.0.0",
+ "simple-swizzle": "^0.2.2"
+ }
+ },
+ "node_modules/color-support": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+ "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+ "dev": true,
+ "bin": {
+ "color-support": "bin.js"
+ }
+ },
+ "node_modules/combine-source-map": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
+ "integrity": "sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==",
+ "dev": true,
+ "dependencies": {
+ "convert-source-map": "~1.1.0",
+ "inline-source-map": "~0.6.0",
+ "lodash.memoize": "~3.0.3",
+ "source-map": "~0.5.3"
+ }
+ },
+ "node_modules/combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "dev": true,
+ "dependencies": {
+ "delayed-stream": "~1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/commander": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+ "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/commist": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/commist/-/commist-1.1.0.tgz",
+ "integrity": "sha512-rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==",
+ "dev": true,
+ "dependencies": {
+ "leven": "^2.1.0",
+ "minimist": "^1.1.0"
+ }
+ },
+ "node_modules/commist/node_modules/leven": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
+ "integrity": "sha512-nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/commist/node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/component-bind": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+ "integrity": "sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==",
+ "dev": true
+ },
+ "node_modules/component-emitter": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+ "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/component-inherit": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+ "integrity": "sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==",
+ "dev": true
+ },
+ "node_modules/component-type": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/component-type/-/component-type-1.2.2.tgz",
+ "integrity": "sha512-99VUHREHiN5cLeHm3YLq312p6v+HUEcwtLCAtelvUDI6+SH5g5Cr85oNR2S1o6ywzL0ykMbuwLzM2ANocjEOIA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/compressible": {
+ "version": "2.0.18",
+ "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+ "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "mime-db": ">= 1.43.0 < 2"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+ },
+ "node_modules/concat-stream": {
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+ "dev": true,
+ "engines": [
+ "node >= 0.8"
+ ],
+ "dependencies": {
+ "buffer-from": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.2.2",
+ "typedarray": "^0.0.6"
+ }
+ },
+ "node_modules/concat-stream/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/concat-stream/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/concat-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/concat-stream/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/configstore": {
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.5.tgz",
+ "integrity": "sha512-nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA==",
+ "dev": true,
+ "dependencies": {
+ "dot-prop": "^4.2.1",
+ "graceful-fs": "^4.1.2",
+ "make-dir": "^1.0.0",
+ "unique-string": "^1.0.0",
+ "write-file-atomic": "^2.0.0",
+ "xdg-basedir": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/configstore/node_modules/make-dir": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+ "dev": true,
+ "dependencies": {
+ "pify": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/configstore/node_modules/write-file-atomic": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+ "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+ "dev": true,
+ "dependencies": {
+ "graceful-fs": "^4.1.11",
+ "imurmurhash": "^0.1.4",
+ "signal-exit": "^3.0.2"
+ }
+ },
+ "node_modules/connection-parse": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz",
+ "integrity": "sha512-bTTG28diWg7R7/+qE5NZumwPbCiJOT8uPdZYu674brDjBWQctbaQbYlDKhalS+4i5HxIx+G8dZsnBHKzWpp01A==",
+ "dev": true
+ },
+ "node_modules/consola": {
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/consola/-/consola-3.3.3.tgz",
+ "integrity": "sha512-Qil5KwghMzlqd51UXM0b6fyaGHtOC22scxrwrz4A2882LyUMwQjnvaedN1HAeXzphspQ6CpHkzMAWxBTUruDLg==",
+ "engines": {
+ "node": "^14.18.0 || >=16.10.0"
+ }
+ },
+ "node_modules/console-browserify": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+ "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+ "dev": true
+ },
+ "node_modules/console-control-strings": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+ "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+ "dev": true
+ },
+ "node_modules/consolidate": {
+ "version": "0.15.1",
+ "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
+ "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+ "deprecated": "Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog",
+ "dev": true,
+ "dependencies": {
+ "bluebird": "^3.1.1"
+ },
+ "engines": {
+ "node": ">= 0.10.0"
+ }
+ },
+ "node_modules/constant-case": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-1.1.2.tgz",
+ "integrity": "sha512-FQ/HuOuSnX6nIF8OnofRWj+KnOpGAHXQpOKHmsL1sAnuLwu6r5mHGK+mJc0SkHkbmNfcU/SauqXLTEOL1JQfJA==",
+ "dev": true,
+ "dependencies": {
+ "snake-case": "^1.1.0",
+ "upper-case": "^1.1.1"
+ }
+ },
+ "node_modules/constantinople": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz",
+ "integrity": "sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/parser": "^7.6.0",
+ "@babel/types": "^7.6.1"
+ }
+ },
+ "node_modules/constants-browserify": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+ "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
+ "dev": true
+ },
+ "node_modules/content-disposition": {
+ "version": "0.5.4",
+ "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+ "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "5.2.1"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/content-type": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+ "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/convert-source-map": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
+ "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==",
+ "dev": true
+ },
+ "node_modules/cookie": {
+ "version": "0.4.2",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+ "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/cookie-signature": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+ "dev": true
+ },
+ "node_modules/cookiejar": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
+ "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
+ "dev": true
+ },
+ "node_modules/cookies": {
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
+ "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
+ "dev": true,
+ "dependencies": {
+ "depd": "~2.0.0",
+ "keygrip": "~1.1.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/copy": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/copy/-/copy-0.3.2.tgz",
+ "integrity": "sha512-drDFuUZctIuvSuvL9dOF/v5GxrwB1Q8eMIRlYONC0lSMEq+L2xabXP3jme8cQFdDO8cgP8JsuYhQg7JtTwezmg==",
+ "dev": true,
+ "dependencies": {
+ "async-each": "^1.0.0",
+ "bluebird": "^3.4.1",
+ "extend-shallow": "^2.0.1",
+ "file-contents": "^0.3.1",
+ "glob-parent": "^2.0.0",
+ "graceful-fs": "^4.1.4",
+ "has-glob": "^0.1.1",
+ "is-absolute": "^0.2.5",
+ "lazy-cache": "^2.0.1",
+ "log-ok": "^0.1.1",
+ "matched": "^0.4.1",
+ "mkdirp": "^0.5.1",
+ "resolve-dir": "^0.1.0",
+ "to-file": "^0.2.0"
+ },
+ "bin": {
+ "copy": "bin/cli.js",
+ "copy-cli": "bin/cli.js"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/copy-descriptor": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+ "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/core-js-pure": {
+ "version": "3.35.0",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.35.0.tgz",
+ "integrity": "sha512-f+eRYmkou59uh7BPcyJ8MC76DiGhspj1KMxVIcF24tzP8NA9HVa1uC7BTW2tgx7E1QVCzDzsgp7kArrzhlz8Ew==",
+ "dev": true,
+ "hasInstallScript": true,
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/core-js"
+ }
+ },
+ "node_modules/core-util-is": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+ "dev": true
+ },
+ "node_modules/cors": {
+ "version": "2.8.5",
+ "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+ "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+ "dev": true,
+ "dependencies": {
+ "object-assign": "^4",
+ "vary": "^1"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/cowsay": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/cowsay/-/cowsay-1.5.0.tgz",
+ "integrity": "sha512-8Ipzr54Z8zROr/62C8f0PdhQcDusS05gKTS87xxdji8VbWefWly0k8BwGK7+VqamOrkv3eGsCkPtvlHzrhWsCA==",
+ "dev": true,
+ "dependencies": {
+ "get-stdin": "8.0.0",
+ "string-width": "~2.1.1",
+ "strip-final-newline": "2.0.0",
+ "yargs": "15.4.1"
+ },
+ "bin": {
+ "cowsay": "cli.js",
+ "cowthink": "cli.js"
+ },
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/create-ecdh": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^4.1.0",
+ "elliptic": "^6.5.3"
+ }
+ },
+ "node_modules/create-ecdh/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
+ "node_modules/create-error-class": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+ "integrity": "sha512-gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==",
+ "dev": true,
+ "dependencies": {
+ "capture-stack-trace": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/create-hash": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+ "dev": true,
+ "dependencies": {
+ "cipher-base": "^1.0.1",
+ "inherits": "^2.0.1",
+ "md5.js": "^1.3.4",
+ "ripemd160": "^2.0.1",
+ "sha.js": "^2.4.0"
+ }
+ },
+ "node_modules/create-hmac": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+ "dev": true,
+ "dependencies": {
+ "cipher-base": "^1.0.3",
+ "create-hash": "^1.1.0",
+ "inherits": "^2.0.1",
+ "ripemd160": "^2.0.0",
+ "safe-buffer": "^5.0.1",
+ "sha.js": "^2.4.8"
+ }
+ },
+ "node_modules/create-jest": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+ "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+ "dev": true,
+ "dependencies": {
+ "@jest/types": "^29.6.3",
+ "chalk": "^4.0.0",
+ "exit": "^0.1.2",
+ "graceful-fs": "^4.2.9",
+ "jest-config": "^29.7.0",
+ "jest-util": "^29.7.0",
+ "prompts": "^2.0.1"
+ },
+ "bin": {
+ "create-jest": "bin/create-jest.js"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/create-require": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/cron-parser": {
+ "version": "2.18.0",
+ "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-2.18.0.tgz",
+ "integrity": "sha512-s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==",
+ "dev": true,
+ "dependencies": {
+ "is-nan": "^1.3.0",
+ "moment-timezone": "^0.5.31"
+ },
+ "engines": {
+ "node": ">=0.8"
+ }
+ },
+ "node_modules/cross-env": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+ "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+ "dev": true,
+ "dependencies": {
+ "cross-spawn": "^7.0.1"
+ },
+ "bin": {
+ "cross-env": "src/bin/cross-env.js",
+ "cross-env-shell": "src/bin/cross-env-shell.js"
+ },
+ "engines": {
+ "node": ">=10.14",
+ "npm": ">=6",
+ "yarn": ">=1"
+ }
+ },
+ "node_modules/cross-fetch": {
+ "version": "3.1.8",
+ "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
+ "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "node-fetch": "^2.6.12"
+ }
+ },
+ "node_modules/cross-spawn": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+ "dependencies": {
+ "path-key": "^3.1.0",
+ "shebang-command": "^2.0.0",
+ "which": "^2.0.1"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/cross-spawn/node_modules/which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dependencies": {
+ "isexe": "^2.0.0"
+ },
+ "bin": {
+ "node-which": "bin/node-which"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/crypt": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+ "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/crypto-browserify": {
+ "version": "3.12.0",
+ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+ "dev": true,
+ "dependencies": {
+ "browserify-cipher": "^1.0.0",
+ "browserify-sign": "^4.0.0",
+ "create-ecdh": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "create-hmac": "^1.1.0",
+ "diffie-hellman": "^5.0.0",
+ "inherits": "^2.0.1",
+ "pbkdf2": "^3.0.3",
+ "public-encrypt": "^4.0.0",
+ "randombytes": "^2.0.0",
+ "randomfill": "^1.0.3"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/crypto-js": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+ "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
+ "dev": true
+ },
+ "node_modules/crypto-random-string": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+ "integrity": "sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/cson-parser": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.3.5.tgz",
+ "integrity": "sha512-Pchz4dDkyafUL4V3xBuP9Os8Hu9VU96R+MxuTKh7NR+D866UiWrhBiSLbfuvwApEaJzpXhXTr3iPe4lFtXLzcQ==",
+ "dev": true,
+ "dependencies": {
+ "coffee-script": "^1.10.0"
+ }
+ },
+ "node_modules/css-selector-parser": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.4.1.tgz",
+ "integrity": "sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g==",
+ "dev": true
+ },
+ "node_modules/cssfilter": {
+ "version": "0.0.10",
+ "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
+ "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==",
+ "dev": true
+ },
+ "node_modules/cssom": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+ "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+ "dev": true
+ },
+ "node_modules/cssstyle": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+ "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+ "dev": true,
+ "dependencies": {
+ "cssom": "~0.3.6"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/cssstyle/node_modules/cssom": {
+ "version": "0.3.8",
+ "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+ "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+ "dev": true
+ },
+ "node_modules/csstype": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+ "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+ "dev": true
+ },
+ "node_modules/cuid": {
+ "version": "2.1.8",
+ "resolved": "https://registry.npmjs.org/cuid/-/cuid-2.1.8.tgz",
+ "integrity": "sha512-xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg==",
+ "deprecated": "Cuid and other k-sortable and non-cryptographic ids (Ulid, ObjectId, KSUID, all UUIDs) are all insecure. Use @paralleldrive/cuid2 instead.",
+ "dev": true
+ },
+ "node_modules/current-script-polyfill": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz",
+ "integrity": "sha512-qv8s+G47V6Hq+g2kRE5th+ASzzrL7b6l+tap1DHKK25ZQJv3yIFhH96XaQ7NGL+zRW3t/RDbweJf/dJDe5Z5KA==",
+ "dev": true
+ },
+ "node_modules/d": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
+ "integrity": "sha512-0SdM9V9pd/OXJHoWmTfNPTAeD+lw6ZqHg+isPyBFuJsZLSE0Ygg1cYZ/0l6DrKQXMOqGOu1oWupMoOfoRfMZrQ==",
+ "dev": true,
+ "dependencies": {
+ "es5-ext": "~0.10.2"
+ }
+ },
+ "node_modules/damerau-levenshtein": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
+ "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+ "dev": true
+ },
+ "node_modules/dash-ast": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz",
+ "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==",
+ "dev": true
+ },
+ "node_modules/dashdash": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+ "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+ "dev": true,
+ "dependencies": {
+ "assert-plus": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/data-urls": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+ "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+ "dev": true,
+ "dependencies": {
+ "abab": "^2.0.3",
+ "whatwg-mimetype": "^2.3.0",
+ "whatwg-url": "^8.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/dayjs": {
+ "version": "1.11.10",
+ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
+ "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==",
+ "dev": true
+ },
+ "node_modules/debug": {
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+ "dependencies": {
+ "ms": "2.1.2"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/debug/node_modules/ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+ },
+ "node_modules/debuglog": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+ "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==",
+ "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/decamelize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/decimal.js": {
+ "version": "10.4.3",
+ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+ "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+ "dev": true
+ },
+ "node_modules/decode-named-character-reference": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz",
+ "integrity": "sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==",
+ "dev": true,
+ "dependencies": {
+ "character-entities": "^2.0.0"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
+ "node_modules/decode-uri-component": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+ "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/decompress-response": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+ "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
+ "dev": true,
+ "dependencies": {
+ "mimic-response": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/dedent": {
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+ "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+ "dev": true,
+ "peerDependencies": {
+ "babel-plugin-macros": "^3.1.0"
+ },
+ "peerDependenciesMeta": {
+ "babel-plugin-macros": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/deep-equal": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+ "integrity": "sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==",
+ "dev": true
+ },
+ "node_modules/deep-extend": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/deep-is": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+ "dev": true
+ },
+ "node_modules/deepmerge": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+ "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/define-data-property": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+ "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+ "dev": true,
+ "dependencies": {
+ "es-define-property": "^1.0.0",
+ "es-errors": "^1.3.0",
+ "gopd": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/define-properties": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+ "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+ "dev": true,
+ "dependencies": {
+ "define-data-property": "^1.0.1",
+ "has-property-descriptors": "^1.0.0",
+ "object-keys": "^1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/defined": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/delay": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/delay/-/delay-5.0.0.tgz",
+ "integrity": "sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/delegates": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+ "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+ "dev": true
+ },
+ "node_modules/denque": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
+ "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/depd": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/deprecated-decorator": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz",
+ "integrity": "sha512-MHidOOnCHGlZDKsI21+mbIIhf4Fff+hhCTB7gtVg4uoIqjcrTZc5v6M+GS2zVI0sV7PqK415rb8XaOSQsQkHOw==",
+ "dev": true
+ },
+ "node_modules/deps-sort": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz",
+ "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==",
+ "dev": true,
+ "dependencies": {
+ "JSONStream": "^1.0.3",
+ "shasum-object": "^1.0.0",
+ "subarg": "^1.0.0",
+ "through2": "^2.0.0"
+ },
+ "bin": {
+ "deps-sort": "bin/cmd.js"
+ }
+ },
+ "node_modules/dequal": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+ "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/des.js": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+ "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0"
+ }
+ },
+ "node_modules/destroy": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+ "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8",
+ "npm": "1.2.8000 || >= 1.4.16"
+ }
+ },
+ "node_modules/details-element-polyfill": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/details-element-polyfill/-/details-element-polyfill-2.4.0.tgz",
+ "integrity": "sha512-jnZ/m0+b1gz3EcooitqL7oDEkKHEro659dt8bWB/T/HjiILucoQhHvvi5MEOAIFJXxxO+rIYJ/t3qCgfUOSU5g==",
+ "dev": true
+ },
+ "node_modules/detect-indent": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-7.0.1.tgz",
+ "integrity": "sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.20"
+ }
+ },
+ "node_modules/detect-libc": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz",
+ "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/detect-newline": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+ "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/detective": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
+ "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
+ "dev": true,
+ "dependencies": {
+ "acorn-node": "^1.8.2",
+ "defined": "^1.0.0",
+ "minimist": "^1.2.6"
+ },
+ "bin": {
+ "detective": "bin/detective.js"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/detective/node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/dezalgo": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+ "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+ "dev": true,
+ "dependencies": {
+ "asap": "^2.0.0",
+ "wrappy": "1"
+ }
+ },
+ "node_modules/dfa": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/dfa/-/dfa-1.2.0.tgz",
+ "integrity": "sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q==",
+ "dev": true
+ },
+ "node_modules/dicer": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz",
+ "integrity": "sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==",
+ "dev": true,
+ "dependencies": {
+ "streamsearch": "0.1.2"
+ },
+ "engines": {
+ "node": ">=4.5.0"
+ }
+ },
+ "node_modules/diff": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+ "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.3.1"
+ }
+ },
+ "node_modules/diff-sequences": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+ "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+ "dev": true,
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/diffie-hellman": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^4.1.0",
+ "miller-rabin": "^4.0.0",
+ "randombytes": "^2.0.0"
+ }
+ },
+ "node_modules/diffie-hellman/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
+ "node_modules/dir-glob": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+ "dev": true,
+ "dependencies": {
+ "path-type": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/doctrine": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "esutils": "^2.0.2"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/doctypes": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
+ "integrity": "sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==",
+ "dev": true
+ },
+ "node_modules/dom-walk": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+ "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
+ "dev": true
+ },
+ "node_modules/domain-browser": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+ "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4",
+ "npm": ">=1.2"
+ }
+ },
+ "node_modules/domexception": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+ "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+ "deprecated": "Use your platform's native DOMException instead",
+ "dev": true,
+ "dependencies": {
+ "webidl-conversions": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/domexception/node_modules/webidl-conversions": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+ "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/dot-case": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-1.1.2.tgz",
+ "integrity": "sha512-NzEIt12UjECXi6JZ/R/nBey6EE1qCN0yUTEFaPIaKW0AcOEwlKqujtcJVbtSfLNnj3CDoXLQyli79vAaqohyvw==",
+ "dev": true,
+ "dependencies": {
+ "sentence-case": "^1.1.2"
+ }
+ },
+ "node_modules/dot-prop": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
+ "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
+ "dev": true,
+ "dependencies": {
+ "is-obj": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/dottie": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.6.tgz",
+ "integrity": "sha512-iGCHkfUc5kFekGiqhe8B/mdaurD+lakO9txNnTvKtA6PISrw86LgqHvRzWYPyoE2Ph5aMIrCw9/uko6XHTKCwA==",
+ "dev": true
+ },
+ "node_modules/dunder-proto": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+ "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "call-bind-apply-helpers": "^1.0.1",
+ "es-errors": "^1.3.0",
+ "gopd": "^1.2.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/duplex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/duplex/-/duplex-1.0.0.tgz",
+ "integrity": "sha512-6Urdl3FU6TU6TAbd9b46YsvYhxqWvuuvlDL1VaP4DJb9E1jbU9Y5E6KUIXt7+0CUgKhPveZ495kqVAzm/uynyg==",
+ "dev": true
+ },
+ "node_modules/duplexer": {
+ "version": "0.0.4",
+ "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.0.4.tgz",
+ "integrity": "sha512-nO0WWuIDTde3CWK/8IPpG50dyhUilgpsqzYSIP+w20Yh+4iDgb/2Gs75QItcp0Hmx/JtxtTXBalj+LSTD1VemA==",
+ "dev": true
+ },
+ "node_modules/duplexer2": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+ "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "^2.0.2"
+ }
+ },
+ "node_modules/duplexer2/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/duplexer2/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/duplexer2/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/duplexer2/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/duplexer3": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz",
+ "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==",
+ "dev": true
+ },
+ "node_modules/duplexify": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz",
+ "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==",
+ "dev": true,
+ "dependencies": {
+ "end-of-stream": "^1.4.1",
+ "inherits": "^2.0.3",
+ "readable-stream": "^3.1.1",
+ "stream-shift": "^1.0.2"
+ }
+ },
+ "node_modules/eastasianwidth": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+ },
+ "node_modules/ecc-jsbn": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+ "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
+ "dev": true,
+ "dependencies": {
+ "jsbn": "~0.1.0",
+ "safer-buffer": "^2.1.0"
+ }
+ },
+ "node_modules/ecdsa-sig-formatter": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+ "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/ee-first": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+ "dev": true
+ },
+ "node_modules/ejs": {
+ "version": "2.7.4",
+ "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
+ "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
+ "dev": true,
+ "hasInstallScript": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/electron-to-chromium": {
+ "version": "1.5.76",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz",
+ "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==",
+ "dev": true
+ },
+ "node_modules/elliptic": {
+ "version": "6.6.1",
+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz",
+ "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "bn.js": "^4.11.9",
+ "brorand": "^1.1.0",
+ "hash.js": "^1.0.0",
+ "hmac-drbg": "^1.0.1",
+ "inherits": "^2.0.4",
+ "minimalistic-assert": "^1.0.1",
+ "minimalistic-crypto-utils": "^1.0.1"
+ }
+ },
+ "node_modules/elliptic/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
+ "node_modules/emissary": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/emissary/-/emissary-1.3.3.tgz",
+ "integrity": "sha512-pD6FWNBSlEOzSJDCTcSGVLgNnGw5fnCvvGMdQ/TN43efeXZ/QTq8+hZoK3OOEXPRNjMmSJmeOnEJh+bWT5O8rQ==",
+ "dev": true,
+ "dependencies": {
+ "es6-weak-map": "^0.1.2",
+ "mixto": "1.x",
+ "property-accessors": "^1.1",
+ "underscore-plus": "1.x"
+ }
+ },
+ "node_modules/emittery": {
+ "version": "0.13.1",
+ "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+ "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+ }
+ },
+ "node_modules/emoji-regex": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+ },
+ "node_modules/encodeurl": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/end-of-stream": {
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+ "dev": true,
+ "dependencies": {
+ "once": "^1.4.0"
+ }
+ },
+ "node_modules/engine.io": {
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.6.1.tgz",
+ "integrity": "sha512-dfs8EVg/i7QjFsXxn7cCRQ+Wai1G1TlEvHhdYEi80fxn5R1vZ2K661O6v/rezj1FP234SZ14r9CmJke99iYDGg==",
+ "dev": true,
+ "dependencies": {
+ "accepts": "~1.3.4",
+ "base64id": "2.0.0",
+ "cookie": "~0.4.1",
+ "debug": "~4.1.0",
+ "engine.io-parser": "~2.2.0",
+ "ws": "~7.4.2"
+ },
+ "engines": {
+ "node": ">=8.0.0"
+ }
+ },
+ "node_modules/engine.io-client": {
+ "version": "3.5.3",
+ "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.3.tgz",
+ "integrity": "sha512-qsgyc/CEhJ6cgMUwxRRtOndGVhIu5hpL5tR4umSpmX/MvkFoIxUTM7oFMDQumHNzlNLwSVy6qhstFPoWTf7dOw==",
+ "dev": true,
+ "dependencies": {
+ "component-emitter": "~1.3.0",
+ "component-inherit": "0.0.3",
+ "debug": "~3.1.0",
+ "engine.io-parser": "~2.2.0",
+ "has-cors": "1.1.0",
+ "indexof": "0.0.1",
+ "parseqs": "0.0.6",
+ "parseuri": "0.0.6",
+ "ws": "~7.4.2",
+ "xmlhttprequest-ssl": "~1.6.2",
+ "yeast": "0.1.2"
+ }
+ },
+ "node_modules/engine.io-client/node_modules/debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/engine.io-client/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true
+ },
+ "node_modules/engine.io-client/node_modules/ws": {
+ "version": "7.4.6",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+ "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.3.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": "^5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/engine.io-parser": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz",
+ "integrity": "sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==",
+ "dev": true,
+ "dependencies": {
+ "after": "0.8.2",
+ "arraybuffer.slice": "~0.0.7",
+ "base64-arraybuffer": "0.1.4",
+ "blob": "0.0.5",
+ "has-binary2": "~1.0.2"
+ }
+ },
+ "node_modules/engine.io/node_modules/debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "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/engine.io/node_modules/ws": {
+ "version": "7.4.6",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+ "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.3.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": "^5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/enhanced-resolve": {
+ "version": "5.15.0",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+ "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+ "dev": true,
+ "dependencies": {
+ "graceful-fs": "^4.2.4",
+ "tapable": "^2.2.0"
+ },
+ "engines": {
+ "node": ">=10.13.0"
+ }
+ },
+ "node_modules/ent": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+ "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
+ "dev": true
+ },
+ "node_modules/error-ex": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+ "dev": true,
+ "dependencies": {
+ "is-arrayish": "^0.2.1"
+ }
+ },
+ "node_modules/error-stack-parser": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+ "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
+ "dev": true,
+ "dependencies": {
+ "stackframe": "^1.3.4"
+ }
+ },
+ "node_modules/es-abstract": {
+ "version": "1.22.4",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz",
+ "integrity": "sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==",
+ "dev": true,
+ "dependencies": {
+ "array-buffer-byte-length": "^1.0.1",
+ "arraybuffer.prototype.slice": "^1.0.3",
+ "available-typed-arrays": "^1.0.6",
+ "call-bind": "^1.0.7",
+ "es-define-property": "^1.0.0",
+ "es-errors": "^1.3.0",
+ "es-set-tostringtag": "^2.0.2",
+ "es-to-primitive": "^1.2.1",
+ "function.prototype.name": "^1.1.6",
+ "get-intrinsic": "^1.2.4",
+ "get-symbol-description": "^1.0.2",
+ "globalthis": "^1.0.3",
+ "gopd": "^1.0.1",
+ "has-property-descriptors": "^1.0.2",
+ "has-proto": "^1.0.1",
+ "has-symbols": "^1.0.3",
+ "hasown": "^2.0.1",
+ "internal-slot": "^1.0.7",
+ "is-array-buffer": "^3.0.4",
+ "is-callable": "^1.2.7",
+ "is-negative-zero": "^2.0.2",
+ "is-regex": "^1.1.4",
+ "is-shared-array-buffer": "^1.0.2",
+ "is-string": "^1.0.7",
+ "is-typed-array": "^1.1.13",
+ "is-weakref": "^1.0.2",
+ "object-inspect": "^1.13.1",
+ "object-keys": "^1.1.1",
+ "object.assign": "^4.1.5",
+ "regexp.prototype.flags": "^1.5.2",
+ "safe-array-concat": "^1.1.0",
+ "safe-regex-test": "^1.0.3",
+ "string.prototype.trim": "^1.2.8",
+ "string.prototype.trimend": "^1.0.7",
+ "string.prototype.trimstart": "^1.0.7",
+ "typed-array-buffer": "^1.0.1",
+ "typed-array-byte-length": "^1.0.0",
+ "typed-array-byte-offset": "^1.0.0",
+ "typed-array-length": "^1.0.4",
+ "unbox-primitive": "^1.0.2",
+ "which-typed-array": "^1.1.14"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/es-array-method-boxes-properly": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+ "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+ "dev": true
+ },
+ "node_modules/es-define-property": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+ "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-errors": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+ "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-get-iterator": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+ "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "get-intrinsic": "^1.1.3",
+ "has-symbols": "^1.0.3",
+ "is-arguments": "^1.1.1",
+ "is-map": "^2.0.2",
+ "is-set": "^2.0.2",
+ "is-string": "^1.0.7",
+ "isarray": "^2.0.5",
+ "stop-iteration-iterator": "^1.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/es-iterator-helpers": {
+ "version": "1.0.17",
+ "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.17.tgz",
+ "integrity": "sha512-lh7BsUqelv4KUbR5a/ZTaGGIMLCjPGPqJ6q+Oq24YP0RdyptX1uzm4vvaqzk7Zx3bpl/76YLTTDj9L7uYQ92oQ==",
+ "dev": true,
+ "dependencies": {
+ "asynciterator.prototype": "^1.0.0",
+ "call-bind": "^1.0.7",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.22.4",
+ "es-errors": "^1.3.0",
+ "es-set-tostringtag": "^2.0.2",
+ "function-bind": "^1.1.2",
+ "get-intrinsic": "^1.2.4",
+ "globalthis": "^1.0.3",
+ "has-property-descriptors": "^1.0.2",
+ "has-proto": "^1.0.1",
+ "has-symbols": "^1.0.3",
+ "internal-slot": "^1.0.7",
+ "iterator.prototype": "^1.1.2",
+ "safe-array-concat": "^1.1.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-object-atoms": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+ "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "es-errors": "^1.3.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-set-tostringtag": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
+ "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
+ "dev": true,
+ "dependencies": {
+ "get-intrinsic": "^1.2.2",
+ "has-tostringtag": "^1.0.0",
+ "hasown": "^2.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-shim-unscopables": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+ "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+ "dev": true,
+ "dependencies": {
+ "hasown": "^2.0.0"
+ }
+ },
+ "node_modules/es-to-primitive": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+ "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+ "dev": true,
+ "dependencies": {
+ "is-callable": "^1.1.4",
+ "is-date-object": "^1.0.1",
+ "is-symbol": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/es5-ext": {
+ "version": "0.10.62",
+ "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
+ "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "es6-iterator": "^2.0.3",
+ "es6-symbol": "^3.1.3",
+ "next-tick": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/es5-ext/node_modules/d": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+ "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+ "dev": true,
+ "dependencies": {
+ "es5-ext": "^0.10.50",
+ "type": "^1.0.1"
+ }
+ },
+ "node_modules/es5-ext/node_modules/es6-iterator": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+ "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+ "dev": true,
+ "dependencies": {
+ "d": "1",
+ "es5-ext": "^0.10.35",
+ "es6-symbol": "^3.1.1"
+ }
+ },
+ "node_modules/es5-ext/node_modules/es6-symbol": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+ "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+ "dev": true,
+ "dependencies": {
+ "d": "^1.0.1",
+ "ext": "^1.1.2"
+ }
+ },
+ "node_modules/es5-ext/node_modules/type": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+ "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+ "dev": true
+ },
+ "node_modules/es6-iterator": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+ "integrity": "sha512-6TOmbFM6OPWkTe+bQ3ZuUkvqcWUjAnYjKUCLdbvRsAUz2Pr+fYIibwNXNkLNtIK9PPFbNMZZddaRNkyJhlGJhA==",
+ "dev": true,
+ "dependencies": {
+ "d": "~0.1.1",
+ "es5-ext": "~0.10.5",
+ "es6-symbol": "~2.0.1"
+ }
+ },
+ "node_modules/es6-map": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+ "integrity": "sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==",
+ "dev": true,
+ "dependencies": {
+ "d": "1",
+ "es5-ext": "~0.10.14",
+ "es6-iterator": "~2.0.1",
+ "es6-set": "~0.1.5",
+ "es6-symbol": "~3.1.1",
+ "event-emitter": "~0.3.5"
+ }
+ },
+ "node_modules/es6-map/node_modules/d": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+ "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+ "dev": true,
+ "dependencies": {
+ "es5-ext": "^0.10.50",
+ "type": "^1.0.1"
+ }
+ },
+ "node_modules/es6-map/node_modules/es6-iterator": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+ "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+ "dev": true,
+ "dependencies": {
+ "d": "1",
+ "es5-ext": "^0.10.35",
+ "es6-symbol": "^3.1.1"
+ }
+ },
+ "node_modules/es6-map/node_modules/es6-symbol": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+ "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+ "dev": true,
+ "dependencies": {
+ "d": "^1.0.1",
+ "ext": "^1.1.2"
+ }
+ },
+ "node_modules/es6-map/node_modules/type": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+ "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+ "dev": true
+ },
+ "node_modules/es6-promise": {
+ "version": "4.2.8",
+ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+ "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+ "dev": true
+ },
+ "node_modules/es6-promisify": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+ "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==",
+ "dev": true,
+ "dependencies": {
+ "es6-promise": "^4.0.3"
+ }
+ },
+ "node_modules/es6-set": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz",
+ "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==",
+ "dev": true,
+ "dependencies": {
+ "d": "^1.0.1",
+ "es5-ext": "^0.10.62",
+ "es6-iterator": "~2.0.3",
+ "es6-symbol": "^3.1.3",
+ "event-emitter": "^0.3.5",
+ "type": "^2.7.2"
+ },
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
+ "node_modules/es6-set/node_modules/d": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+ "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+ "dev": true,
+ "dependencies": {
+ "es5-ext": "^0.10.50",
+ "type": "^1.0.1"
+ }
+ },
+ "node_modules/es6-set/node_modules/d/node_modules/type": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+ "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+ "dev": true
+ },
+ "node_modules/es6-set/node_modules/es6-iterator": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+ "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+ "dev": true,
+ "dependencies": {
+ "d": "1",
+ "es5-ext": "^0.10.35",
+ "es6-symbol": "^3.1.1"
+ }
+ },
+ "node_modules/es6-set/node_modules/es6-symbol": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+ "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+ "dev": true,
+ "dependencies": {
+ "d": "^1.0.1",
+ "ext": "^1.1.2"
+ }
+ },
+ "node_modules/es6-symbol": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz",
+ "integrity": "sha512-wjobO4zO8726HVU7mI2OA/B6QszqwHJuKab7gKHVx+uRfVVYGcWJkCIFxV2Madqb9/RUSrhJ/r6hPfG7FsWtow==",
+ "dev": true,
+ "dependencies": {
+ "d": "~0.1.1",
+ "es5-ext": "~0.10.5"
+ }
+ },
+ "node_modules/es6-weak-map": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.4.tgz",
+ "integrity": "sha512-P+N5Cd2TXeb7G59euFiM7snORspgbInS29Nbf3KNO2JQp/DyhvMCDWd58nsVAXwYJ6W3Bx7qDdy6QQ3PCJ7jKQ==",
+ "dev": true,
+ "dependencies": {
+ "d": "~0.1.1",
+ "es5-ext": "~0.10.6",
+ "es6-iterator": "~0.1.3",
+ "es6-symbol": "~2.0.1"
+ }
+ },
+ "node_modules/esbuild": {
+ "version": "0.25.0",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.0.tgz",
+ "integrity": "sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "MIT",
+ "bin": {
+ "esbuild": "bin/esbuild"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "optionalDependencies": {
+ "@esbuild/aix-ppc64": "0.25.0",
+ "@esbuild/android-arm": "0.25.0",
+ "@esbuild/android-arm64": "0.25.0",
+ "@esbuild/android-x64": "0.25.0",
+ "@esbuild/darwin-arm64": "0.25.0",
+ "@esbuild/darwin-x64": "0.25.0",
+ "@esbuild/freebsd-arm64": "0.25.0",
+ "@esbuild/freebsd-x64": "0.25.0",
+ "@esbuild/linux-arm": "0.25.0",
+ "@esbuild/linux-arm64": "0.25.0",
+ "@esbuild/linux-ia32": "0.25.0",
+ "@esbuild/linux-loong64": "0.25.0",
+ "@esbuild/linux-mips64el": "0.25.0",
+ "@esbuild/linux-ppc64": "0.25.0",
+ "@esbuild/linux-riscv64": "0.25.0",
+ "@esbuild/linux-s390x": "0.25.0",
+ "@esbuild/linux-x64": "0.25.0",
+ "@esbuild/netbsd-arm64": "0.25.0",
+ "@esbuild/netbsd-x64": "0.25.0",
+ "@esbuild/openbsd-arm64": "0.25.0",
+ "@esbuild/openbsd-x64": "0.25.0",
+ "@esbuild/sunos-x64": "0.25.0",
+ "@esbuild/win32-arm64": "0.25.0",
+ "@esbuild/win32-ia32": "0.25.0",
+ "@esbuild/win32-x64": "0.25.0"
+ }
+ },
+ "node_modules/escalade": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+ "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/escape-html": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+ "dev": true
+ },
+ "node_modules/escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/escodegen": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+ "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+ "dev": true,
+ "dependencies": {
+ "esprima": "^4.0.1",
+ "estraverse": "^5.2.0",
+ "esutils": "^2.0.2"
+ },
+ "bin": {
+ "escodegen": "bin/escodegen.js",
+ "esgenerate": "bin/esgenerate.js"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "optionalDependencies": {
+ "source-map": "~0.6.1"
+ }
+ },
+ "node_modules/escodegen/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "optional": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint": {
+ "version": "8.56.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
+ "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.2.0",
+ "@eslint-community/regexpp": "^4.6.1",
+ "@eslint/eslintrc": "^2.1.4",
+ "@eslint/js": "8.56.0",
+ "@humanwhocodes/config-array": "^0.11.13",
+ "@humanwhocodes/module-importer": "^1.0.1",
+ "@nodelib/fs.walk": "^1.2.8",
+ "@ungap/structured-clone": "^1.2.0",
+ "ajv": "^6.12.4",
+ "chalk": "^4.0.0",
+ "cross-spawn": "^7.0.2",
+ "debug": "^4.3.2",
+ "doctrine": "^3.0.0",
+ "escape-string-regexp": "^4.0.0",
+ "eslint-scope": "^7.2.2",
+ "eslint-visitor-keys": "^3.4.3",
+ "espree": "^9.6.1",
+ "esquery": "^1.4.2",
+ "esutils": "^2.0.2",
+ "fast-deep-equal": "^3.1.3",
+ "file-entry-cache": "^6.0.1",
+ "find-up": "^5.0.0",
+ "glob-parent": "^6.0.2",
+ "globals": "^13.19.0",
+ "graphemer": "^1.4.0",
+ "ignore": "^5.2.0",
+ "imurmurhash": "^0.1.4",
+ "is-glob": "^4.0.0",
+ "is-path-inside": "^3.0.3",
+ "js-yaml": "^4.1.0",
+ "json-stable-stringify-without-jsonify": "^1.0.1",
+ "levn": "^0.4.1",
+ "lodash.merge": "^4.6.2",
+ "minimatch": "^3.1.2",
+ "natural-compare": "^1.4.0",
+ "optionator": "^0.9.3",
+ "strip-ansi": "^6.0.1",
+ "text-table": "^0.2.0"
+ },
+ "bin": {
+ "eslint": "bin/eslint.js"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint-config-prettier": {
+ "version": "9.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+ "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+ "dev": true,
+ "bin": {
+ "eslint-config-prettier": "bin/cli.js"
+ },
+ "peerDependencies": {
+ "eslint": ">=7.0.0"
+ }
+ },
+ "node_modules/eslint-import-resolver-alias": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz",
+ "integrity": "sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4"
+ },
+ "peerDependencies": {
+ "eslint-plugin-import": ">=1.4.0"
+ }
+ },
+ "node_modules/eslint-import-resolver-node": {
+ "version": "0.3.9",
+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+ "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^3.2.7",
+ "is-core-module": "^2.13.0",
+ "resolve": "^1.22.4"
+ }
+ },
+ "node_modules/eslint-import-resolver-node/node_modules/debug": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "dev": true,
+ "dependencies": {
+ "ms": "^2.1.1"
+ }
+ },
+ "node_modules/eslint-import-resolver-typescript": {
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz",
+ "integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.4",
+ "enhanced-resolve": "^5.12.0",
+ "eslint-module-utils": "^2.7.4",
+ "fast-glob": "^3.3.1",
+ "get-tsconfig": "^4.5.0",
+ "is-core-module": "^2.11.0",
+ "is-glob": "^4.0.3"
+ },
+ "engines": {
+ "node": "^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
+ },
+ "peerDependencies": {
+ "eslint": "*",
+ "eslint-plugin-import": "*"
+ }
+ },
+ "node_modules/eslint-import-resolver-typescript/node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint-import-resolver-typescript/node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint-module-utils": {
+ "version": "2.8.0",
+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+ "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^3.2.7"
+ },
+ "engines": {
+ "node": ">=4"
+ },
+ "peerDependenciesMeta": {
+ "eslint": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/eslint-module-utils/node_modules/debug": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "dev": true,
+ "dependencies": {
+ "ms": "^2.1.1"
+ }
+ },
+ "node_modules/eslint-plugin-eslint-comments": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz",
+ "integrity": "sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==",
+ "dev": true,
+ "dependencies": {
+ "escape-string-regexp": "^1.0.5",
+ "ignore": "^5.0.5"
+ },
+ "engines": {
+ "node": ">=6.5.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/mysticatea"
+ },
+ "peerDependencies": {
+ "eslint": ">=4.19.1"
+ }
+ },
+ "node_modules/eslint-plugin-import": {
+ "version": "2.29.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+ "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
+ "dev": true,
+ "dependencies": {
+ "array-includes": "^3.1.7",
+ "array.prototype.findlastindex": "^1.2.3",
+ "array.prototype.flat": "^1.3.2",
+ "array.prototype.flatmap": "^1.3.2",
+ "debug": "^3.2.7",
+ "doctrine": "^2.1.0",
+ "eslint-import-resolver-node": "^0.3.9",
+ "eslint-module-utils": "^2.8.0",
+ "hasown": "^2.0.0",
+ "is-core-module": "^2.13.1",
+ "is-glob": "^4.0.3",
+ "minimatch": "^3.1.2",
+ "object.fromentries": "^2.0.7",
+ "object.groupby": "^1.0.1",
+ "object.values": "^1.1.7",
+ "semver": "^6.3.1",
+ "tsconfig-paths": "^3.15.0"
+ },
+ "engines": {
+ "node": ">=4"
+ },
+ "peerDependencies": {
+ "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+ }
+ },
+ "node_modules/eslint-plugin-import/node_modules/debug": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "dev": true,
+ "dependencies": {
+ "ms": "^2.1.1"
+ }
+ },
+ "node_modules/eslint-plugin-import/node_modules/doctrine": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+ "dev": true,
+ "dependencies": {
+ "esutils": "^2.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint-plugin-import/node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint-plugin-import/node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint-plugin-import/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/eslint-plugin-jest": {
+ "version": "27.8.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.8.0.tgz",
+ "integrity": "sha512-347hVFiu4ZKMYl5xFp0X81gLNwBdno0dl0CMpUMjwuAux9X/M2a7z+ab2VHmPL6XCT87q8nv1vaVzhIO4TE/hw==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/utils": "^5.10.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ },
+ "peerDependencies": {
+ "@typescript-eslint/eslint-plugin": "^5.0.0 || ^6.0.0 || ^7.0.0",
+ "eslint": "^7.0.0 || ^8.0.0",
+ "jest": "*"
+ },
+ "peerDependenciesMeta": {
+ "@typescript-eslint/eslint-plugin": {
+ "optional": true
+ },
+ "jest": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/scope-manager": {
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+ "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/visitor-keys": "5.62.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/types": {
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+ "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/typescript-estree": {
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+ "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/visitor-keys": "5.62.0",
+ "debug": "^4.3.4",
+ "globby": "^11.1.0",
+ "is-glob": "^4.0.3",
+ "semver": "^7.3.7",
+ "tsutils": "^3.21.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/utils": {
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+ "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+ "dev": true,
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.2.0",
+ "@types/json-schema": "^7.0.9",
+ "@types/semver": "^7.3.12",
+ "@typescript-eslint/scope-manager": "5.62.0",
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/typescript-estree": "5.62.0",
+ "eslint-scope": "^5.1.1",
+ "semver": "^7.3.7"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+ }
+ },
+ "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/visitor-keys": {
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+ "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "5.62.0",
+ "eslint-visitor-keys": "^3.3.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/eslint-plugin-jest/node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint-plugin-jest/node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint-plugin-jsx-a11y": {
+ "version": "6.8.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.8.0.tgz",
+ "integrity": "sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==",
+ "dev": true,
+ "dependencies": {
+ "@babel/runtime": "^7.23.2",
+ "aria-query": "^5.3.0",
+ "array-includes": "^3.1.7",
+ "array.prototype.flatmap": "^1.3.2",
+ "ast-types-flow": "^0.0.8",
+ "axe-core": "=4.7.0",
+ "axobject-query": "^3.2.1",
+ "damerau-levenshtein": "^1.0.8",
+ "emoji-regex": "^9.2.2",
+ "es-iterator-helpers": "^1.0.15",
+ "hasown": "^2.0.0",
+ "jsx-ast-utils": "^3.3.5",
+ "language-tags": "^1.0.9",
+ "minimatch": "^3.1.2",
+ "object.entries": "^1.1.7",
+ "object.fromentries": "^2.0.7"
+ },
+ "engines": {
+ "node": ">=4.0"
+ },
+ "peerDependencies": {
+ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+ }
+ },
+ "node_modules/eslint-plugin-jsx-a11y/node_modules/axe-core": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz",
+ "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
+ "version": "9.2.2",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+ "dev": true
+ },
+ "node_modules/eslint-plugin-playwright": {
+ "version": "0.16.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-0.16.0.tgz",
+ "integrity": "sha512-DcHpF0SLbNeh9MT4pMzUGuUSnJ7q5MWbP8sSEFIMS6j7Ggnduq8ghNlfhURgty4c1YFny7Ge9xYTO1FSAoV2Vw==",
+ "dev": true,
+ "peerDependencies": {
+ "eslint": ">=7",
+ "eslint-plugin-jest": ">=25"
+ },
+ "peerDependenciesMeta": {
+ "eslint-plugin-jest": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/eslint-plugin-react": {
+ "version": "7.33.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz",
+ "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==",
+ "dev": true,
+ "dependencies": {
+ "array-includes": "^3.1.6",
+ "array.prototype.flatmap": "^1.3.1",
+ "array.prototype.tosorted": "^1.1.1",
+ "doctrine": "^2.1.0",
+ "es-iterator-helpers": "^1.0.12",
+ "estraverse": "^5.3.0",
+ "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+ "minimatch": "^3.1.2",
+ "object.entries": "^1.1.6",
+ "object.fromentries": "^2.0.6",
+ "object.hasown": "^1.1.2",
+ "object.values": "^1.1.6",
+ "prop-types": "^15.8.1",
+ "resolve": "^2.0.0-next.4",
+ "semver": "^6.3.1",
+ "string.prototype.matchall": "^4.0.8"
+ },
+ "engines": {
+ "node": ">=4"
+ },
+ "peerDependencies": {
+ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+ }
+ },
+ "node_modules/eslint-plugin-react-hooks": {
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
+ "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "peerDependencies": {
+ "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+ }
+ },
+ "node_modules/eslint-plugin-react/node_modules/doctrine": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+ "dev": true,
+ "dependencies": {
+ "esutils": "^2.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint-plugin-react/node_modules/resolve": {
+ "version": "2.0.0-next.5",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+ "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
+ "dev": true,
+ "dependencies": {
+ "is-core-module": "^2.13.0",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
+ },
+ "bin": {
+ "resolve": "bin/resolve"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/eslint-plugin-react/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/eslint-plugin-testing-library": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-6.2.0.tgz",
+ "integrity": "sha512-+LCYJU81WF2yQ+Xu4A135CgK8IszcFcyMF4sWkbiu6Oj+Nel0TrkZq/HvDw0/1WuO3dhDQsZA/OpEMGd0NfcUw==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/utils": "^5.58.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
+ "npm": ">=6"
+ },
+ "peerDependencies": {
+ "eslint": "^7.5.0 || ^8.0.0"
+ }
+ },
+ "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/scope-manager": {
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+ "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/visitor-keys": "5.62.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/types": {
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+ "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/typescript-estree": {
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+ "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/visitor-keys": "5.62.0",
+ "debug": "^4.3.4",
+ "globby": "^11.1.0",
+ "is-glob": "^4.0.3",
+ "semver": "^7.3.7",
+ "tsutils": "^3.21.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/utils": {
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+ "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+ "dev": true,
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.2.0",
+ "@types/json-schema": "^7.0.9",
+ "@types/semver": "^7.3.12",
+ "@typescript-eslint/scope-manager": "5.62.0",
+ "@typescript-eslint/types": "5.62.0",
+ "@typescript-eslint/typescript-estree": "5.62.0",
+ "eslint-scope": "^5.1.1",
+ "semver": "^7.3.7"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+ }
+ },
+ "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/visitor-keys": {
+ "version": "5.62.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+ "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "5.62.0",
+ "eslint-visitor-keys": "^3.3.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/eslint-plugin-testing-library/node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint-plugin-testing-library/node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint-plugin-tsdoc": {
+ "version": "0.2.17",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-tsdoc/-/eslint-plugin-tsdoc-0.2.17.tgz",
+ "integrity": "sha512-xRmVi7Zx44lOBuYqG8vzTXuL6IdGOeF9nHX17bjJ8+VE6fsxpdGem0/SBTmAwgYMKYB1WBkqRJVQ+n8GK041pA==",
+ "dev": true,
+ "dependencies": {
+ "@microsoft/tsdoc": "0.14.2",
+ "@microsoft/tsdoc-config": "0.16.2"
+ }
+ },
+ "node_modules/eslint-plugin-unicorn": {
+ "version": "48.0.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-48.0.1.tgz",
+ "integrity": "sha512-FW+4r20myG/DqFcCSzoumaddKBicIPeFnTrifon2mWIzlfyvzwyqZjqVP7m4Cqr/ZYisS2aiLghkUWaPg6vtCw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-validator-identifier": "^7.22.5",
+ "@eslint-community/eslint-utils": "^4.4.0",
+ "ci-info": "^3.8.0",
+ "clean-regexp": "^1.0.0",
+ "esquery": "^1.5.0",
+ "indent-string": "^4.0.0",
+ "is-builtin-module": "^3.2.1",
+ "jsesc": "^3.0.2",
+ "lodash": "^4.17.21",
+ "pluralize": "^8.0.0",
+ "read-pkg-up": "^7.0.1",
+ "regexp-tree": "^0.1.27",
+ "regjsparser": "^0.10.0",
+ "semver": "^7.5.4",
+ "strip-indent": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
+ },
+ "peerDependencies": {
+ "eslint": ">=8.44.0"
+ }
+ },
+ "node_modules/eslint-scope": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+ "dev": true,
+ "dependencies": {
+ "esrecurse": "^4.3.0",
+ "estraverse": "^4.1.1"
+ },
+ "engines": {
+ "node": ">=8.0.0"
+ }
+ },
+ "node_modules/eslint-scope/node_modules/estraverse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/eslint-visitor-keys": {
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint/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,
+ "peer": true
+ },
+ "node_modules/eslint/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,
+ "peer": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eslint/node_modules/eslint-scope": {
+ "version": "7.2.2",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+ "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "esrecurse": "^4.3.0",
+ "estraverse": "^5.2.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint/node_modules/find-up": {
+ "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,
+ "peer": true,
+ "dependencies": {
+ "locate-path": "^6.0.0",
+ "path-exists": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eslint/node_modules/glob-parent": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "is-glob": "^4.0.3"
+ },
+ "engines": {
+ "node": ">=10.13.0"
+ }
+ },
+ "node_modules/eslint/node_modules/globals": {
+ "version": "13.24.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+ "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "type-fest": "^0.20.2"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eslint/node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint/node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eslint/node_modules/is-path-inside": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+ "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/eslint/node_modules/js-yaml": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "argparse": "^2.0.1"
+ },
+ "bin": {
+ "js-yaml": "bin/js-yaml.js"
+ }
+ },
+ "node_modules/eslint/node_modules/levn": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "prelude-ls": "^1.2.1",
+ "type-check": "~0.4.0"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/eslint/node_modules/locate-path": {
+ "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,
+ "peer": true,
+ "dependencies": {
+ "p-locate": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eslint/node_modules/optionator": {
+ "version": "0.9.3",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+ "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "@aashutoshrathi/word-wrap": "^1.2.3",
+ "deep-is": "^0.1.3",
+ "fast-levenshtein": "^2.0.6",
+ "levn": "^0.4.1",
+ "prelude-ls": "^1.2.1",
+ "type-check": "^0.4.0"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/eslint/node_modules/p-locate": {
+ "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,
+ "peer": true,
+ "dependencies": {
+ "p-limit": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eslint/node_modules/prelude-ls": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/eslint/node_modules/type-check": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "prelude-ls": "^1.2.1"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/eslint/node_modules/type-fest": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/esm": {
+ "version": "3.2.25",
+ "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
+ "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/espree": {
+ "version": "9.6.1",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+ "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "acorn": "^8.9.0",
+ "acorn-jsx": "^5.3.2",
+ "eslint-visitor-keys": "^3.4.1"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/esprima": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+ "dev": true,
+ "bin": {
+ "esparse": "bin/esparse.js",
+ "esvalidate": "bin/esvalidate.js"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/esquery": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+ "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+ "dev": true,
+ "dependencies": {
+ "estraverse": "^5.1.0"
+ },
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/esrecurse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+ "dev": true,
+ "dependencies": {
+ "estraverse": "^5.2.0"
+ },
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/estree-walker": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+ "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+ },
+ "node_modules/esutils": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/etag": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/event-emitter": {
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+ "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+ "dev": true,
+ "dependencies": {
+ "d": "1",
+ "es5-ext": "~0.10.14"
+ }
+ },
+ "node_modules/event-emitter/node_modules/d": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+ "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+ "dev": true,
+ "dependencies": {
+ "es5-ext": "^0.10.50",
+ "type": "^1.0.1"
+ }
+ },
+ "node_modules/event-emitter/node_modules/type": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+ "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+ "dev": true
+ },
+ "node_modules/event-kit": {
+ "version": "2.5.3",
+ "resolved": "https://registry.npmjs.org/event-kit/-/event-kit-2.5.3.tgz",
+ "integrity": "sha512-b7Qi1JNzY4BfAYfnIRanLk0DOD1gdkWHT4GISIn8Q2tAf3LpU8SP2CMwWaq40imYoKWbtN4ZhbSRxvsnikooZQ==",
+ "dev": true
+ },
+ "node_modules/event-source-polyfill": {
+ "version": "1.0.31",
+ "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.31.tgz",
+ "integrity": "sha512-4IJSItgS/41IxN5UVAVuAyczwZF7ZIEsM1XAoUzIHA6A+xzusEZUutdXz2Nr+MQPLxfTiCvqE79/C8HT8fKFvA==",
+ "dev": true
+ },
+ "node_modules/event-target-shim": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+ "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/eventemitter-asyncresource": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz",
+ "integrity": "sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==",
+ "dev": true
+ },
+ "node_modules/eventemitter2": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz",
+ "integrity": "sha512-5EM1GHXycJBS6mauYAbVKT1cVs7POKWb2NXD4Vyt8dDqeZa7LaDK1/sjtL+Zb0lzTpSNil4596Dyu97hz37QLg==",
+ "dev": true
+ },
+ "node_modules/eventemitter3": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
+ "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
+ "dev": true
+ },
+ "node_modules/events": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz",
+ "integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.x"
+ }
+ },
+ "node_modules/evp_bytestokey": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+ "dev": true,
+ "dependencies": {
+ "md5.js": "^1.3.4",
+ "safe-buffer": "^5.1.1"
+ }
+ },
+ "node_modules/execa": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+ "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+ "dev": true,
+ "dependencies": {
+ "cross-spawn": "^7.0.3",
+ "get-stream": "^6.0.0",
+ "human-signals": "^2.1.0",
+ "is-stream": "^2.0.0",
+ "merge-stream": "^2.0.0",
+ "npm-run-path": "^4.0.1",
+ "onetime": "^5.1.2",
+ "signal-exit": "^3.0.3",
+ "strip-final-newline": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/execa?sponsor=1"
+ }
+ },
+ "node_modules/exif-parser": {
+ "version": "0.1.12",
+ "resolved": "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.12.tgz",
+ "integrity": "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw==",
+ "dev": true
+ },
+ "node_modules/exit": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+ "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/expand-brackets": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+ "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^2.3.3",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "posix-character-classes": "^0.1.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/expand-brackets/node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/expand-brackets/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true
+ },
+ "node_modules/expand-tilde": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
+ "integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==",
+ "dev": true,
+ "dependencies": {
+ "os-homedir": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/expect": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+ "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+ "dev": true,
+ "dependencies": {
+ "@jest/expect-utils": "^29.7.0",
+ "jest-get-type": "^29.6.3",
+ "jest-matcher-utils": "^29.7.0",
+ "jest-message-util": "^29.7.0",
+ "jest-util": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/express": {
+ "version": "4.21.2",
+ "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+ "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "accepts": "~1.3.8",
+ "array-flatten": "1.1.1",
+ "body-parser": "1.20.3",
+ "content-disposition": "0.5.4",
+ "content-type": "~1.0.4",
+ "cookie": "0.7.1",
+ "cookie-signature": "1.0.6",
+ "debug": "2.6.9",
+ "depd": "2.0.0",
+ "encodeurl": "~2.0.0",
+ "escape-html": "~1.0.3",
+ "etag": "~1.8.1",
+ "finalhandler": "1.3.1",
+ "fresh": "0.5.2",
+ "http-errors": "2.0.0",
+ "merge-descriptors": "1.0.3",
+ "methods": "~1.1.2",
+ "on-finished": "2.4.1",
+ "parseurl": "~1.3.3",
+ "path-to-regexp": "0.1.12",
+ "proxy-addr": "~2.0.7",
+ "qs": "6.13.0",
+ "range-parser": "~1.2.1",
+ "safe-buffer": "5.2.1",
+ "send": "0.19.0",
+ "serve-static": "1.16.2",
+ "setprototypeof": "1.2.0",
+ "statuses": "2.0.1",
+ "type-is": "~1.6.18",
+ "utils-merge": "1.0.1",
+ "vary": "~1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.10.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/express"
+ }
+ },
+ "node_modules/express/node_modules/cookie": {
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+ "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/express/node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/express/node_modules/encodeurl": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+ "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/express/node_modules/http-errors": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+ "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+ "dev": true,
+ "dependencies": {
+ "depd": "2.0.0",
+ "inherits": "2.0.4",
+ "setprototypeof": "1.2.0",
+ "statuses": "2.0.1",
+ "toidentifier": "1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/express/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true
+ },
+ "node_modules/ext": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
+ "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+ "dev": true,
+ "dependencies": {
+ "type": "^2.7.2"
+ }
+ },
+ "node_modules/extend": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+ "dev": true
+ },
+ "node_modules/extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+ "dev": true,
+ "dependencies": {
+ "is-extendable": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/external-editor": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+ "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+ "dev": true,
+ "dependencies": {
+ "chardet": "^0.4.0",
+ "iconv-lite": "^0.4.17",
+ "tmp": "^0.0.33"
+ },
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
+ "node_modules/extglob": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+ "dev": true,
+ "dependencies": {
+ "array-unique": "^0.3.2",
+ "define-property": "^1.0.0",
+ "expand-brackets": "^2.1.4",
+ "extend-shallow": "^2.0.1",
+ "fragment-cache": "^0.2.1",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/extglob/node_modules/define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/extglob/node_modules/is-descriptor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+ "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^1.0.1",
+ "is-data-descriptor": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/extract-zip": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+ "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+ "dev": true,
+ "dependencies": {
+ "concat-stream": "^1.6.2",
+ "debug": "^2.6.9",
+ "mkdirp": "^0.5.4",
+ "yauzl": "^2.10.0"
+ },
+ "bin": {
+ "extract-zip": "cli.js"
+ }
+ },
+ "node_modules/extract-zip/node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/extract-zip/node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/extract-zip/node_modules/mkdirp": {
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+ "dev": true,
+ "dependencies": {
+ "minimist": "^1.2.6"
+ },
+ "bin": {
+ "mkdirp": "bin/cmd.js"
+ }
+ },
+ "node_modules/extract-zip/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true
+ },
+ "node_modules/extsprintf": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+ "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+ "dev": true,
+ "engines": [
+ "node >=0.6.0"
+ ]
+ },
+ "node_modules/eyes": {
+ "version": "0.1.8",
+ "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+ "integrity": "sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ==",
+ "dev": true,
+ "engines": {
+ "node": "> 0.1.90"
+ }
+ },
+ "node_modules/fast-deep-equal": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+ "dev": true
+ },
+ "node_modules/fast-glob": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+ "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+ "dev": true,
+ "dependencies": {
+ "@nodelib/fs.stat": "^2.0.2",
+ "@nodelib/fs.walk": "^1.2.3",
+ "glob-parent": "^5.1.2",
+ "merge2": "^1.3.0",
+ "micromatch": "^4.0.4"
+ },
+ "engines": {
+ "node": ">=8.6.0"
+ }
+ },
+ "node_modules/fast-glob/node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "dependencies": {
+ "is-glob": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/fast-glob/node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/fast-glob/node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/fast-json-stable-stringify": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+ "dev": true
+ },
+ "node_modules/fast-levenshtein": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/fast-safe-stringify": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+ "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+ "dev": true
+ },
+ "node_modules/fast-text-encoding": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz",
+ "integrity": "sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==",
+ "dev": true
+ },
+ "node_modules/fast-xml-parser": {
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
+ "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/NaturalIntelligence"
+ },
+ {
+ "type": "paypal",
+ "url": "https://paypal.me/naturalintelligence"
+ }
+ ],
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "strnum": "^1.0.5"
+ },
+ "bin": {
+ "fxparser": "src/cli/cli.js"
+ }
+ },
+ "node_modules/fastq": {
+ "version": "1.16.0",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
+ "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
+ "dev": true,
+ "dependencies": {
+ "reusify": "^1.0.4"
+ }
+ },
+ "node_modules/faye-websocket": {
+ "version": "0.11.4",
+ "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+ "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+ "dev": true,
+ "dependencies": {
+ "websocket-driver": ">=0.5.1"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/fb-watchman": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+ "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+ "dev": true,
+ "dependencies": {
+ "bser": "2.1.1"
+ }
+ },
+ "node_modules/fd-slicer": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+ "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+ "dev": true,
+ "dependencies": {
+ "pend": "~1.2.0"
+ }
+ },
+ "node_modules/fetch-h2": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/fetch-h2/-/fetch-h2-2.5.1.tgz",
+ "integrity": "sha512-U+LQ+fHwF6TMg82A88wjljC5L174eoJfrc+0g4e7JWqL7U0w0QAoOkPDCGkO9KGH9BY55s4n45gLGOtlTAoqmw==",
+ "dev": true,
+ "dependencies": {
+ "@types/tough-cookie": "^4.0.0",
+ "already": "^1.13.1",
+ "callguard": "^2.0.0",
+ "get-stream": "^6.0.0",
+ "through2": "^4.0.2",
+ "to-arraybuffer": "^1.0.1",
+ "tough-cookie": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10.4"
+ }
+ },
+ "node_modules/fetch-h2/node_modules/through2": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+ "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "3"
+ }
+ },
+ "node_modules/figures": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+ "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
+ "dev": true,
+ "dependencies": {
+ "escape-string-regexp": "^1.0.5"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/file-contents": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/file-contents/-/file-contents-0.3.2.tgz",
+ "integrity": "sha512-7xaJjA+9eTve2l1FzoagBX26tICgaTwLPAY9vi/FDutEUKNeBR4YYvvQ8bgxuYJb09edaAQoEGIa6Juim88dpQ==",
+ "dev": true,
+ "dependencies": {
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "file-stat": "^0.2.3",
+ "fs-exists-sync": "^0.1.0",
+ "graceful-fs": "^4.1.4",
+ "is-buffer": "^1.1.3",
+ "isobject": "^2.1.0",
+ "lazy-cache": "^2.0.1",
+ "strip-bom-buffer": "^0.1.1",
+ "strip-bom-string": "^0.1.2",
+ "through2": "^2.0.1",
+ "vinyl": "^1.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/file-entry-cache": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+ "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "flat-cache": "^3.0.4"
+ },
+ "engines": {
+ "node": "^10.12.0 || >=12.0.0"
+ }
+ },
+ "node_modules/file-source": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/file-source/-/file-source-0.6.1.tgz",
+ "integrity": "sha512-1R1KneL7eTXmXfKxC10V/9NeGOdbsAXJ+lQ//fvvcHUgtaZcZDWNJNblxAoVOyV1cj45pOtUrR3vZTBwqcW8XA==",
+ "dev": true,
+ "dependencies": {
+ "stream-source": "0.3"
+ }
+ },
+ "node_modules/file-stat": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/file-stat/-/file-stat-0.2.3.tgz",
+ "integrity": "sha512-wjHoKZzas90Jl1XOBfLnNGc5gl9JTm7sTceuoO4P3OdadlCz1ELrOxYmiamqLJP4S8+phD7wzW8S1oBj+8vnBQ==",
+ "dev": true,
+ "dependencies": {
+ "fs-exists-sync": "^0.1.0",
+ "graceful-fs": "^4.1.4",
+ "lazy-cache": "^2.0.1",
+ "through2": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/file-type": {
+ "version": "16.5.4",
+ "resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
+ "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
+ "dev": true,
+ "dependencies": {
+ "readable-web-to-node-stream": "^3.0.0",
+ "strtok3": "^6.2.4",
+ "token-types": "^4.1.1"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/file-type?sponsor=1"
+ }
+ },
+ "node_modules/file-uri-to-path": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
+ },
+ "node_modules/filelist": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+ "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+ "dev": true,
+ "dependencies": {
+ "minimatch": "^5.0.1"
+ }
+ },
+ "node_modules/filelist/node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "dependencies": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "node_modules/filelist/node_modules/minimatch": {
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+ "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+ "dev": true,
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/fill-range": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+ "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+ "dev": true,
+ "dependencies": {
+ "to-regex-range": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/finalhandler": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+ "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "debug": "2.6.9",
+ "encodeurl": "~2.0.0",
+ "escape-html": "~1.0.3",
+ "on-finished": "2.4.1",
+ "parseurl": "~1.3.3",
+ "statuses": "2.0.1",
+ "unpipe": "~1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/finalhandler/node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/finalhandler/node_modules/encodeurl": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+ "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/finalhandler/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "dependencies": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/firebase": {
+ "version": "11.3.1",
+ "resolved": "https://registry.npmjs.org/firebase/-/firebase-11.3.1.tgz",
+ "integrity": "sha512-P4YVFM0Bm2d8aO61SCEMF8E1pYgieGLrmr/LFw7vs6sAMebwuwHt+Wug+1qL2fhAHWPwpWbCLsdJH8NQ+4Sw8Q==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/analytics": "0.10.11",
+ "@firebase/analytics-compat": "0.2.17",
+ "@firebase/app": "0.11.1",
+ "@firebase/app-check": "0.8.11",
+ "@firebase/app-check-compat": "0.3.18",
+ "@firebase/app-compat": "0.2.50",
+ "@firebase/app-types": "0.9.3",
+ "@firebase/auth": "1.9.0",
+ "@firebase/auth-compat": "0.5.18",
+ "@firebase/data-connect": "0.3.0",
+ "@firebase/database": "1.0.12",
+ "@firebase/database-compat": "2.0.3",
+ "@firebase/firestore": "4.7.8",
+ "@firebase/firestore-compat": "0.3.43",
+ "@firebase/functions": "0.12.2",
+ "@firebase/functions-compat": "0.3.19",
+ "@firebase/installations": "0.6.12",
+ "@firebase/installations-compat": "0.2.12",
+ "@firebase/messaging": "0.12.16",
+ "@firebase/messaging-compat": "0.2.16",
+ "@firebase/performance": "0.7.0",
+ "@firebase/performance-compat": "0.2.13",
+ "@firebase/remote-config": "0.5.0",
+ "@firebase/remote-config-compat": "0.2.12",
+ "@firebase/storage": "0.13.6",
+ "@firebase/storage-compat": "0.3.16",
+ "@firebase/util": "1.10.3",
+ "@firebase/vertexai": "1.0.4"
+ }
+ },
+ "node_modules/firebase-admin": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-12.0.0.tgz",
+ "integrity": "sha512-wBrrSSsKV++/+O8E7O/C7/wL0nbG/x4Xv4yatz/+sohaZ+LsnWtYUcrd3gZutO86hLpDex7xgyrkKbgulmtVyQ==",
+ "dev": true,
+ "dependencies": {
+ "@fastify/busboy": "^1.2.1",
+ "@firebase/database-compat": "^1.0.2",
+ "@firebase/database-types": "^1.0.0",
+ "@types/node": "^20.10.3",
+ "jsonwebtoken": "^9.0.0",
+ "jwks-rsa": "^3.0.1",
+ "node-forge": "^1.3.1",
+ "uuid": "^9.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "optionalDependencies": {
+ "@google-cloud/firestore": "^7.1.0",
+ "@google-cloud/storage": "^7.7.0"
+ }
+ },
+ "node_modules/firebase-admin/node_modules/@types/node": {
+ "version": "20.12.7",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz",
+ "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==",
+ "dev": true,
+ "dependencies": {
+ "undici-types": "~5.26.4"
+ }
+ },
+ "node_modules/firebase-admin/node_modules/uuid": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+ "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+ "dev": true,
+ "funding": [
+ "https://github.com/sponsors/broofa",
+ "https://github.com/sponsors/ctavan"
+ ],
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/firebase/node_modules/@firebase/auth": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.9.0.tgz",
+ "integrity": "sha512-Xz2mbEYauF689qXG/4HppS2+/yGo9R7B6eNUBh3H2+XpAZTGdx8d8TFsW/BMTAK9Q95NB0pb1Bbvfx0lwofq8Q==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ },
+ "peerDependencies": {
+ "@firebase/app": "0.x",
+ "@react-native-async-storage/async-storage": "^1.18.1"
+ },
+ "peerDependenciesMeta": {
+ "@react-native-async-storage/async-storage": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/firebase/node_modules/@firebase/database-compat": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-2.0.3.tgz",
+ "integrity": "sha512-uHGQrSUeJvsDfA+IyHW5O4vdRPsCksEzv4T4Jins+bmQgYy20ZESU4x01xrQCn/nzqKHuQMEW99CoCO7D+5NiQ==",
+ "dev": true,
+ "dependencies": {
+ "@firebase/component": "0.6.12",
+ "@firebase/database": "1.0.12",
+ "@firebase/database-types": "1.0.8",
+ "@firebase/logger": "0.4.4",
+ "@firebase/util": "1.10.3",
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=18.0.0"
+ }
+ },
+ "node_modules/firebase/node_modules/tslib": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true
+ },
+ "node_modules/first-mate": {
+ "version": "7.4.3",
+ "resolved": "https://registry.npmjs.org/first-mate/-/first-mate-7.4.3.tgz",
+ "integrity": "sha512-PtZUpaPmcV5KV4Rw5TfwczEnExN+X1o3Q/G82E4iRJ0tW91fm3Yi7pa5t4cBH8r3D6EyoBKvfpG2jKE+TZ0/nw==",
+ "dev": true,
+ "dependencies": {
+ "emissary": "^1",
+ "event-kit": "^2.2.0",
+ "fs-plus": "^3.0.0",
+ "grim": "^2.0.1",
+ "oniguruma": "^7.2.3",
+ "season": "^6.0.2",
+ "underscore-plus": "^1"
+ }
+ },
+ "node_modules/first-mate-select-grammar": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/first-mate-select-grammar/-/first-mate-select-grammar-1.0.3.tgz",
+ "integrity": "sha512-OTGt//jDdzPAzny8hpxhg6SHpkeFhOAj26egYqusY78twKk9vpyMBqIVtm6TE2Q7ccM0p21gnNFadIUbyDFmJQ==",
+ "dev": true,
+ "dependencies": {
+ "lodash": "^4.17.11"
+ }
+ },
+ "node_modules/flat-cache": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+ "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "flatted": "^3.2.9",
+ "keyv": "^4.5.3",
+ "rimraf": "^3.0.2"
+ },
+ "engines": {
+ "node": "^10.12.0 || >=12.0.0"
+ }
+ },
+ "node_modules/flat-cache/node_modules/json-buffer": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/flat-cache/node_modules/keyv": {
+ "version": "4.5.4",
+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+ "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "json-buffer": "3.0.1"
+ }
+ },
+ "node_modules/flatted": {
+ "version": "3.2.9",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
+ "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/fluent-ffmpeg": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.2.tgz",
+ "integrity": "sha512-IZTB4kq5GK0DPp7sGQ0q/BWurGHffRtQQwVkiqDgeO6wYJLLV5ZhgNOQ65loZxxuPMKZKZcICCUnaGtlxBiR0Q==",
+ "dev": true,
+ "dependencies": {
+ "async": ">=0.2.9",
+ "which": "^1.1.1"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/follow-redirects": {
+ "version": "1.15.6",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+ "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "individual",
+ "url": "https://github.com/sponsors/RubenVerborgh"
+ }
+ ],
+ "engines": {
+ "node": ">=4.0"
+ },
+ "peerDependenciesMeta": {
+ "debug": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/fontkit": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/fontkit/-/fontkit-1.9.0.tgz",
+ "integrity": "sha512-HkW/8Lrk8jl18kzQHvAw9aTHe1cqsyx5sDnxncx652+CIfhawokEPkeM3BoIC+z/Xv7a0yMr0f3pRRwhGH455g==",
+ "dev": true,
+ "dependencies": {
+ "@swc/helpers": "^0.3.13",
+ "brotli": "^1.3.2",
+ "clone": "^2.1.2",
+ "deep-equal": "^2.0.5",
+ "dfa": "^1.2.0",
+ "restructure": "^2.0.1",
+ "tiny-inflate": "^1.0.3",
+ "unicode-properties": "^1.3.1",
+ "unicode-trie": "^2.0.0"
+ }
+ },
+ "node_modules/fontkit/node_modules/deep-equal": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
+ "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
+ "dev": true,
+ "dependencies": {
+ "array-buffer-byte-length": "^1.0.0",
+ "call-bind": "^1.0.5",
+ "es-get-iterator": "^1.1.3",
+ "get-intrinsic": "^1.2.2",
+ "is-arguments": "^1.1.1",
+ "is-array-buffer": "^3.0.2",
+ "is-date-object": "^1.0.5",
+ "is-regex": "^1.1.4",
+ "is-shared-array-buffer": "^1.0.2",
+ "isarray": "^2.0.5",
+ "object-is": "^1.1.5",
+ "object-keys": "^1.1.1",
+ "object.assign": "^4.1.4",
+ "regexp.prototype.flags": "^1.5.1",
+ "side-channel": "^1.0.4",
+ "which-boxed-primitive": "^1.0.2",
+ "which-collection": "^1.0.1",
+ "which-typed-array": "^1.1.13"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/for-each": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+ "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+ "dev": true,
+ "dependencies": {
+ "is-callable": "^1.1.3"
+ }
+ },
+ "node_modules/for-in": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+ "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/foreground-child": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+ "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+ "dependencies": {
+ "cross-spawn": "^7.0.0",
+ "signal-exit": "^4.0.1"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/foreground-child/node_modules/signal-exit": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/forever-agent": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/form-data": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+ "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+ "dev": true,
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/formidable": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz",
+ "integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==",
+ "dev": true,
+ "dependencies": {
+ "dezalgo": "^1.0.4",
+ "hexoid": "^1.0.0",
+ "once": "^1.4.0",
+ "qs": "^6.11.0"
+ },
+ "funding": {
+ "url": "https://ko-fi.com/tunnckoCore/commissions"
+ }
+ },
+ "node_modules/forwarded": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+ "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/fragment-cache": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+ "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+ "dev": true,
+ "dependencies": {
+ "map-cache": "^0.2.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/fresh": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+ "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/from2": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+ "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.0"
+ }
+ },
+ "node_modules/from2-string": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/from2-string/-/from2-string-1.1.0.tgz",
+ "integrity": "sha512-m8vCh+KnXXXBtfF2VUbiYlQ+nczLcntB0BrtNgpmLkHylhObe9WF1b2LZjBBzrZzA6P4mkEla6ZYQoOUTG8cYA==",
+ "dev": true,
+ "dependencies": {
+ "from2": "^2.0.3"
+ }
+ },
+ "node_modules/from2/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/from2/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/from2/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/from2/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/fs-capacitor": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.4.tgz",
+ "integrity": "sha512-8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.5"
+ }
+ },
+ "node_modules/fs-exists-sync": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
+ "integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/fs-extra": {
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+ "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+ "dev": true,
+ "dependencies": {
+ "graceful-fs": "^4.2.0",
+ "jsonfile": "^6.0.1",
+ "universalify": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/fs-minipass": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+ "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+ "dev": true,
+ "dependencies": {
+ "minipass": "^3.0.0"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/fs-minipass/node_modules/minipass": {
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+ "dev": true,
+ "dependencies": {
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/fs-plus": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/fs-plus/-/fs-plus-3.1.1.tgz",
+ "integrity": "sha512-Se2PJdOWXqos1qVTkvqqjb0CSnfBnwwD+pq+z4ksT+e97mEShod/hrNg0TRCCsXPbJzcIq+NuzQhigunMWMJUA==",
+ "dev": true,
+ "dependencies": {
+ "async": "^1.5.2",
+ "mkdirp": "^0.5.1",
+ "rimraf": "^2.5.2",
+ "underscore-plus": "1.x"
+ }
+ },
+ "node_modules/fs-plus/node_modules/async": {
+ "version": "1.5.2",
+ "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+ "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==",
+ "dev": true
+ },
+ "node_modules/fs-plus/node_modules/rimraf": {
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+ "dev": true,
+ "dependencies": {
+ "glob": "^7.1.3"
+ },
+ "bin": {
+ "rimraf": "bin.js"
+ }
+ },
+ "node_modules/fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+ },
+ "node_modules/fsevents": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+ }
+ },
+ "node_modules/function-bind": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/function.prototype.name": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+ "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1",
+ "functions-have-names": "^1.2.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/functional-red-black-tree": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+ "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+ "dev": true
+ },
+ "node_modules/functions-have-names": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/gauge": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+ "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+ "deprecated": "This package is no longer supported.",
+ "dev": true,
+ "dependencies": {
+ "aproba": "^1.0.3 || ^2.0.0",
+ "color-support": "^1.1.2",
+ "console-control-strings": "^1.0.0",
+ "has-unicode": "^2.0.1",
+ "object-assign": "^4.1.1",
+ "signal-exit": "^3.0.0",
+ "string-width": "^4.2.3",
+ "strip-ansi": "^6.0.1",
+ "wide-align": "^1.1.2"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/gauge/node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/gauge/node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/gaxios": {
+ "version": "6.4.0",
+ "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.4.0.tgz",
+ "integrity": "sha512-apAloYrY4dlBGlhauDAYSZveafb5U6+L9titing1wox6BvWM0TSXBp603zTrLpyLMGkrcFgohnUN150dFN/zOA==",
+ "dev": true,
+ "dependencies": {
+ "extend": "^3.0.2",
+ "https-proxy-agent": "^7.0.1",
+ "is-stream": "^2.0.0",
+ "node-fetch": "^2.6.9",
+ "uuid": "^9.0.1"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/gaxios/node_modules/agent-base": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+ "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.4"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/gaxios/node_modules/https-proxy-agent": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+ "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+ "dev": true,
+ "dependencies": {
+ "agent-base": "^7.0.2",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/gaxios/node_modules/uuid": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+ "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+ "dev": true,
+ "funding": [
+ "https://github.com/sponsors/broofa",
+ "https://github.com/sponsors/ctavan"
+ ],
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/gcp-metadata": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-3.5.0.tgz",
+ "integrity": "sha512-ZQf+DLZ5aKcRpLzYUyBS3yo3N0JSa82lNDO8rj3nMSlovLcz2riKFBsYgDzeXcv75oo5eqB2lx+B14UvPoCRnA==",
+ "dev": true,
+ "dependencies": {
+ "gaxios": "^2.1.0",
+ "json-bigint": "^0.3.0"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/gcp-metadata/node_modules/gaxios": {
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-2.3.4.tgz",
+ "integrity": "sha512-US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA==",
+ "dev": true,
+ "dependencies": {
+ "abort-controller": "^3.0.0",
+ "extend": "^3.0.2",
+ "https-proxy-agent": "^5.0.0",
+ "is-stream": "^2.0.0",
+ "node-fetch": "^2.3.0"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/gensync": {
+ "version": "1.0.0-beta.2",
+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/geo-tz": {
+ "version": "7.0.7",
+ "resolved": "https://registry.npmjs.org/geo-tz/-/geo-tz-7.0.7.tgz",
+ "integrity": "sha512-Aq0sRSO1y4w62D5muRqzDmN4SWfFYnt703BLiqiHAvunlwsJs4qd3Fkl1pKSUa0bwuBmPFxIA8M1E+ilg2PSjw==",
+ "dev": true,
+ "dependencies": {
+ "@turf/boolean-point-in-polygon": "^6.5.0",
+ "@turf/helpers": "^6.5.0",
+ "geobuf": "^3.0.2",
+ "pbf": "^3.2.1"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/geobuf": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/geobuf/-/geobuf-3.0.2.tgz",
+ "integrity": "sha512-ASgKwEAQQRnyNFHNvpd5uAwstbVYmiTW0Caw3fBb509tNTqXyAAPMyFs5NNihsLZhLxU1j/kjFhkhLWA9djuVg==",
+ "dev": true,
+ "dependencies": {
+ "concat-stream": "^2.0.0",
+ "pbf": "^3.2.1",
+ "shapefile": "~0.6.6"
+ },
+ "bin": {
+ "geobuf2json": "bin/geobuf2json",
+ "json2geobuf": "bin/json2geobuf",
+ "shp2geobuf": "bin/shp2geobuf"
+ }
+ },
+ "node_modules/geobuf/node_modules/concat-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+ "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+ "dev": true,
+ "engines": [
+ "node >= 6.0"
+ ],
+ "dependencies": {
+ "buffer-from": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^3.0.2",
+ "typedarray": "^0.0.6"
+ }
+ },
+ "node_modules/geoip-lite": {
+ "version": "1.4.10",
+ "resolved": "https://registry.npmjs.org/geoip-lite/-/geoip-lite-1.4.10.tgz",
+ "integrity": "sha512-4N69uhpS3KFd97m00wiFEefwa+L+HT5xZbzPhwu+sDawStg6UN/dPwWtUfkQuZkGIY1Cj7wDVp80IsqNtGMi2w==",
+ "dev": true,
+ "dependencies": {
+ "async": "2.1 - 2.6.4",
+ "chalk": "4.1 - 4.1.2",
+ "iconv-lite": "0.4.13 - 0.6.3",
+ "ip-address": "5.8.9 - 5.9.4",
+ "lazy": "1.0.11",
+ "rimraf": "2.5.2 - 2.7.1",
+ "yauzl": "2.9.2 - 2.10.0"
+ },
+ "engines": {
+ "node": ">=10.3.0"
+ }
+ },
+ "node_modules/geoip-lite/node_modules/async": {
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+ "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+ "dev": true,
+ "dependencies": {
+ "lodash": "^4.17.14"
+ }
+ },
+ "node_modules/geoip-lite/node_modules/rimraf": {
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+ "deprecated": "Rimraf versions prior to v4 are no longer supported",
+ "dev": true,
+ "dependencies": {
+ "glob": "^7.1.3"
+ },
+ "bin": {
+ "rimraf": "bin.js"
+ }
+ },
+ "node_modules/get-assigned-identifiers": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
+ "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==",
+ "dev": true
+ },
+ "node_modules/get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "dev": true,
+ "engines": {
+ "node": "6.* || 8.* || >= 10.*"
+ }
+ },
+ "node_modules/get-intrinsic": {
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz",
+ "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "call-bind-apply-helpers": "^1.0.1",
+ "es-define-property": "^1.0.1",
+ "es-errors": "^1.3.0",
+ "es-object-atoms": "^1.0.0",
+ "function-bind": "^1.1.2",
+ "get-proto": "^1.0.0",
+ "gopd": "^1.2.0",
+ "has-symbols": "^1.1.0",
+ "hasown": "^2.0.2",
+ "math-intrinsics": "^1.1.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/get-package-type": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+ "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.0.0"
+ }
+ },
+ "node_modules/get-port": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
+ "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/get-proto": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+ "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "dunder-proto": "^1.0.1",
+ "es-object-atoms": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/get-stdin": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+ "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/get-stream": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/get-symbol-description": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
+ "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.5",
+ "es-errors": "^1.3.0",
+ "get-intrinsic": "^1.2.4"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/get-tsconfig": {
+ "version": "4.7.2",
+ "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
+ "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
+ "dev": true,
+ "dependencies": {
+ "resolve-pkg-maps": "^1.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+ }
+ },
+ "node_modules/get-value": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+ "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/getpass": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+ "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+ "dev": true,
+ "dependencies": {
+ "assert-plus": "^1.0.0"
+ }
+ },
+ "node_modules/gifwrap": {
+ "version": "0.10.1",
+ "resolved": "https://registry.npmjs.org/gifwrap/-/gifwrap-0.10.1.tgz",
+ "integrity": "sha512-2760b1vpJHNmLzZ/ubTtNnEx5WApN/PYWJvXvgS+tL1egTTthayFYIQQNi136FLEDcN/IyEY2EcGpIITD6eYUw==",
+ "dev": true,
+ "dependencies": {
+ "image-q": "^4.0.0",
+ "omggif": "^1.0.10"
+ }
+ },
+ "node_modules/git-hooks-list": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/git-hooks-list/-/git-hooks-list-3.1.0.tgz",
+ "integrity": "sha512-LF8VeHeR7v+wAbXqfgRlTSX/1BJR9Q1vEMR8JAz1cEg6GX07+zyj3sAdDvYjj/xnlIfVuGgj4qBei1K3hKH+PA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/fisker/git-hooks-list?sponsor=1"
+ }
+ },
+ "node_modules/glob": {
+ "version": "7.2.3",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+ "dependencies": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.1.1",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ },
+ "engines": {
+ "node": "*"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/glob-parent": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+ "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
+ "dev": true,
+ "dependencies": {
+ "is-glob": "^2.0.0"
+ }
+ },
+ "node_modules/glob-stream": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+ "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
+ "dev": true,
+ "dependencies": {
+ "extend": "^3.0.0",
+ "glob": "^7.1.1",
+ "glob-parent": "^3.1.0",
+ "is-negated-glob": "^1.0.0",
+ "ordered-read-streams": "^1.0.0",
+ "pumpify": "^1.3.5",
+ "readable-stream": "^2.1.5",
+ "remove-trailing-separator": "^1.0.1",
+ "to-absolute-glob": "^2.0.0",
+ "unique-stream": "^2.0.2"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/glob-stream/node_modules/glob-parent": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+ "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+ "dev": true,
+ "dependencies": {
+ "is-glob": "^3.1.0",
+ "path-dirname": "^1.0.0"
+ }
+ },
+ "node_modules/glob-stream/node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/glob-stream/node_modules/is-glob": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+ "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/glob-stream/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/glob-stream/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/glob-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/glob-stream/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/global": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+ "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+ "dev": true,
+ "dependencies": {
+ "min-document": "^2.19.0",
+ "process": "^0.11.10"
+ }
+ },
+ "node_modules/global-dirs": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+ "integrity": "sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==",
+ "dev": true,
+ "dependencies": {
+ "ini": "^1.3.4"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/global-modules": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
+ "integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==",
+ "dev": true,
+ "dependencies": {
+ "global-prefix": "^0.1.4",
+ "is-windows": "^0.2.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/global-prefix": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
+ "integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==",
+ "dev": true,
+ "dependencies": {
+ "homedir-polyfill": "^1.0.0",
+ "ini": "^1.3.4",
+ "is-windows": "^0.2.0",
+ "which": "^1.2.12"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/globalize": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/globalize/-/globalize-1.7.0.tgz",
+ "integrity": "sha512-faR46vTIbFCeAemyuc9E6/d7Wrx9k2ae2L60UhakztFg6VuE42gENVJNuPFtt7Sdjrk9m2w8+py7Jj+JTNy59w==",
+ "dev": true,
+ "dependencies": {
+ "cldrjs": "^0.5.4"
+ }
+ },
+ "node_modules/globals": {
+ "version": "11.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/globalthis": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+ "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+ "dev": true,
+ "dependencies": {
+ "define-properties": "^1.1.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/globby": {
+ "version": "11.1.0",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+ "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+ "dev": true,
+ "dependencies": {
+ "array-union": "^2.1.0",
+ "dir-glob": "^3.0.1",
+ "fast-glob": "^3.2.9",
+ "ignore": "^5.2.0",
+ "merge2": "^1.4.1",
+ "slash": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/google-auth-library": {
+ "version": "5.10.1",
+ "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-5.10.1.tgz",
+ "integrity": "sha512-rOlaok5vlpV9rSiUu5EpR0vVpc+PhN62oF4RyX/6++DG1VsaulAFEMlDYBLjJDDPI6OcNOCGAKy9UVB/3NIDXg==",
+ "dev": true,
+ "dependencies": {
+ "arrify": "^2.0.0",
+ "base64-js": "^1.3.0",
+ "ecdsa-sig-formatter": "^1.0.11",
+ "fast-text-encoding": "^1.0.0",
+ "gaxios": "^2.1.0",
+ "gcp-metadata": "^3.4.0",
+ "gtoken": "^4.1.0",
+ "jws": "^4.0.0",
+ "lru-cache": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/google-auth-library/node_modules/gaxios": {
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-2.3.4.tgz",
+ "integrity": "sha512-US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA==",
+ "dev": true,
+ "dependencies": {
+ "abort-controller": "^3.0.0",
+ "extend": "^3.0.2",
+ "https-proxy-agent": "^5.0.0",
+ "is-stream": "^2.0.0",
+ "node-fetch": "^2.3.0"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/google-auth-library/node_modules/lru-cache": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+ "dev": true,
+ "dependencies": {
+ "yallist": "^3.0.2"
+ }
+ },
+ "node_modules/google-auth-library/node_modules/yallist": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+ "dev": true
+ },
+ "node_modules/google-gax": {
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-4.3.2.tgz",
+ "integrity": "sha512-2mw7qgei2LPdtGrmd1zvxQviOcduTnsvAWYzCxhOWXK4IQKmQztHnDQwD0ApB690fBQJemFKSU7DnceAy3RLzw==",
+ "dev": true,
+ "dependencies": {
+ "@grpc/grpc-js": "~1.10.0",
+ "@grpc/proto-loader": "^0.7.0",
+ "@types/long": "^4.0.0",
+ "abort-controller": "^3.0.0",
+ "duplexify": "^4.0.0",
+ "google-auth-library": "^9.3.0",
+ "node-fetch": "^2.6.1",
+ "object-hash": "^3.0.0",
+ "proto3-json-serializer": "^2.0.0",
+ "protobufjs": "7.2.6",
+ "retry-request": "^7.0.0",
+ "uuid": "^9.0.1"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/google-gax/node_modules/@tootallnate/once": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+ "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+ "dev": true,
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/google-gax/node_modules/gcp-metadata": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.0.tgz",
+ "integrity": "sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==",
+ "dev": true,
+ "dependencies": {
+ "gaxios": "^6.0.0",
+ "json-bigint": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/google-gax/node_modules/google-auth-library": {
+ "version": "9.7.0",
+ "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.7.0.tgz",
+ "integrity": "sha512-I/AvzBiUXDzLOy4iIZ2W+Zq33W4lcukQv1nl7C8WUA6SQwyQwUwu3waNmWNAvzds//FG8SZ+DnKnW/2k6mQS8A==",
+ "dev": true,
+ "dependencies": {
+ "base64-js": "^1.3.0",
+ "ecdsa-sig-formatter": "^1.0.11",
+ "gaxios": "^6.1.1",
+ "gcp-metadata": "^6.1.0",
+ "gtoken": "^7.0.0",
+ "jws": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/google-gax/node_modules/gtoken": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
+ "integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+ "dev": true,
+ "dependencies": {
+ "gaxios": "^6.0.0",
+ "jws": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/google-gax/node_modules/http-proxy-agent": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+ "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+ "dev": true,
+ "dependencies": {
+ "@tootallnate/once": "2",
+ "agent-base": "6",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/google-gax/node_modules/json-bigint": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+ "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+ "dev": true,
+ "dependencies": {
+ "bignumber.js": "^9.0.0"
+ }
+ },
+ "node_modules/google-gax/node_modules/retry-request": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz",
+ "integrity": "sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==",
+ "dev": true,
+ "dependencies": {
+ "@types/request": "^2.48.8",
+ "extend": "^3.0.2",
+ "teeny-request": "^9.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/google-gax/node_modules/teeny-request": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz",
+ "integrity": "sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==",
+ "dev": true,
+ "dependencies": {
+ "http-proxy-agent": "^5.0.0",
+ "https-proxy-agent": "^5.0.0",
+ "node-fetch": "^2.6.9",
+ "stream-events": "^1.0.5",
+ "uuid": "^9.0.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/google-gax/node_modules/uuid": {
+ "version": "9.0.1",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+ "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+ "dev": true,
+ "funding": [
+ "https://github.com/sponsors/broofa",
+ "https://github.com/sponsors/ctavan"
+ ],
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/google-p12-pem": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.5.tgz",
+ "integrity": "sha512-7RLkxwSsMsYh9wQ5Vb2zRtkAHvqPvfoMGag+nugl1noYO7gf0844Yr9TIFA5NEBMAeVt2Z+Imu7CQMp3oNatzQ==",
+ "dev": true,
+ "dependencies": {
+ "node-forge": "^0.10.0"
+ },
+ "bin": {
+ "gp12-pem": "build/src/bin/gp12-pem.js"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/google-p12-pem/node_modules/node-forge": {
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
+ "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 6.0.0"
+ }
+ },
+ "node_modules/gopd": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+ "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/got": {
+ "version": "8.3.2",
+ "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
+ "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
+ "dev": true,
+ "dependencies": {
+ "@sindresorhus/is": "^0.7.0",
+ "cacheable-request": "^2.1.1",
+ "decompress-response": "^3.3.0",
+ "duplexer3": "^0.1.4",
+ "get-stream": "^3.0.0",
+ "into-stream": "^3.1.0",
+ "is-retry-allowed": "^1.1.0",
+ "isurl": "^1.0.0-alpha5",
+ "lowercase-keys": "^1.0.0",
+ "mimic-response": "^1.0.0",
+ "p-cancelable": "^0.4.0",
+ "p-timeout": "^2.0.1",
+ "pify": "^3.0.0",
+ "safe-buffer": "^5.1.1",
+ "timed-out": "^4.0.1",
+ "url-parse-lax": "^3.0.0",
+ "url-to-options": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/got/node_modules/get-stream": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+ "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/got/node_modules/is-retry-allowed": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+ "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/got/node_modules/p-timeout": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
+ "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
+ "dev": true,
+ "dependencies": {
+ "p-finally": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/graceful-fs": {
+ "version": "4.2.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+ },
+ "node_modules/graphemer": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+ "dev": true
+ },
+ "node_modules/graphql": {
+ "version": "14.7.0",
+ "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.7.0.tgz",
+ "integrity": "sha512-l0xWZpoPKpppFzMfvVyFmp9vLN7w/ZZJPefUicMCepfJeQ8sMcztloGYY9DfjVPo6tIUDzU5Hw3MUbIjj9AVVA==",
+ "dev": true,
+ "dependencies": {
+ "iterall": "^1.2.2"
+ },
+ "engines": {
+ "node": ">= 6.x"
+ }
+ },
+ "node_modules/graphql-extensions": {
+ "version": "0.16.0",
+ "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.16.0.tgz",
+ "integrity": "sha512-rZQc/USoEIw437BGRUwoHoLPR1LA791Ltj6axONqgKIyyx2sqIO3YT9kTbB/eIUdJBrCozp4KuUeZ09xKeQDxg==",
+ "deprecated": "The `graphql-extensions` API has been removed from Apollo Server 3. Use the plugin API instead: https://www.apollographql.com/docs/apollo-server/integrations/plugins/",
+ "dev": true,
+ "dependencies": {
+ "@apollographql/apollo-tools": "^0.5.0",
+ "apollo-server-env": "^3.2.0",
+ "apollo-server-types": "^0.10.0"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependencies": {
+ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/graphql-subscriptions": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz",
+ "integrity": "sha512-95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g==",
+ "dev": true,
+ "dependencies": {
+ "iterall": "^1.3.0"
+ },
+ "peerDependencies": {
+ "graphql": "^0.10.5 || ^0.11.3 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/graphql-tag": {
+ "version": "2.12.6",
+ "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz",
+ "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "peerDependencies": {
+ "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
+ }
+ },
+ "node_modules/graphql-tag/node_modules/tslib": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+ "dev": true
+ },
+ "node_modules/graphql-tools": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.8.tgz",
+ "integrity": "sha512-MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg==",
+ "deprecated": "This package has been deprecated and now it only exports makeExecutableSchema.\nAnd it will no longer receive updates.\nWe recommend you to migrate to scoped packages such as @graphql-tools/schema, @graphql-tools/utils and etc.\nCheck out https://www.graphql-tools.com to learn what package you should use instead",
+ "dev": true,
+ "dependencies": {
+ "apollo-link": "^1.2.14",
+ "apollo-utilities": "^1.0.1",
+ "deprecated-decorator": "^0.1.6",
+ "iterall": "^1.1.3",
+ "uuid": "^3.1.0"
+ },
+ "peerDependencies": {
+ "graphql": "^0.13.0 || ^14.0.0 || ^15.0.0"
+ }
+ },
+ "node_modules/grim": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.3.tgz",
+ "integrity": "sha512-FM20Ump11qYLK9k9DbL8yzVpy+YBieya1JG15OeH8s+KbHq8kL4SdwRtURwIUHniSxb24EoBUpwKfFjGNVi4/Q==",
+ "dev": true,
+ "dependencies": {
+ "event-kit": "^2.0.0"
+ }
+ },
+ "node_modules/gtoken": {
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.1.4.tgz",
+ "integrity": "sha512-VxirzD0SWoFUo5p8RDP8Jt2AGyOmyYcT/pOUgDKJCK+iSw0TMqwrVfY37RXTNmoKwrzmDHSk0GMT9FsgVmnVSA==",
+ "dev": true,
+ "dependencies": {
+ "gaxios": "^2.1.0",
+ "google-p12-pem": "^2.0.0",
+ "jws": "^4.0.0",
+ "mime": "^2.2.0"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/gtoken/node_modules/gaxios": {
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-2.3.4.tgz",
+ "integrity": "sha512-US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA==",
+ "dev": true,
+ "dependencies": {
+ "abort-controller": "^3.0.0",
+ "extend": "^3.0.2",
+ "https-proxy-agent": "^5.0.0",
+ "is-stream": "^2.0.0",
+ "node-fetch": "^2.3.0"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/gtoken/node_modules/mime": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+ "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+ "dev": true,
+ "bin": {
+ "mime": "cli.js"
+ },
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/har-schema": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+ "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/har-validator": {
+ "version": "5.1.5",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+ "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+ "deprecated": "this library is no longer supported",
+ "dev": true,
+ "dependencies": {
+ "ajv": "^6.12.3",
+ "har-schema": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/has": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
+ "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/has-bigints": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+ "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-binary2": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+ "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+ "dev": true,
+ "dependencies": {
+ "isarray": "2.0.1"
+ }
+ },
+ "node_modules/has-binary2/node_modules/isarray": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+ "integrity": "sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ==",
+ "dev": true
+ },
+ "node_modules/has-cors": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+ "integrity": "sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==",
+ "dev": true
+ },
+ "node_modules/has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/has-glob": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/has-glob/-/has-glob-0.1.1.tgz",
+ "integrity": "sha512-WMHzb7oCwDcMDngWy0b+viLjED8zvSi5d4/YdBetADHX/rLH+noJaRTytuyN6thTxxM7lK+FloogQHHdOOR+7g==",
+ "dev": true,
+ "dependencies": {
+ "is-glob": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/has-property-descriptors": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+ "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+ "dev": true,
+ "dependencies": {
+ "es-define-property": "^1.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-proto": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+ "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-symbol-support-x": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+ "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/has-symbols": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+ "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-to-string-tag-x": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+ "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+ "dev": true,
+ "dependencies": {
+ "has-symbol-support-x": "^1.4.1"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/has-tostringtag": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+ "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+ "dev": true,
+ "dependencies": {
+ "has-symbols": "^1.0.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-unicode": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+ "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+ "dev": true
+ },
+ "node_modules/has-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+ "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+ "dev": true,
+ "dependencies": {
+ "get-value": "^2.0.6",
+ "has-values": "^1.0.0",
+ "isobject": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/has-value/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/has-values": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+ "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+ "dev": true,
+ "dependencies": {
+ "is-number": "^3.0.0",
+ "kind-of": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/has-values/node_modules/is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/has-values/node_modules/kind-of": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+ "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/hash-base": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.4",
+ "readable-stream": "^3.6.0",
+ "safe-buffer": "^5.2.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/hash-sum": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+ "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+ "dev": true
+ },
+ "node_modules/hash.js": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.3",
+ "minimalistic-assert": "^1.0.1"
+ }
+ },
+ "node_modules/hasha": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
+ "integrity": "sha512-jZ38TU/EBiGKrmyTNNZgnvCZHNowiRI4+w/I9noMlekHTZH3KyGgvJLmhSgykeAQ9j2SYPDosM0Bg3wHfzibAQ==",
+ "dev": true,
+ "dependencies": {
+ "is-stream": "^1.0.1",
+ "pinkie-promise": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/hasha/node_modules/is-stream": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+ "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/hashring": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz",
+ "integrity": "sha512-xCMovURClsQZ+TR30icCZj+34Fq1hs0y6YCASD6ZqdRfYRybb5Iadws2WS+w09mGM/kf9xyA5FCdJQGcgcraSA==",
+ "dev": true,
+ "dependencies": {
+ "connection-parse": "0.0.x",
+ "simple-lru-cache": "0.0.x"
+ }
+ },
+ "node_modules/hasown": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "function-bind": "^1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/hdr-histogram-js": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz",
+ "integrity": "sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==",
+ "dev": true,
+ "dependencies": {
+ "@assemblyscript/loader": "^0.10.1",
+ "base64-js": "^1.2.0",
+ "pako": "^1.0.3"
+ }
+ },
+ "node_modules/hdr-histogram-percentiles-obj": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz",
+ "integrity": "sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==",
+ "dev": true
+ },
+ "node_modules/he": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+ "dev": true,
+ "bin": {
+ "he": "bin/he"
+ }
+ },
+ "node_modules/help-me": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz",
+ "integrity": "sha512-P/IZ8yOMne3SCTHbVY429NZ67B/2bVQlcYGZh2iPPbdLrEQ/qY5aGChn0YTDmt7Sb4IKRI51fypItav+lNl76w==",
+ "dev": true,
+ "dependencies": {
+ "callback-stream": "^1.0.2",
+ "glob-stream": "^6.1.0",
+ "through2": "^2.0.1",
+ "xtend": "^4.0.0"
+ }
+ },
+ "node_modules/hexoid": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
+ "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/highlights": {
+ "version": "3.1.6",
+ "resolved": "https://registry.npmjs.org/highlights/-/highlights-3.1.6.tgz",
+ "integrity": "sha512-WvFo8DzI+DnFWPckWjdK5Sne4ucAaNI4guikzAE5k0qhJE7JX2Px7OOolwVJJQmi7YkJDbubWVAxT3SjMUJWcw==",
+ "dev": true,
+ "dependencies": {
+ "first-mate": "^7.0.2",
+ "first-mate-select-grammar": "^1.0.3",
+ "fs-plus": "^3.0.0",
+ "once": "^1.3.2",
+ "season": "^6.0.2",
+ "underscore-plus": "^1.5.1",
+ "yargs": "^17.0.1"
+ },
+ "bin": {
+ "highlights": "bin/highlights"
+ }
+ },
+ "node_modules/highlights/node_modules/cliui": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.1",
+ "wrap-ansi": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/highlights/node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/highlights/node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/highlights/node_modules/wrap-ansi": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
+ "node_modules/highlights/node_modules/y18n": {
+ "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/highlights/node_modules/yargs": {
+ "version": "17.7.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+ "dev": true,
+ "dependencies": {
+ "cliui": "^8.0.1",
+ "escalade": "^3.1.1",
+ "get-caller-file": "^2.0.5",
+ "require-directory": "^2.1.1",
+ "string-width": "^4.2.3",
+ "y18n": "^5.0.5",
+ "yargs-parser": "^21.1.1"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/highlights/node_modules/yargs-parser": {
+ "version": "21.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/hmac-drbg": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+ "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+ "dev": true,
+ "dependencies": {
+ "hash.js": "^1.0.3",
+ "minimalistic-assert": "^1.0.0",
+ "minimalistic-crypto-utils": "^1.0.1"
+ }
+ },
+ "node_modules/homedir-polyfill": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+ "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+ "dev": true,
+ "dependencies": {
+ "parse-passwd": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/hosted-git-info": {
+ "version": "2.8.9",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+ "dev": true
+ },
+ "node_modules/hot-shots": {
+ "version": "6.8.7",
+ "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-6.8.7.tgz",
+ "integrity": "sha512-XH8iezBSZgVw2jegu96pUfF1Zv0VZ/iXjb7L5yE3F7mn7/bdhf4qeniXjO0wQWeefe433rhOsazNKLxM+XMI9w==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.0.0"
+ },
+ "optionalDependencies": {
+ "unix-dgram": "2.0.x"
+ }
+ },
+ "node_modules/html-encoding-sniffer": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+ "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+ "dev": true,
+ "dependencies": {
+ "whatwg-encoding": "^1.0.5"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/html-escaper": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+ "dev": true
+ },
+ "node_modules/html5shiv": {
+ "version": "3.7.3",
+ "resolved": "https://registry.npmjs.org/html5shiv/-/html5shiv-3.7.3.tgz",
+ "integrity": "sha512-SZwGvLGNtgp8GbgFX7oXEp8OR1aBt5LliX6dG0kdD1kl3KhMonN0QcSa/A3TsTgFewaGCbIryQunjayWDXzxmw==",
+ "dev": true
+ },
+ "node_modules/htmlescape": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
+ "integrity": "sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/http-assert": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.5.0.tgz",
+ "integrity": "sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==",
+ "dev": true,
+ "dependencies": {
+ "deep-equal": "~1.0.1",
+ "http-errors": "~1.8.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/http-cache-semantics": {
+ "version": "3.8.1",
+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+ "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+ "dev": true
+ },
+ "node_modules/http-errors": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+ "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+ "dev": true,
+ "dependencies": {
+ "depd": "~1.1.2",
+ "inherits": "2.0.4",
+ "setprototypeof": "1.2.0",
+ "statuses": ">= 1.5.0 < 2",
+ "toidentifier": "1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/http-errors/node_modules/depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/http-errors/node_modules/statuses": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+ "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/http-link-header": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/http-link-header/-/http-link-header-0.8.0.tgz",
+ "integrity": "sha512-qsh/wKe1Mk1vtYEFr+LpQBFWTO1gxZQBdii2D0Umj+IUQ23r5sT088Rhpq4XzpSyIpaX7vwjB8Rrtx8u9JTg+Q==",
+ "dev": true
+ },
+ "node_modules/http-parser-js": {
+ "version": "0.5.8",
+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+ "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+ "dev": true
+ },
+ "node_modules/http-proxy-agent": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+ "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+ "dev": true,
+ "dependencies": {
+ "@tootallnate/once": "1",
+ "agent-base": "6",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/http-signature": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+ "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
+ "dev": true,
+ "dependencies": {
+ "assert-plus": "^1.0.0",
+ "jsprim": "^1.2.2",
+ "sshpk": "^1.7.0"
+ },
+ "engines": {
+ "node": ">=0.8",
+ "npm": ">=1.3.7"
+ }
+ },
+ "node_modules/http-status": {
+ "version": "1.7.3",
+ "resolved": "https://registry.npmjs.org/http-status/-/http-status-1.7.3.tgz",
+ "integrity": "sha512-GS8tL1qHT2nBCMJDYMHGkkkKQLNkIAHz37vgO68XKvzv+XyqB4oh/DfmMHdtRzfqSJPj1xKG2TaELZtlCz6BEQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/httpntlm": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz",
+ "integrity": "sha512-Tcz3Ct9efvNqw3QdTl3h6IgRRlIQxwKkJELN/aAIGnzi2xvb3pDHdnMs8BrxWLV6OoT4DlVyhzSVhFt/tk0lIw==",
+ "dev": true,
+ "dependencies": {
+ "httpreq": ">=0.4.22",
+ "underscore": "~1.7.0"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/httpntlm/node_modules/underscore": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+ "integrity": "sha512-cp0oQQyZhUM1kpJDLdGO1jPZHgS/MpzoWYfe9+CM2h/QGDZlqwT2T3YGukuBdaNJ/CAPoeyAZRRHz8JFo176vA==",
+ "dev": true
+ },
+ "node_modules/httpreq": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/httpreq/-/httpreq-1.1.1.tgz",
+ "integrity": "sha512-uhSZLPPD2VXXOSN8Cni3kIsoFHaU2pT/nySEU/fHr/ePbqHYr0jeiQRmUKLEirC09SFPsdMoA7LU7UXMd/w0Kw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 6.15.1"
+ }
+ },
+ "node_modules/https-browserify": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+ "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
+ "dev": true
+ },
+ "node_modules/https-proxy-agent": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+ "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+ "dev": true,
+ "dependencies": {
+ "agent-base": "6",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/human-signals": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+ "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+ "dev": true,
+ "engines": {
+ "node": ">=10.17.0"
+ }
+ },
+ "node_modules/iconv-lite": {
+ "version": "0.4.24",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+ "dev": true,
+ "dependencies": {
+ "safer-buffer": ">= 2.1.2 < 3"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/idb": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
+ "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==",
+ "dev": true
+ },
+ "node_modules/ieee754": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+ "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"
+ }
+ ]
+ },
+ "node_modules/ignore": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+ "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/image-q": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/image-q/-/image-q-4.0.0.tgz",
+ "integrity": "sha512-PfJGVgIfKQJuq3s0tTDOKtztksibuUEbJQIYT3by6wctQo+Rdlh7ef4evJ5NCdxY4CfMbvFkocEwbl4BF8RlJw==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "16.9.1"
+ }
+ },
+ "node_modules/image-q/node_modules/@types/node": {
+ "version": "16.9.1",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz",
+ "integrity": "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==",
+ "dev": true
+ },
+ "node_modules/image-ssim": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/image-ssim/-/image-ssim-0.2.0.tgz",
+ "integrity": "sha512-W7+sO6/yhxy83L0G7xR8YAc5Z5QFtYEXXRV6EaE8tuYBZJnA3gVgp3q7X7muhLZVodeb9UfvjSbwt9VJwjIYAg==",
+ "dev": true
+ },
+ "node_modules/immediate": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+ "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==",
+ "dev": true
+ },
+ "node_modules/import-fresh": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+ "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "parent-module": "^1.0.0",
+ "resolve-from": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/import-fresh/node_modules/resolve-from": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/import-lazy": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+ "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/import-local": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+ "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+ "dev": true,
+ "dependencies": {
+ "pkg-dir": "^4.2.0",
+ "resolve-cwd": "^3.0.0"
+ },
+ "bin": {
+ "import-local-fixture": "fixtures/cli.js"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/import-local/node_modules/pkg-dir": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+ "dev": true,
+ "dependencies": {
+ "find-up": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/imurmurhash": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.19"
+ }
+ },
+ "node_modules/indent-string": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/indexof": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+ "integrity": "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==",
+ "dev": true
+ },
+ "node_modules/inflection": {
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.2.7.tgz",
+ "integrity": "sha512-0baJIGEJm8RVuFZ390oImj8Q0i57nZvH/gRKjLbatW2JYEnphm+IGTuHCRw5PN59nAtrrQrT83q0tnebEznz7Q==",
+ "dev": true,
+ "engines": [
+ "node >= 0.4.0"
+ ]
+ },
+ "node_modules/inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+ "dependencies": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "node_modules/inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "node_modules/ini": {
+ "version": "1.3.8",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+ "dev": true
+ },
+ "node_modules/inline-source-map": {
+ "version": "0.6.2",
+ "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
+ "integrity": "sha512-0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA==",
+ "dev": true,
+ "dependencies": {
+ "source-map": "~0.5.3"
+ }
+ },
+ "node_modules/inquirer": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+ "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+ "dev": true,
+ "dependencies": {
+ "ansi-escapes": "^3.0.0",
+ "chalk": "^2.0.0",
+ "cli-cursor": "^2.1.0",
+ "cli-width": "^2.0.0",
+ "external-editor": "^2.0.4",
+ "figures": "^2.0.0",
+ "lodash": "^4.3.0",
+ "mute-stream": "0.0.7",
+ "run-async": "^2.2.0",
+ "rx-lite": "^4.0.8",
+ "rx-lite-aggregates": "^4.0.8",
+ "string-width": "^2.1.0",
+ "strip-ansi": "^4.0.0",
+ "through": "^2.3.6"
+ }
+ },
+ "node_modules/inquirer/node_modules/ansi-escapes": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+ "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/inquirer/node_modules/ansi-regex": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+ "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/inquirer/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/inquirer/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/inquirer/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/inquirer/node_modules/color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+ "dev": true
+ },
+ "node_modules/inquirer/node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/inquirer/node_modules/strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+ "dev": true,
+ "dependencies": {
+ "ansi-regex": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/inquirer/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"
+ }
+ },
+ "node_modules/insert-module-globals": {
+ "version": "7.2.1",
+ "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz",
+ "integrity": "sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==",
+ "dev": true,
+ "dependencies": {
+ "acorn-node": "^1.5.2",
+ "combine-source-map": "^0.8.0",
+ "concat-stream": "^1.6.1",
+ "is-buffer": "^1.1.0",
+ "JSONStream": "^1.0.3",
+ "path-is-absolute": "^1.0.1",
+ "process": "~0.11.0",
+ "through2": "^2.0.0",
+ "undeclared-identifiers": "^1.1.2",
+ "xtend": "^4.0.0"
+ },
+ "bin": {
+ "insert-module-globals": "bin/cmd.js"
+ }
+ },
+ "node_modules/internal-slot": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
+ "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+ "dev": true,
+ "dependencies": {
+ "es-errors": "^1.3.0",
+ "hasown": "^2.0.0",
+ "side-channel": "^1.0.4"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/interpret": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+ "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/intl": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/intl/-/intl-1.2.5.tgz",
+ "integrity": "sha512-rK0KcPHeBFBcqsErKSpvZnrOmWOj+EmDkyJ57e90YWaQNqbcivcqmKDlHEeNprDWOsKzPsh1BfSpPQdDvclHVw==",
+ "dev": true
+ },
+ "node_modules/intl-messageformat": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-4.4.0.tgz",
+ "integrity": "sha512-z+Bj2rS3LZSYU4+sNitdHrwnBhr0wO80ZJSW8EzKDBowwUe3Q/UsvgCGjrwa+HPzoGCLEb9HAjfJgo4j2Sac8w==",
+ "dev": true,
+ "dependencies": {
+ "intl-messageformat-parser": "^1.8.1"
+ }
+ },
+ "node_modules/intl-messageformat-parser": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.8.1.tgz",
+ "integrity": "sha512-IMSCKVf0USrM/959vj3xac7s8f87sc+80Y/ipBzdKy4ifBv5Gsj2tZ41EAaURVg01QU71fYr77uA8Meh6kELbg==",
+ "deprecated": "We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser",
+ "dev": true
+ },
+ "node_modules/intl-pluralrules": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/intl-pluralrules/-/intl-pluralrules-1.3.1.tgz",
+ "integrity": "sha512-sNYPls1Q4fyN0EGLFVJ7TIuaMWln01LupLozfIBt69rHK0DHehghMSz6ejfnSklgRddnyQSEaQPIU6d9TCKH3w==",
+ "dev": true
+ },
+ "node_modules/into-stream": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
+ "integrity": "sha512-TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ==",
+ "dev": true,
+ "dependencies": {
+ "from2": "^2.1.1",
+ "p-is-promise": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/invert-kv": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+ "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/ioredis": {
+ "version": "4.28.5",
+ "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.28.5.tgz",
+ "integrity": "sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==",
+ "dev": true,
+ "dependencies": {
+ "cluster-key-slot": "^1.1.0",
+ "debug": "^4.3.1",
+ "denque": "^1.1.0",
+ "lodash.defaults": "^4.2.0",
+ "lodash.flatten": "^4.4.0",
+ "lodash.isarguments": "^3.1.0",
+ "p-map": "^2.1.0",
+ "redis-commands": "1.7.0",
+ "redis-errors": "^1.2.0",
+ "redis-parser": "^3.0.0",
+ "standard-as-callback": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/ioredis"
+ }
+ },
+ "node_modules/ip-address": {
+ "version": "5.9.4",
+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-5.9.4.tgz",
+ "integrity": "sha512-dHkI3/YNJq4b/qQaz+c8LuarD3pY24JqZWfjB8aZx1gtpc2MDILu9L9jpZe1sHpzo/yWFweQVn+U//FhazUxmw==",
+ "dev": true,
+ "dependencies": {
+ "jsbn": "1.1.0",
+ "lodash": "^4.17.15",
+ "sprintf-js": "1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/ip-address/node_modules/jsbn": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+ "dev": true
+ },
+ "node_modules/ip-address/node_modules/sprintf-js": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+ "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+ "dev": true
+ },
+ "node_modules/ip-regex": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+ "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/ipaddr.js": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+ "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/is": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
+ "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/is-absolute": {
+ "version": "0.2.6",
+ "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
+ "integrity": "sha512-7Kr05z5LkcOpoMvxHN1PC11WbPabdNFmMYYo0eZvWu3BfVS0T03yoqYDczoCBx17xqk2x1XAZrcKiFVL88jxlQ==",
+ "dev": true,
+ "dependencies": {
+ "is-relative": "^0.2.1",
+ "is-windows": "^0.2.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-accessor-descriptor": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+ "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+ "dev": true,
+ "dependencies": {
+ "hasown": "^2.0.0"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/is-arguments": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+ "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "has-tostringtag": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-array-buffer": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
+ "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "get-intrinsic": "^1.2.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-arrayish": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+ "dev": true
+ },
+ "node_modules/is-async-function": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
+ "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
+ "dev": true,
+ "dependencies": {
+ "has-tostringtag": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-bigint": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+ "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+ "dev": true,
+ "dependencies": {
+ "has-bigints": "^1.0.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-binary-path": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+ "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
+ "dev": true,
+ "dependencies": {
+ "binary-extensions": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-boolean-object": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+ "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "has-tostringtag": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-buffer": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+ "dev": true
+ },
+ "node_modules/is-builtin-module": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+ "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+ "dev": true,
+ "dependencies": {
+ "builtin-modules": "^3.3.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/is-callable": {
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+ "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-ci": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+ "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+ "dev": true,
+ "dependencies": {
+ "ci-info": "^1.5.0"
+ },
+ "bin": {
+ "is-ci": "bin.js"
+ }
+ },
+ "node_modules/is-ci/node_modules/ci-info": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+ "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+ "dev": true
+ },
+ "node_modules/is-core-module": {
+ "version": "2.13.1",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+ "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+ "dev": true,
+ "dependencies": {
+ "hasown": "^2.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-data-descriptor": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+ "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
+ "dev": true,
+ "dependencies": {
+ "hasown": "^2.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/is-date-object": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+ "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+ "dev": true,
+ "dependencies": {
+ "has-tostringtag": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-descriptor": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+ "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^1.0.1",
+ "is-data-descriptor": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/is-docker": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+ "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+ "dev": true,
+ "bin": {
+ "is-docker": "cli.js"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/is-expression": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz",
+ "integrity": "sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==",
+ "dev": true,
+ "dependencies": {
+ "acorn": "^7.1.1",
+ "object-assign": "^4.1.1"
+ }
+ },
+ "node_modules/is-expression/node_modules/acorn": {
+ "version": "7.4.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+ "dev": true,
+ "bin": {
+ "acorn": "bin/acorn"
+ },
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-extglob": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+ "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-finalizationregistry": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
+ "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "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": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/is-function": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+ "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
+ "dev": true
+ },
+ "node_modules/is-generator-fn": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+ "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/is-generator-function": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+ "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+ "dev": true,
+ "dependencies": {
+ "has-tostringtag": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-glob": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+ "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-installed-globally": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
+ "integrity": "sha512-ERNhMg+i/XgDwPIPF3u24qpajVreaiSuvpb1Uu0jugw7KKcxGyCX8cgp8P5fwTmAuXku6beDHHECdKArjlg7tw==",
+ "dev": true,
+ "dependencies": {
+ "global-dirs": "^0.1.0",
+ "is-path-inside": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/is-lower-case": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz",
+ "integrity": "sha512-+5A1e/WJpLLXZEDlgz4G//WYSHyQBD32qa4Jd3Lw06qQlv3fJHnp3YIHjTQSGzHMgzmVKz2ZP3rBxTHkPw/lxA==",
+ "dev": true,
+ "dependencies": {
+ "lower-case": "^1.1.0"
+ }
+ },
+ "node_modules/is-map": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+ "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-nan": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
+ "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.0",
+ "define-properties": "^1.1.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-negated-glob": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+ "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-negative-zero": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+ "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-npm": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
+ "integrity": "sha512-9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.12.0"
+ }
+ },
+ "node_modules/is-number-object": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+ "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+ "dev": true,
+ "dependencies": {
+ "has-tostringtag": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-obj": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+ "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-object": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
+ "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-path-inside": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+ "integrity": "sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==",
+ "dev": true,
+ "dependencies": {
+ "path-is-inside": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-plain-obj": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+ "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-plain-object": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+ "dev": true,
+ "dependencies": {
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-plain-object/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-potential-custom-element-name": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+ "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+ "dev": true
+ },
+ "node_modules/is-promise": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+ "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+ "dev": true
+ },
+ "node_modules/is-redirect": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+ "integrity": "sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-regex": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+ "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "has-tostringtag": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-relative": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz",
+ "integrity": "sha512-9AMzjRmLqcue629b4ezEVSK6kJsYJlUIhMcygmYORUgwUNJiavHcC3HkaGx0XYpyVKQSOqFbMEZmW42cY87sYw==",
+ "dev": true,
+ "dependencies": {
+ "is-unc-path": "^0.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-retry-allowed": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
+ "integrity": "sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/is-set": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+ "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-shared-array-buffer": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+ "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-stream": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/is-string": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+ "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+ "dev": true,
+ "dependencies": {
+ "has-tostringtag": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-symbol": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+ "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+ "dev": true,
+ "dependencies": {
+ "has-symbols": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-typed-array": {
+ "version": "1.1.13",
+ "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+ "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+ "dev": true,
+ "dependencies": {
+ "which-typed-array": "^1.1.14"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-typedarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+ "dev": true
+ },
+ "node_modules/is-unc-path": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz",
+ "integrity": "sha512-HhLc5VDMH4pu3oMtIuunz/DFQUIoR561kMME3U3Afhj8b7vH085vkIkemrz1kLXCEIuoMAmO3yVmafWdSbGW8w==",
+ "dev": true,
+ "dependencies": {
+ "unc-path-regex": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-upper-case": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz",
+ "integrity": "sha512-GQYSJMgfeAmVwh9ixyk888l7OIhNAGKtY6QA+IrWlu9MDTCaXmeozOZ2S9Knj7bQwBO/H6J2kb+pbyTUiMNbsw==",
+ "dev": true,
+ "dependencies": {
+ "upper-case": "^1.1.0"
+ }
+ },
+ "node_modules/is-url": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
+ "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
+ "dev": true
+ },
+ "node_modules/is-utf8": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+ "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+ "dev": true
+ },
+ "node_modules/is-valid-glob": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
+ "integrity": "sha512-CvG8EtJZ8FyzVOGPzrDorzyN65W1Ld8BVnqshRCah6pFIsprGx3dKgFtjLn/Vw9kGqR4OlR84U7yhT9ZVTyWIQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-weakmap": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+ "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-weakref": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+ "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-weakset": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+ "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "get-intrinsic": "^1.1.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-windows": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
+ "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-wsl": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+ "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/is2": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.1.tgz",
+ "integrity": "sha512-+WaJvnaA7aJySz2q/8sLjMb2Mw14KTplHmSwcSpZ/fWJPkUmqw3YTzSWbPJ7OAwRvdYTWF2Wg+yYJ1AdP5Z8CA==",
+ "dev": true,
+ "dependencies": {
+ "deep-is": "^0.1.3",
+ "ip-regex": "^2.1.0",
+ "is-url": "^1.2.2"
+ },
+ "engines": {
+ "node": ">=v0.10.0"
+ }
+ },
+ "node_modules/isarray": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+ "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+ "dev": true
+ },
+ "node_modules/isemail": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz",
+ "integrity": "sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==",
+ "dev": true,
+ "dependencies": {
+ "punycode": "2.x.x"
+ },
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/isemail/node_modules/punycode": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/iserror": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/iserror/-/iserror-0.0.2.tgz",
+ "integrity": "sha512-oKGGrFVaWwETimP3SiWwjDeY27ovZoyZPHtxblC4hCq9fXxed/jasx+ATWFFjCVSRZng8VTMsN1nDnGo6zMBSw==",
+ "dev": true
+ },
+ "node_modules/isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+ },
+ "node_modules/isobject": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+ "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+ "dev": true,
+ "dependencies": {
+ "isarray": "1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/isobject/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/isomorphic-fetch": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
+ "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
+ "dev": true,
+ "dependencies": {
+ "node-fetch": "^2.6.1",
+ "whatwg-fetch": "^3.4.1"
+ }
+ },
+ "node_modules/isomorphic-fetch/node_modules/whatwg-fetch": {
+ "version": "3.6.20",
+ "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
+ "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==",
+ "dev": true
+ },
+ "node_modules/isomorphic-unfetch": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz",
+ "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==",
+ "dev": true,
+ "dependencies": {
+ "node-fetch": "^2.6.1",
+ "unfetch": "^4.2.0"
+ }
+ },
+ "node_modules/isstream": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+ "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
+ "dev": true
+ },
+ "node_modules/istanbul-lib-coverage": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+ "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/istanbul-lib-instrument": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+ "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+ "dev": true,
+ "dependencies": {
+ "@babel/core": "^7.23.9",
+ "@babel/parser": "^7.23.9",
+ "@istanbuljs/schema": "^0.1.3",
+ "istanbul-lib-coverage": "^3.2.0",
+ "semver": "^7.5.4"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/istanbul-lib-report": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+ "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+ "dev": true,
+ "dependencies": {
+ "istanbul-lib-coverage": "^3.0.0",
+ "make-dir": "^4.0.0",
+ "supports-color": "^7.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/istanbul-lib-source-maps": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+ "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.1.1",
+ "istanbul-lib-coverage": "^3.0.0",
+ "source-map": "^0.6.1"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/istanbul-reports": {
+ "version": "3.1.7",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+ "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+ "dev": true,
+ "dependencies": {
+ "html-escaper": "^2.0.0",
+ "istanbul-lib-report": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/isurl": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+ "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+ "dev": true,
+ "dependencies": {
+ "has-to-string-tag-x": "^1.2.0",
+ "is-object": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/iterall": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.3.0.tgz",
+ "integrity": "sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==",
+ "dev": true
+ },
+ "node_modules/iterator.prototype": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
+ "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
+ "dev": true,
+ "dependencies": {
+ "define-properties": "^1.2.1",
+ "get-intrinsic": "^1.2.1",
+ "has-symbols": "^1.0.3",
+ "reflect.getprototypeof": "^1.0.4",
+ "set-function-name": "^2.0.1"
+ }
+ },
+ "node_modules/jackpot": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz",
+ "integrity": "sha512-rbWXX+A9ooq03/dfavLg9OXQ8YB57Wa7PY5c4LfU3CgFpwEhhl3WyXTQVurkaT7zBM5I9SSOaiLyJ4I0DQmC0g==",
+ "dev": true,
+ "dependencies": {
+ "retry": "0.6.0"
+ }
+ },
+ "node_modules/jackpot/node_modules/retry": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz",
+ "integrity": "sha512-RgncoxLF1GqwAzTZs/K2YpZkWrdIYbXsmesdomi+iPilSzjUyr/wzNIuteoTVaWokzdwZIJ9NHRNQa/RUiOB2g==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/jackspeak": {
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+ "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+ "dependencies": {
+ "@isaacs/cliui": "^8.0.2"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ },
+ "optionalDependencies": {
+ "@pkgjs/parseargs": "^0.11.0"
+ }
+ },
+ "node_modules/jake": {
+ "version": "10.8.7",
+ "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz",
+ "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==",
+ "dev": true,
+ "dependencies": {
+ "async": "^3.2.3",
+ "chalk": "^4.0.2",
+ "filelist": "^1.0.4",
+ "minimatch": "^3.1.2"
+ },
+ "bin": {
+ "jake": "bin/cli.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/jayson": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/jayson/-/jayson-2.1.2.tgz",
+ "integrity": "sha512-2GejcQnEV35KYTXoBvzALIDdO/1oyEIoJHBnaJFhJhcurv0x2JqUXQW6xlDUhcNOpN9t+d2w+JGA6vOphb+5mg==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "^10.3.5",
+ "commander": "^2.12.2",
+ "es6-promisify": "^5.0.0",
+ "eyes": "^0.1.8",
+ "json-stringify-safe": "^5.0.1",
+ "JSONStream": "^1.3.1",
+ "lodash": "^4.17.11",
+ "uuid": "^3.2.1"
+ },
+ "bin": {
+ "jayson": "bin/jayson.js"
+ }
+ },
+ "node_modules/jayson/node_modules/@types/node": {
+ "version": "10.17.60",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
+ "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==",
+ "dev": true
+ },
+ "node_modules/jayson/node_modules/commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+ "dev": true
+ },
+ "node_modules/jest": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+ "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+ "dev": true,
+ "dependencies": {
+ "@jest/core": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "import-local": "^3.0.2",
+ "jest-cli": "^29.7.0"
+ },
+ "bin": {
+ "jest": "bin/jest.js"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ },
+ "peerDependencies": {
+ "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+ },
+ "peerDependenciesMeta": {
+ "node-notifier": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/jest-changed-files": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+ "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+ "dev": true,
+ "dependencies": {
+ "execa": "^5.0.0",
+ "jest-util": "^29.7.0",
+ "p-limit": "^3.1.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-circus": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+ "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+ "dev": true,
+ "dependencies": {
+ "@jest/environment": "^29.7.0",
+ "@jest/expect": "^29.7.0",
+ "@jest/test-result": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "co": "^4.6.0",
+ "dedent": "^1.0.0",
+ "is-generator-fn": "^2.0.0",
+ "jest-each": "^29.7.0",
+ "jest-matcher-utils": "^29.7.0",
+ "jest-message-util": "^29.7.0",
+ "jest-runtime": "^29.7.0",
+ "jest-snapshot": "^29.7.0",
+ "jest-util": "^29.7.0",
+ "p-limit": "^3.1.0",
+ "pretty-format": "^29.7.0",
+ "pure-rand": "^6.0.0",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-cli": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+ "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+ "dev": true,
+ "dependencies": {
+ "@jest/core": "^29.7.0",
+ "@jest/test-result": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "chalk": "^4.0.0",
+ "create-jest": "^29.7.0",
+ "exit": "^0.1.2",
+ "import-local": "^3.0.2",
+ "jest-config": "^29.7.0",
+ "jest-util": "^29.7.0",
+ "jest-validate": "^29.7.0",
+ "yargs": "^17.3.1"
+ },
+ "bin": {
+ "jest": "bin/jest.js"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ },
+ "peerDependencies": {
+ "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+ },
+ "peerDependenciesMeta": {
+ "node-notifier": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/jest-cli/node_modules/cliui": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.1",
+ "wrap-ansi": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/jest-cli/node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/jest-cli/node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/jest-cli/node_modules/wrap-ansi": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
+ "node_modules/jest-cli/node_modules/y18n": {
+ "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/jest-cli/node_modules/yargs": {
+ "version": "17.7.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+ "dev": true,
+ "dependencies": {
+ "cliui": "^8.0.1",
+ "escalade": "^3.1.1",
+ "get-caller-file": "^2.0.5",
+ "require-directory": "^2.1.1",
+ "string-width": "^4.2.3",
+ "y18n": "^5.0.5",
+ "yargs-parser": "^21.1.1"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/jest-cli/node_modules/yargs-parser": {
+ "version": "21.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/jest-config": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+ "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+ "dev": true,
+ "dependencies": {
+ "@babel/core": "^7.11.6",
+ "@jest/test-sequencer": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "babel-jest": "^29.7.0",
+ "chalk": "^4.0.0",
+ "ci-info": "^3.2.0",
+ "deepmerge": "^4.2.2",
+ "glob": "^7.1.3",
+ "graceful-fs": "^4.2.9",
+ "jest-circus": "^29.7.0",
+ "jest-environment-node": "^29.7.0",
+ "jest-get-type": "^29.6.3",
+ "jest-regex-util": "^29.6.3",
+ "jest-resolve": "^29.7.0",
+ "jest-runner": "^29.7.0",
+ "jest-util": "^29.7.0",
+ "jest-validate": "^29.7.0",
+ "micromatch": "^4.0.4",
+ "parse-json": "^5.2.0",
+ "pretty-format": "^29.7.0",
+ "slash": "^3.0.0",
+ "strip-json-comments": "^3.1.1"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ },
+ "peerDependencies": {
+ "@types/node": "*",
+ "ts-node": ">=9.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/node": {
+ "optional": true
+ },
+ "ts-node": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/jest-diff": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+ "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+ "dev": true,
+ "dependencies": {
+ "chalk": "^4.0.0",
+ "diff-sequences": "^29.6.3",
+ "jest-get-type": "^29.6.3",
+ "pretty-format": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-docblock": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+ "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+ "dev": true,
+ "dependencies": {
+ "detect-newline": "^3.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-each": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+ "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+ "dev": true,
+ "dependencies": {
+ "@jest/types": "^29.6.3",
+ "chalk": "^4.0.0",
+ "jest-get-type": "^29.6.3",
+ "jest-util": "^29.7.0",
+ "pretty-format": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-environment-node": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+ "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+ "dev": true,
+ "dependencies": {
+ "@jest/environment": "^29.7.0",
+ "@jest/fake-timers": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "@types/node": "*",
+ "jest-mock": "^29.7.0",
+ "jest-util": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-get-type": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+ "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+ "dev": true,
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-haste-map": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+ "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+ "dev": true,
+ "dependencies": {
+ "@jest/types": "^29.6.3",
+ "@types/graceful-fs": "^4.1.3",
+ "@types/node": "*",
+ "anymatch": "^3.0.3",
+ "fb-watchman": "^2.0.0",
+ "graceful-fs": "^4.2.9",
+ "jest-regex-util": "^29.6.3",
+ "jest-util": "^29.7.0",
+ "jest-worker": "^29.7.0",
+ "micromatch": "^4.0.4",
+ "walker": "^1.0.8"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ },
+ "optionalDependencies": {
+ "fsevents": "^2.3.2"
+ }
+ },
+ "node_modules/jest-leak-detector": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+ "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+ "dev": true,
+ "dependencies": {
+ "jest-get-type": "^29.6.3",
+ "pretty-format": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-matcher-utils": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+ "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+ "dev": true,
+ "dependencies": {
+ "chalk": "^4.0.0",
+ "jest-diff": "^29.7.0",
+ "jest-get-type": "^29.6.3",
+ "pretty-format": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-message-util": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+ "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.12.13",
+ "@jest/types": "^29.6.3",
+ "@types/stack-utils": "^2.0.0",
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.9",
+ "micromatch": "^4.0.4",
+ "pretty-format": "^29.7.0",
+ "slash": "^3.0.0",
+ "stack-utils": "^2.0.3"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-mock": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+ "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+ "dev": true,
+ "dependencies": {
+ "@jest/types": "^29.6.3",
+ "@types/node": "*",
+ "jest-util": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-pnp-resolver": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+ "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ },
+ "peerDependencies": {
+ "jest-resolve": "*"
+ },
+ "peerDependenciesMeta": {
+ "jest-resolve": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/jest-regex-util": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+ "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+ "dev": true,
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-resolve": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+ "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+ "dev": true,
+ "dependencies": {
+ "chalk": "^4.0.0",
+ "graceful-fs": "^4.2.9",
+ "jest-haste-map": "^29.7.0",
+ "jest-pnp-resolver": "^1.2.2",
+ "jest-util": "^29.7.0",
+ "jest-validate": "^29.7.0",
+ "resolve": "^1.20.0",
+ "resolve.exports": "^2.0.0",
+ "slash": "^3.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-resolve-dependencies": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+ "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+ "dev": true,
+ "dependencies": {
+ "jest-regex-util": "^29.6.3",
+ "jest-snapshot": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-runner": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+ "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+ "dev": true,
+ "dependencies": {
+ "@jest/console": "^29.7.0",
+ "@jest/environment": "^29.7.0",
+ "@jest/test-result": "^29.7.0",
+ "@jest/transform": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "emittery": "^0.13.1",
+ "graceful-fs": "^4.2.9",
+ "jest-docblock": "^29.7.0",
+ "jest-environment-node": "^29.7.0",
+ "jest-haste-map": "^29.7.0",
+ "jest-leak-detector": "^29.7.0",
+ "jest-message-util": "^29.7.0",
+ "jest-resolve": "^29.7.0",
+ "jest-runtime": "^29.7.0",
+ "jest-util": "^29.7.0",
+ "jest-watcher": "^29.7.0",
+ "jest-worker": "^29.7.0",
+ "p-limit": "^3.1.0",
+ "source-map-support": "0.5.13"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-runtime": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+ "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+ "dev": true,
+ "dependencies": {
+ "@jest/environment": "^29.7.0",
+ "@jest/fake-timers": "^29.7.0",
+ "@jest/globals": "^29.7.0",
+ "@jest/source-map": "^29.6.3",
+ "@jest/test-result": "^29.7.0",
+ "@jest/transform": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "cjs-module-lexer": "^1.0.0",
+ "collect-v8-coverage": "^1.0.0",
+ "glob": "^7.1.3",
+ "graceful-fs": "^4.2.9",
+ "jest-haste-map": "^29.7.0",
+ "jest-message-util": "^29.7.0",
+ "jest-mock": "^29.7.0",
+ "jest-regex-util": "^29.6.3",
+ "jest-resolve": "^29.7.0",
+ "jest-snapshot": "^29.7.0",
+ "jest-util": "^29.7.0",
+ "slash": "^3.0.0",
+ "strip-bom": "^4.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-snapshot": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+ "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/core": "^7.11.6",
+ "@babel/generator": "^7.7.2",
+ "@babel/plugin-syntax-jsx": "^7.7.2",
+ "@babel/plugin-syntax-typescript": "^7.7.2",
+ "@babel/types": "^7.3.3",
+ "@jest/expect-utils": "^29.7.0",
+ "@jest/transform": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "babel-preset-current-node-syntax": "^1.0.0",
+ "chalk": "^4.0.0",
+ "expect": "^29.7.0",
+ "graceful-fs": "^4.2.9",
+ "jest-diff": "^29.7.0",
+ "jest-get-type": "^29.6.3",
+ "jest-matcher-utils": "^29.7.0",
+ "jest-message-util": "^29.7.0",
+ "jest-util": "^29.7.0",
+ "natural-compare": "^1.4.0",
+ "pretty-format": "^29.7.0",
+ "semver": "^7.5.3"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-util": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+ "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+ "dev": true,
+ "dependencies": {
+ "@jest/types": "^29.6.3",
+ "@types/node": "*",
+ "chalk": "^4.0.0",
+ "ci-info": "^3.2.0",
+ "graceful-fs": "^4.2.9",
+ "picomatch": "^2.2.3"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-util/node_modules/picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
+ "node_modules/jest-validate": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+ "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+ "dev": true,
+ "dependencies": {
+ "@jest/types": "^29.6.3",
+ "camelcase": "^6.2.0",
+ "chalk": "^4.0.0",
+ "jest-get-type": "^29.6.3",
+ "leven": "^3.1.0",
+ "pretty-format": "^29.7.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-validate/node_modules/camelcase": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/jest-watcher": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+ "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+ "dev": true,
+ "dependencies": {
+ "@jest/test-result": "^29.7.0",
+ "@jest/types": "^29.6.3",
+ "@types/node": "*",
+ "ansi-escapes": "^4.2.1",
+ "chalk": "^4.0.0",
+ "emittery": "^0.13.1",
+ "jest-util": "^29.7.0",
+ "string-length": "^4.0.1"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-worker": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+ "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*",
+ "jest-util": "^29.7.0",
+ "merge-stream": "^2.0.0",
+ "supports-color": "^8.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/jest-worker/node_modules/supports-color": {
+ "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": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/supports-color?sponsor=1"
+ }
+ },
+ "node_modules/jimp": {
+ "version": "0.22.12",
+ "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.22.12.tgz",
+ "integrity": "sha512-R5jZaYDnfkxKJy1dwLpj/7cvyjxiclxU3F4TrI/J4j2rS0niq6YDUMoPn5hs8GDpO+OZGo7Ky057CRtWesyhfg==",
+ "dev": true,
+ "dependencies": {
+ "@jimp/custom": "^0.22.12",
+ "@jimp/plugins": "^0.22.12",
+ "@jimp/types": "^0.22.12",
+ "regenerator-runtime": "^0.13.3"
+ }
+ },
+ "node_modules/jimp/node_modules/regenerator-runtime": {
+ "version": "0.13.11",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+ "dev": true
+ },
+ "node_modules/jju": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+ "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==",
+ "dev": true
+ },
+ "node_modules/jmespath": {
+ "version": "0.16.0",
+ "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz",
+ "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6.0"
+ }
+ },
+ "node_modules/join-component": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz",
+ "integrity": "sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==",
+ "dev": true
+ },
+ "node_modules/jose": {
+ "version": "4.15.5",
+ "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.5.tgz",
+ "integrity": "sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/panva"
+ }
+ },
+ "node_modules/jpeg-js": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
+ "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==",
+ "dev": true
+ },
+ "node_modules/js-library-detector": {
+ "version": "5.9.0",
+ "resolved": "https://registry.npmjs.org/js-library-detector/-/js-library-detector-5.9.0.tgz",
+ "integrity": "sha512-0wYHRVJv8uVsylJhfQQaH2vOBYGehyZyJbtaHuchoTP3Mb6hqYvrA0hoMQ1ZhARLHzHJMbMc/nCr4D3pTNSCgw==",
+ "dev": true
+ },
+ "node_modules/js-polyfills": {
+ "version": "0.1.43",
+ "resolved": "https://registry.npmjs.org/js-polyfills/-/js-polyfills-0.1.43.tgz",
+ "integrity": "sha512-wWCJcw7uMA12uk7qcqZlIQy9nj+Evh1wVUmn5MOlJ7GPC8HT5PLjB9Uiqjw9ldAbbOuNOWJ6ENb7NwU6qqf48g==",
+ "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+ "dev": true
+ },
+ "node_modules/js-stringify": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
+ "integrity": "sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==",
+ "dev": true
+ },
+ "node_modules/js-tokens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+ "dev": true
+ },
+ "node_modules/js-yaml": {
+ "version": "3.14.1",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+ "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+ "dev": true,
+ "dependencies": {
+ "argparse": "^1.0.7",
+ "esprima": "^4.0.0"
+ },
+ "bin": {
+ "js-yaml": "bin/js-yaml.js"
+ }
+ },
+ "node_modules/js2xmlparser": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
+ "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
+ "dev": true,
+ "dependencies": {
+ "xmlcreate": "^2.0.4"
+ }
+ },
+ "node_modules/jsbn": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+ "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+ "dev": true
+ },
+ "node_modules/jsdom": {
+ "version": "16.7.0",
+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+ "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+ "dev": true,
+ "dependencies": {
+ "abab": "^2.0.5",
+ "acorn": "^8.2.4",
+ "acorn-globals": "^6.0.0",
+ "cssom": "^0.4.4",
+ "cssstyle": "^2.3.0",
+ "data-urls": "^2.0.0",
+ "decimal.js": "^10.2.1",
+ "domexception": "^2.0.1",
+ "escodegen": "^2.0.0",
+ "form-data": "^3.0.0",
+ "html-encoding-sniffer": "^2.0.1",
+ "http-proxy-agent": "^4.0.1",
+ "https-proxy-agent": "^5.0.0",
+ "is-potential-custom-element-name": "^1.0.1",
+ "nwsapi": "^2.2.0",
+ "parse5": "6.0.1",
+ "saxes": "^5.0.1",
+ "symbol-tree": "^3.2.4",
+ "tough-cookie": "^4.0.0",
+ "w3c-hr-time": "^1.0.2",
+ "w3c-xmlserializer": "^2.0.0",
+ "webidl-conversions": "^6.1.0",
+ "whatwg-encoding": "^1.0.5",
+ "whatwg-mimetype": "^2.3.0",
+ "whatwg-url": "^8.5.0",
+ "ws": "^7.4.6",
+ "xml-name-validator": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "peerDependencies": {
+ "canvas": "^2.5.0"
+ },
+ "peerDependenciesMeta": {
+ "canvas": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/jsdom/node_modules/ws": {
+ "version": "7.5.9",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+ "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.3.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": "^5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/jsesc": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+ "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+ "dev": true,
+ "bin": {
+ "jsesc": "bin/jsesc"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/json-bigint": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.1.tgz",
+ "integrity": "sha512-DGWnSzmusIreWlEupsUelHrhwmPPE+FiQvg+drKfk2p+bdEYa5mp4PJ8JsCWqae0M2jQNb0HPvnwvf1qOTThzQ==",
+ "dev": true,
+ "dependencies": {
+ "bignumber.js": "^9.0.0"
+ }
+ },
+ "node_modules/json-buffer": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+ "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==",
+ "dev": true
+ },
+ "node_modules/json-edm-parser": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz",
+ "integrity": "sha512-J1U9mk6lf8dPULcaMwALXB6yel3cJyyhk9Z8FQ4sMwiazNwjaUhegIcpZyZFNMvLRtnXwh+TkCjX9uYUObBBYA==",
+ "dev": true,
+ "dependencies": {
+ "jsonparse": "~1.2.0"
+ }
+ },
+ "node_modules/json-parse-even-better-errors": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+ "dev": true
+ },
+ "node_modules/json-schema": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+ "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+ "dev": true
+ },
+ "node_modules/json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
+ },
+ "node_modules/json-stable-stringify": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+ "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==",
+ "dev": true,
+ "dependencies": {
+ "jsonify": "~0.0.0"
+ }
+ },
+ "node_modules/json-stable-stringify-without-jsonify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+ "dev": true
+ },
+ "node_modules/json-stringify-safe": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+ "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+ "dev": true
+ },
+ "node_modules/json3": {
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+ "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
+ "dev": true
+ },
+ "node_modules/json5": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+ "dev": true,
+ "bin": {
+ "json5": "lib/cli.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/jsonc-parser": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+ "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+ "dev": true
+ },
+ "node_modules/jsonfile": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+ "dev": true,
+ "dependencies": {
+ "universalify": "^2.0.0"
+ },
+ "optionalDependencies": {
+ "graceful-fs": "^4.1.6"
+ }
+ },
+ "node_modules/jsonify": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+ "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/jsonld": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.8.1.tgz",
+ "integrity": "sha512-f0rusl5v8aPKS3jApT5fhYsdTC/JpyK1PoJ+ZtYYtZXoyb1J0Z///mJqLwrfL/g4NueFSqPymDYIi1CcSk7b8Q==",
+ "dev": true,
+ "dependencies": {
+ "canonicalize": "^1.0.1",
+ "rdf-canonize": "^1.0.2",
+ "request": "^2.88.0",
+ "semver": "^5.6.0",
+ "xmldom": "0.1.19"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/jsonld/node_modules/semver": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/jsonlint-mod": {
+ "version": "1.7.6",
+ "resolved": "https://registry.npmjs.org/jsonlint-mod/-/jsonlint-mod-1.7.6.tgz",
+ "integrity": "sha512-oGuk6E1ehmIpw0w9ttgb2KsDQQgGXBzZczREW8OfxEm9eCQYL9/LCexSnh++0z3AiYGcXpBgqDSx9AAgzl/Bvg==",
+ "dev": true,
+ "dependencies": {
+ "chalk": "^2.4.2",
+ "JSV": "^4.0.2",
+ "underscore": "^1.9.1"
+ },
+ "bin": {
+ "jsonlint": "lib/cli.js"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/jsonlint-mod/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/jsonlint-mod/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/jsonlint-mod/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/jsonlint-mod/node_modules/color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+ "dev": true
+ },
+ "node_modules/jsonlint-mod/node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/jsonlint-mod/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"
+ }
+ },
+ "node_modules/jsonparse": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz",
+ "integrity": "sha512-LkDEYtKnPFI9hQ/IURETe6F1dUH80cbRkaF6RaViSwoSNPwaxQpi6TgJGvJKyLQ2/9pQW+XCxK3hBoR44RAjkg==",
+ "dev": true,
+ "engines": [
+ "node >= 0.2.0"
+ ]
+ },
+ "node_modules/JSONStream": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+ "dev": true,
+ "dependencies": {
+ "jsonparse": "^1.2.0",
+ "through": ">=2.2.7 <3"
+ },
+ "bin": {
+ "JSONStream": "bin.js"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/jsonstream2": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/jsonstream2/-/jsonstream2-3.0.0.tgz",
+ "integrity": "sha512-8ngq2XB8NjYrpe3+Xtl9lFJl6RoV2dNT4I7iyaHwxUpTBwsj0AlAR7epGfeYVP0z4Z7KxMoSxRgJWrd2jmBT/Q==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "jsonparse": "1.3.1",
+ "through2": "^3.0.1",
+ "type-component": "0.0.1"
+ },
+ "bin": {
+ "jsonstream": "bin/jsonstream.js"
+ },
+ "engines": {
+ "node": ">=5.10.0"
+ }
+ },
+ "node_modules/jsonstream2/node_modules/jsonparse": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+ "dev": true,
+ "engines": [
+ "node >= 0.2.0"
+ ],
+ "peer": true
+ },
+ "node_modules/jsonstream2/node_modules/through2": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+ "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "inherits": "^2.0.4",
+ "readable-stream": "2 || 3"
+ }
+ },
+ "node_modules/jsonwebtoken": {
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
+ "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
+ "dev": true,
+ "dependencies": {
+ "jws": "^3.2.2",
+ "lodash.includes": "^4.3.0",
+ "lodash.isboolean": "^3.0.3",
+ "lodash.isinteger": "^4.0.4",
+ "lodash.isnumber": "^3.0.3",
+ "lodash.isplainobject": "^4.0.6",
+ "lodash.isstring": "^4.0.1",
+ "lodash.once": "^4.0.0",
+ "ms": "^2.1.1",
+ "semver": "^7.5.4"
+ },
+ "engines": {
+ "node": ">=12",
+ "npm": ">=6"
+ }
+ },
+ "node_modules/jsonwebtoken/node_modules/jwa": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+ "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+ "dev": true,
+ "dependencies": {
+ "buffer-equal-constant-time": "1.0.1",
+ "ecdsa-sig-formatter": "1.0.11",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/jsonwebtoken/node_modules/jws": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+ "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+ "dev": true,
+ "dependencies": {
+ "jwa": "^1.4.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/jsprim": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+ "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
+ "dev": true,
+ "dependencies": {
+ "assert-plus": "1.0.0",
+ "extsprintf": "1.3.0",
+ "json-schema": "0.4.0",
+ "verror": "1.10.0"
+ },
+ "engines": {
+ "node": ">=0.6.0"
+ }
+ },
+ "node_modules/jstransformer": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz",
+ "integrity": "sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==",
+ "dev": true,
+ "dependencies": {
+ "is-promise": "^2.0.0",
+ "promise": "^7.0.1"
+ }
+ },
+ "node_modules/JSV": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
+ "integrity": "sha512-ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/jsx-ast-utils": {
+ "version": "3.3.5",
+ "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+ "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+ "dev": true,
+ "dependencies": {
+ "array-includes": "^3.1.6",
+ "array.prototype.flat": "^1.3.1",
+ "object.assign": "^4.1.4",
+ "object.values": "^1.1.6"
+ },
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/jugglingdb": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/jugglingdb/-/jugglingdb-2.0.1.tgz",
+ "integrity": "sha512-KZxp+ypI2yyFYWG94mX9xWuwLBkZdJHE8OFmCbwlprtRDNWi5hoJaKxAjF+zVmwItWpiGUCcLremAaI22vpqtA==",
+ "dev": true,
+ "engines": [
+ "node >= 0.6"
+ ],
+ "dependencies": {
+ "inflection": "=1.2.7",
+ "when": "3.7.3"
+ }
+ },
+ "node_modules/jugglingdb/node_modules/when": {
+ "version": "3.7.3",
+ "resolved": "https://registry.npmjs.org/when/-/when-3.7.3.tgz",
+ "integrity": "sha512-cUsp3b0BOMVm5kupGM/V6dY2B4IeednZSGajNm6+bGKV5CG3w7qc5RAQLnBjgYuHWDUDSdndYeXr9ayBeLXH6Q==",
+ "dev": true
+ },
+ "node_modules/jwa": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
+ "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+ "dev": true,
+ "dependencies": {
+ "buffer-equal-constant-time": "1.0.1",
+ "ecdsa-sig-formatter": "1.0.11",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/jwks-rsa": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.1.0.tgz",
+ "integrity": "sha512-v7nqlfezb9YfHHzYII3ef2a2j1XnGeSE/bK3WfumaYCqONAIstJbrEGapz4kadScZzEt7zYCN7bucj8C0Mv/Rg==",
+ "dev": true,
+ "dependencies": {
+ "@types/express": "^4.17.17",
+ "@types/jsonwebtoken": "^9.0.2",
+ "debug": "^4.3.4",
+ "jose": "^4.14.6",
+ "limiter": "^1.1.5",
+ "lru-memoizer": "^2.2.0"
+ },
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/jws": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+ "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+ "dev": true,
+ "dependencies": {
+ "jwa": "^2.0.0",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/kareem": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz",
+ "integrity": "sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
+ "node_modules/kew": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+ "integrity": "sha512-IG6nm0+QtAMdXt9KvbgbGdvY50RSrw+U4sGZg+KlrSKPJEwVE5JVoI3d7RWfSMdBQneRheeAOj3lIjX5VL/9RQ==",
+ "dev": true
+ },
+ "node_modules/keygrip": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
+ "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
+ "dev": true,
+ "dependencies": {
+ "tsscmp": "1.0.6"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/keyv": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
+ "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
+ "dev": true,
+ "dependencies": {
+ "json-buffer": "3.0.0"
+ }
+ },
+ "node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/kleur": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+ "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/koa": {
+ "version": "2.15.0",
+ "resolved": "https://registry.npmjs.org/koa/-/koa-2.15.0.tgz",
+ "integrity": "sha512-KEL/vU1knsoUvfP4MC4/GthpQrY/p6dzwaaGI6Rt4NQuFqkw3qrvsdYF5pz3wOfi7IGTvMPHC9aZIcUKYFNxsw==",
+ "dev": true,
+ "dependencies": {
+ "accepts": "^1.3.5",
+ "cache-content-type": "^1.0.0",
+ "content-disposition": "~0.5.2",
+ "content-type": "^1.0.4",
+ "cookies": "~0.9.0",
+ "debug": "^4.3.2",
+ "delegates": "^1.0.0",
+ "depd": "^2.0.0",
+ "destroy": "^1.0.4",
+ "encodeurl": "^1.0.2",
+ "escape-html": "^1.0.3",
+ "fresh": "~0.5.2",
+ "http-assert": "^1.3.0",
+ "http-errors": "^1.6.3",
+ "is-generator-function": "^1.0.7",
+ "koa-compose": "^4.1.0",
+ "koa-convert": "^2.0.0",
+ "on-finished": "^2.3.0",
+ "only": "~0.0.2",
+ "parseurl": "^1.3.2",
+ "statuses": "^1.5.0",
+ "type-is": "^1.6.16",
+ "vary": "^1.1.2"
+ },
+ "engines": {
+ "node": "^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4"
+ }
+ },
+ "node_modules/koa-compose": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz",
+ "integrity": "sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==",
+ "dev": true
+ },
+ "node_modules/koa-convert": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/koa-convert/-/koa-convert-2.0.0.tgz",
+ "integrity": "sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==",
+ "dev": true,
+ "dependencies": {
+ "co": "^4.6.0",
+ "koa-compose": "^4.1.0"
+ },
+ "engines": {
+ "node": ">= 10"
+ }
+ },
+ "node_modules/koa/node_modules/statuses": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+ "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/labeled-stream-splicer": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
+ "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.1",
+ "stream-splicer": "^2.0.0"
+ }
+ },
+ "node_modules/language-subtag-registry": {
+ "version": "0.3.22",
+ "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
+ "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==",
+ "dev": true
+ },
+ "node_modules/language-tags": {
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz",
+ "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==",
+ "dev": true,
+ "dependencies": {
+ "language-subtag-registry": "^0.3.20"
+ },
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/latest-version": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
+ "integrity": "sha512-Be1YRHWWlZaSsrz2U+VInk+tO0EwLIyV+23RhWLINJYwg/UIikxjlj3MhH37/6/EDCAusjajvMkMMUXRaMWl/w==",
+ "dev": true,
+ "dependencies": {
+ "package-json": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/lazy": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz",
+ "integrity": "sha512-Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.2.0"
+ }
+ },
+ "node_modules/lazy-cache": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz",
+ "integrity": "sha512-7vp2Acd2+Kz4XkzxGxaB1FWOi8KjWIWsgdfD5MCb86DWvlLqhRPM+d6Pro3iNEL5VT9mstz5hKAlcd+QR6H3aA==",
+ "dev": true,
+ "dependencies": {
+ "set-getter": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lcid": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+ "dev": true,
+ "dependencies": {
+ "invert-kv": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/level-concat-iterator": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz",
+ "integrity": "sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/level-supports": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/level-supports/-/level-supports-1.0.1.tgz",
+ "integrity": "sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==",
+ "dev": true,
+ "dependencies": {
+ "xtend": "^4.0.2"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/leveldown": {
+ "version": "5.6.0",
+ "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.6.0.tgz",
+ "integrity": "sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "abstract-leveldown": "~6.2.1",
+ "napi-macros": "~2.0.0",
+ "node-gyp-build": "~4.1.0"
+ },
+ "engines": {
+ "node": ">=8.6.0"
+ }
+ },
+ "node_modules/leveldown/node_modules/node-gyp-build": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz",
+ "integrity": "sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==",
+ "dev": true,
+ "bin": {
+ "node-gyp-build": "bin.js",
+ "node-gyp-build-optional": "optional.js",
+ "node-gyp-build-test": "build-test.js"
+ }
+ },
+ "node_modules/leven": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+ "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/lighthouse": {
+ "version": "5.6.0",
+ "resolved": "https://registry.npmjs.org/lighthouse/-/lighthouse-5.6.0.tgz",
+ "integrity": "sha512-PQYeK6/P0p/JxP/zq8yfcPmuep/aeib5ykROTgzDHejMiuzYdD6k6MaSCv0ncwK+lj+Ld67Az+66rHqiPKHc6g==",
+ "dev": true,
+ "dependencies": {
+ "axe-core": "3.3.0",
+ "chrome-launcher": "^0.11.2",
+ "configstore": "^3.1.1",
+ "cssstyle": "1.2.1",
+ "details-element-polyfill": "^2.4.0",
+ "http-link-header": "^0.8.0",
+ "inquirer": "^3.3.0",
+ "intl": "^1.2.5",
+ "intl-messageformat": "^4.4.0",
+ "intl-pluralrules": "^1.0.3",
+ "jpeg-js": "0.1.2",
+ "js-library-detector": "^5.5.0",
+ "jsonld": "^1.5.0",
+ "jsonlint-mod": "^1.7.5",
+ "lighthouse-logger": "^1.2.0",
+ "lodash.isequal": "^4.5.0",
+ "lodash.set": "^4.3.2",
+ "lookup-closest-locale": "6.0.4",
+ "metaviewport-parser": "0.2.0",
+ "mkdirp": "0.5.1",
+ "open": "^6.4.0",
+ "parse-cache-control": "1.0.1",
+ "raven": "^2.2.1",
+ "rimraf": "^2.6.1",
+ "robots-parser": "^2.0.1",
+ "semver": "^5.3.0",
+ "speedline-core": "1.4.2",
+ "third-party-web": "^0.11.0",
+ "update-notifier": "^2.5.0",
+ "ws": "3.3.2",
+ "yargs": "3.32.0",
+ "yargs-parser": "7.0.0"
+ },
+ "bin": {
+ "chrome-debug": "lighthouse-core/scripts/manual-chrome-launcher.js",
+ "lighthouse": "lighthouse-cli/index.js"
+ },
+ "engines": {
+ "node": ">=10.13"
+ }
+ },
+ "node_modules/lighthouse-logger": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.4.2.tgz",
+ "integrity": "sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^2.6.9",
+ "marky": "^1.2.2"
+ }
+ },
+ "node_modules/lighthouse-logger/node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/lighthouse-logger/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true
+ },
+ "node_modules/lighthouse/node_modules/ansi-regex": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lighthouse/node_modules/camelcase": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+ "integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lighthouse/node_modules/chrome-launcher": {
+ "version": "0.11.2",
+ "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.11.2.tgz",
+ "integrity": "sha512-jx0kJDCXdB2ARcDMwNCtrf04oY1Up4rOmVu+fqJ5MTPOOIG8EhRcEU9NZfXZc6dMw9FU8o1r21PNp8V2M0zQ+g==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*",
+ "is-wsl": "^2.1.0",
+ "lighthouse-logger": "^1.0.0",
+ "mkdirp": "0.5.1",
+ "rimraf": "^2.6.1"
+ }
+ },
+ "node_modules/lighthouse/node_modules/cliui": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+ "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wrap-ansi": "^2.0.0"
+ }
+ },
+ "node_modules/lighthouse/node_modules/cssom": {
+ "version": "0.3.8",
+ "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+ "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+ "dev": true
+ },
+ "node_modules/lighthouse/node_modules/cssstyle": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.1.tgz",
+ "integrity": "sha512-7DYm8qe+gPx/h77QlCyFmX80+fGaE/6A/Ekl0zaszYOubvySO2saYFdQ78P29D0UsULxFKCetDGNaNRUdSF+2A==",
+ "dev": true,
+ "dependencies": {
+ "cssom": "0.3.x"
+ }
+ },
+ "node_modules/lighthouse/node_modules/invert-kv": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+ "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lighthouse/node_modules/is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+ "dev": true,
+ "dependencies": {
+ "number-is-nan": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lighthouse/node_modules/is-wsl": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+ "dev": true,
+ "dependencies": {
+ "is-docker": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/lighthouse/node_modules/jpeg-js": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz",
+ "integrity": "sha512-CiRVjMKBUp6VYtGwzRjrdnro41yMwKGOWdP9ATXqmixdz2n7KHNwdqthTYSSbOKj/Ha79Gct1sA8ZQpse55TYA==",
+ "dev": true
+ },
+ "node_modules/lighthouse/node_modules/lcid": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+ "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
+ "dev": true,
+ "dependencies": {
+ "invert-kv": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lighthouse/node_modules/os-locale": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+ "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
+ "dev": true,
+ "dependencies": {
+ "lcid": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lighthouse/node_modules/rimraf": {
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+ "dev": true,
+ "dependencies": {
+ "glob": "^7.1.3"
+ },
+ "bin": {
+ "rimraf": "bin.js"
+ }
+ },
+ "node_modules/lighthouse/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/lighthouse/node_modules/semver": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/lighthouse/node_modules/string-width": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+ "dev": true,
+ "dependencies": {
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lighthouse/node_modules/strip-ansi": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+ "dev": true,
+ "dependencies": {
+ "ansi-regex": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lighthouse/node_modules/wrap-ansi": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+ "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lighthouse/node_modules/ws": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz",
+ "integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==",
+ "dev": true,
+ "dependencies": {
+ "async-limiter": "~1.0.0",
+ "safe-buffer": "~5.1.0",
+ "ultron": "~1.1.0"
+ }
+ },
+ "node_modules/lighthouse/node_modules/y18n": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+ "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+ "dev": true
+ },
+ "node_modules/lighthouse/node_modules/yargs": {
+ "version": "3.32.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+ "integrity": "sha512-ONJZiimStfZzhKamYvR/xvmgW3uEkAUFSP91y2caTEPhzF6uP2JfPiVZcq66b/YR0C3uitxSV7+T1x8p5bkmMg==",
+ "dev": true,
+ "dependencies": {
+ "camelcase": "^2.0.1",
+ "cliui": "^3.0.3",
+ "decamelize": "^1.1.1",
+ "os-locale": "^1.4.0",
+ "string-width": "^1.0.1",
+ "window-size": "^0.1.4",
+ "y18n": "^3.2.0"
+ }
+ },
+ "node_modules/limiter": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
+ "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==",
+ "dev": true
+ },
+ "node_modules/linebreak": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/linebreak/-/linebreak-1.1.0.tgz",
+ "integrity": "sha512-MHp03UImeVhB7XZtjd0E4n6+3xr5Dq/9xI/5FptGk5FrbDR3zagPa2DS6U8ks/3HjbKWG9Q1M2ufOzxV2qLYSQ==",
+ "dev": true,
+ "dependencies": {
+ "base64-js": "0.0.8",
+ "unicode-trie": "^2.0.0"
+ }
+ },
+ "node_modules/linebreak/node_modules/base64-js": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+ "integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/lines-and-columns": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+ "dev": true
+ },
+ "node_modules/load-bmfont": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.2.tgz",
+ "integrity": "sha512-qElWkmjW9Oq1F9EI5Gt7aD9zcdHb9spJCW1L/dmPf7KzCCEJxq8nhHz5eCgI9aMf7vrG/wyaCqdsI+Iy9ZTlog==",
+ "dev": true,
+ "dependencies": {
+ "buffer-equal": "0.0.1",
+ "mime": "^1.3.4",
+ "parse-bmfont-ascii": "^1.0.3",
+ "parse-bmfont-binary": "^1.0.5",
+ "parse-bmfont-xml": "^1.1.4",
+ "phin": "^3.7.1",
+ "xhr": "^2.0.1",
+ "xtend": "^4.0.0"
+ }
+ },
+ "node_modules/load-bmfont/node_modules/mime": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+ "dev": true,
+ "bin": {
+ "mime": "cli.js"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "dependencies": {
+ "p-locate": "^4.1.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/lodash": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+ "dev": true
+ },
+ "node_modules/lodash._reinterpolate": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+ "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
+ "dev": true
+ },
+ "node_modules/lodash.camelcase": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+ "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
+ "dev": true
+ },
+ "node_modules/lodash.clonedeep": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+ "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
+ "dev": true
+ },
+ "node_modules/lodash.defaults": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+ "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
+ "dev": true
+ },
+ "node_modules/lodash.flatten": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+ "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
+ "dev": true
+ },
+ "node_modules/lodash.get": {
+ "version": "4.4.2",
+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+ "dev": true
+ },
+ "node_modules/lodash.includes": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+ "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
+ "dev": true
+ },
+ "node_modules/lodash.isarguments": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+ "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+ "dev": true
+ },
+ "node_modules/lodash.isboolean": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+ "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
+ "dev": true
+ },
+ "node_modules/lodash.isequal": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+ "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
+ "dev": true
+ },
+ "node_modules/lodash.isinteger": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+ "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
+ "dev": true
+ },
+ "node_modules/lodash.isnumber": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+ "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
+ "dev": true
+ },
+ "node_modules/lodash.isplainobject": {
+ "version": "4.0.6",
+ "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+ "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+ "dev": true
+ },
+ "node_modules/lodash.isstring": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+ "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
+ "dev": true
+ },
+ "node_modules/lodash.memoize": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
+ "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==",
+ "dev": true
+ },
+ "node_modules/lodash.merge": {
+ "version": "4.6.2",
+ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/lodash.once": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+ "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+ "dev": true
+ },
+ "node_modules/lodash.set": {
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
+ "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==",
+ "dev": true
+ },
+ "node_modules/lodash.sortby": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+ "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",
+ "dev": true
+ },
+ "node_modules/lodash.template": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+ "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+ "dev": true,
+ "dependencies": {
+ "lodash._reinterpolate": "^3.0.0",
+ "lodash.templatesettings": "^4.0.0"
+ }
+ },
+ "node_modules/lodash.templatesettings": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+ "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+ "dev": true,
+ "dependencies": {
+ "lodash._reinterpolate": "^3.0.0"
+ }
+ },
+ "node_modules/lodash.uniq": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+ "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+ "dev": true
+ },
+ "node_modules/log-ok": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/log-ok/-/log-ok-0.1.1.tgz",
+ "integrity": "sha512-cc8VrkS6C+9TFuYAwuHpshrcrGRAv7d0tUJ0GdM72ZBlKXtlgjUZF84O+OhQUdiVHoF7U/nVxwpjOdwUJ8d3Vg==",
+ "dev": true,
+ "dependencies": {
+ "ansi-green": "^0.1.1",
+ "success-symbol": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/loglevel": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz",
+ "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6.0"
+ },
+ "funding": {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/loglevel"
+ }
+ },
+ "node_modules/long": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+ "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==",
+ "dev": true
+ },
+ "node_modules/longest": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+ "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lookup-closest-locale": {
+ "version": "6.0.4",
+ "resolved": "https://registry.npmjs.org/lookup-closest-locale/-/lookup-closest-locale-6.0.4.tgz",
+ "integrity": "sha512-bWoFbSGe6f1GvMGzj17LrwMX4FhDXDwZyH04ySVCPbtOJADcSRguZNKewoJ3Ful/MOxD/wRHvFPadk/kYZUbuQ==",
+ "dev": true
+ },
+ "node_modules/loopback": {
+ "version": "3.28.0",
+ "resolved": "https://registry.npmjs.org/loopback/-/loopback-3.28.0.tgz",
+ "integrity": "sha512-txYAc2vUn2imOKqcxnRFTm7fLx6+dbZ+V/wfAME0kyOJVyuV56H8RPpHl9/LTpKyNYQuoedGYrl9bwSavXgKoQ==",
+ "dev": true,
+ "dependencies": {
+ "async": "^2.0.1",
+ "bcryptjs": "^2.1.0",
+ "bluebird": "^3.1.1",
+ "body-parser": "^1.12.0",
+ "canonical-json": "0.0.4",
+ "debug": "^2.1.2",
+ "depd": "^1.0.0",
+ "ejs": "^2.3.1",
+ "express": "^4.14.0",
+ "inflection": "^1.6.0",
+ "isemail": "^3.2.0",
+ "loopback-connector-remote": "^3.0.0",
+ "loopback-datasource-juggler": "^3.28.0",
+ "loopback-filters": "^1.0.0",
+ "loopback-phase": "^3.0.0",
+ "nodemailer": "^6.4.16",
+ "nodemailer-direct-transport": "^3.3.2",
+ "nodemailer-stub-transport": "^1.1.0",
+ "serve-favicon": "^2.2.0",
+ "stable": "^0.1.5",
+ "strong-globalize": "^4.1.1",
+ "strong-remoting": "^3.11.0",
+ "uid2": "0.0.3",
+ "underscore.string": "^3.3.5"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/loopback-connector": {
+ "version": "4.11.1",
+ "resolved": "https://registry.npmjs.org/loopback-connector/-/loopback-connector-4.11.1.tgz",
+ "integrity": "sha512-EA31zur3xIhP4UW+P2rWEcSbqpk4jPddpTBZSSw8KCszM7T0/Pe4HvEmG0MndAWJctRPtrwKDEu/8rWuMDLf+A==",
+ "dev": true,
+ "dependencies": {
+ "async": "^3.2.0",
+ "bluebird": "^3.7.2",
+ "debug": "^4.1.1",
+ "msgpack5": "^4.2.0",
+ "strong-globalize": "^5.1.0",
+ "uuid": "^7.0.3"
+ },
+ "engines": {
+ "node": ">=8.9"
+ }
+ },
+ "node_modules/loopback-connector-remote": {
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/loopback-connector-remote/-/loopback-connector-remote-3.4.1.tgz",
+ "integrity": "sha512-O22X2Gcq8YzZF9DvRjOCyktQlASw1/22i/zzqxJHNKSQA5aQYeTB0w5FttOiKxcw6Q/jzL476hUvUE/NaZVZ1Q==",
+ "dev": true,
+ "dependencies": {
+ "loopback-datasource-juggler": "^3.0.0",
+ "strong-remoting": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/execa": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+ "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+ "dev": true,
+ "dependencies": {
+ "cross-spawn": "^7.0.0",
+ "get-stream": "^5.0.0",
+ "human-signals": "^1.1.1",
+ "is-stream": "^2.0.0",
+ "merge-stream": "^2.0.0",
+ "npm-run-path": "^4.0.0",
+ "onetime": "^5.1.0",
+ "signal-exit": "^3.0.2",
+ "strip-final-newline": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/execa?sponsor=1"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/get-stream": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+ "dev": true,
+ "dependencies": {
+ "pump": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/human-signals": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+ "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.12.0"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/invert-kv": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-3.0.1.tgz",
+ "integrity": "sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/invert-kv?sponsor=1"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/lcid": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-3.1.1.tgz",
+ "integrity": "sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg==",
+ "dev": true,
+ "dependencies": {
+ "invert-kv": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/mem": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz",
+ "integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==",
+ "dev": true,
+ "dependencies": {
+ "map-age-cleaner": "^0.1.3",
+ "mimic-fn": "^2.1.0",
+ "p-is-promise": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/mkdirp": {
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+ "dev": true,
+ "dependencies": {
+ "minimist": "^1.2.6"
+ },
+ "bin": {
+ "mkdirp": "bin/cmd.js"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/os-locale": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz",
+ "integrity": "sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA==",
+ "dev": true,
+ "dependencies": {
+ "execa": "^4.0.0",
+ "lcid": "^3.0.0",
+ "mem": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/p-is-promise": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/strong-globalize": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/strong-globalize/-/strong-globalize-5.1.0.tgz",
+ "integrity": "sha512-9cooAb6kNMDFmTDybkkch1x7b+LuzZNva8oIr+MxXnvx9jcvw4/4DTSXPc53mG68G0Q9YOTYZkhDkWe/DiJ1Qg==",
+ "dev": true,
+ "dependencies": {
+ "accept-language": "^3.0.18",
+ "debug": "^4.1.1",
+ "globalize": "^1.5.0",
+ "lodash": "^4.17.15",
+ "md5": "^2.2.1",
+ "mkdirp": "^0.5.5",
+ "os-locale": "^5.0.0",
+ "yamljs": "^0.3.0"
+ },
+ "engines": {
+ "node": ">=8.9"
+ }
+ },
+ "node_modules/loopback-connector/node_modules/uuid": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+ "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
+ "dev": true,
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/loopback-datasource-juggler": {
+ "version": "3.36.1",
+ "resolved": "https://registry.npmjs.org/loopback-datasource-juggler/-/loopback-datasource-juggler-3.36.1.tgz",
+ "integrity": "sha512-6eop3qxFyN3AkPBPUte2DHcsW1DopJwXXA20x3vwYsBSo4hLSv4gIeXo0+yqdQoXpHfbKRB9cv1hHEHAQSiWUA==",
+ "dev": true,
+ "dependencies": {
+ "async": "^2.6.0",
+ "bluebird": "^3.1.1",
+ "debug": "^3.1.0",
+ "depd": "^1.0.0",
+ "inflection": "^1.6.0",
+ "lodash": "^4.17.4",
+ "loopback-connector": "^4.4.0",
+ "minimatch": "^3.0.3",
+ "qs": "^6.5.0",
+ "shortid": "^2.2.6",
+ "strong-globalize": "^4.1.1",
+ "traverse": "^0.6.6",
+ "uuid": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/loopback-datasource-juggler/node_modules/async": {
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+ "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+ "dev": true,
+ "dependencies": {
+ "lodash": "^4.17.14"
+ }
+ },
+ "node_modules/loopback-datasource-juggler/node_modules/debug": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "dev": true,
+ "dependencies": {
+ "ms": "^2.1.1"
+ }
+ },
+ "node_modules/loopback-datasource-juggler/node_modules/depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/loopback-datasource-juggler/node_modules/inflection": {
+ "version": "1.13.4",
+ "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz",
+ "integrity": "sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==",
+ "dev": true,
+ "engines": [
+ "node >= 0.4.0"
+ ]
+ },
+ "node_modules/loopback-datatype-geopoint": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/loopback-datatype-geopoint/-/loopback-datatype-geopoint-1.0.0.tgz",
+ "integrity": "sha512-MqcEBXl/x4YC/hm/5ZRFBZGI9RCqHdy8zrv3jGHiE4cOnSdKVdranG+zEs8Xv7Z2sy/rV6qY3wsr7gBNcC9Kmw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/loopback-filters": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/loopback-filters/-/loopback-filters-1.1.1.tgz",
+ "integrity": "sha512-p0qSzuuX7eATe5Bxy+RqCj3vSfSFfdCtqyf3yuC+DpchMvgal33XlhEi2UmywyK/Ym28oVnZxxWmfrwFMzSwLQ==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^3.1.0"
+ },
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/loopback-filters/node_modules/debug": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "dev": true,
+ "dependencies": {
+ "ms": "^2.1.1"
+ }
+ },
+ "node_modules/loopback-phase": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/loopback-phase/-/loopback-phase-3.4.0.tgz",
+ "integrity": "sha512-FHtCOXO9IpaGkg/dw3lBQc2EmEtUx6LXZ0th5vkL1+jwDQVh6kdfvVk7wqVfZsskdOZz3j34rGWEP8qWx9JF0A==",
+ "dev": true,
+ "dependencies": {
+ "async": "^2.6.1",
+ "debug": "^3.1.0",
+ "strong-globalize": "^4.1.1"
+ },
+ "engines": {
+ "node": ">=8.9"
+ }
+ },
+ "node_modules/loopback-phase/node_modules/async": {
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+ "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+ "dev": true,
+ "dependencies": {
+ "lodash": "^4.17.14"
+ }
+ },
+ "node_modules/loopback-phase/node_modules/debug": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+ "dev": true,
+ "dependencies": {
+ "ms": "^2.1.1"
+ }
+ },
+ "node_modules/loopback/node_modules/async": {
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+ "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+ "dev": true,
+ "dependencies": {
+ "lodash": "^4.17.14"
+ }
+ },
+ "node_modules/loopback/node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/loopback/node_modules/depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/loopback/node_modules/inflection": {
+ "version": "1.13.4",
+ "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz",
+ "integrity": "sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==",
+ "dev": true,
+ "engines": [
+ "node >= 0.4.0"
+ ]
+ },
+ "node_modules/loopback/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true
+ },
+ "node_modules/loose-envify": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+ "dev": true,
+ "dependencies": {
+ "js-tokens": "^3.0.0 || ^4.0.0"
+ },
+ "bin": {
+ "loose-envify": "cli.js"
+ }
+ },
+ "node_modules/lower-case": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+ "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
+ "dev": true
+ },
+ "node_modules/lower-case-first": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz",
+ "integrity": "sha512-UuxaYakO7XeONbKrZf5FEgkantPf5DUqDayzP5VXZrtRPdH86s4kN47I8B3TW10S4QKiE3ziHNf3kRN//okHjA==",
+ "dev": true,
+ "dependencies": {
+ "lower-case": "^1.1.2"
+ }
+ },
+ "node_modules/lowercase-keys": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+ "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/lru_map": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz",
+ "integrity": "sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==",
+ "dev": true
+ },
+ "node_modules/lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dependencies": {
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/lru-memoizer": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.2.0.tgz",
+ "integrity": "sha512-QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw==",
+ "dev": true,
+ "dependencies": {
+ "lodash.clonedeep": "^4.5.0",
+ "lru-cache": "~4.0.0"
+ }
+ },
+ "node_modules/lru-memoizer/node_modules/lru-cache": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
+ "integrity": "sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==",
+ "dev": true,
+ "dependencies": {
+ "pseudomap": "^1.0.1",
+ "yallist": "^2.0.0"
+ }
+ },
+ "node_modules/lru-memoizer/node_modules/yallist": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+ "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+ "dev": true
+ },
+ "node_modules/luxon": {
+ "version": "3.4.4",
+ "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
+ "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/mailgun": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/mailgun/-/mailgun-0.5.0.tgz",
+ "integrity": "sha512-g0qrj4RP7l3S6+9Fb7x0nTmRoR+oB1rm68iEuSg3IKJir67b9RE5kfsNyK3ZenVgDCLRCdtaheDiybjkSYeZRA==",
+ "dev": true
+ },
+ "node_modules/make-dir": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+ "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+ "dev": true,
+ "dependencies": {
+ "semver": "^7.5.3"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/make-error": {
+ "version": "1.3.6",
+ "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/makeerror": {
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+ "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+ "dev": true,
+ "dependencies": {
+ "tmpl": "1.0.5"
+ }
+ },
+ "node_modules/map-age-cleaner": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+ "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+ "dev": true,
+ "dependencies": {
+ "p-defer": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/map-cache": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+ "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/map-visit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+ "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+ "dev": true,
+ "dependencies": {
+ "object-visit": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/mariadb": {
+ "version": "2.5.6",
+ "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-2.5.6.tgz",
+ "integrity": "sha512-zBx7loYY5GzLl8Y6AKxGXfY9DUYIIdGrmEORPOK9FEu0pg5ZLBKCGJuucHwKADxTBxKY7eM4rxndqxRcnMZKIw==",
+ "dev": true,
+ "dependencies": {
+ "@types/geojson": "^7946.0.8",
+ "@types/node": "^17.0.10",
+ "denque": "^2.0.1",
+ "iconv-lite": "^0.6.3",
+ "long": "^5.2.0",
+ "moment-timezone": "^0.5.34",
+ "please-upgrade-node": "^3.2.0"
+ },
+ "engines": {
+ "node": ">= 10.13"
+ }
+ },
+ "node_modules/mariadb/node_modules/@types/node": {
+ "version": "17.0.45",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
+ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
+ "dev": true
+ },
+ "node_modules/mariadb/node_modules/denque": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
+ "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/mariadb/node_modules/iconv-lite": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+ "dev": true,
+ "dependencies": {
+ "safer-buffer": ">= 2.1.2 < 3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/mariadb/node_modules/long": {
+ "version": "5.2.3",
+ "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+ "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
+ "dev": true
+ },
+ "node_modules/marky": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
+ "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
+ "dev": true
+ },
+ "node_modules/matched": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/matched/-/matched-0.4.4.tgz",
+ "integrity": "sha512-zpasnbB5vQkvb0nfcKV0zEoGgMtV7atlWR1Vk3E8tEKh6EicMseKtVV+5vc+zsZwvDlcNMKlKK/CVOEeAalYRQ==",
+ "dev": true,
+ "dependencies": {
+ "arr-union": "^3.1.0",
+ "async-array-reduce": "^0.2.0",
+ "extend-shallow": "^2.0.1",
+ "fs-exists-sync": "^0.1.0",
+ "glob": "^7.0.5",
+ "has-glob": "^0.1.1",
+ "is-valid-glob": "^0.3.0",
+ "lazy-cache": "^2.0.1",
+ "resolve-dir": "^0.1.0"
+ },
+ "engines": {
+ "node": ">= 0.12.0"
+ }
+ },
+ "node_modules/math-intrinsics": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+ "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/md5": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+ "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+ "dev": true,
+ "dependencies": {
+ "charenc": "0.0.2",
+ "crypt": "0.0.2",
+ "is-buffer": "~1.1.6"
+ }
+ },
+ "node_modules/md5.js": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+ "dev": true,
+ "dependencies": {
+ "hash-base": "^3.0.0",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+ }
+ },
+ "node_modules/mdast-util-from-markdown": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz",
+ "integrity": "sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==",
+ "dev": true,
+ "dependencies": {
+ "@types/mdast": "^3.0.0",
+ "@types/unist": "^2.0.0",
+ "decode-named-character-reference": "^1.0.0",
+ "mdast-util-to-string": "^3.1.0",
+ "micromark": "^3.0.0",
+ "micromark-util-decode-numeric-character-reference": "^1.0.0",
+ "micromark-util-decode-string": "^1.0.0",
+ "micromark-util-normalize-identifier": "^1.0.0",
+ "micromark-util-symbol": "^1.0.0",
+ "micromark-util-types": "^1.0.0",
+ "unist-util-stringify-position": "^3.0.0",
+ "uvu": "^0.5.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/mdast-util-to-string": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz",
+ "integrity": "sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==",
+ "dev": true,
+ "dependencies": {
+ "@types/mdast": "^3.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/media-typer": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+ "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/mem": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+ "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+ "dev": true,
+ "dependencies": {
+ "map-age-cleaner": "^0.1.1",
+ "mimic-fn": "^2.0.0",
+ "p-is-promise": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/mem/node_modules/p-is-promise": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/memcached": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/memcached/-/memcached-2.2.2.tgz",
+ "integrity": "sha512-lHwUmqkT9WdUUgRsAvquO4xsKXYaBd644Orz31tuth+w/BIfFNuJMWwsG7sa7H3XXytaNfPTZ5R/yOG3d9zJMA==",
+ "dev": true,
+ "dependencies": {
+ "hashring": "3.2.x",
+ "jackpot": ">=0.0.6"
+ }
+ },
+ "node_modules/memory-pager": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
+ "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
+ "dev": true
+ },
+ "node_modules/merge-descriptors": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+ "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+ "dev": true,
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/merge-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+ "dev": true
+ },
+ "node_modules/merge2": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/metaviewport-parser": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/metaviewport-parser/-/metaviewport-parser-0.2.0.tgz",
+ "integrity": "sha512-qL5NtY18LGs7lvZCkj3ep2H4Pes9rIiSLZRUyfDdvVw7pWFA0eLwmqaIxApD74RGvUrNEtk9e5Wt1rT+VlCvGw==",
+ "dev": true
+ },
+ "node_modules/methods": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+ "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/micromark": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.2.0.tgz",
+ "integrity": "sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "@types/debug": "^4.0.0",
+ "debug": "^4.0.0",
+ "decode-named-character-reference": "^1.0.0",
+ "micromark-core-commonmark": "^1.0.1",
+ "micromark-factory-space": "^1.0.0",
+ "micromark-util-character": "^1.0.0",
+ "micromark-util-chunked": "^1.0.0",
+ "micromark-util-combine-extensions": "^1.0.0",
+ "micromark-util-decode-numeric-character-reference": "^1.0.0",
+ "micromark-util-encode": "^1.0.0",
+ "micromark-util-normalize-identifier": "^1.0.0",
+ "micromark-util-resolve-all": "^1.0.0",
+ "micromark-util-sanitize-uri": "^1.0.0",
+ "micromark-util-subtokenize": "^1.0.0",
+ "micromark-util-symbol": "^1.0.0",
+ "micromark-util-types": "^1.0.1",
+ "uvu": "^0.5.0"
+ }
+ },
+ "node_modules/micromark-core-commonmark": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz",
+ "integrity": "sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "decode-named-character-reference": "^1.0.0",
+ "micromark-factory-destination": "^1.0.0",
+ "micromark-factory-label": "^1.0.0",
+ "micromark-factory-space": "^1.0.0",
+ "micromark-factory-title": "^1.0.0",
+ "micromark-factory-whitespace": "^1.0.0",
+ "micromark-util-character": "^1.0.0",
+ "micromark-util-chunked": "^1.0.0",
+ "micromark-util-classify-character": "^1.0.0",
+ "micromark-util-html-tag-name": "^1.0.0",
+ "micromark-util-normalize-identifier": "^1.0.0",
+ "micromark-util-resolve-all": "^1.0.0",
+ "micromark-util-subtokenize": "^1.0.0",
+ "micromark-util-symbol": "^1.0.0",
+ "micromark-util-types": "^1.0.1",
+ "uvu": "^0.5.0"
+ }
+ },
+ "node_modules/micromark-factory-destination": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.1.0.tgz",
+ "integrity": "sha512-XaNDROBgx9SgSChd69pjiGKbV+nfHGDPVYFs5dOoDd7ZnMAE+Cuu91BCpsY8RT2NP9vo/B8pds2VQNCLiu0zhg==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-character": "^1.0.0",
+ "micromark-util-symbol": "^1.0.0",
+ "micromark-util-types": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-factory-label": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.1.0.tgz",
+ "integrity": "sha512-OLtyez4vZo/1NjxGhcpDSbHQ+m0IIGnT8BoPamh+7jVlzLJBH98zzuCoUeMxvM6WsNeh8wx8cKvqLiPHEACn0w==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-character": "^1.0.0",
+ "micromark-util-symbol": "^1.0.0",
+ "micromark-util-types": "^1.0.0",
+ "uvu": "^0.5.0"
+ }
+ },
+ "node_modules/micromark-factory-space": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz",
+ "integrity": "sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-character": "^1.0.0",
+ "micromark-util-types": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-factory-title": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.1.0.tgz",
+ "integrity": "sha512-J7n9R3vMmgjDOCY8NPw55jiyaQnH5kBdV2/UXCtZIpnHH3P6nHUKaH7XXEYuWwx/xUJcawa8plLBEjMPU24HzQ==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-factory-space": "^1.0.0",
+ "micromark-util-character": "^1.0.0",
+ "micromark-util-symbol": "^1.0.0",
+ "micromark-util-types": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-factory-whitespace": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.1.0.tgz",
+ "integrity": "sha512-v2WlmiymVSp5oMg+1Q0N1Lxmt6pMhIHD457whWM7/GUlEks1hI9xj5w3zbc4uuMKXGisksZk8DzP2UyGbGqNsQ==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-factory-space": "^1.0.0",
+ "micromark-util-character": "^1.0.0",
+ "micromark-util-symbol": "^1.0.0",
+ "micromark-util-types": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-util-character": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.2.0.tgz",
+ "integrity": "sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-symbol": "^1.0.0",
+ "micromark-util-types": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-util-chunked": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.1.0.tgz",
+ "integrity": "sha512-Ye01HXpkZPNcV6FiyoW2fGZDUw4Yc7vT0E9Sad83+bEDiCJ1uXu0S3mr8WLpsz3HaG3x2q0HM6CTuPdcZcluFQ==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-symbol": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-util-classify-character": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.1.0.tgz",
+ "integrity": "sha512-SL0wLxtKSnklKSUplok1WQFoGhUdWYKggKUiqhX+Swala+BtptGCu5iPRc+xvzJ4PXE/hwM3FNXsfEVgoZsWbw==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-character": "^1.0.0",
+ "micromark-util-symbol": "^1.0.0",
+ "micromark-util-types": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-util-combine-extensions": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.1.0.tgz",
+ "integrity": "sha512-Q20sp4mfNf9yEqDL50WwuWZHUrCO4fEyeDCnMGmG5Pr0Cz15Uo7KBs6jq+dq0EgX4DPwwrh9m0X+zPV1ypFvUA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-chunked": "^1.0.0",
+ "micromark-util-types": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-util-decode-numeric-character-reference": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.1.0.tgz",
+ "integrity": "sha512-m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-symbol": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-util-decode-string": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.1.0.tgz",
+ "integrity": "sha512-YphLGCK8gM1tG1bd54azwyrQRjCFcmgj2S2GoJDNnh4vYtnL38JS8M4gpxzOPNyHdNEpheyWXCTnnTDY3N+NVQ==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "decode-named-character-reference": "^1.0.0",
+ "micromark-util-character": "^1.0.0",
+ "micromark-util-decode-numeric-character-reference": "^1.0.0",
+ "micromark-util-symbol": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-util-encode": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.1.0.tgz",
+ "integrity": "sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ]
+ },
+ "node_modules/micromark-util-html-tag-name": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.2.0.tgz",
+ "integrity": "sha512-VTQzcuQgFUD7yYztuQFKXT49KghjtETQ+Wv/zUjGSGBioZnkA4P1XXZPT1FHeJA6RwRXSF47yvJ1tsJdoxwO+Q==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ]
+ },
+ "node_modules/micromark-util-normalize-identifier": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.1.0.tgz",
+ "integrity": "sha512-N+w5vhqrBihhjdpM8+5Xsxy71QWqGn7HYNUvch71iV2PM7+E3uWGox1Qp90loa1ephtCxG2ftRV/Conitc6P2Q==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-symbol": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-util-resolve-all": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.1.0.tgz",
+ "integrity": "sha512-b/G6BTMSg+bX+xVCshPTPyAu2tmA0E4X98NSR7eIbeC6ycCqCeE7wjfDIgzEbkzdEVJXRtOG4FbEm/uGbCRouA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-types": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-util-sanitize-uri": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz",
+ "integrity": "sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-character": "^1.0.0",
+ "micromark-util-encode": "^1.0.0",
+ "micromark-util-symbol": "^1.0.0"
+ }
+ },
+ "node_modules/micromark-util-subtokenize": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.1.0.tgz",
+ "integrity": "sha512-kUQHyzRoxvZO2PuLzMt2P/dwVsTiivCK8icYTeR+3WgbuPqfHgPPy7nFKbeqRivBvn/3N3GBiNC+JRTMSxEC7A==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "micromark-util-chunked": "^1.0.0",
+ "micromark-util-symbol": "^1.0.0",
+ "micromark-util-types": "^1.0.0",
+ "uvu": "^0.5.0"
+ }
+ },
+ "node_modules/micromark-util-symbol": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz",
+ "integrity": "sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ]
+ },
+ "node_modules/micromark-util-types": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.1.0.tgz",
+ "integrity": "sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ]
+ },
+ "node_modules/micromatch": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+ "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+ "dev": true,
+ "dependencies": {
+ "braces": "^3.0.3",
+ "picomatch": "^2.3.1"
+ },
+ "engines": {
+ "node": ">=8.6"
+ }
+ },
+ "node_modules/micromatch/node_modules/picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
+ "node_modules/microtime": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/microtime/-/microtime-3.1.1.tgz",
+ "integrity": "sha512-to1r7o24cDsud9IhN6/8wGmMx5R2kT0w2Xwm5okbYI3d1dk6Xv0m+Z+jg2vS9pt+ocgQHTCtgs/YuyJhySzxNg==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "node-addon-api": "^5.0.0",
+ "node-gyp-build": "^4.4.0"
+ },
+ "engines": {
+ "node": ">= 14.13.0"
+ }
+ },
+ "node_modules/microtime/node_modules/node-addon-api": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
+ "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==",
+ "dev": true
+ },
+ "node_modules/miller-rabin": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^4.0.0",
+ "brorand": "^1.0.1"
+ },
+ "bin": {
+ "miller-rabin": "bin/miller-rabin"
+ }
+ },
+ "node_modules/miller-rabin/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
+ "node_modules/mime": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
+ "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
+ "dev": true,
+ "optional": true,
+ "bin": {
+ "mime": "cli.js"
+ },
+ "engines": {
+ "node": ">=10.0.0"
+ }
+ },
+ "node_modules/mime-db": {
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/mime-types": {
+ "version": "2.1.35",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+ "dev": true,
+ "dependencies": {
+ "mime-db": "1.52.0"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/mimic-fn": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/mimic-response": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+ "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/min-document": {
+ "version": "2.19.0",
+ "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+ "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==",
+ "dev": true,
+ "dependencies": {
+ "dom-walk": "^0.1.0"
+ }
+ },
+ "node_modules/min-indent": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+ "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/minimalistic-assert": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+ "dev": true
+ },
+ "node_modules/minimalistic-crypto-utils": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+ "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
+ "dev": true
+ },
+ "node_modules/minimatch": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+ "dependencies": {
+ "brace-expansion": "^1.1.7"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/minimist": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
+ "dev": true
+ },
+ "node_modules/minipass": {
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+ "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ }
+ },
+ "node_modules/minizlib": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz",
+ "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==",
+ "dependencies": {
+ "minipass": "^7.0.4",
+ "rimraf": "^5.0.5"
+ },
+ "engines": {
+ "node": ">= 18"
+ }
+ },
+ "node_modules/minizlib/node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dependencies": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "node_modules/minizlib/node_modules/glob": {
+ "version": "10.4.5",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+ "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+ "dependencies": {
+ "foreground-child": "^3.1.0",
+ "jackspeak": "^3.1.2",
+ "minimatch": "^9.0.4",
+ "minipass": "^7.1.2",
+ "package-json-from-dist": "^1.0.0",
+ "path-scurry": "^1.11.1"
+ },
+ "bin": {
+ "glob": "dist/esm/bin.mjs"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/minizlib/node_modules/minimatch": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+ "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/minizlib/node_modules/rimraf": {
+ "version": "5.0.10",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+ "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+ "dependencies": {
+ "glob": "^10.3.7"
+ },
+ "bin": {
+ "rimraf": "dist/esm/bin.mjs"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/mixin-deep": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+ "dev": true,
+ "dependencies": {
+ "for-in": "^1.0.2",
+ "is-extendable": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/mixin-deep/node_modules/is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "dependencies": {
+ "is-plain-object": "^2.0.4"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/mixto": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/mixto/-/mixto-1.0.0.tgz",
+ "integrity": "sha512-g2Kg8O3ww9RbWuPnAgTsAhe+aBwVXoo/lhYyDKTYPiLKdJofAr97O8zTFzW5UfiJUoeJbmXLmcjDAF7/Egwi8Q==",
+ "dev": true
+ },
+ "node_modules/mkdirp": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
+ "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+ "dev": true,
+ "dependencies": {
+ "minimist": "0.0.8"
+ },
+ "bin": {
+ "mkdirp": "bin/cmd.js"
+ }
+ },
+ "node_modules/mkdirp-classic": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+ "dev": true
+ },
+ "node_modules/mnemonist": {
+ "version": "0.32.0",
+ "resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.32.0.tgz",
+ "integrity": "sha512-WMVGPpT8guWwnsnw+WibOvInBnPfXFG+9SD+mg2+YgPEuW9Gdz9D2MEi05ko6RG1ui0RHljc+yYAvOHQn3GbbQ==",
+ "dev": true,
+ "dependencies": {
+ "obliterator": "^1.5.0"
+ }
+ },
+ "node_modules/module-deps": {
+ "version": "6.2.3",
+ "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz",
+ "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==",
+ "dev": true,
+ "dependencies": {
+ "browser-resolve": "^2.0.0",
+ "cached-path-relative": "^1.0.2",
+ "concat-stream": "~1.6.0",
+ "defined": "^1.0.0",
+ "detective": "^5.2.0",
+ "duplexer2": "^0.1.2",
+ "inherits": "^2.0.1",
+ "JSONStream": "^1.0.3",
+ "parents": "^1.0.0",
+ "readable-stream": "^2.0.2",
+ "resolve": "^1.4.0",
+ "stream-combiner2": "^1.1.1",
+ "subarg": "^1.0.0",
+ "through2": "^2.0.0",
+ "xtend": "^4.0.0"
+ },
+ "bin": {
+ "module-deps": "bin/cmd.js"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/module-deps/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/module-deps/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/module-deps/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/module-deps/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/moment": {
+ "version": "2.30.1",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+ "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/moment-timezone": {
+ "version": "0.5.44",
+ "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.44.tgz",
+ "integrity": "sha512-nv3YpzI/8lkQn0U6RkLd+f0W/zy/JnoR5/EyPz/dNkPTBjA2jNLCVxaiQ8QpeLymhSZvX0wCL5s27NQWdOPwAw==",
+ "dev": true,
+ "dependencies": {
+ "moment": "^2.29.4"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/mongodb": {
+ "version": "4.17.2",
+ "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.17.2.tgz",
+ "integrity": "sha512-mLV7SEiov2LHleRJPMPrK2PMyhXFZt2UQLC4VD4pnth3jMjYKHhtqfwwkkvS/NXuo/Fp3vbhaNcXrIDaLRb9Tg==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "bson": "^4.7.2",
+ "mongodb-connection-string-url": "^2.6.0",
+ "socks": "^2.7.1"
+ },
+ "engines": {
+ "node": ">=12.9.0"
+ },
+ "optionalDependencies": {
+ "@aws-sdk/credential-providers": "^3.186.0",
+ "@mongodb-js/saslprep": "^1.1.0"
+ }
+ },
+ "node_modules/mongodb-connection-string-url": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz",
+ "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@types/whatwg-url": "^8.2.1",
+ "whatwg-url": "^11.0.0"
+ }
+ },
+ "node_modules/mongodb-connection-string-url/node_modules/punycode": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/mongodb-connection-string-url/node_modules/tr46": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+ "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "punycode": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/mongodb-connection-string-url/node_modules/webidl-conversions": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+ "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/mongodb-connection-string-url/node_modules/whatwg-url": {
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+ "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "tr46": "^3.0.0",
+ "webidl-conversions": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/mongoose": {
+ "version": "6.13.6",
+ "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.13.6.tgz",
+ "integrity": "sha512-1c5NBoiJ+n7wBVaifBsFVSnVkCB/m6IfnZh6ppnyQVLTtK99mS37nfW/ytnoftIcu1ITvRDgzgOj5H2fPX5ezw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "bson": "^4.7.2",
+ "kareem": "2.5.1",
+ "mongodb": "4.17.2",
+ "mpath": "0.9.0",
+ "mquery": "4.0.3",
+ "ms": "2.1.3",
+ "sift": "16.0.1"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mongoose"
+ }
+ },
+ "node_modules/mpath": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz",
+ "integrity": "sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/mqtt": {
+ "version": "2.18.9",
+ "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-2.18.9.tgz",
+ "integrity": "sha512-ufywki8VAQ8YAERiunbj77TnXgaeVYVlyebnj4o9vhPUQFRjo+d3oUf0rft8kWi7YPYf4O8rkwPkeFc7ndWESg==",
+ "dev": true,
+ "dependencies": {
+ "commist": "^1.0.0",
+ "concat-stream": "^1.6.2",
+ "end-of-stream": "^1.4.1",
+ "es6-map": "^0.1.5",
+ "help-me": "^1.0.1",
+ "inherits": "^2.0.3",
+ "minimist": "^1.2.0",
+ "mqtt-packet": "^5.6.0",
+ "pump": "^3.0.0",
+ "readable-stream": "^2.3.6",
+ "reinterval": "^1.1.0",
+ "split2": "^2.1.1",
+ "websocket-stream": "~5.2.0",
+ "xtend": "^4.0.1"
+ },
+ "bin": {
+ "mqtt": "mqtt.js",
+ "mqtt_pub": "bin/pub.js",
+ "mqtt_sub": "bin/sub.js"
+ },
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/mqtt-packet": {
+ "version": "5.6.1",
+ "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.6.1.tgz",
+ "integrity": "sha512-eaF9rO2uFrIYEHomJxziuKTDkbWW5psLBaIGCazQSKqYsTaB3n4SpvJ1PexKaDBiPnMLPIFWBIiTYT3IfEJfww==",
+ "dev": true,
+ "dependencies": {
+ "bl": "^1.2.1",
+ "inherits": "^2.0.3",
+ "process-nextick-args": "^2.0.0",
+ "safe-buffer": "^5.1.0"
+ }
+ },
+ "node_modules/mqtt-packet/node_modules/bl": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
+ "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "^2.3.5",
+ "safe-buffer": "^5.1.1"
+ }
+ },
+ "node_modules/mqtt-packet/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/mqtt-packet/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/mqtt-packet/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/mqtt-packet/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/mqtt/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/mqtt/node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/mqtt/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/mqtt/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/mqtt/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/mquery": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/mquery/-/mquery-4.0.3.tgz",
+ "integrity": "sha512-J5heI+P08I6VJ2Ky3+33IpCdAvlYGTSUjwTPxkAr8i8EoduPMBX2OY/wa3IKZIQl7MU4SbFk8ndgSKyB/cl1zA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "debug": "4.x"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
+ "node_modules/mri": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
+ "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/ms": {
+ "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/msgpack-js": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/msgpack-js/-/msgpack-js-0.3.0.tgz",
+ "integrity": "sha512-dBIO+q0IAtZMeTn8K1gr0NuM0OvXEV97NwFsJQKzJ/qkQI9d5MN7Vc++TAUkIxaoIMJyIgMByOAwoJO2wdYDrA==",
+ "dev": true,
+ "dependencies": {
+ "bops": "~0.0.6"
+ }
+ },
+ "node_modules/msgpack-js/node_modules/base64-js": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz",
+ "integrity": "sha512-Pj9L87dCdGcKlSqPVUjD+q96pbIx1zQQLb2CUiWURfjiBELv84YX+0nGnKmyT/9KkC7PQk7UN1w+Al8bBozaxQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/msgpack-js/node_modules/bops": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/bops/-/bops-0.0.7.tgz",
+ "integrity": "sha512-oF8JFj2vZoTTzbS4haaB/37vqoJbZXxPBWmNdFONu3dUBW+zp7JcoIIYYd1r+4/YwFM8QUSR1u4rrPbtcdHsRg==",
+ "dev": true,
+ "dependencies": {
+ "base64-js": "0.0.2",
+ "to-utf8": "0.0.1"
+ }
+ },
+ "node_modules/msgpack-stream": {
+ "version": "0.0.13",
+ "resolved": "https://registry.npmjs.org/msgpack-stream/-/msgpack-stream-0.0.13.tgz",
+ "integrity": "sha512-Wh+t8IJrHPzSjph4wKJhenKG8vvtT0RDebLf1k1RSuRNOJ7caLFvwDnkyiihhZ5QJJmSg0KpjvqtDj9FvvWHWg==",
+ "dev": true,
+ "dependencies": {
+ "bops": "1.0.0",
+ "msgpack-js": "0.3.0",
+ "through": "2.3.4"
+ }
+ },
+ "node_modules/msgpack-stream/node_modules/through": {
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.4.tgz",
+ "integrity": "sha512-DwbmSAcABsMazNkLOJJSLRC3gfh4cPxUxJCn9npmvbcI6undhgoJ2ShvEOgZrW8BH62Gyr9jKboGbfFcmY5VsQ==",
+ "dev": true
+ },
+ "node_modules/msgpack5": {
+ "version": "4.5.1",
+ "resolved": "https://registry.npmjs.org/msgpack5/-/msgpack5-4.5.1.tgz",
+ "integrity": "sha512-zC1vkcliryc4JGlL6OfpHumSYUHWFGimSI+OgfRCjTFLmKA2/foR9rMTOhWiqfOrfxJOctrpWPvrppf8XynJxw==",
+ "dev": true,
+ "dependencies": {
+ "bl": "^2.0.1",
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.3.6",
+ "safe-buffer": "^5.1.2"
+ }
+ },
+ "node_modules/msgpack5/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/msgpack5/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/msgpack5/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/msgpack5/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/msgpackr": {
+ "version": "1.10.1",
+ "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.10.1.tgz",
+ "integrity": "sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==",
+ "dev": true,
+ "optionalDependencies": {
+ "msgpackr-extract": "^3.0.2"
+ }
+ },
+ "node_modules/msgpackr-extract": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz",
+ "integrity": "sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==",
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "dependencies": {
+ "node-gyp-build-optional-packages": "5.0.7"
+ },
+ "bin": {
+ "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
+ },
+ "optionalDependencies": {
+ "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.2",
+ "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.2",
+ "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.2",
+ "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.2",
+ "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.2",
+ "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.2"
+ }
+ },
+ "node_modules/mutationobserver-shim": {
+ "version": "0.3.7",
+ "resolved": "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz",
+ "integrity": "sha512-oRIDTyZQU96nAiz2AQyngwx1e89iApl2hN5AOYwyxLUB47UYsU3Wv9lJWqH5y/QdiYkc5HQLi23ZNB3fELdHcQ==",
+ "dev": true
+ },
+ "node_modules/mute-stream": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+ "integrity": "sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==",
+ "dev": true
+ },
+ "node_modules/mux-demux": {
+ "version": "3.7.9",
+ "resolved": "https://registry.npmjs.org/mux-demux/-/mux-demux-3.7.9.tgz",
+ "integrity": "sha512-zf+kqfl+e/U+0MSqJwUg+Wzbyxucf8YK6Sxyzy94gzS6ichxcEV2mUpXD7hPhCTKAVpX6s00ihYbJC/aH8gxwA==",
+ "dev": true,
+ "dependencies": {
+ "duplex": "~1.0.0",
+ "json-buffer": "~2.0.4",
+ "msgpack-stream": "~0.0.10",
+ "stream-combiner": "0.0.2",
+ "stream-serializer": "~1.1.1",
+ "through": "~2.3.1",
+ "xtend": "~1.0.3"
+ }
+ },
+ "node_modules/mux-demux/node_modules/json-buffer": {
+ "version": "2.0.11",
+ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-2.0.11.tgz",
+ "integrity": "sha512-Wu4/hxSZX7Krzjor+sZHWaRau6Be4WQHlrkl3v8cmxRBBewF2TotlgHUedKQJyFiUyFxnK/ZlRYnR9UNVZ7pkg==",
+ "dev": true
+ },
+ "node_modules/mux-demux/node_modules/xtend": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-1.0.3.tgz",
+ "integrity": "sha512-wv78b3q8kHDveC/C7Yq/UUrJXsAAM1t/j5m28h/ZlqYy0+eqByglhsWR88D2j3VImQzZlNIDsSbZ3QItwgWEGw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4"
+ }
+ },
+ "node_modules/mysql": {
+ "version": "2.18.1",
+ "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz",
+ "integrity": "sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==",
+ "dev": true,
+ "dependencies": {
+ "bignumber.js": "9.0.0",
+ "readable-stream": "2.3.7",
+ "safe-buffer": "5.1.2",
+ "sqlstring": "2.3.1"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/mysql/node_modules/bignumber.js": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
+ "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/mysql/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/mysql/node_modules/readable-stream": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/mysql/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/mysql/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/n3": {
+ "version": "1.17.2",
+ "resolved": "https://registry.npmjs.org/n3/-/n3-1.17.2.tgz",
+ "integrity": "sha512-BxSM52wYFqXrbQQT5WUEzKUn6qpYV+2L4XZLfn3Gblz2kwZ09S+QxC33WNdVEQy2djenFL8SNkrjejEKlvI6+Q==",
+ "dev": true,
+ "dependencies": {
+ "queue-microtask": "^1.1.2",
+ "readable-stream": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=12.0"
+ }
+ },
+ "node_modules/n3/node_modules/buffer": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+ "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+ "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"
+ }
+ ],
+ "dependencies": {
+ "base64-js": "^1.3.1",
+ "ieee754": "^1.2.1"
+ }
+ },
+ "node_modules/n3/node_modules/events": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.x"
+ }
+ },
+ "node_modules/n3/node_modules/readable-stream": {
+ "version": "4.5.2",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz",
+ "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
+ "dev": true,
+ "dependencies": {
+ "abort-controller": "^3.0.0",
+ "buffer": "^6.0.3",
+ "events": "^3.3.0",
+ "process": "^0.11.10",
+ "string_decoder": "^1.3.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ }
+ },
+ "node_modules/nan": {
+ "version": "2.18.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
+ "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
+ "dev": true
+ },
+ "node_modules/nanoid": {
+ "version": "2.1.11",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz",
+ "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==",
+ "dev": true
+ },
+ "node_modules/nanomatch": {
+ "version": "1.2.13",
+ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+ "dev": true,
+ "dependencies": {
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "fragment-cache": "^0.2.1",
+ "is-windows": "^1.0.2",
+ "kind-of": "^6.0.2",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/nanomatch/node_modules/define-property": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^1.0.2",
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/nanomatch/node_modules/extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+ "dev": true,
+ "dependencies": {
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/nanomatch/node_modules/is-descriptor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+ "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^1.0.1",
+ "is-data-descriptor": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/nanomatch/node_modules/is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "dependencies": {
+ "is-plain-object": "^2.0.4"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/nanomatch/node_modules/is-windows": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/nanomatch/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/nanomatch/node_modules/kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/napi-macros": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-2.0.0.tgz",
+ "integrity": "sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg==",
+ "dev": true
+ },
+ "node_modules/natural-compare": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+ "dev": true
+ },
+ "node_modules/negotiator": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+ "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/next-tick": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+ "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+ "dev": true
+ },
+ "node_modules/nice-napi": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz",
+ "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==",
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "os": [
+ "!win32"
+ ],
+ "dependencies": {
+ "node-addon-api": "^3.0.0",
+ "node-gyp-build": "^4.2.2"
+ }
+ },
+ "node_modules/nice-napi/node_modules/node-addon-api": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+ "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+ "dev": true,
+ "optional": true
+ },
+ "node_modules/nice-try": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+ "dev": true
+ },
+ "node_modules/node-abort-controller": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
+ "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
+ "dev": true
+ },
+ "node_modules/node-addon-api": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.0.0.tgz",
+ "integrity": "sha512-vgbBJTS4m5/KkE16t5Ly0WW9hz46swAstv0hYYwMtbG7AznRhNyfLRe8HZAiWIpcHzoO7HxhLuBQj9rJ/Ho0ZA==",
+ "dev": true
+ },
+ "node_modules/node-fetch": {
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+ "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+ "dependencies": {
+ "whatwg-url": "^5.0.0"
+ },
+ "engines": {
+ "node": "4.x || >=6.0.0"
+ },
+ "peerDependencies": {
+ "encoding": "^0.1.0"
+ },
+ "peerDependenciesMeta": {
+ "encoding": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/node-fetch/node_modules/tr46": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+ },
+ "node_modules/node-fetch/node_modules/webidl-conversions": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+ },
+ "node_modules/node-fetch/node_modules/whatwg-url": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+ "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+ "dependencies": {
+ "tr46": "~0.0.3",
+ "webidl-conversions": "^3.0.0"
+ }
+ },
+ "node_modules/node-forge": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+ "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 6.13.0"
+ }
+ },
+ "node_modules/node-gyp-build": {
+ "version": "4.7.1",
+ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.7.1.tgz",
+ "integrity": "sha512-wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg==",
+ "bin": {
+ "node-gyp-build": "bin.js",
+ "node-gyp-build-optional": "optional.js",
+ "node-gyp-build-test": "build-test.js"
+ }
+ },
+ "node_modules/node-gyp-build-optional-packages": {
+ "version": "5.0.7",
+ "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz",
+ "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==",
+ "dev": true,
+ "optional": true,
+ "bin": {
+ "node-gyp-build-optional-packages": "bin.js",
+ "node-gyp-build-optional-packages-optional": "optional.js",
+ "node-gyp-build-optional-packages-test": "build-test.js"
+ }
+ },
+ "node_modules/node-int64": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+ "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+ "dev": true
+ },
+ "node_modules/node-releases": {
+ "version": "2.0.19",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+ "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+ "dev": true
+ },
+ "node_modules/nodeify-fetch": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/nodeify-fetch/-/nodeify-fetch-2.2.2.tgz",
+ "integrity": "sha512-4b1Jysy9RGyya0wJpseTQyxUgSbx6kw9ocHTY0OFRXWlxa2Uy5PrSo/P/nwoUn59rBR9YKty2kd7g4LKXmsZVA==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "@zazuko/node-fetch": "^2.6.6",
+ "concat-stream": "^1.6.0",
+ "cross-fetch": "^3.0.4",
+ "readable-error": "^1.0.0",
+ "readable-stream": "^3.5.0"
+ }
+ },
+ "node_modules/nodemailer": {
+ "version": "6.9.8",
+ "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.8.tgz",
+ "integrity": "sha512-cfrYUk16e67Ks051i4CntM9kshRYei1/o/Gi8K1d+R34OIs21xdFnW7Pt7EucmVKA0LKtqUGNcjMZ7ehjl49mQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/nodemailer-direct-transport": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz",
+ "integrity": "sha512-vEMLWdUZP9NpbeabM8VTiB3Ar1R0ixASp/6DdKX372LK4USKB4Lq12/WCp69k/+kWk4RiCWWEGo57CcsXOs/bw==",
+ "dev": true,
+ "dependencies": {
+ "nodemailer-shared": "1.1.0",
+ "smtp-connection": "2.12.0"
+ }
+ },
+ "node_modules/nodemailer-fetch": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz",
+ "integrity": "sha512-P7S5CEVGAmDrrpn351aXOLYs1R/7fD5NamfMCHyi6WIkbjS2eeZUB/TkuvpOQr0bvRZicVqo59+8wbhR3yrJbQ==",
+ "dev": true
+ },
+ "node_modules/nodemailer-shared": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz",
+ "integrity": "sha512-68xW5LSyPWv8R0GLm6veAvm7E+XFXkVgvE3FW0FGxNMMZqMkPFeGDVALfR1DPdSfcoO36PnW7q5AAOgFImEZGg==",
+ "dev": true,
+ "dependencies": {
+ "nodemailer-fetch": "1.6.0"
+ }
+ },
+ "node_modules/nodemailer-stub-transport": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/nodemailer-stub-transport/-/nodemailer-stub-transport-1.1.0.tgz",
+ "integrity": "sha512-4fwl2f+647IIyuNuf6wuEMqK4oEU9FMJSYme8kPckVSr1rXIXcmI6BNcIWO+1cAK8XeexYKxYoFztam0jAwjkA==",
+ "dev": true
+ },
+ "node_modules/nopt": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.0.0.tgz",
+ "integrity": "sha512-1L/fTJ4UmV/lUxT2Uf006pfZKTvAgCF+chz+0OgBHO8u2Z67pE7AaAUUj7CJy0lXqHmymUvGFt6NE9R3HER0yw==",
+ "dependencies": {
+ "abbrev": "^2.0.0"
+ },
+ "bin": {
+ "nopt": "bin/nopt.js"
+ },
+ "engines": {
+ "node": "^18.17.0 || >=20.5.0"
+ }
+ },
+ "node_modules/normalize-package-data": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+ "dev": true,
+ "dependencies": {
+ "hosted-git-info": "^2.1.4",
+ "resolve": "^1.10.0",
+ "semver": "2 || 3 || 4 || 5",
+ "validate-npm-package-license": "^3.0.1"
+ }
+ },
+ "node_modules/normalize-package-data/node_modules/semver": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/normalize-url": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+ "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+ "dev": true,
+ "dependencies": {
+ "prepend-http": "^2.0.0",
+ "query-string": "^5.0.1",
+ "sort-keys": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/notate": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/notate/-/notate-1.1.2.tgz",
+ "integrity": "sha512-87c1SbFP7TvHk1gdc1ZRTk+0wr+1VbKC6Nm3cW7xqHjEyU0eY27fOHjJnWmxFkgSkQF/kaLj9PfvtUh13GjHMQ==",
+ "dev": true
+ },
+ "node_modules/npm-run-path": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+ "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+ "dev": true,
+ "dependencies": {
+ "path-key": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/npmlog": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+ "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+ "deprecated": "This package is no longer supported.",
+ "dev": true,
+ "dependencies": {
+ "are-we-there-yet": "^2.0.0",
+ "console-control-strings": "^1.1.0",
+ "gauge": "^3.0.0",
+ "set-blocking": "^2.0.0"
+ }
+ },
+ "node_modules/number-is-nan": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+ "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/nwsapi": {
+ "version": "2.2.7",
+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
+ "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
+ "dev": true
+ },
+ "node_modules/oauth": {
+ "version": "0.9.15",
+ "resolved": "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz",
+ "integrity": "sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==",
+ "dev": true
+ },
+ "node_modules/oauth-sign": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/object-assign": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-copy": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+ "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+ "dev": true,
+ "dependencies": {
+ "copy-descriptor": "^0.1.0",
+ "define-property": "^0.2.5",
+ "kind-of": "^3.0.3"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-hash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+ "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/object-inspect": {
+ "version": "1.13.3",
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
+ "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/object-is": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+ "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.1.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/object-keys": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/object-path": {
+ "version": "0.11.8",
+ "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz",
+ "integrity": "sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 10.12.0"
+ }
+ },
+ "node_modules/object-visit": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+ "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+ "dev": true,
+ "dependencies": {
+ "isobject": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-visit/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object.assign": {
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
+ "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.5",
+ "define-properties": "^1.2.1",
+ "has-symbols": "^1.0.3",
+ "object-keys": "^1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/object.entries": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz",
+ "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/object.fromentries": {
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
+ "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/object.getownpropertydescriptors": {
+ "version": "2.1.7",
+ "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz",
+ "integrity": "sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==",
+ "dev": true,
+ "dependencies": {
+ "array.prototype.reduce": "^1.0.6",
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1",
+ "safe-array-concat": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/object.groupby": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz",
+ "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==",
+ "dev": true,
+ "dependencies": {
+ "array.prototype.filter": "^1.0.3",
+ "call-bind": "^1.0.5",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.22.3",
+ "es-errors": "^1.0.0"
+ }
+ },
+ "node_modules/object.hasown": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz",
+ "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==",
+ "dev": true,
+ "dependencies": {
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/object.pick": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+ "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+ "dev": true,
+ "dependencies": {
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object.pick/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object.values": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
+ "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/obliterator": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-1.6.1.tgz",
+ "integrity": "sha512-9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig==",
+ "dev": true
+ },
+ "node_modules/omggif": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz",
+ "integrity": "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==",
+ "dev": true
+ },
+ "node_modules/on-finished": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+ "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+ "dev": true,
+ "dependencies": {
+ "ee-first": "1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+ "dependencies": {
+ "wrappy": "1"
+ }
+ },
+ "node_modules/onetime": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+ "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+ "dev": true,
+ "dependencies": {
+ "mimic-fn": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/oniguruma": {
+ "version": "7.2.3",
+ "resolved": "https://registry.npmjs.org/oniguruma/-/oniguruma-7.2.3.tgz",
+ "integrity": "sha512-PZZcE0yfg8Q1IvaJImh21RUTHl8ep0zwwyoE912KqlWVrsGByjjj29sdACcD1BFyX2bLkfuOJeP+POzAGVWtbA==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "nan": "^2.14.0"
+ }
+ },
+ "node_modules/only": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/only/-/only-0.0.2.tgz",
+ "integrity": "sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==",
+ "dev": true
+ },
+ "node_modules/open": {
+ "version": "6.4.0",
+ "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
+ "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
+ "dev": true,
+ "dependencies": {
+ "is-wsl": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/optimist": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+ "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
+ "dev": true,
+ "dependencies": {
+ "minimist": "~0.0.1",
+ "wordwrap": "~0.0.2"
+ }
+ },
+ "node_modules/options": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
+ "integrity": "sha512-bOj3L1ypm++N+n7CEbbe473A414AB7z+amKYshRb//iuL3MpdDCLhPnw6aVTdKB9g5ZRVHIEp8eUln6L2NUStg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/oracledb": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/oracledb/-/oracledb-6.3.0.tgz",
+ "integrity": "sha512-fr3U66QxgGXb5cs/ozLBQU50TMbZcBQEWvSaj2rJAXG8KRrsZcGOK8JTlZL1yJHeW8cSjOm6n/wTw3SJksGjDg==",
+ "dev": true,
+ "hasInstallScript": true,
+ "engines": {
+ "node": ">=14.6"
+ }
+ },
+ "node_modules/ordered-read-streams": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+ "integrity": "sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "^2.0.1"
+ }
+ },
+ "node_modules/ordered-read-streams/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/ordered-read-streams/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/ordered-read-streams/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/ordered-read-streams/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/os-browserify": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+ "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
+ "dev": true
+ },
+ "node_modules/os-homedir": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+ "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/os-locale": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+ "dev": true,
+ "dependencies": {
+ "execa": "^1.0.0",
+ "lcid": "^2.0.0",
+ "mem": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/os-locale/node_modules/cross-spawn": {
+ "version": "6.0.5",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+ "dev": true,
+ "dependencies": {
+ "nice-try": "^1.0.4",
+ "path-key": "^2.0.1",
+ "semver": "^5.5.0",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
+ },
+ "engines": {
+ "node": ">=4.8"
+ }
+ },
+ "node_modules/os-locale/node_modules/execa": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+ "dev": true,
+ "dependencies": {
+ "cross-spawn": "^6.0.0",
+ "get-stream": "^4.0.0",
+ "is-stream": "^1.1.0",
+ "npm-run-path": "^2.0.0",
+ "p-finally": "^1.0.0",
+ "signal-exit": "^3.0.0",
+ "strip-eof": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/os-locale/node_modules/get-stream": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+ "dev": true,
+ "dependencies": {
+ "pump": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/os-locale/node_modules/is-stream": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+ "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/os-locale/node_modules/npm-run-path": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+ "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+ "dev": true,
+ "dependencies": {
+ "path-key": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/os-locale/node_modules/path-key": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+ "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/os-locale/node_modules/semver": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/os-locale/node_modules/shebang-command": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+ "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+ "dev": true,
+ "dependencies": {
+ "shebang-regex": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/os-locale/node_modules/shebang-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+ "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/os-tmpdir": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/outpipe": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/outpipe/-/outpipe-1.1.1.tgz",
+ "integrity": "sha512-BnNY/RwnDrkmQdUa9U+OfN/Y7AWmKuUPCCd+hbRclZnnANvYpO72zp/a6Q4n829hPbdqEac31XCcsvlEvb+rtA==",
+ "dev": true,
+ "dependencies": {
+ "shell-quote": "^1.4.2"
+ }
+ },
+ "node_modules/p-cancelable": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
+ "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/p-defer": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+ "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/p-finally": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+ "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/p-is-promise": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+ "integrity": "sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "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-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "dependencies": {
+ "p-limit": "^2.2.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/p-locate/node_modules/p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dev": true,
+ "dependencies": {
+ "p-try": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/p-map": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+ "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/p-timeout": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
+ "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+ "dev": true,
+ "dependencies": {
+ "p-finally": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/package-json": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+ "integrity": "sha512-q/R5GrMek0vzgoomq6rm9OX+3PQve8sLwTirmK30YB3Cu0Bbt9OX9M/SIUnroN5BGJkzwGsFwDaRGD9EwBOlCA==",
+ "dev": true,
+ "dependencies": {
+ "got": "^6.7.1",
+ "registry-auth-token": "^3.0.1",
+ "registry-url": "^3.0.3",
+ "semver": "^5.1.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/package-json-from-dist": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
+ },
+ "node_modules/package-json/node_modules/get-stream": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+ "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/package-json/node_modules/got": {
+ "version": "6.7.1",
+ "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+ "integrity": "sha512-Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg==",
+ "dev": true,
+ "dependencies": {
+ "create-error-class": "^3.0.0",
+ "duplexer3": "^0.1.4",
+ "get-stream": "^3.0.0",
+ "is-redirect": "^1.0.0",
+ "is-retry-allowed": "^1.0.0",
+ "is-stream": "^1.0.0",
+ "lowercase-keys": "^1.0.0",
+ "safe-buffer": "^5.0.1",
+ "timed-out": "^4.0.0",
+ "unzip-response": "^2.0.1",
+ "url-parse-lax": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/package-json/node_modules/is-retry-allowed": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+ "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/package-json/node_modules/is-stream": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+ "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/package-json/node_modules/prepend-http": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+ "integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/package-json/node_modules/semver": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/package-json/node_modules/url-parse-lax": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+ "integrity": "sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA==",
+ "dev": true,
+ "dependencies": {
+ "prepend-http": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/packet-reader": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
+ "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==",
+ "dev": true
+ },
+ "node_modules/pako": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+ "dev": true
+ },
+ "node_modules/param-case": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/param-case/-/param-case-1.1.2.tgz",
+ "integrity": "sha512-gksk6zeZQxwBm1AHsKh+XDFsTGf1LvdZSkkpSIkfDtzW+EQj/P2PBgNb3Cs0Y9Xxqmbciv2JZe3fWU6Xbher+Q==",
+ "dev": true,
+ "dependencies": {
+ "sentence-case": "^1.1.2"
+ }
+ },
+ "node_modules/paraphrase": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/paraphrase/-/paraphrase-1.8.0.tgz",
+ "integrity": "sha512-447jeY7a82JcPtJht+rEEnlSeKFmaZezMpkeQTtWB88n8PtJew/HIGHhmvjxi2QfSiRECeIJ6XkZ9U8w0neCZg==",
+ "dev": true,
+ "dependencies": {
+ "notate": "^1.1.2"
+ }
+ },
+ "node_modules/parent-module": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "callsites": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/parents": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+ "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
+ "dev": true,
+ "dependencies": {
+ "path-platform": "~0.11.15"
+ }
+ },
+ "node_modules/parse-asn1": {
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+ "dev": true,
+ "dependencies": {
+ "asn1.js": "^5.2.0",
+ "browserify-aes": "^1.0.0",
+ "evp_bytestokey": "^1.0.0",
+ "pbkdf2": "^3.0.3",
+ "safe-buffer": "^5.1.1"
+ }
+ },
+ "node_modules/parse-bmfont-ascii": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz",
+ "integrity": "sha512-U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA==",
+ "dev": true
+ },
+ "node_modules/parse-bmfont-binary": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz",
+ "integrity": "sha512-GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA==",
+ "dev": true
+ },
+ "node_modules/parse-bmfont-xml": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.6.tgz",
+ "integrity": "sha512-0cEliVMZEhrFDwMh4SxIyVJpqYoOWDJ9P895tFuS+XuNzI5UBmBk5U5O4KuJdTnZpSBI4LFA2+ZiJaiwfSwlMA==",
+ "dev": true,
+ "dependencies": {
+ "xml-parse-from-string": "^1.0.0",
+ "xml2js": "^0.5.0"
+ }
+ },
+ "node_modules/parse-bmfont-xml/node_modules/xml2js": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+ "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+ "dev": true,
+ "dependencies": {
+ "sax": ">=0.6.0",
+ "xmlbuilder": "~11.0.0"
+ },
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/parse-bmfont-xml/node_modules/xmlbuilder": {
+ "version": "11.0.1",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+ "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/parse-cache-control": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/parse-cache-control/-/parse-cache-control-1.0.1.tgz",
+ "integrity": "sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg==",
+ "dev": true
+ },
+ "node_modules/parse-headers": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.5.tgz",
+ "integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA==",
+ "dev": true
+ },
+ "node_modules/parse-json": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.0.0",
+ "error-ex": "^1.3.1",
+ "json-parse-even-better-errors": "^2.3.0",
+ "lines-and-columns": "^1.1.6"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/parse-numeric-range": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz",
+ "integrity": "sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ==",
+ "dev": true
+ },
+ "node_modules/parse-passwd": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+ "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/parse5": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+ "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+ "dev": true
+ },
+ "node_modules/parse5-htmlparser2-tree-adapter": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+ "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+ "dev": true,
+ "dependencies": {
+ "parse5": "^6.0.1"
+ }
+ },
+ "node_modules/parseqs": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz",
+ "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==",
+ "dev": true
+ },
+ "node_modules/parseuri": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz",
+ "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==",
+ "dev": true
+ },
+ "node_modules/parseurl": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/pascal-case": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-1.1.2.tgz",
+ "integrity": "sha512-QWlbdQHdKWlcyTEuv/M0noJtlCa7qTmg5QFAqhx5X9xjAfCU1kXucL+rcOmd2HliESuRLIOz8521RAW/yhuQog==",
+ "dev": true,
+ "dependencies": {
+ "camel-case": "^1.1.1",
+ "upper-case-first": "^1.1.0"
+ }
+ },
+ "node_modules/pascalcase": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+ "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/passport": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz",
+ "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==",
+ "dev": true,
+ "dependencies": {
+ "passport-strategy": "1.x.x",
+ "pause": "0.0.1",
+ "utils-merge": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4.0"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/jaredhanson"
+ }
+ },
+ "node_modules/passport-google-oauth": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-2.0.0.tgz",
+ "integrity": "sha512-JKxZpBx6wBQXX1/a1s7VmdBgwOugohH+IxCy84aPTZNq/iIPX6u7Mqov1zY7MKRz3niFPol0KJz8zPLBoHKtYA==",
+ "dev": true,
+ "dependencies": {
+ "passport-google-oauth1": "1.x.x",
+ "passport-google-oauth20": "2.x.x"
+ },
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/passport-google-oauth1": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz",
+ "integrity": "sha512-qpCEhuflJgYrdg5zZIpAq/K3gTqa1CtHjbubsEsidIdpBPLkEVq6tB1I8kBNcH89RdSiYbnKpCBXAZXX/dtx1Q==",
+ "dev": true,
+ "dependencies": {
+ "passport-oauth1": "1.x.x"
+ }
+ },
+ "node_modules/passport-google-oauth20": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz",
+ "integrity": "sha512-KSk6IJ15RoxuGq7D1UKK/8qKhNfzbLeLrG3gkLZ7p4A6DBCcv7xpyQwuXtWdpyR0+E0mwkpjY1VfPOhxQrKzdQ==",
+ "dev": true,
+ "dependencies": {
+ "passport-oauth2": "1.x.x"
+ },
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/passport-oauth1": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.3.0.tgz",
+ "integrity": "sha512-8T/nX4gwKTw0PjxP1xfD0QhrydQNakzeOpZ6M5Uqdgz9/a/Ag62RmJxnZQ4LkbdXGrRehQHIAHNAu11rCP46Sw==",
+ "dev": true,
+ "dependencies": {
+ "oauth": "0.9.x",
+ "passport-strategy": "1.x.x",
+ "utils-merge": "1.x.x"
+ },
+ "engines": {
+ "node": ">= 0.4.0"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/jaredhanson"
+ }
+ },
+ "node_modules/passport-oauth2": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.7.0.tgz",
+ "integrity": "sha512-j2gf34szdTF2Onw3+76alNnaAExlUmHvkc7cL+cmaS5NzHzDP/BvFHJruueQ9XAeNOdpI+CH+PWid8RA7KCwAQ==",
+ "dev": true,
+ "dependencies": {
+ "base64url": "3.x.x",
+ "oauth": "0.9.x",
+ "passport-strategy": "1.x.x",
+ "uid2": "0.0.x",
+ "utils-merge": "1.x.x"
+ },
+ "engines": {
+ "node": ">= 0.4.0"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/jaredhanson"
+ }
+ },
+ "node_modules/passport-strategy": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
+ "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/passport-trakt": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/passport-trakt/-/passport-trakt-1.0.4.tgz",
+ "integrity": "sha512-XTmscUdrSEk4jYC+XQoybShbpNepaYigJLAlAd5wNS6HlCB+p+lT14+hvOuuUeNRwUI259+kVgVKXZjc3Asgeg==",
+ "dev": true,
+ "dependencies": {
+ "passport-oauth2": "1.x.x",
+ "pkginfo": "0.3.x"
+ },
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/path-browserify": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+ "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+ "dev": true
+ },
+ "node_modules/path-case": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/path-case/-/path-case-1.1.2.tgz",
+ "integrity": "sha512-2snAGA6xVRqTuTPa40bn0iEpYtVK6gEqeyS/63dqpm5pGlesOv6EmRcnB9Rr6eAnAC2Wqlbz0tqgJZryttxhxg==",
+ "dev": true,
+ "dependencies": {
+ "sentence-case": "^1.1.2"
+ }
+ },
+ "node_modules/path-dirname": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+ "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
+ "dev": true
+ },
+ "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/path-is-absolute": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/path-is-inside": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+ "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
+ "dev": true
+ },
+ "node_modules/path-key": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/path-parse": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+ "dev": true
+ },
+ "node_modules/path-platform": {
+ "version": "0.11.15",
+ "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
+ "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/path-scurry": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+ "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+ "dependencies": {
+ "lru-cache": "^10.2.0",
+ "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/path-scurry/node_modules/lru-cache": {
+ "version": "10.4.3",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+ },
+ "node_modules/path-source": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/path-source/-/path-source-0.1.3.tgz",
+ "integrity": "sha512-dWRHm5mIw5kw0cs3QZLNmpUWty48f5+5v9nWD2dw3Y0Hf+s01Ag8iJEWV0Sm0kocE8kK27DrIowha03e1YR+Qw==",
+ "dev": true,
+ "dependencies": {
+ "array-source": "0.0",
+ "file-source": "0.6"
+ }
+ },
+ "node_modules/path-to-regexp": {
+ "version": "0.1.12",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+ "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/path-type": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/pause": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+ "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==",
+ "dev": true
+ },
+ "node_modules/pbf": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
+ "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==",
+ "dev": true,
+ "dependencies": {
+ "ieee754": "^1.1.12",
+ "resolve-protobuf-schema": "^2.1.0"
+ },
+ "bin": {
+ "pbf": "bin/pbf"
+ }
+ },
+ "node_modules/pbkdf2": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+ "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+ "dev": true,
+ "dependencies": {
+ "create-hash": "^1.1.2",
+ "create-hmac": "^1.1.4",
+ "ripemd160": "^2.0.1",
+ "safe-buffer": "^5.0.1",
+ "sha.js": "^2.4.8"
+ },
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
+ "node_modules/pdf2json": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/pdf2json/-/pdf2json-2.0.2.tgz",
+ "integrity": "sha512-BFt5zy5VeAc6sOAUy+TWT6cM+eFFrFoSzcqFUYjKK82lukq5/1SwCD9QdC4ostj0/u3NEr6cqDsqVL/971U28Q==",
+ "bundleDependencies": [
+ "@xmldom/xmldom"
+ ],
+ "dev": true,
+ "dependencies": {
+ "@xmldom/xmldom": "^0.8.7"
+ },
+ "bin": {
+ "pdf2json": "bin/pdf2json"
+ },
+ "engines": {
+ "node": ">=14.18.0",
+ "npm": ">=6.14.15"
+ }
+ },
+ "node_modules/pdf2json/node_modules/@xmldom/xmldom": {
+ "version": "0.8.7",
+ "dev": true,
+ "inBundle": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=10.0.0"
+ }
+ },
+ "node_modules/pdfkit": {
+ "version": "0.14.0",
+ "resolved": "https://registry.npmjs.org/pdfkit/-/pdfkit-0.14.0.tgz",
+ "integrity": "sha512-Hnor8/78jhHm6ONrxWhrqOwAVALlBnFyWOF8sstBZMiqHZgZ5A6RU+Q3yahhw82plxpT7LOfH3b3qcOX6rzMQg==",
+ "dev": true,
+ "dependencies": {
+ "crypto-js": "^4.2.0",
+ "fontkit": "^1.8.1",
+ "linebreak": "^1.0.2",
+ "png-js": "^1.0.0"
+ }
+ },
+ "node_modules/peek-readable": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
+ "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/Borewit"
+ }
+ },
+ "node_modules/pend": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+ "dev": true
+ },
+ "node_modules/performance-now": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+ "dev": true
+ },
+ "node_modules/pg": {
+ "version": "7.18.2",
+ "resolved": "https://registry.npmjs.org/pg/-/pg-7.18.2.tgz",
+ "integrity": "sha512-Mvt0dGYMwvEADNKy5PMQGlzPudKcKKzJds/VbOeZJpb6f/pI3mmoXX0JksPgI3l3JPP/2Apq7F36O63J7mgveA==",
+ "dev": true,
+ "dependencies": {
+ "buffer-writer": "2.0.0",
+ "packet-reader": "1.0.0",
+ "pg-connection-string": "0.1.3",
+ "pg-packet-stream": "^1.1.0",
+ "pg-pool": "^2.0.10",
+ "pg-types": "^2.1.0",
+ "pgpass": "1.x",
+ "semver": "4.3.2"
+ },
+ "engines": {
+ "node": ">= 4.5.0"
+ }
+ },
+ "node_modules/pg-connection-string": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz",
+ "integrity": "sha512-i0NV/CrSkFTaiOQs9AGy3tq0dkSjtTd4d7DfsjeDVZAA4aIHInwfFEmriNYGGJUfZ5x6IAC/QddoUpUJjQAi0w==",
+ "dev": true
+ },
+ "node_modules/pg-int8": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
+ "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/pg-packet-stream": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz",
+ "integrity": "sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg==",
+ "dev": true
+ },
+ "node_modules/pg-pool": {
+ "version": "2.0.10",
+ "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz",
+ "integrity": "sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg==",
+ "dev": true,
+ "peerDependencies": {
+ "pg": ">5.0"
+ }
+ },
+ "node_modules/pg-types": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
+ "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+ "dev": true,
+ "dependencies": {
+ "pg-int8": "1.0.1",
+ "postgres-array": "~2.0.0",
+ "postgres-bytea": "~1.0.0",
+ "postgres-date": "~1.0.4",
+ "postgres-interval": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/pg/node_modules/semver": {
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz",
+ "integrity": "sha512-VyFUffiBx8hABJ9HYSTXLRwyZtdDHMzMtFmID1aiNAD2BZppBmJm0Hqw3p2jkgxP9BNt1pQ9RnC49P0EcXf6cA==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/pgpass": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
+ "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
+ "dev": true,
+ "dependencies": {
+ "split2": "^4.1.0"
+ }
+ },
+ "node_modules/pgpass/node_modules/split2": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+ "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 10.x"
+ }
+ },
+ "node_modules/phantomjs-prebuilt": {
+ "version": "2.1.16",
+ "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz",
+ "integrity": "sha512-PIiRzBhW85xco2fuj41FmsyuYHKjKuXWmhjy3A/Y+CMpN/63TV+s9uzfVhsUwFe0G77xWtHBG8xmXf5BqEUEuQ==",
+ "deprecated": "this package is now deprecated",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "es6-promise": "^4.0.3",
+ "extract-zip": "^1.6.5",
+ "fs-extra": "^1.0.0",
+ "hasha": "^2.2.0",
+ "kew": "^0.7.0",
+ "progress": "^1.1.8",
+ "request": "^2.81.0",
+ "request-progress": "^2.0.1",
+ "which": "^1.2.10"
+ },
+ "bin": {
+ "phantomjs": "bin/phantomjs"
+ }
+ },
+ "node_modules/phantomjs-prebuilt/node_modules/fs-extra": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
+ "integrity": "sha512-VerQV6vEKuhDWD2HGOybV6v5I73syoc/cXAbKlgTC7M/oFVEtklWlp9QH2Ijw3IaWDOQcMkldSPa7zXy79Z/UQ==",
+ "dev": true,
+ "dependencies": {
+ "graceful-fs": "^4.1.2",
+ "jsonfile": "^2.1.0",
+ "klaw": "^1.0.0"
+ }
+ },
+ "node_modules/phantomjs-prebuilt/node_modules/jsonfile": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+ "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
+ "dev": true,
+ "optionalDependencies": {
+ "graceful-fs": "^4.1.6"
+ }
+ },
+ "node_modules/phantomjs-prebuilt/node_modules/klaw": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+ "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==",
+ "dev": true,
+ "optionalDependencies": {
+ "graceful-fs": "^4.1.9"
+ }
+ },
+ "node_modules/phin": {
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/phin/-/phin-3.7.1.tgz",
+ "integrity": "sha512-GEazpTWwTZaEQ9RhL7Nyz0WwqilbqgLahDM3D0hxWwmVDI52nXEybHqiN6/elwpkJBhcuj+WbBu+QfT0uhPGfQ==",
+ "dev": true,
+ "dependencies": {
+ "centra": "^2.7.0"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/picocolors": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+ "dev": true
+ },
+ "node_modules/picomatch": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+ "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
+ "node_modules/picturefill": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/picturefill/-/picturefill-3.0.3.tgz",
+ "integrity": "sha512-JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g==",
+ "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/pify": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+ "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/pinkie": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+ "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/pinkie-promise": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+ "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+ "dev": true,
+ "dependencies": {
+ "pinkie": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/pirates": {
+ "version": "4.0.6",
+ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+ "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/piscina": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz",
+ "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==",
+ "dev": true,
+ "dependencies": {
+ "eventemitter-asyncresource": "^1.0.0",
+ "hdr-histogram-js": "^2.0.1",
+ "hdr-histogram-percentiles-obj": "^3.0.0"
+ },
+ "optionalDependencies": {
+ "nice-napi": "^1.0.2"
+ }
+ },
+ "node_modules/pixelmatch": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-5.3.0.tgz",
+ "integrity": "sha512-o8mkY4E/+LNUf6LzX96ht6k6CEDi65k9G2rjMtBe9Oo+VPKSvl+0GKHuH/AlG+GA5LPG/i5hrekkxUc3s2HU+Q==",
+ "dev": true,
+ "dependencies": {
+ "pngjs": "^6.0.0"
+ },
+ "bin": {
+ "pixelmatch": "bin/pixelmatch"
+ }
+ },
+ "node_modules/pkg-dir": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
+ "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
+ "dev": true,
+ "dependencies": {
+ "find-up": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/pkg-dir/node_modules/find-up": {
+ "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": "^6.0.0",
+ "path-exists": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/pkg-dir/node_modules/locate-path": {
+ "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": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/pkg-dir/node_modules/p-locate": {
+ "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": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/pkginfo": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+ "integrity": "sha512-yO5feByMzAp96LtP58wvPKSbaKAi/1C4kV9XpTctr6EepnP6F33RBNOiVrdz9BrPA98U2BMFsTNHo44TWcbQ2A==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/playwright-core": {
+ "version": "1.40.1",
+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.1.tgz",
+ "integrity": "sha512-+hkOycxPiV534c4HhpfX6yrlawqVUzITRKwHAmYfmsVreltEl6fAZJ3DPfLMOODw0H3s1Itd6MDCWmP1fl/QvQ==",
+ "dev": true,
+ "bin": {
+ "playwright-core": "cli.js"
+ },
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/please-upgrade-node": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
+ "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
+ "dev": true,
+ "dependencies": {
+ "semver-compare": "^1.0.0"
+ }
+ },
+ "node_modules/pluralize": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
+ "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/png-js": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/png-js/-/png-js-1.0.0.tgz",
+ "integrity": "sha512-k+YsbhpA9e+EFfKjTCH3VW6aoKlyNYI6NYdTfDL4CIvFnvsuO84ttonmZE7rc+v23SLTH8XX+5w/Ak9v0xGY4g==",
+ "dev": true
+ },
+ "node_modules/pngjs": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-6.0.0.tgz",
+ "integrity": "sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.13.0"
+ }
+ },
+ "node_modules/polyfill-library": {
+ "version": "3.93.0",
+ "resolved": "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.93.0.tgz",
+ "integrity": "sha512-Sv4A4hUK5/s95EqUtOnbZawQj2o9aVsnZbIQ6pCg400I0Ip4mWNLyDhpXwj78WV6OWvGhh4LBNjm5G43c1R5TA==",
+ "dev": true,
+ "dependencies": {
+ "@financial-times/polyfill-useragent-normaliser": "^1.7.0",
+ "@formatjs/intl-pluralrules": "^1.1.2",
+ "@formatjs/intl-relativetimeformat": "^3.0.2",
+ "@webcomponents/template": "^1.4.0",
+ "abort-controller": "^3.0.0",
+ "audio-context-polyfill": "^1.0.0",
+ "Base64": "^1.0.0",
+ "current-script-polyfill": "^1.0.0",
+ "diff": "4.0.2",
+ "event-source-polyfill": "^1.0.12",
+ "from2-string": "^1.1.0",
+ "glob": "^7.1.1",
+ "graceful-fs": "^4.1.10",
+ "html5shiv": "^3.7.3",
+ "intl": "^1.2.5",
+ "js-polyfills": "^0.1.40",
+ "json3": "^3.3.2",
+ "merge2": "^1.0.3",
+ "mkdirp": "^0.5.0",
+ "mnemonist": "^0.32.0",
+ "mutationobserver-shim": "^0.3.2",
+ "picturefill": "^3.0.1",
+ "resize-observer-polyfill": "^1.5.1",
+ "rimraf": "^3.0.0",
+ "smoothscroll-polyfill": "^0.4.4",
+ "spdx-licenses": "^1.0.0",
+ "stream-cache": "^0.0.2",
+ "stream-from-promise": "^1.0.0",
+ "stream-to-string": "^1.1.0",
+ "toposort": "^2.0.2",
+ "uglify-js": "^2.7.5",
+ "unorm": "^1.6.0",
+ "usertiming": "^0.1.8",
+ "web-animations-js": "^2.2.5",
+ "whatwg-fetch": "^3.0.0",
+ "wicg-inert": "^3.0.0",
+ "yaku": "0.19.3"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/polyfill-library/node_modules/camelcase": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+ "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/polyfill-library/node_modules/cliui": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+ "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
+ "dev": true,
+ "dependencies": {
+ "center-align": "^0.1.1",
+ "right-align": "^0.1.1",
+ "wordwrap": "0.0.2"
+ }
+ },
+ "node_modules/polyfill-library/node_modules/uglify-js": {
+ "version": "2.8.29",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+ "integrity": "sha512-qLq/4y2pjcU3vhlhseXGGJ7VbFO4pBANu0kwl8VCa9KEI0V8VfZIx2Fy3w01iSTA/pGwKZSmu/+I4etLNDdt5w==",
+ "dev": true,
+ "dependencies": {
+ "source-map": "~0.5.1",
+ "yargs": "~3.10.0"
+ },
+ "bin": {
+ "uglifyjs": "bin/uglifyjs"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ },
+ "optionalDependencies": {
+ "uglify-to-browserify": "~1.0.0"
+ }
+ },
+ "node_modules/polyfill-library/node_modules/whatwg-fetch": {
+ "version": "3.6.20",
+ "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
+ "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==",
+ "dev": true
+ },
+ "node_modules/polyfill-library/node_modules/window-size": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+ "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/polyfill-library/node_modules/wordwrap": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+ "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/polyfill-library/node_modules/yargs": {
+ "version": "3.10.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+ "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
+ "dev": true,
+ "dependencies": {
+ "camelcase": "^1.0.2",
+ "cliui": "^2.1.0",
+ "decamelize": "^1.0.0",
+ "window-size": "0.1.0"
+ }
+ },
+ "node_modules/posix-character-classes": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+ "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/postcss": {
+ "version": "8.4.32",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
+ "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/postcss"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "dependencies": {
+ "nanoid": "^3.3.7",
+ "picocolors": "^1.0.0",
+ "source-map-js": "^1.0.2"
+ },
+ "engines": {
+ "node": "^10 || ^12 || >=14"
+ }
+ },
+ "node_modules/postcss/node_modules/nanoid": {
+ "version": "3.3.7",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+ "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "bin": {
+ "nanoid": "bin/nanoid.cjs"
+ },
+ "engines": {
+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ }
+ },
+ "node_modules/postgres-array": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+ "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/postgres-bytea": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+ "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/postgres-date": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+ "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/postgres-interval": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+ "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+ "dev": true,
+ "dependencies": {
+ "xtend": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/pprof-format": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/pprof-format/-/pprof-format-2.1.0.tgz",
+ "integrity": "sha512-0+G5bHH0RNr8E5hoZo/zJYsL92MhkZjwrHp3O2IxmY8RJL9ooKeuZ8Tm0ZNBw5sGZ9TiM71sthTjWoR2Vf5/xw==",
+ "dev": true
+ },
+ "node_modules/prepare-response": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/prepare-response/-/prepare-response-2.1.1.tgz",
+ "integrity": "sha512-WwQJDGRqIOsUqPV13TwEV+7c0u1rBGM5hs2JKSHJsRfaX1Lwqt7w1/FT5euUTP3b04tdhnWHq6JNPM7EWTbVPA==",
+ "dev": true,
+ "dependencies": {
+ "mime": "^2.0.3",
+ "ms": "^2.0.0",
+ "promise": "^8.0.0"
+ }
+ },
+ "node_modules/prepare-response/node_modules/mime": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+ "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+ "dev": true,
+ "bin": {
+ "mime": "cli.js"
+ },
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/prepare-response/node_modules/promise": {
+ "version": "8.3.0",
+ "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
+ "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
+ "dev": true,
+ "dependencies": {
+ "asap": "~2.0.6"
+ }
+ },
+ "node_modules/prepend-http": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+ "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/prettier": {
+ "version": "3.2.5",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+ "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+ "dev": true,
+ "bin": {
+ "prettier": "bin/prettier.cjs"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/prettier/prettier?sponsor=1"
+ }
+ },
+ "node_modules/prettier-plugin-packagejson": {
+ "version": "2.4.10",
+ "resolved": "https://registry.npmjs.org/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.4.10.tgz",
+ "integrity": "sha512-qFzOfQDHi1tzvVJRuZ2jh1j6IFV5MURh5m5WDt+qfEMOf4SSL5RpwSysiX8u0W1PJYsM0vKJGNULt43wwteKiQ==",
+ "dev": true,
+ "dependencies": {
+ "sort-package-json": "2.7.0",
+ "synckit": "0.9.0"
+ },
+ "peerDependencies": {
+ "prettier": ">= 1.16.0"
+ },
+ "peerDependenciesMeta": {
+ "prettier": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/pretty-format": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+ "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+ "dev": true,
+ "dependencies": {
+ "@jest/schemas": "^29.6.3",
+ "ansi-styles": "^5.0.0",
+ "react-is": "^18.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/pretty-format/node_modules/ansi-styles": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/priorityqueuejs": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/priorityqueuejs/-/priorityqueuejs-1.0.0.tgz",
+ "integrity": "sha512-lg++21mreCEOuGWTbO5DnJKAdxfjrdN0S9ysoW9SzdSJvbkWpkaDdpG/cdsPCsEnoLUwmd9m3WcZhngW7yKA2g==",
+ "dev": true
+ },
+ "node_modules/prismjs": {
+ "version": "1.29.0",
+ "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
+ "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/process": {
+ "version": "0.11.10",
+ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+ "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6.0"
+ }
+ },
+ "node_modules/process-nextick-args": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+ "dev": true
+ },
+ "node_modules/progress": {
+ "version": "1.1.8",
+ "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+ "integrity": "sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/promise": {
+ "version": "7.3.1",
+ "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+ "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+ "dev": true,
+ "dependencies": {
+ "asap": "~2.0.3"
+ }
+ },
+ "node_modules/promise-the-world": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/promise-the-world/-/promise-the-world-1.0.1.tgz",
+ "integrity": "sha512-eAXctcYU0ksq9YT5LT0N3e8yvdEAp0aYuzIiaJo9CpZwga45i08MW05GMXZIow7N05d1o4EBoR5hjkb7jhzqKg==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/promise.prototype.finally": {
+ "version": "3.1.7",
+ "resolved": "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.7.tgz",
+ "integrity": "sha512-iL9OcJRUZcCE5xn6IwhZxO+eMM0VEXjkETHy+Nk+d9q3s7kxVtPg+mBlMO+ZGxNKNMODyKmy/bOyt/yhxTnvEw==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.22.1",
+ "get-intrinsic": "^1.2.1",
+ "set-function-name": "^2.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/prompts": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+ "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+ "dev": true,
+ "dependencies": {
+ "kleur": "^3.0.3",
+ "sisteransi": "^1.0.5"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/prop-types": {
+ "version": "15.8.1",
+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+ "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+ "dev": true,
+ "dependencies": {
+ "loose-envify": "^1.4.0",
+ "object-assign": "^4.1.1",
+ "react-is": "^16.13.1"
+ }
+ },
+ "node_modules/prop-types/node_modules/react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "dev": true
+ },
+ "node_modules/property-accessors": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/property-accessors/-/property-accessors-1.1.3.tgz",
+ "integrity": "sha512-WQTVW7rn+k6wq8FyYVM15afyoB2loEdeIzd/o7+HEA5hMZcxvRf4Khie0fBM9wLP3EJotKhiH15kY7Dd4gc57g==",
+ "dev": true,
+ "dependencies": {
+ "es6-weak-map": "^0.1.2",
+ "mixto": "1.x"
+ }
+ },
+ "node_modules/proto3-json-serializer": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-2.0.1.tgz",
+ "integrity": "sha512-8awBvjO+FwkMd6gNoGFZyqkHZXCFd54CIYTb6De7dPaufGJ2XNW+QUNqbMr8MaAocMdb+KpsD4rxEOaTBDCffA==",
+ "dev": true,
+ "dependencies": {
+ "protobufjs": "^7.2.5"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/protobufjs": {
+ "version": "7.2.6",
+ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.6.tgz",
+ "integrity": "sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "@protobufjs/aspromise": "^1.1.2",
+ "@protobufjs/base64": "^1.1.2",
+ "@protobufjs/codegen": "^2.0.4",
+ "@protobufjs/eventemitter": "^1.1.0",
+ "@protobufjs/fetch": "^1.1.0",
+ "@protobufjs/float": "^1.0.2",
+ "@protobufjs/inquire": "^1.1.0",
+ "@protobufjs/path": "^1.1.2",
+ "@protobufjs/pool": "^1.1.0",
+ "@protobufjs/utf8": "^1.1.0",
+ "@types/node": ">=13.7.0",
+ "long": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ }
+ },
+ "node_modules/protobufjs/node_modules/long": {
+ "version": "5.2.3",
+ "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+ "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
+ "dev": true
+ },
+ "node_modules/protocol-buffers-schema": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
+ "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==",
+ "dev": true
+ },
+ "node_modules/proxy-addr": {
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+ "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+ "dev": true,
+ "dependencies": {
+ "forwarded": "0.2.0",
+ "ipaddr.js": "1.9.1"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/proxy-from-env": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+ "dev": true
+ },
+ "node_modules/pseudomap": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+ "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
+ "dev": true
+ },
+ "node_modules/psl": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+ "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+ "dev": true
+ },
+ "node_modules/public-encrypt": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^4.1.0",
+ "browserify-rsa": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "parse-asn1": "^5.0.0",
+ "randombytes": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+ }
+ },
+ "node_modules/public-encrypt/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
+ "node_modules/pug": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz",
+ "integrity": "sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw==",
+ "dev": true,
+ "dependencies": {
+ "pug-code-gen": "^3.0.2",
+ "pug-filters": "^4.0.0",
+ "pug-lexer": "^5.0.1",
+ "pug-linker": "^4.0.0",
+ "pug-load": "^3.0.0",
+ "pug-parser": "^6.0.0",
+ "pug-runtime": "^3.0.1",
+ "pug-strip-comments": "^2.0.0"
+ }
+ },
+ "node_modules/pug-attrs": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz",
+ "integrity": "sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==",
+ "dev": true,
+ "dependencies": {
+ "constantinople": "^4.0.1",
+ "js-stringify": "^1.0.2",
+ "pug-runtime": "^3.0.0"
+ }
+ },
+ "node_modules/pug-code-gen": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.2.tgz",
+ "integrity": "sha512-nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg==",
+ "dev": true,
+ "dependencies": {
+ "constantinople": "^4.0.1",
+ "doctypes": "^1.1.0",
+ "js-stringify": "^1.0.2",
+ "pug-attrs": "^3.0.0",
+ "pug-error": "^2.0.0",
+ "pug-runtime": "^3.0.0",
+ "void-elements": "^3.1.0",
+ "with": "^7.0.0"
+ }
+ },
+ "node_modules/pug-error": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz",
+ "integrity": "sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==",
+ "dev": true
+ },
+ "node_modules/pug-filters": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz",
+ "integrity": "sha512-yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A==",
+ "dev": true,
+ "dependencies": {
+ "constantinople": "^4.0.1",
+ "jstransformer": "1.0.0",
+ "pug-error": "^2.0.0",
+ "pug-walk": "^2.0.0",
+ "resolve": "^1.15.1"
+ }
+ },
+ "node_modules/pug-lexer": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz",
+ "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==",
+ "dev": true,
+ "dependencies": {
+ "character-parser": "^2.2.0",
+ "is-expression": "^4.0.0",
+ "pug-error": "^2.0.0"
+ }
+ },
+ "node_modules/pug-linker": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz",
+ "integrity": "sha512-gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw==",
+ "dev": true,
+ "dependencies": {
+ "pug-error": "^2.0.0",
+ "pug-walk": "^2.0.0"
+ }
+ },
+ "node_modules/pug-load": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz",
+ "integrity": "sha512-OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ==",
+ "dev": true,
+ "dependencies": {
+ "object-assign": "^4.1.1",
+ "pug-walk": "^2.0.0"
+ }
+ },
+ "node_modules/pug-parser": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz",
+ "integrity": "sha512-ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw==",
+ "dev": true,
+ "dependencies": {
+ "pug-error": "^2.0.0",
+ "token-stream": "1.0.0"
+ }
+ },
+ "node_modules/pug-runtime": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz",
+ "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==",
+ "dev": true
+ },
+ "node_modules/pug-strip-comments": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz",
+ "integrity": "sha512-zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ==",
+ "dev": true,
+ "dependencies": {
+ "pug-error": "^2.0.0"
+ }
+ },
+ "node_modules/pug-walk": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz",
+ "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==",
+ "dev": true
+ },
+ "node_modules/pump": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "dev": true,
+ "dependencies": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
+ "node_modules/pumpify": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+ "dev": true,
+ "dependencies": {
+ "duplexify": "^3.6.0",
+ "inherits": "^2.0.3",
+ "pump": "^2.0.0"
+ }
+ },
+ "node_modules/pumpify/node_modules/duplexify": {
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+ "dev": true,
+ "dependencies": {
+ "end-of-stream": "^1.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.0",
+ "stream-shift": "^1.0.0"
+ }
+ },
+ "node_modules/pumpify/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/pumpify/node_modules/pump": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+ "dev": true,
+ "dependencies": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
+ "node_modules/pumpify/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/pumpify/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/pumpify/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/punycode": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+ "dev": true
+ },
+ "node_modules/pure-rand": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+ "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "individual",
+ "url": "https://github.com/sponsors/dubzzz"
+ },
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/fast-check"
+ }
+ ]
+ },
+ "node_modules/qs": {
+ "version": "6.13.0",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+ "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+ "dev": true,
+ "license": "BSD-3-Clause",
+ "dependencies": {
+ "side-channel": "^1.0.6"
+ },
+ "engines": {
+ "node": ">=0.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/query-string": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+ "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+ "dev": true,
+ "dependencies": {
+ "decode-uri-component": "^0.2.0",
+ "object-assign": "^4.1.0",
+ "strict-uri-encode": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/querystring": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+ "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+ "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.x"
+ }
+ },
+ "node_modules/querystring-es3": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+ "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.x"
+ }
+ },
+ "node_modules/querystringify": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+ "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+ "dev": true
+ },
+ "node_modules/queue-microtask": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+ "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"
+ }
+ ]
+ },
+ "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/randomfill": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+ "dev": true,
+ "dependencies": {
+ "randombytes": "^2.0.5",
+ "safe-buffer": "^5.1.0"
+ }
+ },
+ "node_modules/range-parser": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/raven": {
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/raven/-/raven-2.6.4.tgz",
+ "integrity": "sha512-6PQdfC4+DQSFncowthLf+B6Hr0JpPsFBgTVYTAOq7tCmx/kR4SXbeawtPch20+3QfUcQDoJBLjWW1ybvZ4kXTw==",
+ "deprecated": "Please upgrade to @sentry/node. See the migration guide https://bit.ly/3ybOlo7",
+ "dev": true,
+ "dependencies": {
+ "cookie": "0.3.1",
+ "md5": "^2.2.1",
+ "stack-trace": "0.0.10",
+ "timed-out": "4.0.1",
+ "uuid": "3.3.2"
+ },
+ "bin": {
+ "raven": "bin/raven"
+ },
+ "engines": {
+ "node": ">= 4.0.0"
+ }
+ },
+ "node_modules/raven/node_modules/cookie": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+ "integrity": "sha512-+IJOX0OqlHCszo2mBUq+SrEbCj6w7Kpffqx60zYbPTFaO4+yYgRjHwcZNpWvaTylDHaV7PPmBHzSecZiMhtPgw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/raven/node_modules/uuid": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+ "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+ "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.",
+ "dev": true,
+ "bin": {
+ "uuid": "bin/uuid"
+ }
+ },
+ "node_modules/raw-body": {
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+ "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+ "dev": true,
+ "dependencies": {
+ "bytes": "3.1.2",
+ "http-errors": "2.0.0",
+ "iconv-lite": "0.4.24",
+ "unpipe": "1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/raw-body/node_modules/http-errors": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+ "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+ "dev": true,
+ "dependencies": {
+ "depd": "2.0.0",
+ "inherits": "2.0.4",
+ "setprototypeof": "1.2.0",
+ "statuses": "2.0.1",
+ "toidentifier": "1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/rc": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+ "dev": true,
+ "dependencies": {
+ "deep-extend": "^0.6.0",
+ "ini": "~1.3.0",
+ "minimist": "^1.2.0",
+ "strip-json-comments": "~2.0.1"
+ },
+ "bin": {
+ "rc": "cli.js"
+ }
+ },
+ "node_modules/rc/node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/rc/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": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/rdf-canonize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/rdf-canonize/-/rdf-canonize-1.2.0.tgz",
+ "integrity": "sha512-MQdcRDz4+82nUrEb3hNQangBDpmep15uMmnWclGi/1KS0bNVc8oHpoNI0PFLHZsvwgwRzH31bO1JAScqUAstvw==",
+ "dev": true,
+ "dependencies": {
+ "node-forge": "^0.10.0",
+ "semver": "^6.3.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/rdf-canonize/node_modules/node-forge": {
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
+ "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 6.0.0"
+ }
+ },
+ "node_modules/rdf-canonize/node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver.js"
+ }
+ },
+ "node_modules/rdf-ext": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/rdf-ext/-/rdf-ext-1.3.5.tgz",
+ "integrity": "sha512-LS/waItwp5aGY9Ay7y147HxWLIaSvw4r172S995aGwVkvg0KwUA0NY8w61p/LoFdQ4V6mzxQdVoRN6x/6OaK0w==",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/data-model": "^1.3.3",
+ "@rdfjs/dataset": "^1.1.1",
+ "@rdfjs/to-ntriples": "^1.0.1",
+ "rdf-normalize": "^1.0.0",
+ "readable-stream": "^3.6.0"
+ }
+ },
+ "node_modules/rdf-ext/node_modules/@rdfjs/to-ntriples": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@rdfjs/to-ntriples/-/to-ntriples-1.0.2.tgz",
+ "integrity": "sha512-ngw5XAaGHjgGiwWWBPGlfdCclHftonmbje5lMys4G2j4NvfExraPIuRZgjSnd5lg4dnulRVUll8tRbgKO+7EDA==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/rdf-js": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/rdf-js/-/rdf-js-4.0.2.tgz",
+ "integrity": "sha512-ApvlFa/WsQh8LpPK/6hctQwG06Z9ztQQGWVtrcrf9L6+sejHNXLPOqL+w7q3hF+iL0C4sv3AX1PUtGkLNzyZ0Q==",
+ "dev": true,
+ "dependencies": {
+ "@rdfjs/types": "*"
+ }
+ },
+ "node_modules/rdf-normalize": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/rdf-normalize/-/rdf-normalize-1.0.0.tgz",
+ "integrity": "sha512-1ocjoxovKc4+AyS4Tgtroay5R33yrtM2kQnAGvVaB0iGSRggukHxMJW0y8xTR7TwKZabS+7oMSQNMdbu/qTtCQ==",
+ "dev": true
+ },
+ "node_modules/rdf-transform-triple-to-quad": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/rdf-transform-triple-to-quad/-/rdf-transform-triple-to-quad-1.0.2.tgz",
+ "integrity": "sha512-cr8wgJcj+SvPLichNhWhUTyXHcoD1EVgajVmvbtwYbMRw479KAaW03TTviQaJAUqgcWzIzkrWLtWkrY2FgwryQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "@rdfjs/data-model": "^1.1.2",
+ "readable-stream": "^3.5.0"
+ }
+ },
+ "node_modules/react": {
+ "version": "16.14.0",
+ "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
+ "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
+ "dev": true,
+ "dependencies": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1",
+ "prop-types": "^15.6.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/react-dom": {
+ "version": "16.14.0",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
+ "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
+ "dev": true,
+ "dependencies": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1",
+ "prop-types": "^15.6.2",
+ "scheduler": "^0.19.1"
+ },
+ "peerDependencies": {
+ "react": "^16.14.0"
+ }
+ },
+ "node_modules/react-is": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+ "dev": true
+ },
+ "node_modules/read-only-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
+ "integrity": "sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "^2.0.2"
+ }
+ },
+ "node_modules/read-only-stream/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/read-only-stream/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/read-only-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/read-only-stream/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/read-pkg": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+ "dev": true,
+ "dependencies": {
+ "@types/normalize-package-data": "^2.4.0",
+ "normalize-package-data": "^2.5.0",
+ "parse-json": "^5.0.0",
+ "type-fest": "^0.6.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+ "dev": true,
+ "dependencies": {
+ "find-up": "^4.1.0",
+ "read-pkg": "^5.2.0",
+ "type-fest": "^0.8.1"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/type-fest": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg/node_modules/type-fest": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/readable-error": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/readable-error/-/readable-error-1.0.0.tgz",
+ "integrity": "sha512-CLnInu5bUphmFiZ3pD/BC6+Cg4/BzK6ZMvWfd0b2QMzYo159Z/f/nVFQ9L5IeMrqUxy0EFsp3XJ+BRfLfY13IQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "readable-stream": "^2.3.3"
+ }
+ },
+ "node_modules/readable-error/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/readable-error/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/readable-error/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/readable-error/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/readable-stream": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/readable-to-readable": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/readable-to-readable/-/readable-to-readable-0.1.3.tgz",
+ "integrity": "sha512-G+0kz01xJM/uTuItKcqC73cifW8S6CZ7tp77NLN87lE5mrSU+GC8geoSAlfmp0NocmXckQ7W8s8ns73HYsIA3w==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "^3.6.0"
+ }
+ },
+ "node_modules/readable-web-to-node-stream": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
+ "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "^3.6.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/Borewit"
+ }
+ },
+ "node_modules/readdirp": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+ "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+ "dev": true,
+ "dependencies": {
+ "graceful-fs": "^4.1.11",
+ "micromatch": "^3.1.10",
+ "readable-stream": "^2.0.2"
+ },
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/readdirp/node_modules/braces": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+ "dev": true,
+ "dependencies": {
+ "arr-flatten": "^1.1.0",
+ "array-unique": "^0.3.2",
+ "extend-shallow": "^2.0.1",
+ "fill-range": "^4.0.0",
+ "isobject": "^3.0.1",
+ "repeat-element": "^1.1.2",
+ "snapdragon": "^0.8.1",
+ "snapdragon-node": "^2.0.1",
+ "split-string": "^3.0.2",
+ "to-regex": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/readdirp/node_modules/define-property": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^1.0.2",
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/readdirp/node_modules/fill-range": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+ "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+ "dev": true,
+ "dependencies": {
+ "extend-shallow": "^2.0.1",
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1",
+ "to-regex-range": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/readdirp/node_modules/is-descriptor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+ "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^1.0.1",
+ "is-data-descriptor": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/readdirp/node_modules/is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "dependencies": {
+ "is-plain-object": "^2.0.4"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/readdirp/node_modules/is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/readdirp/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/readdirp/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/readdirp/node_modules/kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/readdirp/node_modules/micromatch": {
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+ "dev": true,
+ "dependencies": {
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "braces": "^2.3.1",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "extglob": "^2.0.4",
+ "fragment-cache": "^0.2.1",
+ "kind-of": "^6.0.2",
+ "nanomatch": "^1.2.9",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/readdirp/node_modules/micromatch/node_modules/extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+ "dev": true,
+ "dependencies": {
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/readdirp/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/readdirp/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/readdirp/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/readdirp/node_modules/to-regex-range": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+ "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+ "dev": true,
+ "dependencies": {
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/rechoir": {
+ "version": "0.6.2",
+ "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+ "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
+ "dev": true,
+ "dependencies": {
+ "resolve": "^1.1.6"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/redis": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz",
+ "integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==",
+ "dev": true,
+ "dependencies": {
+ "denque": "^1.5.0",
+ "redis-commands": "^1.7.0",
+ "redis-errors": "^1.2.0",
+ "redis-parser": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/node-redis"
+ }
+ },
+ "node_modules/redis-commands": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz",
+ "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==",
+ "dev": true
+ },
+ "node_modules/redis-errors": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",
+ "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/redis-parser": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
+ "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==",
+ "dev": true,
+ "dependencies": {
+ "redis-errors": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/reflect.getprototypeof": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz",
+ "integrity": "sha512-62wgfC8dJWrmxv44CA36pLDnP6KKl3Vhxb7PL+8+qrrFMMoJij4vgiMP8zV4O8+CBMXY1mHxI5fITGHXFHVmQQ==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.5",
+ "define-properties": "^1.2.1",
+ "es-abstract": "^1.22.3",
+ "es-errors": "^1.0.0",
+ "get-intrinsic": "^1.2.3",
+ "globalthis": "^1.0.3",
+ "which-builtin-type": "^1.1.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/regenerator-runtime": {
+ "version": "0.14.1",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+ "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+ "dev": true
+ },
+ "node_modules/regex-not": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+ "dev": true,
+ "dependencies": {
+ "extend-shallow": "^3.0.2",
+ "safe-regex": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/regex-not/node_modules/extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+ "dev": true,
+ "dependencies": {
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/regex-not/node_modules/is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "dependencies": {
+ "is-plain-object": "^2.0.4"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/regexp-tree": {
+ "version": "0.1.27",
+ "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz",
+ "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==",
+ "dev": true,
+ "bin": {
+ "regexp-tree": "bin/regexp-tree"
+ }
+ },
+ "node_modules/regexp.prototype.flags": {
+ "version": "1.5.2",
+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
+ "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.6",
+ "define-properties": "^1.2.1",
+ "es-errors": "^1.3.0",
+ "set-function-name": "^2.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/registry-auth-token": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+ "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
+ "dev": true,
+ "dependencies": {
+ "rc": "^1.1.6",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/registry-url": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+ "integrity": "sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==",
+ "dev": true,
+ "dependencies": {
+ "rc": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/regjsparser": {
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz",
+ "integrity": "sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==",
+ "dev": true,
+ "dependencies": {
+ "jsesc": "~0.5.0"
+ },
+ "bin": {
+ "regjsparser": "bin/parser"
+ }
+ },
+ "node_modules/regjsparser/node_modules/jsesc": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+ "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+ "dev": true,
+ "bin": {
+ "jsesc": "bin/jsesc"
+ }
+ },
+ "node_modules/reinterval": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz",
+ "integrity": "sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==",
+ "dev": true
+ },
+ "node_modules/remark-parse": {
+ "version": "10.0.2",
+ "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.2.tgz",
+ "integrity": "sha512-3ydxgHa/ZQzG8LvC7jTXccARYDcRld3VfcgIIFs7bI6vbRSxJJmzgLEIIoYKyrfhaY+ujuWaf/PJiMZXoiCXgw==",
+ "dev": true,
+ "dependencies": {
+ "@types/mdast": "^3.0.0",
+ "mdast-util-from-markdown": "^1.0.0",
+ "unified": "^10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/remark-prism": {
+ "version": "1.3.6",
+ "resolved": "https://registry.npmjs.org/remark-prism/-/remark-prism-1.3.6.tgz",
+ "integrity": "sha512-yYSXJ2MEK2DeD9UKDKFkQPcVqRx6aX2FYD1kE27ScogpZ/BBO8MoOO6gf/AKqfXvKGnP51wqvDEBmPseypgaug==",
+ "dev": true,
+ "dependencies": {
+ "classnames": "^2.3.1",
+ "css-selector-parser": "^1.4.1",
+ "escape-html": "^1.0.3",
+ "jsdom": "^16.5.3",
+ "parse-numeric-range": "^1.2.0",
+ "parse5": "^6.0.1",
+ "parse5-htmlparser2-tree-adapter": "^6.0.1",
+ "prismjs": "^1.23.0",
+ "unist-util-map": "^2.0.1"
+ }
+ },
+ "node_modules/remove-trailing-separator": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+ "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+ "dev": true
+ },
+ "node_modules/remove-trailing-slash": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz",
+ "integrity": "sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==",
+ "dev": true
+ },
+ "node_modules/repeat-element": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+ "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/repeat-string": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+ "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/replace-ext": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+ "integrity": "sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/request": {
+ "version": "2.88.2",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+ "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+ "dev": true,
+ "dependencies": {
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.8.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.6",
+ "extend": "~3.0.2",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.2",
+ "har-validator": "~5.1.3",
+ "http-signature": "~1.2.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.19",
+ "oauth-sign": "~0.9.0",
+ "performance-now": "^2.1.0",
+ "qs": "~6.5.2",
+ "safe-buffer": "^5.1.2",
+ "tough-cookie": "~2.5.0",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.3.2"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/request-progress": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
+ "integrity": "sha512-dxdraeZVUNEn9AvLrxkgB2k6buTlym71dJk1fk4v8j3Ou3RKNm07BcgbHdj2lLgYGfqX71F+awb1MR+tWPFJzA==",
+ "dev": true,
+ "dependencies": {
+ "throttleit": "^1.0.0"
+ }
+ },
+ "node_modules/request/node_modules/form-data": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+ "dev": true,
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.6",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 0.12"
+ }
+ },
+ "node_modules/request/node_modules/punycode": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/request/node_modules/qs": {
+ "version": "6.5.3",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+ "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.6"
+ }
+ },
+ "node_modules/request/node_modules/tough-cookie": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+ "dev": true,
+ "dependencies": {
+ "psl": "^1.1.28",
+ "punycode": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.8"
+ }
+ },
+ "node_modules/require-directory": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+ "dev": true,
+ "engines": {
+ "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/requires-port": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+ "dev": true
+ },
+ "node_modules/resize-observer-polyfill": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+ "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==",
+ "dev": true
+ },
+ "node_modules/resolve": {
+ "version": "1.22.8",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+ "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+ "dev": true,
+ "dependencies": {
+ "is-core-module": "^2.13.0",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
+ },
+ "bin": {
+ "resolve": "bin/resolve"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/resolve-cwd": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+ "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+ "dev": true,
+ "dependencies": {
+ "resolve-from": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/resolve-dir": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
+ "integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==",
+ "dev": true,
+ "dependencies": {
+ "expand-tilde": "^1.2.2",
+ "global-modules": "^0.2.3"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/resolve-from": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/resolve-pkg-maps": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+ "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+ }
+ },
+ "node_modules/resolve-protobuf-schema": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
+ "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
+ "dev": true,
+ "dependencies": {
+ "protocol-buffers-schema": "^3.3.1"
+ }
+ },
+ "node_modules/resolve-url": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+ "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+ "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+ "dev": true
+ },
+ "node_modules/resolve.exports": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
+ "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/responselike": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+ "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
+ "dev": true,
+ "dependencies": {
+ "lowercase-keys": "^1.0.0"
+ }
+ },
+ "node_modules/rest-facade": {
+ "version": "1.16.4",
+ "resolved": "https://registry.npmjs.org/rest-facade/-/rest-facade-1.16.4.tgz",
+ "integrity": "sha512-EeQm4TMYFAvEw/6wV0OyjerdR8V2cThnmXuPCmRWSrwG6p2fZw9ZkzMIYy33OpdnvHCoGHggKOly7J6Nu3nsAQ==",
+ "dev": true,
+ "dependencies": {
+ "change-case": "^2.3.0",
+ "deepmerge": "^3.2.0",
+ "lodash.get": "^4.4.2",
+ "superagent": "^7.1.3"
+ },
+ "peerDependencies": {
+ "superagent-proxy": "^3.0.0"
+ },
+ "peerDependenciesMeta": {
+ "superagent-proxy": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/rest-facade/node_modules/deepmerge": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.3.0.tgz",
+ "integrity": "sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/restore-cursor": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+ "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
+ "dev": true,
+ "dependencies": {
+ "onetime": "^2.0.0",
+ "signal-exit": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/restore-cursor/node_modules/mimic-fn": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+ "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/restore-cursor/node_modules/onetime": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+ "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
+ "dev": true,
+ "dependencies": {
+ "mimic-fn": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/restructure": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/restructure/-/restructure-2.0.1.tgz",
+ "integrity": "sha512-e0dOpjm5DseomnXx2M5lpdZ5zoHqF1+bqdMJUohoYVVQa7cBdnk7fdmeI6byNWP/kiME72EeTiSypTCVnpLiDg==",
+ "dev": true
+ },
+ "node_modules/ret": {
+ "version": "0.1.15",
+ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
+ "node_modules/retry": {
+ "version": "0.13.1",
+ "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+ "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/retry-as-promised": {
+ "version": "7.0.4",
+ "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-7.0.4.tgz",
+ "integrity": "sha512-XgmCoxKWkDofwH8WddD0w85ZfqYz+ZHlr5yo+3YUCfycWawU56T5ckWXsScsj5B8tqUcIG67DxXByo3VUgiAdA==",
+ "dev": true
+ },
+ "node_modules/retry-request": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz",
+ "integrity": "sha512-xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.1.1",
+ "extend": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/reusify": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+ "dev": true,
+ "engines": {
+ "iojs": ">=1.0.0",
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/right-align": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+ "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
+ "dev": true,
+ "dependencies": {
+ "align-text": "^0.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/rimraf": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+ "dev": true,
+ "dependencies": {
+ "glob": "^7.1.3"
+ },
+ "bin": {
+ "rimraf": "bin.js"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/ripemd160": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+ "dev": true,
+ "dependencies": {
+ "hash-base": "^3.0.0",
+ "inherits": "^2.0.1"
+ }
+ },
+ "node_modules/robots-parser": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/robots-parser/-/robots-parser-2.4.0.tgz",
+ "integrity": "sha512-oO8f2SI04dJk3pbj2KOMJ4G6QfPAgqcGmrYGmansIcpRewIPT2ljWEt5I+ip6EgiyaLo+RXkkUWw74M25HDkMA==",
+ "dev": true
+ },
+ "node_modules/run-async": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+ "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.12.0"
+ }
+ },
+ "node_modules/run-parallel": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+ "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"
+ }
+ ],
+ "dependencies": {
+ "queue-microtask": "^1.2.2"
+ }
+ },
+ "node_modules/rx-lite": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+ "integrity": "sha512-Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==",
+ "dev": true
+ },
+ "node_modules/rx-lite-aggregates": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+ "integrity": "sha512-3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==",
+ "dev": true,
+ "dependencies": {
+ "rx-lite": "*"
+ }
+ },
+ "node_modules/rxjs": {
+ "version": "6.6.7",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+ "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^1.9.0"
+ },
+ "engines": {
+ "npm": ">=2.0.0"
+ }
+ },
+ "node_modules/sade": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz",
+ "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==",
+ "dev": true,
+ "dependencies": {
+ "mri": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/safe-array-concat": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz",
+ "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.5",
+ "get-intrinsic": "^1.2.2",
+ "has-symbols": "^1.0.3",
+ "isarray": "^2.0.5"
+ },
+ "engines": {
+ "node": ">=0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/safe-buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+ "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"
+ }
+ ]
+ },
+ "node_modules/safe-identifier": {
+ "version": "0.4.2",
+ "resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz",
+ "integrity": "sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/safe-regex": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+ "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+ "dev": true,
+ "dependencies": {
+ "ret": "~0.1.10"
+ }
+ },
+ "node_modules/safe-regex-test": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
+ "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.6",
+ "es-errors": "^1.3.0",
+ "is-regex": "^1.1.4"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/safer-buffer": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+ "dev": true
+ },
+ "node_modules/saslprep": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz",
+ "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==",
+ "dev": true,
+ "dependencies": {
+ "sparse-bitfield": "^3.0.3"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/sax": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
+ "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==",
+ "dev": true
+ },
+ "node_modules/saxes": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+ "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+ "dev": true,
+ "dependencies": {
+ "xmlchars": "^2.2.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/scheduler": {
+ "version": "0.19.1",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
+ "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
+ "dev": true,
+ "dependencies": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1"
+ }
+ },
+ "node_modules/scmp": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/scmp/-/scmp-2.1.0.tgz",
+ "integrity": "sha512-o/mRQGk9Rcer/jEEw/yw4mwo3EU/NvYvp577/Btqrym9Qy5/MdWGBqipbALgd2lrdWTJ5/gqDusxfnQBxOxT2Q==",
+ "dev": true
+ },
+ "node_modules/season": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/season/-/season-6.0.2.tgz",
+ "integrity": "sha512-5eq1ZKvsIUTkefE/R6PhJyiDDaalPjmdhUPVMuOFh4Yz2n5pBl1COkzNlxQyI8BXEBEIu1nJeJqJPVD0c3vycQ==",
+ "dev": true,
+ "dependencies": {
+ "cson-parser": "^1.3.0",
+ "fs-plus": "^3.0.0",
+ "yargs": "^3.23.0"
+ },
+ "bin": {
+ "csonc": "bin/csonc"
+ }
+ },
+ "node_modules/season/node_modules/ansi-regex": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/season/node_modules/camelcase": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+ "integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/season/node_modules/cliui": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+ "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wrap-ansi": "^2.0.0"
+ }
+ },
+ "node_modules/season/node_modules/invert-kv": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+ "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/season/node_modules/is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+ "dev": true,
+ "dependencies": {
+ "number-is-nan": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/season/node_modules/lcid": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+ "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
+ "dev": true,
+ "dependencies": {
+ "invert-kv": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/season/node_modules/os-locale": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+ "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
+ "dev": true,
+ "dependencies": {
+ "lcid": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/season/node_modules/string-width": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+ "dev": true,
+ "dependencies": {
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/season/node_modules/strip-ansi": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+ "dev": true,
+ "dependencies": {
+ "ansi-regex": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/season/node_modules/wrap-ansi": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+ "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/season/node_modules/y18n": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+ "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+ "dev": true
+ },
+ "node_modules/season/node_modules/yargs": {
+ "version": "3.32.0",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+ "integrity": "sha512-ONJZiimStfZzhKamYvR/xvmgW3uEkAUFSP91y2caTEPhzF6uP2JfPiVZcq66b/YR0C3uitxSV7+T1x8p5bkmMg==",
+ "dev": true,
+ "dependencies": {
+ "camelcase": "^2.0.1",
+ "cliui": "^3.0.3",
+ "decamelize": "^1.1.1",
+ "os-locale": "^1.4.0",
+ "string-width": "^1.0.1",
+ "window-size": "^0.1.4",
+ "y18n": "^3.2.0"
+ }
+ },
+ "node_modules/semaphore": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/semaphore/-/semaphore-1.0.5.tgz",
+ "integrity": "sha512-15WnK4TxpOk33fL0UoDnJ5myIWwJiodIZHtPRBoSxcaADt1Tm7kxEERd8n0vsw6OWsXwCCeROjSKU9MqfHaS1A==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/semver": {
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+ "dependencies": {
+ "lru-cache": "^6.0.0"
+ },
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/semver-compare": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+ "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+ "dev": true
+ },
+ "node_modules/semver-diff": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
+ "integrity": "sha512-gL8F8L4ORwsS0+iQ34yCYv///jsOq0ZL7WP55d1HnJ32o7tyFYEFQZQA22mrLIacZdU6xecaBBZ+uEiffGNyXw==",
+ "dev": true,
+ "dependencies": {
+ "semver": "^5.0.3"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/semver-diff/node_modules/semver": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/send": {
+ "version": "0.19.0",
+ "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+ "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "debug": "2.6.9",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
+ "encodeurl": "~1.0.2",
+ "escape-html": "~1.0.3",
+ "etag": "~1.8.1",
+ "fresh": "0.5.2",
+ "http-errors": "2.0.0",
+ "mime": "1.6.0",
+ "ms": "2.1.3",
+ "on-finished": "2.4.1",
+ "range-parser": "~1.2.1",
+ "statuses": "2.0.1"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/send/node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/send/node_modules/debug/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/send/node_modules/http-errors": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+ "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "depd": "2.0.0",
+ "inherits": "2.0.4",
+ "setprototypeof": "1.2.0",
+ "statuses": "2.0.1",
+ "toidentifier": "1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/send/node_modules/mime": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "mime": "cli.js"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/sentence-case": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-1.1.3.tgz",
+ "integrity": "sha512-laa/UDTPXsrQnoN/Kc8ZO7gTeEjMsuPiDgUCk9N0iINRZvqAMCTXjGl8+tD27op1eF/JHbdUlEUmovDh6AX7sA==",
+ "dev": true,
+ "dependencies": {
+ "lower-case": "^1.1.1"
+ }
+ },
+ "node_modules/separate-stream": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/separate-stream/-/separate-stream-1.0.1.tgz",
+ "integrity": "sha512-UKFCzmddW2akOq40YdGehllv5gu6AD3y6nGSVuZuwI1kify2CiW7Zwsxx4ioaNLxx4LZaZMkcjdICHtSxpEpaA==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "readable-stream": "^3.6.0"
+ }
+ },
+ "node_modules/sequelize": {
+ "version": "6.35.2",
+ "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.35.2.tgz",
+ "integrity": "sha512-EdzLaw2kK4/aOnWQ7ed/qh3B6/g+1DvmeXr66RwbcqSm/+QRS9X0LDI5INBibsy4eNJHWIRPo3+QK0zL+IPBHg==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/sequelize"
+ }
+ ],
+ "dependencies": {
+ "@types/debug": "^4.1.8",
+ "@types/validator": "^13.7.17",
+ "debug": "^4.3.4",
+ "dottie": "^2.0.6",
+ "inflection": "^1.13.4",
+ "lodash": "^4.17.21",
+ "moment": "^2.29.4",
+ "moment-timezone": "^0.5.43",
+ "pg-connection-string": "^2.6.1",
+ "retry-as-promised": "^7.0.4",
+ "semver": "^7.5.4",
+ "sequelize-pool": "^7.1.0",
+ "toposort-class": "^1.0.1",
+ "uuid": "^8.3.2",
+ "validator": "^13.9.0",
+ "wkx": "^0.5.0"
+ },
+ "engines": {
+ "node": ">=10.0.0"
+ },
+ "peerDependenciesMeta": {
+ "ibm_db": {
+ "optional": true
+ },
+ "mariadb": {
+ "optional": true
+ },
+ "mysql2": {
+ "optional": true
+ },
+ "oracledb": {
+ "optional": true
+ },
+ "pg": {
+ "optional": true
+ },
+ "pg-hstore": {
+ "optional": true
+ },
+ "snowflake-sdk": {
+ "optional": true
+ },
+ "sqlite3": {
+ "optional": true
+ },
+ "tedious": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/sequelize-pool": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-7.1.0.tgz",
+ "integrity": "sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 10.0.0"
+ }
+ },
+ "node_modules/sequelize/node_modules/inflection": {
+ "version": "1.13.4",
+ "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz",
+ "integrity": "sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==",
+ "dev": true,
+ "engines": [
+ "node >= 0.4.0"
+ ]
+ },
+ "node_modules/sequelize/node_modules/pg-connection-string": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz",
+ "integrity": "sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA==",
+ "dev": true
+ },
+ "node_modules/sequelize/node_modules/uuid": {
+ "version": "8.3.2",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+ "dev": true,
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/serialize-javascript": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+ "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+ "dev": true,
+ "license": "BSD-3-Clause",
+ "dependencies": {
+ "randombytes": "^2.1.0"
+ }
+ },
+ "node_modules/serialport": {
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/serialport/-/serialport-12.0.0.tgz",
+ "integrity": "sha512-AmH3D9hHPFmnF/oq/rvigfiAouAKyK/TjnrkwZRYSFZxNggJxwvbAbfYrLeuvq7ktUdhuHdVdSjj852Z55R+uA==",
+ "dev": true,
+ "dependencies": {
+ "@serialport/binding-mock": "10.2.2",
+ "@serialport/bindings-cpp": "12.0.1",
+ "@serialport/parser-byte-length": "12.0.0",
+ "@serialport/parser-cctalk": "12.0.0",
+ "@serialport/parser-delimiter": "12.0.0",
+ "@serialport/parser-inter-byte-timeout": "12.0.0",
+ "@serialport/parser-packet-length": "12.0.0",
+ "@serialport/parser-readline": "12.0.0",
+ "@serialport/parser-ready": "12.0.0",
+ "@serialport/parser-regex": "12.0.0",
+ "@serialport/parser-slip-encoder": "12.0.0",
+ "@serialport/parser-spacepacket": "12.0.0",
+ "@serialport/stream": "12.0.0",
+ "debug": "4.3.4"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/serialport/donate"
+ }
+ },
+ "node_modules/serve-favicon": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz",
+ "integrity": "sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==",
+ "dev": true,
+ "dependencies": {
+ "etag": "~1.8.1",
+ "fresh": "0.5.2",
+ "ms": "2.1.1",
+ "parseurl": "~1.3.2",
+ "safe-buffer": "5.1.1"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/serve-favicon/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==",
+ "dev": true
+ },
+ "node_modules/serve-favicon/node_modules/safe-buffer": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+ "dev": true
+ },
+ "node_modules/serve-static": {
+ "version": "1.16.2",
+ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+ "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "encodeurl": "~2.0.0",
+ "escape-html": "~1.0.3",
+ "parseurl": "~1.3.3",
+ "send": "0.19.0"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/serve-static/node_modules/encodeurl": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+ "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/set-blocking": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+ "dev": true
+ },
+ "node_modules/set-function-length": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
+ "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
+ "dev": true,
+ "dependencies": {
+ "define-data-property": "^1.1.2",
+ "es-errors": "^1.3.0",
+ "function-bind": "^1.1.2",
+ "get-intrinsic": "^1.2.3",
+ "gopd": "^1.0.1",
+ "has-property-descriptors": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/set-function-name": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+ "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+ "dev": true,
+ "dependencies": {
+ "define-data-property": "^1.0.1",
+ "functions-have-names": "^1.2.3",
+ "has-property-descriptors": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/set-getter": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.1.tgz",
+ "integrity": "sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw==",
+ "dev": true,
+ "dependencies": {
+ "to-object-path": "^0.3.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/set-value": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+ "dev": true,
+ "dependencies": {
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.3",
+ "split-string": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/setprototypeof": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+ "dev": true
+ },
+ "node_modules/sha.js": {
+ "version": "2.4.11",
+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+ },
+ "bin": {
+ "sha.js": "bin.js"
+ }
+ },
+ "node_modules/shapefile": {
+ "version": "0.6.6",
+ "resolved": "https://registry.npmjs.org/shapefile/-/shapefile-0.6.6.tgz",
+ "integrity": "sha512-rLGSWeK2ufzCVx05wYd+xrWnOOdSV7xNUW5/XFgx3Bc02hBkpMlrd2F1dDII7/jhWzv0MSyBFh5uJIy9hLdfuw==",
+ "dev": true,
+ "dependencies": {
+ "array-source": "0.0",
+ "commander": "2",
+ "path-source": "0.1",
+ "slice-source": "0.4",
+ "stream-source": "0.3",
+ "text-encoding": "^0.6.4"
+ },
+ "bin": {
+ "dbf2json": "bin/dbf2json",
+ "shp2json": "bin/shp2json"
+ }
+ },
+ "node_modules/shapefile/node_modules/commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+ "dev": true
+ },
+ "node_modules/sharp": {
+ "version": "0.33.1",
+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.1.tgz",
+ "integrity": "sha512-iAYUnOdTqqZDb3QjMneBKINTllCJDZ3em6WaWy7NPECM4aHncvqHRm0v0bN9nqJxMiwamv5KIdauJ6lUzKDpTQ==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "color": "^4.2.3",
+ "detect-libc": "^2.0.2",
+ "semver": "^7.5.4"
+ },
+ "engines": {
+ "libvips": ">=8.15.0",
+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/libvips"
+ },
+ "optionalDependencies": {
+ "@img/sharp-darwin-arm64": "0.33.1",
+ "@img/sharp-darwin-x64": "0.33.1",
+ "@img/sharp-libvips-darwin-arm64": "1.0.0",
+ "@img/sharp-libvips-darwin-x64": "1.0.0",
+ "@img/sharp-libvips-linux-arm": "1.0.0",
+ "@img/sharp-libvips-linux-arm64": "1.0.0",
+ "@img/sharp-libvips-linux-s390x": "1.0.0",
+ "@img/sharp-libvips-linux-x64": "1.0.0",
+ "@img/sharp-libvips-linuxmusl-arm64": "1.0.0",
+ "@img/sharp-libvips-linuxmusl-x64": "1.0.0",
+ "@img/sharp-linux-arm": "0.33.1",
+ "@img/sharp-linux-arm64": "0.33.1",
+ "@img/sharp-linux-s390x": "0.33.1",
+ "@img/sharp-linux-x64": "0.33.1",
+ "@img/sharp-linuxmusl-arm64": "0.33.1",
+ "@img/sharp-linuxmusl-x64": "0.33.1",
+ "@img/sharp-wasm32": "0.33.1",
+ "@img/sharp-win32-ia32": "0.33.1",
+ "@img/sharp-win32-x64": "0.33.1"
+ }
+ },
+ "node_modules/shasum": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+ "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==",
+ "dev": true,
+ "dependencies": {
+ "json-stable-stringify": "~0.0.0",
+ "sha.js": "~2.4.4"
+ }
+ },
+ "node_modules/shasum-object": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz",
+ "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==",
+ "dev": true,
+ "dependencies": {
+ "fast-safe-stringify": "^2.0.7"
+ }
+ },
+ "node_modules/shebang-command": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+ "dependencies": {
+ "shebang-regex": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/shebang-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/shell-quote": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+ "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/shelljs": {
+ "version": "0.8.5",
+ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+ "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+ "dev": true,
+ "dependencies": {
+ "glob": "^7.0.0",
+ "interpret": "^1.0.0",
+ "rechoir": "^0.6.2"
+ },
+ "bin": {
+ "shjs": "bin/shjs"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/shiki": {
+ "version": "0.14.7",
+ "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.7.tgz",
+ "integrity": "sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg==",
+ "dev": true,
+ "dependencies": {
+ "ansi-sequence-parser": "^1.1.0",
+ "jsonc-parser": "^3.2.0",
+ "vscode-oniguruma": "^1.7.0",
+ "vscode-textmate": "^8.0.0"
+ }
+ },
+ "node_modules/shortid": {
+ "version": "2.2.16",
+ "resolved": "https://registry.npmjs.org/shortid/-/shortid-2.2.16.tgz",
+ "integrity": "sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==",
+ "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+ "dev": true,
+ "dependencies": {
+ "nanoid": "^2.1.0"
+ }
+ },
+ "node_modules/shx": {
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/shx/-/shx-0.3.4.tgz",
+ "integrity": "sha512-N6A9MLVqjxZYcVn8hLmtneQWIJtp8IKzMP4eMnx+nqkvXoqinUPCbUFLp2UcWTEIUONhlk0ewxr/jaVGlc+J+g==",
+ "dev": true,
+ "dependencies": {
+ "minimist": "^1.2.3",
+ "shelljs": "^0.8.5"
+ },
+ "bin": {
+ "shx": "lib/cli.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/shx/node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/side-channel": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+ "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "es-errors": "^1.3.0",
+ "object-inspect": "^1.13.3",
+ "side-channel-list": "^1.0.0",
+ "side-channel-map": "^1.0.1",
+ "side-channel-weakmap": "^1.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/side-channel-list": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+ "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "es-errors": "^1.3.0",
+ "object-inspect": "^1.13.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/side-channel-map": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+ "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "call-bound": "^1.0.2",
+ "es-errors": "^1.3.0",
+ "get-intrinsic": "^1.2.5",
+ "object-inspect": "^1.13.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/side-channel-weakmap": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+ "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "call-bound": "^1.0.2",
+ "es-errors": "^1.3.0",
+ "get-intrinsic": "^1.2.5",
+ "object-inspect": "^1.13.3",
+ "side-channel-map": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/sift": {
+ "version": "16.0.1",
+ "resolved": "https://registry.npmjs.org/sift/-/sift-16.0.1.tgz",
+ "integrity": "sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/signal-exit": {
+ "version": "3.0.7",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+ "dev": true
+ },
+ "node_modules/simple-concat": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+ "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"
+ }
+ ]
+ },
+ "node_modules/simple-get": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+ "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "decompress-response": "^4.2.0",
+ "once": "^1.3.1",
+ "simple-concat": "^1.0.0"
+ }
+ },
+ "node_modules/simple-get/node_modules/decompress-response": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+ "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "dependencies": {
+ "mimic-response": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/simple-get/node_modules/mimic-response": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+ "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+ "dev": true,
+ "optional": true,
+ "peer": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/simple-lru-cache": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz",
+ "integrity": "sha512-uEv/AFO0ADI7d99OHDmh1QfYzQk/izT1vCmu/riQfh7qjBVUUgRT87E5s5h7CxWCA/+YoZerykpEthzVrW3LIw==",
+ "dev": true
+ },
+ "node_modules/simple-swizzle": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+ "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+ "dev": true,
+ "dependencies": {
+ "is-arrayish": "^0.3.1"
+ }
+ },
+ "node_modules/simple-swizzle/node_modules/is-arrayish": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+ "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+ "dev": true
+ },
+ "node_modules/sisteransi": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+ "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+ "dev": true
+ },
+ "node_modules/slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/slice-source": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/slice-source/-/slice-source-0.4.1.tgz",
+ "integrity": "sha512-YiuPbxpCj4hD9Qs06hGAz/OZhQ0eDuALN0lRWJez0eD/RevzKqGdUx1IOMUnXgpr+sXZLq3g8ERwbAH0bCb8vg==",
+ "dev": true
+ },
+ "node_modules/smart-buffer": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">= 6.0.0",
+ "npm": ">= 3.0.0"
+ }
+ },
+ "node_modules/smoothscroll-polyfill": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz",
+ "integrity": "sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==",
+ "dev": true
+ },
+ "node_modules/smtp-connection": {
+ "version": "2.12.0",
+ "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz",
+ "integrity": "sha512-UP5jK4s5SGcUcqPN4U9ingqKt9mXYSKa52YhqxPuMecAnUOsVJpOmtgGaOm1urUBJZlzDt1M9WhZZkgbhxQlvg==",
+ "dev": true,
+ "dependencies": {
+ "httpntlm": "1.6.1",
+ "nodemailer-shared": "1.1.0"
+ }
+ },
+ "node_modules/snake-case": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-1.1.2.tgz",
+ "integrity": "sha512-oapUKC+qulnUIN+/O7Tbl2msi9PQvJeivGN9RNbygxzI2EOY0gA96i8BJLYnGUWSLGcYtyW4YYqnGTZEySU/gg==",
+ "dev": true,
+ "dependencies": {
+ "sentence-case": "^1.1.2"
+ }
+ },
+ "node_modules/snapdragon": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+ "dev": true,
+ "dependencies": {
+ "base": "^0.11.1",
+ "debug": "^2.2.0",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "map-cache": "^0.2.2",
+ "source-map": "^0.5.6",
+ "source-map-resolve": "^0.5.0",
+ "use": "^3.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon-node": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+ "dev": true,
+ "dependencies": {
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.0",
+ "snapdragon-util": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon-node/node_modules/define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon-node/node_modules/is-descriptor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+ "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^1.0.1",
+ "is-data-descriptor": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/snapdragon-node/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon-util": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.2.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true
+ },
+ "node_modules/socket.io": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.5.0.tgz",
+ "integrity": "sha512-gGunfS0od3VpwDBpGwVkzSZx6Aqo9uOcf1afJj2cKnKFAoyl16fvhpsUhmUFd4Ldbvl5JvRQed6eQw6oQp6n8w==",
+ "dev": true,
+ "dependencies": {
+ "debug": "~4.1.0",
+ "engine.io": "~3.6.0",
+ "has-binary2": "~1.0.2",
+ "socket.io-adapter": "~1.1.0",
+ "socket.io-client": "2.5.0",
+ "socket.io-parser": "~3.4.0"
+ }
+ },
+ "node_modules/socket.io-adapter": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz",
+ "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==",
+ "dev": true
+ },
+ "node_modules/socket.io-client": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.5.0.tgz",
+ "integrity": "sha512-lOO9clmdgssDykiOmVQQitwBAF3I6mYcQAo7hQ7AM6Ny5X7fp8hIJ3HcQs3Rjz4SoggoxA1OgrQyY8EgTbcPYw==",
+ "dev": true,
+ "dependencies": {
+ "backo2": "1.0.2",
+ "component-bind": "1.0.0",
+ "component-emitter": "~1.3.0",
+ "debug": "~3.1.0",
+ "engine.io-client": "~3.5.0",
+ "has-binary2": "~1.0.2",
+ "indexof": "0.0.1",
+ "parseqs": "0.0.6",
+ "parseuri": "0.0.6",
+ "socket.io-parser": "~3.3.0",
+ "to-array": "0.1.4"
+ }
+ },
+ "node_modules/socket.io-client/node_modules/debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/socket.io-client/node_modules/isarray": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+ "integrity": "sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ==",
+ "dev": true
+ },
+ "node_modules/socket.io-client/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true
+ },
+ "node_modules/socket.io-client/node_modules/socket.io-parser": {
+ "version": "3.3.4",
+ "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.4.tgz",
+ "integrity": "sha512-z/pFQB3x+EZldRRzORYW1vwVO8m/3ILkswtnpoeU6Ve3cbMWkmHEWDAVJn4QJtchiiFTo5j7UG2QvwxvaA9vow==",
+ "dev": true,
+ "dependencies": {
+ "component-emitter": "~1.3.0",
+ "debug": "~3.1.0",
+ "isarray": "2.0.1"
+ }
+ },
+ "node_modules/socket.io-parser": {
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.3.tgz",
+ "integrity": "sha512-1rE4dZN3kCI/E5wixd393hmbqa78vVpkKmnEJhLeWoS/C5hbFYAbcSfnWoaVH43u9ToUVtzKjguxEZq+1XZfCQ==",
+ "dev": true,
+ "dependencies": {
+ "component-emitter": "1.2.1",
+ "debug": "~4.1.0",
+ "isarray": "2.0.1"
+ },
+ "engines": {
+ "node": ">=10.0.0"
+ }
+ },
+ "node_modules/socket.io-parser/node_modules/component-emitter": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+ "integrity": "sha512-jPatnhd33viNplKjqXKRkGU345p263OIWzDL2wH3LGIGp5Kojo+uXizHmOADRvhGFFTnJqX3jBAKP6vvmSDKcA==",
+ "dev": true
+ },
+ "node_modules/socket.io-parser/node_modules/debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "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/socket.io-parser/node_modules/isarray": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+ "integrity": "sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ==",
+ "dev": true
+ },
+ "node_modules/socket.io/node_modules/debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "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/socks": {
+ "version": "2.8.3",
+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+ "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ip-address": "^9.0.5",
+ "smart-buffer": "^4.2.0"
+ },
+ "engines": {
+ "node": ">= 10.0.0",
+ "npm": ">= 3.0.0"
+ }
+ },
+ "node_modules/socks/node_modules/ip-address": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+ "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "jsbn": "1.1.0",
+ "sprintf-js": "^1.1.3"
+ },
+ "engines": {
+ "node": ">= 12"
+ }
+ },
+ "node_modules/socks/node_modules/jsbn": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/socks/node_modules/sprintf-js": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+ "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+ "dev": true,
+ "license": "BSD-3-Clause"
+ },
+ "node_modules/sort-keys": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+ "integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==",
+ "dev": true,
+ "dependencies": {
+ "is-plain-obj": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/sort-object-keys": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/sort-object-keys/-/sort-object-keys-1.1.3.tgz",
+ "integrity": "sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==",
+ "dev": true
+ },
+ "node_modules/sort-package-json": {
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/sort-package-json/-/sort-package-json-2.7.0.tgz",
+ "integrity": "sha512-6AayF8bp6L+WROgpbhTMUtB9JSFmpGHjmW7DyaNPS1HwlTw2oSVlUUtlkHSEZmg5o89F3zvLBZNvMeZ1T4fjQg==",
+ "dev": true,
+ "dependencies": {
+ "detect-indent": "^7.0.1",
+ "detect-newline": "^4.0.0",
+ "get-stdin": "^9.0.0",
+ "git-hooks-list": "^3.0.0",
+ "globby": "^13.1.2",
+ "is-plain-obj": "^4.1.0",
+ "sort-object-keys": "^1.1.3"
+ },
+ "bin": {
+ "sort-package-json": "cli.js"
+ }
+ },
+ "node_modules/sort-package-json/node_modules/detect-newline": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-4.0.1.tgz",
+ "integrity": "sha512-qE3Veg1YXzGHQhlA6jzebZN2qVf6NX+A7m7qlhCGG30dJixrAQhYOsJjsnBjJkCSmuOPpCk30145fr8FV0bzog==",
+ "dev": true,
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/sort-package-json/node_modules/get-stdin": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
+ "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/sort-package-json/node_modules/globby": {
+ "version": "13.2.2",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+ "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
+ "dev": true,
+ "dependencies": {
+ "dir-glob": "^3.0.1",
+ "fast-glob": "^3.3.0",
+ "ignore": "^5.2.4",
+ "merge2": "^1.4.1",
+ "slash": "^4.0.0"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/sort-package-json/node_modules/is-plain-obj": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+ "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/sort-package-json/node_modules/slash": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+ "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/source-map-js": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+ "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/source-map-resolve": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+ "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+ "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+ "dev": true,
+ "dependencies": {
+ "atob": "^2.1.2",
+ "decode-uri-component": "^0.2.0",
+ "resolve-url": "^0.2.1",
+ "source-map-url": "^0.4.0",
+ "urix": "^0.1.0"
+ }
+ },
+ "node_modules/source-map-support": {
+ "version": "0.5.13",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+ "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+ "dev": true,
+ "dependencies": {
+ "buffer-from": "^1.0.0",
+ "source-map": "^0.6.0"
+ }
+ },
+ "node_modules/source-map-support/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/source-map-url": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+ "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+ "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+ "dev": true
+ },
+ "node_modules/sparql-http-client": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/sparql-http-client/-/sparql-http-client-2.4.2.tgz",
+ "integrity": "sha512-b7KBjs3BEJVQJAbWeaTx4EdBSOU1L0KfWLVgnkeRyBUoSTI8F1kTHuX7wzme/+UlfCS2zYsKGdpma5DwdaVRBQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "@rdfjs/data-model": "^1.1.2",
+ "@rdfjs/parser-n3": "^1.1.3",
+ "@rdfjs/to-ntriples": "^1.0.2",
+ "get-stream": "^5.1.0",
+ "jsonstream2": "^3.0.0",
+ "lodash": "^4.17.15",
+ "nodeify-fetch": "^2.2.0",
+ "promise-the-world": "^1.0.1",
+ "rdf-transform-triple-to-quad": "^1.0.2",
+ "readable-stream": "^3.5.0",
+ "separate-stream": "^1.0.0"
+ }
+ },
+ "node_modules/sparql-http-client/node_modules/@rdfjs/to-ntriples": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@rdfjs/to-ntriples/-/to-ntriples-1.0.2.tgz",
+ "integrity": "sha512-ngw5XAaGHjgGiwWWBPGlfdCclHftonmbje5lMys4G2j4NvfExraPIuRZgjSnd5lg4dnulRVUll8tRbgKO+7EDA==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/sparql-http-client/node_modules/get-stream": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "pump": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/sparse-bitfield": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
+ "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==",
+ "dev": true,
+ "dependencies": {
+ "memory-pager": "^1.0.2"
+ }
+ },
+ "node_modules/spdx-correct": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+ "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+ "dev": true,
+ "dependencies": {
+ "spdx-expression-parse": "^3.0.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "node_modules/spdx-exceptions": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz",
+ "integrity": "sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw==",
+ "dev": true
+ },
+ "node_modules/spdx-expression-parse": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+ "dev": true,
+ "dependencies": {
+ "spdx-exceptions": "^2.1.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "node_modules/spdx-license-ids": {
+ "version": "3.0.17",
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
+ "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
+ "dev": true
+ },
+ "node_modules/spdx-licenses": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/spdx-licenses/-/spdx-licenses-1.0.0.tgz",
+ "integrity": "sha512-BmeFZRYH9XXf56omx0LuiG+gBXRqwmrKsOtcsGTJh8tw9U0cgRKTrOnyDpP1uvI1AVEkoRKYaAvR902ByotFOw==",
+ "dev": true,
+ "dependencies": {
+ "debug": "4.1.1",
+ "is2": "2.0.1"
+ }
+ },
+ "node_modules/spdx-licenses/node_modules/debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "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/speedline-core": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/speedline-core/-/speedline-core-1.4.2.tgz",
+ "integrity": "sha512-9/5CApkKKl6bS6jJ2D0DQllwz/1xq3cyJCR6DLgAQnkj5djCuq8NbflEdD2TI01p8qzS9qaKjzxM9cHT11ezmg==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*",
+ "image-ssim": "^0.2.0",
+ "jpeg-js": "^0.1.2"
+ },
+ "engines": {
+ "node": ">=5.0"
+ }
+ },
+ "node_modules/speedline-core/node_modules/jpeg-js": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz",
+ "integrity": "sha512-CiRVjMKBUp6VYtGwzRjrdnro41yMwKGOWdP9ATXqmixdz2n7KHNwdqthTYSSbOKj/Ha79Gct1sA8ZQpse55TYA==",
+ "dev": true
+ },
+ "node_modules/split-string": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+ "dev": true,
+ "dependencies": {
+ "extend-shallow": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/split-string/node_modules/extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+ "dev": true,
+ "dependencies": {
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/split-string/node_modules/is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "dependencies": {
+ "is-plain-object": "^2.0.4"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/split2": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
+ "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
+ "dev": true,
+ "dependencies": {
+ "through2": "^2.0.2"
+ }
+ },
+ "node_modules/sprintf-js": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+ "dev": true
+ },
+ "node_modules/sqlstring": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
+ "integrity": "sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/sse": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/sse/-/sse-0.0.8.tgz",
+ "integrity": "sha512-cviG7JH31TUhZeaEVhac3zTzA+2FwA7qvHziAHpb7mC7RNVJ/RbHN+6LIGsS2ugP4o2H15DWmrSMK+91CboIcg==",
+ "dev": true,
+ "dependencies": {
+ "options": "0.0.6"
+ },
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/sshpk": {
+ "version": "1.18.0",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
+ "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
+ "dev": true,
+ "dependencies": {
+ "asn1": "~0.2.3",
+ "assert-plus": "^1.0.0",
+ "bcrypt-pbkdf": "^1.0.0",
+ "dashdash": "^1.12.0",
+ "ecc-jsbn": "~0.1.1",
+ "getpass": "^0.1.1",
+ "jsbn": "~0.1.0",
+ "safer-buffer": "^2.0.2",
+ "tweetnacl": "~0.14.0"
+ },
+ "bin": {
+ "sshpk-conv": "bin/sshpk-conv",
+ "sshpk-sign": "bin/sshpk-sign",
+ "sshpk-verify": "bin/sshpk-verify"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/stable": {
+ "version": "0.1.8",
+ "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+ "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+ "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
+ "dev": true
+ },
+ "node_modules/stack-generator": {
+ "version": "2.0.10",
+ "resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.10.tgz",
+ "integrity": "sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==",
+ "dev": true,
+ "dependencies": {
+ "stackframe": "^1.3.4"
+ }
+ },
+ "node_modules/stack-trace": {
+ "version": "0.0.10",
+ "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+ "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/stack-utils": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+ "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+ "dev": true,
+ "dependencies": {
+ "escape-string-regexp": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/stack-utils/node_modules/escape-string-regexp": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+ "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/stackframe": {
+ "version": "1.3.4",
+ "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+ "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==",
+ "dev": true
+ },
+ "node_modules/standard-as-callback": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz",
+ "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==",
+ "dev": true
+ },
+ "node_modules/static-extend": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+ "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+ "dev": true,
+ "dependencies": {
+ "define-property": "^0.2.5",
+ "object-copy": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/statuses": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/stop-iteration-iterator": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+ "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+ "dev": true,
+ "dependencies": {
+ "internal-slot": "^1.0.4"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/stream-browserify": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+ "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "~2.0.1",
+ "readable-stream": "^2.0.2"
+ }
+ },
+ "node_modules/stream-browserify/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/stream-browserify/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/stream-browserify/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/stream-browserify/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/stream-cache": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/stream-cache/-/stream-cache-0.0.2.tgz",
+ "integrity": "sha512-FsMTiRi4aXOcbL3M2lh7yAOWqM7kfVWQfkJ6kelrhdKNpJJVm0IebICQ2LURsbC5w9XfPSRwd9DkfqDHR9OP3g==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/stream-combiner": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.2.tgz",
+ "integrity": "sha512-Z2D5hPQapscuHNqiyUgjnF1sxG/9CB7gs1a9vcS2/OvMiFwmm6EZw9IjbU34l5mPXS62RidpoBdyB83E0GXHLw==",
+ "dev": true,
+ "dependencies": {
+ "duplexer": "~0.0.3"
+ }
+ },
+ "node_modules/stream-combiner2": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+ "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==",
+ "dev": true,
+ "dependencies": {
+ "duplexer2": "~0.1.0",
+ "readable-stream": "^2.0.2"
+ }
+ },
+ "node_modules/stream-combiner2/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/stream-combiner2/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/stream-combiner2/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/stream-combiner2/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/stream-events": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
+ "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
+ "dev": true,
+ "dependencies": {
+ "stubs": "^3.0.0"
+ }
+ },
+ "node_modules/stream-from-promise": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/stream-from-promise/-/stream-from-promise-1.0.0.tgz",
+ "integrity": "sha512-j84KLkudt+gr8KJ21RB02btPLx61uGbrLnewsWz6QKmsz8/c4ZFqXw6mJh5+G4oRN7DgDxdbjPxnpySpg1mUig==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/stream-http": {
+ "version": "2.8.3",
+ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+ "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+ "dev": true,
+ "dependencies": {
+ "builtin-status-codes": "^3.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.3.6",
+ "to-arraybuffer": "^1.0.0",
+ "xtend": "^4.0.0"
+ }
+ },
+ "node_modules/stream-http/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/stream-http/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/stream-http/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/stream-http/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/stream-serializer": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/stream-serializer/-/stream-serializer-1.1.2.tgz",
+ "integrity": "sha512-I/GbDmZwBLn4/gpW4gOwt+jc/cVXt0kQwLOBuY/YLIACfwAnK88qzvSHyyu1+YgoALrWTgbnAVRRirVjGUCTBg==",
+ "dev": true
+ },
+ "node_modules/stream-shift": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz",
+ "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
+ "dev": true
+ },
+ "node_modules/stream-source": {
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/stream-source/-/stream-source-0.3.5.tgz",
+ "integrity": "sha512-ZuEDP9sgjiAwUVoDModftG0JtYiLUV8K4ljYD1VyUMRWtbVf92474o4kuuul43iZ8t/hRuiDAx1dIJSvirrK/g==",
+ "dev": true
+ },
+ "node_modules/stream-splicer": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz",
+ "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.2"
+ }
+ },
+ "node_modules/stream-splicer/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/stream-splicer/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/stream-splicer/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/stream-splicer/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/stream-to-string": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/stream-to-string/-/stream-to-string-1.2.1.tgz",
+ "integrity": "sha512-WsvTDNF8UYs369Yko3pcdTducQtYpzEZeOV7cTuReyFvOoA9S/DLJ6sYK+xPafSPHhUMpaxiljKYnT6JSFztIA==",
+ "dev": true,
+ "dependencies": {
+ "promise-polyfill": "^1.1.6"
+ }
+ },
+ "node_modules/stream-to-string/node_modules/promise-polyfill": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-1.1.6.tgz",
+ "integrity": "sha512-7rrONfyLkDEc7OJ5QBkqa4KI4EBhCd340xRuIUPGCfu13znS+vx+VDdrT9ODAJHlXm7w4lbxN3DRjyv58EuzDg==",
+ "dev": true
+ },
+ "node_modules/streamsearch": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
+ "integrity": "sha512-jos8u++JKm0ARcSUTAZXOVC0mSox7Bhn6sBgty73P1f3JGf7yG2clTbBNHUdde/kdvP2FESam+vM6l8jBrNxHA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/strict-uri-encode": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+ "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/string_decoder": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.2.0"
+ }
+ },
+ "node_modules/string-format-obj": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.1.tgz",
+ "integrity": "sha512-Mm+sROy+pHJmx0P/0Bs1uxIX6UhGJGj6xDGQZ5zh9v/SZRmLGevp+p0VJxV7lirrkAmQ2mvva/gHKpnF/pTb+Q==",
+ "dev": true
+ },
+ "node_modules/string-length": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+ "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+ "dev": true,
+ "dependencies": {
+ "char-regex": "^1.0.2",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/string-to-stream": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/string-to-stream/-/string-to-stream-3.0.1.tgz",
+ "integrity": "sha512-Hl092MV3USJuUCC6mfl9sPzGloA3K5VwdIeJjYIkXY/8K+mUvaeEabWJgArp+xXrsWxCajeT2pc4axbVhIZJyg==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "^3.4.0"
+ }
+ },
+ "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/string-width-cjs": {
+ "name": "string-width",
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/string-width/node_modules/ansi-regex": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+ "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/string-width/node_modules/strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+ "dev": true,
+ "dependencies": {
+ "ansi-regex": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/string.prototype.matchall": {
+ "version": "4.0.10",
+ "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz",
+ "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1",
+ "get-intrinsic": "^1.2.1",
+ "has-symbols": "^1.0.3",
+ "internal-slot": "^1.0.5",
+ "regexp.prototype.flags": "^1.5.0",
+ "set-function-name": "^2.0.0",
+ "side-channel": "^1.0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/string.prototype.trim": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
+ "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/string.prototype.trimend": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
+ "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/string.prototype.trimstart": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
+ "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "es-abstract": "^1.22.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/strip-ansi": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+ "dependencies": {
+ "ansi-regex": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strip-ansi-cjs": {
+ "name": "strip-ansi",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+ "dependencies": {
+ "ansi-regex": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strip-bom": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+ "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strip-bom-buffer": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/strip-bom-buffer/-/strip-bom-buffer-0.1.1.tgz",
+ "integrity": "sha512-dbIOX/cOLFgLH/2ofd7n78uPD3uPkXyt3P1IgaVoGiPYEdOnb7D1mawyhOTXyYWva1kCuRxJY5FkMsVKYlZRRg==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.0",
+ "is-utf8": "^0.2.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/strip-bom-string": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-0.1.2.tgz",
+ "integrity": "sha512-3DgNqQFTfOwWgxn3cXsa6h/WRgFa7dVb6/7YqwfJlBpLSSQbiU1VhaBNRKmtLI59CHjc9awLp9yGJREu7AnaMQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/strip-eof": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+ "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/strip-final-newline": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/strip-indent": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+ "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+ "dev": true,
+ "dependencies": {
+ "min-indent": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strip-json-comments": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/stripe": {
+ "version": "7.63.1",
+ "resolved": "https://registry.npmjs.org/stripe/-/stripe-7.63.1.tgz",
+ "integrity": "sha512-W6R2CzMF87DeWVtxrAD8E9As62VIu2M9Ece+YKVw2P4oOBgvj5M2F2xH8R5VMmnDtmx4RJtg8PIJ4DmijpLU6g==",
+ "dev": true,
+ "dependencies": {
+ "qs": "^6.6.0"
+ },
+ "engines": {
+ "node": "^6 || ^8.1 || >=10.*"
+ }
+ },
+ "node_modules/strnum": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+ "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
+ "dev": true,
+ "optional": true
+ },
+ "node_modules/strong-error-handler": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/strong-error-handler/-/strong-error-handler-3.5.0.tgz",
+ "integrity": "sha512-PCMOf6RYni7wMD3ytGN/TBIJdKZ/EfgItgE8tVrJNGVAf2X39L7I0r/tlDyn+1G9qfVCZL0mSeutljpkOpBy1Q==",
+ "dev": true,
+ "dependencies": {
+ "@types/express": "^4.16.0",
+ "accepts": "^1.3.3",
+ "debug": "^4.1.1",
+ "ejs": "^3.1.3",
+ "fast-safe-stringify": "^2.0.6",
+ "http-status": "^1.1.2",
+ "js2xmlparser": "^4.0.0",
+ "strong-globalize": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/strong-error-handler/node_modules/ejs": {
+ "version": "3.1.9",
+ "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
+ "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+ "dev": true,
+ "dependencies": {
+ "jake": "^10.8.5"
+ },
+ "bin": {
+ "ejs": "bin/cli.js"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/strong-error-handler/node_modules/execa": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+ "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+ "dev": true,
+ "dependencies": {
+ "cross-spawn": "^7.0.0",
+ "get-stream": "^5.0.0",
+ "human-signals": "^1.1.1",
+ "is-stream": "^2.0.0",
+ "merge-stream": "^2.0.0",
+ "npm-run-path": "^4.0.0",
+ "onetime": "^5.1.0",
+ "signal-exit": "^3.0.2",
+ "strip-final-newline": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/execa?sponsor=1"
+ }
+ },
+ "node_modules/strong-error-handler/node_modules/get-stream": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+ "dev": true,
+ "dependencies": {
+ "pump": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/strong-error-handler/node_modules/human-signals": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+ "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.12.0"
+ }
+ },
+ "node_modules/strong-error-handler/node_modules/invert-kv": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-3.0.1.tgz",
+ "integrity": "sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/invert-kv?sponsor=1"
+ }
+ },
+ "node_modules/strong-error-handler/node_modules/lcid": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-3.1.1.tgz",
+ "integrity": "sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg==",
+ "dev": true,
+ "dependencies": {
+ "invert-kv": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strong-error-handler/node_modules/mem": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz",
+ "integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==",
+ "dev": true,
+ "dependencies": {
+ "map-age-cleaner": "^0.1.3",
+ "mimic-fn": "^2.1.0",
+ "p-is-promise": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strong-error-handler/node_modules/mkdirp": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+ "dev": true,
+ "bin": {
+ "mkdirp": "bin/cmd.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/strong-error-handler/node_modules/os-locale": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz",
+ "integrity": "sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA==",
+ "dev": true,
+ "dependencies": {
+ "execa": "^4.0.0",
+ "lcid": "^3.0.0",
+ "mem": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/strong-error-handler/node_modules/p-is-promise": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/strong-error-handler/node_modules/strong-globalize": {
+ "version": "6.0.6",
+ "resolved": "https://registry.npmjs.org/strong-globalize/-/strong-globalize-6.0.6.tgz",
+ "integrity": "sha512-+mN0wTXBg9rLiKBk7jsyfXFWsg08q160XQcmJ3gNxSQ8wrC668dzR8JUp/wcK3NZ2eQ5h5tvc8O6Y+FC0D61lw==",
+ "dev": true,
+ "dependencies": {
+ "accept-language": "^3.0.18",
+ "debug": "^4.2.0",
+ "globalize": "^1.6.0",
+ "lodash": "^4.17.20",
+ "md5": "^2.3.0",
+ "mkdirp": "^1.0.4",
+ "os-locale": "^5.0.0",
+ "yamljs": "^0.3.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/strong-globalize": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/strong-globalize/-/strong-globalize-4.1.3.tgz",
+ "integrity": "sha512-SJegV7w5D4AodEspZJtJ7rls3fmi+Zc0PdyJCqBsg4RN9B8TC80/uAI2fikC+s1Jp9FLvr2vDX8f0Fqc62M4OA==",
+ "dev": true,
+ "dependencies": {
+ "accept-language": "^3.0.18",
+ "debug": "^4.1.1",
+ "globalize": "^1.4.2",
+ "lodash": "^4.17.4",
+ "md5": "^2.2.1",
+ "mkdirp": "^0.5.1",
+ "os-locale": "^3.1.0",
+ "yamljs": "^0.3.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/strong-remoting": {
+ "version": "3.17.0",
+ "resolved": "https://registry.npmjs.org/strong-remoting/-/strong-remoting-3.17.0.tgz",
+ "integrity": "sha512-MfDyLxmoSizuxBE5C8S2A9nPmy4sQquoZNs6NtbSEmaX2OFKlvb/AhTKU9An+Xuee1RRQHEIun8Q/nO+Lp/H6g==",
+ "dev": true,
+ "dependencies": {
+ "async": "^3.1.0",
+ "body-parser": "^1.12.4",
+ "debug": "^4.1.1",
+ "depd": "^2.0.0",
+ "escape-string-regexp": "^2.0.0",
+ "eventemitter2": "^5.0.1",
+ "express": "4.x",
+ "inflection": "^1.7.1",
+ "jayson": "^2.0.5",
+ "js2xmlparser": "^3.0.0",
+ "loopback-datatype-geopoint": "^1.0.0",
+ "loopback-phase": "^3.1.0",
+ "mux-demux": "^3.7.9",
+ "qs": "^6.2.1",
+ "request": "^2.83.0",
+ "sse": "0.0.8",
+ "strong-error-handler": "^3.0.0",
+ "strong-globalize": "^5.0.2",
+ "traverse": "^0.6.6",
+ "xml2js": "^0.4.8"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/escape-string-regexp": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+ "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/execa": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+ "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+ "dev": true,
+ "dependencies": {
+ "cross-spawn": "^7.0.0",
+ "get-stream": "^5.0.0",
+ "human-signals": "^1.1.1",
+ "is-stream": "^2.0.0",
+ "merge-stream": "^2.0.0",
+ "npm-run-path": "^4.0.0",
+ "onetime": "^5.1.0",
+ "signal-exit": "^3.0.2",
+ "strip-final-newline": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/execa?sponsor=1"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/get-stream": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+ "dev": true,
+ "dependencies": {
+ "pump": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/human-signals": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+ "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.12.0"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/inflection": {
+ "version": "1.13.4",
+ "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz",
+ "integrity": "sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==",
+ "dev": true,
+ "engines": [
+ "node >= 0.4.0"
+ ]
+ },
+ "node_modules/strong-remoting/node_modules/invert-kv": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-3.0.1.tgz",
+ "integrity": "sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/invert-kv?sponsor=1"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/js2xmlparser": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz",
+ "integrity": "sha512-CSOkdn0/GhRFwxnipmhXfqJ+FG6+wkWBi46kKSsPx6+j65176ZiQcrCYpg6K8x3iLbO4k3zScBnZ7I/L80dAtw==",
+ "dev": true,
+ "dependencies": {
+ "xmlcreate": "^1.0.1"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/lcid": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-3.1.1.tgz",
+ "integrity": "sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg==",
+ "dev": true,
+ "dependencies": {
+ "invert-kv": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/mem": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz",
+ "integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==",
+ "dev": true,
+ "dependencies": {
+ "map-age-cleaner": "^0.1.3",
+ "mimic-fn": "^2.1.0",
+ "p-is-promise": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/mkdirp": {
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+ "dev": true,
+ "dependencies": {
+ "minimist": "^1.2.6"
+ },
+ "bin": {
+ "mkdirp": "bin/cmd.js"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/os-locale": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz",
+ "integrity": "sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA==",
+ "dev": true,
+ "dependencies": {
+ "execa": "^4.0.0",
+ "lcid": "^3.0.0",
+ "mem": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/p-is-promise": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/strong-globalize": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/strong-globalize/-/strong-globalize-5.1.0.tgz",
+ "integrity": "sha512-9cooAb6kNMDFmTDybkkch1x7b+LuzZNva8oIr+MxXnvx9jcvw4/4DTSXPc53mG68G0Q9YOTYZkhDkWe/DiJ1Qg==",
+ "dev": true,
+ "dependencies": {
+ "accept-language": "^3.0.18",
+ "debug": "^4.1.1",
+ "globalize": "^1.5.0",
+ "lodash": "^4.17.15",
+ "md5": "^2.2.1",
+ "mkdirp": "^0.5.5",
+ "os-locale": "^5.0.0",
+ "yamljs": "^0.3.0"
+ },
+ "engines": {
+ "node": ">=8.9"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/xml2js": {
+ "version": "0.4.23",
+ "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+ "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+ "dev": true,
+ "dependencies": {
+ "sax": ">=0.6.0",
+ "xmlbuilder": "~11.0.0"
+ },
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/xmlbuilder": {
+ "version": "11.0.1",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+ "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/strong-remoting/node_modules/xmlcreate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz",
+ "integrity": "sha512-Mbe56Dvj00onbnSo9J0qj/XlY5bfN9KidsOnpd5tRCsR3ekB3hyyNU9fGrTdqNT5ZNvv4BsA2TcQlignsZyVcw==",
+ "dev": true
+ },
+ "node_modules/strtok3": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
+ "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
+ "dev": true,
+ "dependencies": {
+ "@tokenizer/token": "^0.3.0",
+ "peek-readable": "^4.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/Borewit"
+ }
+ },
+ "node_modules/stubs": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+ "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==",
+ "dev": true
+ },
+ "node_modules/subarg": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+ "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==",
+ "dev": true,
+ "dependencies": {
+ "minimist": "^1.1.0"
+ }
+ },
+ "node_modules/subarg/node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/subscriptions-transport-ws": {
+ "version": "0.9.19",
+ "resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz",
+ "integrity": "sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw==",
+ "deprecated": "The `subscriptions-transport-ws` package is no longer maintained. We recommend you use `graphql-ws` instead. For help migrating Apollo software to `graphql-ws`, see https://www.apollographql.com/docs/apollo-server/data/subscriptions/#switching-from-subscriptions-transport-ws For general help using `graphql-ws`, see https://github.com/enisdenjo/graphql-ws/blob/master/README.md",
+ "dev": true,
+ "dependencies": {
+ "backo2": "^1.0.2",
+ "eventemitter3": "^3.1.0",
+ "iterall": "^1.2.1",
+ "symbol-observable": "^1.0.4",
+ "ws": "^5.2.0 || ^6.0.0 || ^7.0.0"
+ },
+ "peerDependencies": {
+ "graphql": ">=0.10.0"
+ }
+ },
+ "node_modules/subscriptions-transport-ws/node_modules/ws": {
+ "version": "7.5.9",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+ "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.3.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": "^5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/success-symbol": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/success-symbol/-/success-symbol-0.1.0.tgz",
+ "integrity": "sha512-7S6uOTxPklNGxOSbDIg4KlVLBQw1UiGVyfCUYgYxrZUKRblUkmGj7r8xlfQoFudvqLv6Ap5gd76/IIFfI9JG2A==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/superagent": {
+ "version": "7.1.5",
+ "resolved": "https://registry.npmjs.org/superagent/-/superagent-7.1.5.tgz",
+ "integrity": "sha512-HQYyGuDRFGmZ6GNC4hq2f37KnsY9Lr0/R1marNZTgMweVDQLTLJJ6DGQ9Tj/xVVs5HEnop9EMmTbywb5P30aqw==",
+ "dev": true,
+ "dependencies": {
+ "component-emitter": "^1.3.0",
+ "cookiejar": "^2.1.3",
+ "debug": "^4.3.4",
+ "fast-safe-stringify": "^2.1.1",
+ "form-data": "^4.0.0",
+ "formidable": "^2.0.1",
+ "methods": "^1.1.2",
+ "mime": "^2.5.0",
+ "qs": "^6.10.3",
+ "readable-stream": "^3.6.0",
+ "semver": "^7.3.7"
+ },
+ "engines": {
+ "node": ">=6.4.0 <13 || >=14"
+ }
+ },
+ "node_modules/superagent/node_modules/form-data": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+ "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+ "dev": true,
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/superagent/node_modules/mime": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+ "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+ "dev": true,
+ "bin": {
+ "mime": "cli.js"
+ },
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "dependencies": {
+ "has-flag": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/supports-preserve-symlinks-flag": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/swap-case": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz",
+ "integrity": "sha512-BAmWG6/bx8syfc6qXPprof3Mn5vQgf5dwdUNJhsNqU9WdPt5P+ES/wQ5bxfijy8zwZgZZHslC3iAsxsuQMCzJQ==",
+ "dev": true,
+ "dependencies": {
+ "lower-case": "^1.1.1",
+ "upper-case": "^1.1.1"
+ }
+ },
+ "node_modules/swig": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/swig/-/swig-1.4.2.tgz",
+ "integrity": "sha512-23eN2Cmm6XmSc9j//g7J/PlYBdm60eznA/snxYZLVpoy4diL2wzCqEsf6ThVwRhhYIngwSNSztvIdrdH9sTCGA==",
+ "deprecated": "This package is no longer maintained",
+ "dev": true,
+ "dependencies": {
+ "optimist": "~0.6",
+ "uglify-js": "~2.4"
+ },
+ "bin": {
+ "swig": "bin/swig.js"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/swig/node_modules/async": {
+ "version": "0.2.10",
+ "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+ "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
+ "dev": true
+ },
+ "node_modules/swig/node_modules/camelcase": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+ "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/swig/node_modules/source-map": {
+ "version": "0.1.34",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+ "integrity": "sha512-yfCwDj0vR9RTwt3pEzglgb3ZgmcXHt6DjG3bjJvzPwTL+5zDQ2MhmSzAcTy0GTiQuCiriSWXvWM1/NhKdXuoQA==",
+ "dev": true,
+ "dependencies": {
+ "amdefine": ">=0.0.4"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/swig/node_modules/uglify-js": {
+ "version": "2.4.24",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz",
+ "integrity": "sha512-tktIjwackfZLd893KGJmXc1hrRHH1vH9Po3xFh1XBjjeGAnN02xJ3SuoA+n1L29/ZaCA18KzCFlckS+vfPugiA==",
+ "dev": true,
+ "dependencies": {
+ "async": "~0.2.6",
+ "source-map": "0.1.34",
+ "uglify-to-browserify": "~1.0.0",
+ "yargs": "~3.5.4"
+ },
+ "bin": {
+ "uglifyjs": "bin/uglifyjs"
+ },
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/swig/node_modules/window-size": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+ "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/swig/node_modules/wordwrap": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+ "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/swig/node_modules/yargs": {
+ "version": "3.5.4",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+ "integrity": "sha512-5j382E4xQSs71p/xZQsU1PtRA2HXPAjX0E0DkoGLxwNASMOKX6A9doV1NrZmj85u2Pjquz402qonBzz/yLPbPA==",
+ "dev": true,
+ "dependencies": {
+ "camelcase": "^1.0.2",
+ "decamelize": "^1.0.0",
+ "window-size": "0.1.0",
+ "wordwrap": "0.0.2"
+ }
+ },
+ "node_modules/symbol-observable": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+ "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/symbol-tree": {
+ "version": "3.2.4",
+ "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+ "dev": true
+ },
+ "node_modules/synckit": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.0.tgz",
+ "integrity": "sha512-7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg==",
+ "dev": true,
+ "dependencies": {
+ "@pkgr/core": "^0.1.0",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": "^14.18.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/unts"
+ }
+ },
+ "node_modules/synckit/node_modules/tslib": {
+ "version": "2.6.2",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+ "dev": true
+ },
+ "node_modules/syntax-error": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
+ "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
+ "dev": true,
+ "dependencies": {
+ "acorn-node": "^1.2.0"
+ }
+ },
+ "node_modules/tapable": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/tar": {
+ "version": "7.4.3",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+ "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
+ "dependencies": {
+ "@isaacs/fs-minipass": "^4.0.0",
+ "chownr": "^3.0.0",
+ "minipass": "^7.1.2",
+ "minizlib": "^3.0.1",
+ "mkdirp": "^3.0.1",
+ "yallist": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/tar/node_modules/mkdirp": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+ "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+ "bin": {
+ "mkdirp": "dist/cjs/src/bin.js"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/tar/node_modules/yallist": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+ "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/teeny-request": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-6.0.3.tgz",
+ "integrity": "sha512-TZG/dfd2r6yeji19es1cUIwAlVD8y+/svB1kAC2Y0bjEyysrfbO8EZvJBRwIE6WkwmUoB7uvWLwTIhJbMXZ1Dw==",
+ "dev": true,
+ "dependencies": {
+ "http-proxy-agent": "^4.0.0",
+ "https-proxy-agent": "^5.0.0",
+ "node-fetch": "^2.2.0",
+ "stream-events": "^1.0.5",
+ "uuid": "^7.0.0"
+ }
+ },
+ "node_modules/teeny-request/node_modules/uuid": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+ "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
+ "dev": true,
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/term-size": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
+ "integrity": "sha512-7dPUZQGy/+m3/wjVz3ZW5dobSoD/02NxJpoXUX0WIyjfVS3l0c+b/+9phIDFA7FHzkYtwtMFgeGZ/Y8jVTeqQQ==",
+ "dev": true,
+ "dependencies": {
+ "execa": "^0.7.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/term-size/node_modules/cross-spawn": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+ "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
+ "dev": true,
+ "dependencies": {
+ "lru-cache": "^4.0.1",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
+ }
+ },
+ "node_modules/term-size/node_modules/execa": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+ "integrity": "sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==",
+ "dev": true,
+ "dependencies": {
+ "cross-spawn": "^5.0.1",
+ "get-stream": "^3.0.0",
+ "is-stream": "^1.1.0",
+ "npm-run-path": "^2.0.0",
+ "p-finally": "^1.0.0",
+ "signal-exit": "^3.0.0",
+ "strip-eof": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/term-size/node_modules/get-stream": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+ "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/term-size/node_modules/is-stream": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+ "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/term-size/node_modules/lru-cache": {
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+ "dev": true,
+ "dependencies": {
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
+ }
+ },
+ "node_modules/term-size/node_modules/npm-run-path": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+ "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+ "dev": true,
+ "dependencies": {
+ "path-key": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/term-size/node_modules/path-key": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+ "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/term-size/node_modules/shebang-command": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+ "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+ "dev": true,
+ "dependencies": {
+ "shebang-regex": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/term-size/node_modules/shebang-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+ "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/term-size/node_modules/yallist": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+ "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+ "dev": true
+ },
+ "node_modules/test-exclude": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+ "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+ "dev": true,
+ "dependencies": {
+ "@istanbuljs/schema": "^0.1.2",
+ "glob": "^7.1.4",
+ "minimatch": "^3.0.4"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/text-decoding": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz",
+ "integrity": "sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==",
+ "dev": true
+ },
+ "node_modules/text-encoding": {
+ "version": "0.6.4",
+ "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
+ "integrity": "sha512-hJnc6Qg3dWoOMkqP53F0dzRIgtmsAge09kxUIqGrEUS4qr5rWLckGYaQAVr+opBrIMRErGgy6f5aPnyPpyGRfg==",
+ "deprecated": "no longer maintained",
+ "dev": true
+ },
+ "node_modules/text-table": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/third-party-web": {
+ "version": "0.11.1",
+ "resolved": "https://registry.npmjs.org/third-party-web/-/third-party-web-0.11.1.tgz",
+ "integrity": "sha512-PBS478cWhvCM8seuloomV5lGHvu2qMOCj8gq8wKOApdfAaGh9l2rYZkdsBDaQyQg/6plov3uodc6sZ/3c1lu/g==",
+ "dev": true
+ },
+ "node_modules/throat": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
+ "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
+ "dev": true
+ },
+ "node_modules/throttleit": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.1.tgz",
+ "integrity": "sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/through": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+ "dev": true
+ },
+ "node_modules/through2": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "~2.3.6",
+ "xtend": "~4.0.1"
+ }
+ },
+ "node_modules/through2-filter": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+ "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+ "dev": true,
+ "dependencies": {
+ "through2": "~2.0.0",
+ "xtend": "~4.0.0"
+ }
+ },
+ "node_modules/through2/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/through2/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/through2/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/through2/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/timed-out": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+ "integrity": "sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/timers-browserify": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
+ "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==",
+ "dev": true,
+ "dependencies": {
+ "process": "~0.11.0"
+ },
+ "engines": {
+ "node": ">=0.6.0"
+ }
+ },
+ "node_modules/timm": {
+ "version": "1.7.1",
+ "resolved": "https://registry.npmjs.org/timm/-/timm-1.7.1.tgz",
+ "integrity": "sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw==",
+ "dev": true
+ },
+ "node_modules/tiny-inflate": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
+ "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
+ "dev": true
+ },
+ "node_modules/tiny-json-http": {
+ "version": "7.5.1",
+ "resolved": "https://registry.npmjs.org/tiny-json-http/-/tiny-json-http-7.5.1.tgz",
+ "integrity": "sha512-lB7qkBGpL3HR/8gidBu3MMfgfnDj2mlvK/eYXgSbO06gKphemLKGp/TgRTy/BKVD7nCbgIeCm41lMNayXO1f2w==",
+ "dev": true
+ },
+ "node_modules/tinycolor2": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",
+ "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==",
+ "dev": true
+ },
+ "node_modules/title-case": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/title-case/-/title-case-1.1.2.tgz",
+ "integrity": "sha512-xYbo5Um5MBgn24xJSK+x5hZ8ehuGXTVhgx32KJCThHRHwpyIb1lmABi1DH5VvN9E7rNEquPjz//rF/tZQd7mjQ==",
+ "dev": true,
+ "dependencies": {
+ "sentence-case": "^1.1.1",
+ "upper-case": "^1.0.3"
+ }
+ },
+ "node_modules/tmp": {
+ "version": "0.0.33",
+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+ "dev": true,
+ "dependencies": {
+ "os-tmpdir": "~1.0.2"
+ },
+ "engines": {
+ "node": ">=0.6.0"
+ }
+ },
+ "node_modules/tmpl": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+ "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+ "dev": true
+ },
+ "node_modules/to-absolute-glob": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+ "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==",
+ "dev": true,
+ "dependencies": {
+ "is-absolute": "^1.0.0",
+ "is-negated-glob": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-absolute-glob/node_modules/is-absolute": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+ "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+ "dev": true,
+ "dependencies": {
+ "is-relative": "^1.0.0",
+ "is-windows": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-absolute-glob/node_modules/is-relative": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+ "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+ "dev": true,
+ "dependencies": {
+ "is-unc-path": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-absolute-glob/node_modules/is-unc-path": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+ "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+ "dev": true,
+ "dependencies": {
+ "unc-path-regex": "^0.1.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-absolute-glob/node_modules/is-windows": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-array": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+ "integrity": "sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==",
+ "dev": true
+ },
+ "node_modules/to-arraybuffer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+ "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
+ "dev": true
+ },
+ "node_modules/to-file": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/to-file/-/to-file-0.2.0.tgz",
+ "integrity": "sha512-xLyYVRKJQTwy2tKMOLD0M0yL+YSZVgMAzkaY9hh7GhzgBBHSIWARDkgPx8krPPm0mW5CgoIFsQEdKRFOyIRdqg==",
+ "dev": true,
+ "dependencies": {
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "file-contents": "^0.2.4",
+ "glob-parent": "^2.0.0",
+ "is-valid-glob": "^0.3.0",
+ "isobject": "^2.1.0",
+ "lazy-cache": "^2.0.1",
+ "vinyl": "^1.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-file/node_modules/file-contents": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/file-contents/-/file-contents-0.2.4.tgz",
+ "integrity": "sha512-PEz7U6YlXr+dvWCtW63DUY1LUTHOVs1rv4s1/I/39dpvvidQqMSTY6JklazQS60MMoI/ztpo5kMlpdvGagvLbA==",
+ "dev": true,
+ "dependencies": {
+ "extend-shallow": "^2.0.0",
+ "file-stat": "^0.1.0",
+ "graceful-fs": "^4.1.2",
+ "is-buffer": "^1.1.0",
+ "is-utf8": "^0.2.0",
+ "lazy-cache": "^0.2.3",
+ "through2": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-file/node_modules/file-contents/node_modules/lazy-cache": {
+ "version": "0.2.7",
+ "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
+ "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-file/node_modules/file-stat": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/file-stat/-/file-stat-0.1.3.tgz",
+ "integrity": "sha512-f72m4132aOd5DVtREdDX8I0Dd7Zf/3PiUYYvn4BFCxfsLqj6r8joBZzrRlfvsNvxhADw+jpEa0AnWPII9H0Fbg==",
+ "dev": true,
+ "dependencies": {
+ "graceful-fs": "^4.1.2",
+ "lazy-cache": "^0.2.3",
+ "through2": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-file/node_modules/file-stat/node_modules/lazy-cache": {
+ "version": "0.2.7",
+ "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
+ "integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-object-path": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+ "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-regex": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+ "dev": true,
+ "dependencies": {
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "regex-not": "^1.0.2",
+ "safe-regex": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "dependencies": {
+ "is-number": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=8.0"
+ }
+ },
+ "node_modules/to-regex/node_modules/define-property": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^1.0.2",
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-regex/node_modules/extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+ "dev": true,
+ "dependencies": {
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-regex/node_modules/is-descriptor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+ "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^1.0.1",
+ "is-data-descriptor": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/to-regex/node_modules/is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "dependencies": {
+ "is-plain-object": "^2.0.4"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-regex/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-utf8": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz",
+ "integrity": "sha512-zks18/TWT1iHO3v0vFp5qLKOG27m67ycq/Y7a7cTiRuUNlc4gf3HGnkRgMv0NyhnfTamtkYBJl+YeD1/j07gBQ==",
+ "dev": true
+ },
+ "node_modules/toidentifier": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.6"
+ }
+ },
+ "node_modules/token-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz",
+ "integrity": "sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==",
+ "dev": true
+ },
+ "node_modules/token-types": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz",
+ "integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==",
+ "dev": true,
+ "dependencies": {
+ "@tokenizer/token": "^0.3.0",
+ "ieee754": "^1.2.1"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/Borewit"
+ }
+ },
+ "node_modules/toposort": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
+ "integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==",
+ "dev": true
+ },
+ "node_modules/toposort-class": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz",
+ "integrity": "sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg==",
+ "dev": true
+ },
+ "node_modules/tough-cookie": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+ "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+ "dev": true,
+ "dependencies": {
+ "psl": "^1.1.33",
+ "punycode": "^2.1.1",
+ "universalify": "^0.2.0",
+ "url-parse": "^1.5.3"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/tough-cookie/node_modules/punycode": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/tough-cookie/node_modules/universalify": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+ "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4.0.0"
+ }
+ },
+ "node_modules/tr46": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+ "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+ "dev": true,
+ "dependencies": {
+ "punycode": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/tr46/node_modules/punycode": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/traverse": {
+ "version": "0.6.8",
+ "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.8.tgz",
+ "integrity": "sha512-aXJDbk6SnumuaZSANd21XAo15ucCDE38H4fkqiGsc3MhCK+wOlZvLP9cB/TvpHT0mOyWgC4Z8EwRlzqYSUzdsA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/trough": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
+ "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
+ "dev": true,
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
+ "node_modules/ts-api-utils": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.2.1.tgz",
+ "integrity": "sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==",
+ "dev": true,
+ "engines": {
+ "node": ">=16"
+ },
+ "peerDependencies": {
+ "typescript": ">=4.2.0"
+ }
+ },
+ "node_modules/ts-invariant": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.4.4.tgz",
+ "integrity": "sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^1.9.3"
+ }
+ },
+ "node_modules/ts-morph": {
+ "version": "21.0.1",
+ "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-21.0.1.tgz",
+ "integrity": "sha512-dbDtVdEAncKctzrVZ+Nr7kHpHkv+0JDJb2MjjpBaj8bFeCkePU9rHfMklmhuLFnpeq/EJZk2IhStY6NzqgjOkg==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "@ts-morph/common": "~0.22.0",
+ "code-block-writer": "^12.0.0"
+ }
+ },
+ "node_modules/ts-node": {
+ "version": "10.9.2",
+ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+ "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+ "dev": true,
+ "peer": true,
+ "dependencies": {
+ "@cspotcode/source-map-support": "^0.8.0",
+ "@tsconfig/node10": "^1.0.7",
+ "@tsconfig/node12": "^1.0.7",
+ "@tsconfig/node14": "^1.0.0",
+ "@tsconfig/node16": "^1.0.2",
+ "acorn": "^8.4.1",
+ "acorn-walk": "^8.1.1",
+ "arg": "^4.1.0",
+ "create-require": "^1.1.0",
+ "diff": "^4.0.1",
+ "make-error": "^1.1.1",
+ "v8-compile-cache-lib": "^3.0.1",
+ "yn": "3.1.1"
+ },
+ "bin": {
+ "ts-node": "dist/bin.js",
+ "ts-node-cwd": "dist/bin-cwd.js",
+ "ts-node-esm": "dist/bin-esm.js",
+ "ts-node-script": "dist/bin-script.js",
+ "ts-node-transpile-only": "dist/bin-transpile.js",
+ "ts-script": "dist/bin-script-deprecated.js"
+ },
+ "peerDependencies": {
+ "@swc/core": ">=1.2.50",
+ "@swc/wasm": ">=1.2.50",
+ "@types/node": "*",
+ "typescript": ">=2.7"
+ },
+ "peerDependenciesMeta": {
+ "@swc/core": {
+ "optional": true
+ },
+ "@swc/wasm": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/ts-node/node_modules/acorn-walk": {
+ "version": "8.3.1",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.1.tgz",
+ "integrity": "sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/tsconfig-paths": {
+ "version": "3.15.0",
+ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+ "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+ "dev": true,
+ "dependencies": {
+ "@types/json5": "^0.0.29",
+ "json5": "^1.0.2",
+ "minimist": "^1.2.6",
+ "strip-bom": "^3.0.0"
+ }
+ },
+ "node_modules/tsconfig-paths/node_modules/json5": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+ "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+ "dev": true,
+ "dependencies": {
+ "minimist": "^1.2.0"
+ },
+ "bin": {
+ "json5": "lib/cli.js"
+ }
+ },
+ "node_modules/tsconfig-paths/node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/tsconfig-paths/node_modules/strip-bom": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+ "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/tslib": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+ "dev": true
+ },
+ "node_modules/tsscmp": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
+ "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.6.x"
+ }
+ },
+ "node_modules/tsutils": {
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+ "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^1.8.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ },
+ "peerDependencies": {
+ "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+ }
+ },
+ "node_modules/tty-browserify": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+ "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
+ "dev": true
+ },
+ "node_modules/tunnel": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.5.tgz",
+ "integrity": "sha512-gj5sdqherx4VZKMcBA4vewER7zdK25Td+z1npBqpbDys4eJrLx+SlYjJvq1bDXs2irkuJM5pf8ktaEQVipkrbA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+ }
+ },
+ "node_modules/tunnel-agent": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+ "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "^5.0.1"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/tweetnacl": {
+ "version": "0.14.5",
+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+ "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+ "dev": true
+ },
+ "node_modules/twilio": {
+ "version": "4.20.0",
+ "resolved": "https://registry.npmjs.org/twilio/-/twilio-4.20.0.tgz",
+ "integrity": "sha512-Dl49awVTgv9LOLrmXi7elKa2mb69rtkwJHlKNbIR9HjXN7q66gEEaiZsE6gdr+Wfk/zInOvPDVBCdQM+SYXqkA==",
+ "dev": true,
+ "dependencies": {
+ "axios": "^1.6.0",
+ "dayjs": "^1.11.9",
+ "https-proxy-agent": "^5.0.0",
+ "jsonwebtoken": "^9.0.0",
+ "qs": "^6.9.4",
+ "scmp": "^2.1.0",
+ "url-parse": "^1.5.9",
+ "xmlbuilder": "^13.0.2"
+ },
+ "engines": {
+ "node": ">=14.0"
+ }
+ },
+ "node_modules/twilio/node_modules/xmlbuilder": {
+ "version": "13.0.2",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
+ "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.0"
+ }
+ },
+ "node_modules/type": {
+ "version": "2.7.2",
+ "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+ "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
+ "dev": true
+ },
+ "node_modules/type-component": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/type-component/-/type-component-0.0.1.tgz",
+ "integrity": "sha512-mDZRBQS2yZkwRQKfjJvQ8UIYJeBNNWCq+HBNstl9N5s9jZ4dkVYXEGkVPsSCEh5Ld4JM1kmrZTzjnrqSAIQ7dw==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/type-detect": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/type-fest": {
+ "version": "0.21.3",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+ "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/type-is": {
+ "version": "1.6.18",
+ "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+ "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+ "dev": true,
+ "dependencies": {
+ "media-typer": "0.3.0",
+ "mime-types": "~2.1.24"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/typed-array-buffer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.1.tgz",
+ "integrity": "sha512-RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.6",
+ "es-errors": "^1.3.0",
+ "is-typed-array": "^1.1.13"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/typed-array-byte-length": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+ "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "for-each": "^0.3.3",
+ "has-proto": "^1.0.1",
+ "is-typed-array": "^1.1.10"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/typed-array-byte-offset": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+ "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+ "dev": true,
+ "dependencies": {
+ "available-typed-arrays": "^1.0.5",
+ "call-bind": "^1.0.2",
+ "for-each": "^0.3.3",
+ "has-proto": "^1.0.1",
+ "is-typed-array": "^1.1.10"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/typed-array-length": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+ "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "for-each": "^0.3.3",
+ "is-typed-array": "^1.1.9"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/typedarray": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+ "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+ "dev": true
+ },
+ "node_modules/typescript": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
+ "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
+ "dev": true,
+ "bin": {
+ "tsc": "bin/tsc",
+ "tsserver": "bin/tsserver"
+ },
+ "engines": {
+ "node": ">=14.17"
+ }
+ },
+ "node_modules/uglify-es": {
+ "version": "3.3.9",
+ "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
+ "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
+ "deprecated": "support for ECMAScript is superseded by `uglify-js` as of v3.13.0",
+ "dev": true,
+ "dependencies": {
+ "commander": "~2.13.0",
+ "source-map": "~0.6.1"
+ },
+ "bin": {
+ "uglifyjs": "bin/uglifyjs"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/uglify-es/node_modules/commander": {
+ "version": "2.13.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
+ "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+ "dev": true
+ },
+ "node_modules/uglify-es/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/uglify-js": {
+ "version": "3.17.4",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+ "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+ "dev": true,
+ "bin": {
+ "uglifyjs": "bin/uglifyjs"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/uglify-to-browserify": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+ "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
+ "dev": true
+ },
+ "node_modules/uid2": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz",
+ "integrity": "sha512-5gSP1liv10Gjp8cMEnFd6shzkL/D6W1uhXSFNCxDC+YI8+L8wkCYCbJ7n77Ezb4wE/xzMogecE+DtamEe9PZjg==",
+ "dev": true
+ },
+ "node_modules/ultron": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+ "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+ "dev": true
+ },
+ "node_modules/umd": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
+ "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
+ "dev": true,
+ "bin": {
+ "umd": "bin/cli.js"
+ }
+ },
+ "node_modules/unbox-primitive": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+ "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "has-bigints": "^1.0.2",
+ "has-symbols": "^1.0.3",
+ "which-boxed-primitive": "^1.0.2"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/unc-path-regex": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+ "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/undeclared-identifiers": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz",
+ "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==",
+ "dev": true,
+ "dependencies": {
+ "acorn-node": "^1.3.0",
+ "dash-ast": "^1.0.0",
+ "get-assigned-identifiers": "^1.2.0",
+ "simple-concat": "^1.0.0",
+ "xtend": "^4.0.1"
+ },
+ "bin": {
+ "undeclared-identifiers": "bin.js"
+ }
+ },
+ "node_modules/underscore": {
+ "version": "1.13.6",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+ "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+ "dev": true
+ },
+ "node_modules/underscore-plus": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/underscore-plus/-/underscore-plus-1.7.0.tgz",
+ "integrity": "sha512-A3BEzkeicFLnr+U/Q3EyWwJAQPbA19mtZZ4h+lLq3ttm9kn8WC4R3YpuJZEXmWdLjYP47Zc8aLZm9kwdv+zzvA==",
+ "dev": true,
+ "dependencies": {
+ "underscore": "^1.9.1"
+ }
+ },
+ "node_modules/underscore.string": {
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz",
+ "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==",
+ "dev": true,
+ "dependencies": {
+ "sprintf-js": "^1.1.1",
+ "util-deprecate": "^1.0.2"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/underscore.string/node_modules/sprintf-js": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+ "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+ "dev": true
+ },
+ "node_modules/undici-types": {
+ "version": "5.26.5",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+ "dev": true
+ },
+ "node_modules/unfetch": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz",
+ "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==",
+ "dev": true
+ },
+ "node_modules/unicode-properties": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.4.1.tgz",
+ "integrity": "sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==",
+ "dev": true,
+ "dependencies": {
+ "base64-js": "^1.3.0",
+ "unicode-trie": "^2.0.0"
+ }
+ },
+ "node_modules/unicode-trie": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz",
+ "integrity": "sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==",
+ "dev": true,
+ "dependencies": {
+ "pako": "^0.2.5",
+ "tiny-inflate": "^1.0.0"
+ }
+ },
+ "node_modules/unicode-trie/node_modules/pako": {
+ "version": "0.2.9",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+ "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
+ "dev": true
+ },
+ "node_modules/unified": {
+ "version": "10.1.2",
+ "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
+ "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
+ "dev": true,
+ "dependencies": {
+ "@types/unist": "^2.0.0",
+ "bail": "^2.0.0",
+ "extend": "^3.0.0",
+ "is-buffer": "^2.0.0",
+ "is-plain-obj": "^4.0.0",
+ "trough": "^2.0.0",
+ "vfile": "^5.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/unified/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/unified/node_modules/is-plain-obj": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+ "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/union-value": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+ "dev": true,
+ "dependencies": {
+ "arr-union": "^3.1.0",
+ "get-value": "^2.0.6",
+ "is-extendable": "^0.1.1",
+ "set-value": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unique-stream": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+ "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+ "dev": true,
+ "dependencies": {
+ "json-stable-stringify-without-jsonify": "^1.0.1",
+ "through2-filter": "^3.0.0"
+ }
+ },
+ "node_modules/unique-string": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+ "integrity": "sha512-ODgiYu03y5g76A1I9Gt0/chLCzQjvzDy7DsZGsLOE/1MrF6wriEskSncj1+/C58Xk/kPZDppSctDybCwOSaGAg==",
+ "dev": true,
+ "dependencies": {
+ "crypto-random-string": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/unist-util-map": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/unist-util-map/-/unist-util-map-2.0.1.tgz",
+ "integrity": "sha512-VdNvk4BQUUU9Rgr8iUOvclHa/iN9O+6Dt66FKij8l9OVezGG37gGWCPU5KSax1R2degqXFvl3kWTkvzL79e9tQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/mdast": "^3.0.0",
+ "object-assign": "^4.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/unist-util-stringify-position": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz",
+ "integrity": "sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==",
+ "dev": true,
+ "dependencies": {
+ "@types/unist": "^2.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/universalify": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 10.0.0"
+ }
+ },
+ "node_modules/unix-dgram": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.6.tgz",
+ "integrity": "sha512-AURroAsb73BZ6CdAyMrTk/hYKNj3DuYYEuOaB8bYMOHGKupRNScw90Q5C71tWJc3uE7dIeXRyuwN0xLLq3vDTg==",
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "dependencies": {
+ "bindings": "^1.5.0",
+ "nan": "^2.16.0"
+ },
+ "engines": {
+ "node": ">=0.10.48"
+ }
+ },
+ "node_modules/unorm": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+ "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/unpipe": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+ "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/unset-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+ "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+ "dev": true,
+ "dependencies": {
+ "has-value": "^0.3.1",
+ "isobject": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unset-value/node_modules/has-value": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+ "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+ "dev": true,
+ "dependencies": {
+ "get-value": "^2.0.3",
+ "has-values": "^0.1.4",
+ "isobject": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+ "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+ "dev": true,
+ "dependencies": {
+ "isarray": "1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unset-value/node_modules/has-values": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+ "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unset-value/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/unset-value/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unzip-response": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+ "integrity": "sha512-N0XH6lqDtFH84JxptQoZYmloF4nzrQqqrAymNj+/gW60AO2AZgOcf4O/nUXJcYfyQkqvMo9lSupBZmmgvuVXlw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/upath": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+ "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+ "dev": true,
+ "engines": {
+ "node": ">=4",
+ "yarn": "*"
+ }
+ },
+ "node_modules/update-browserslist-db": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+ "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/browserslist"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/browserslist"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "dependencies": {
+ "escalade": "^3.2.0",
+ "picocolors": "^1.1.0"
+ },
+ "bin": {
+ "update-browserslist-db": "cli.js"
+ },
+ "peerDependencies": {
+ "browserslist": ">= 4.21.0"
+ }
+ },
+ "node_modules/update-notifier": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+ "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+ "dev": true,
+ "dependencies": {
+ "boxen": "^1.2.1",
+ "chalk": "^2.0.1",
+ "configstore": "^3.0.0",
+ "import-lazy": "^2.1.0",
+ "is-ci": "^1.0.10",
+ "is-installed-globally": "^0.1.0",
+ "is-npm": "^1.0.0",
+ "latest-version": "^3.0.0",
+ "semver-diff": "^2.0.0",
+ "xdg-basedir": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/update-notifier/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/update-notifier/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/update-notifier/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/update-notifier/node_modules/color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+ "dev": true
+ },
+ "node_modules/update-notifier/node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/update-notifier/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"
+ }
+ },
+ "node_modules/upper-case": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+ "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
+ "dev": true
+ },
+ "node_modules/upper-case-first": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz",
+ "integrity": "sha512-wINKYvI3Db8dtjikdAqoBbZoP6Q+PZUyfMR7pmwHzjC2quzSkUq5DmPrTtPEqHaz8AGtmsB4TqwapMTM1QAQOQ==",
+ "dev": true,
+ "dependencies": {
+ "upper-case": "^1.1.1"
+ }
+ },
+ "node_modules/uri-js": {
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+ "dev": true,
+ "dependencies": {
+ "punycode": "^2.1.0"
+ }
+ },
+ "node_modules/uri-js/node_modules/punycode": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/urix": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+ "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+ "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+ "dev": true
+ },
+ "node_modules/url": {
+ "version": "0.11.3",
+ "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
+ "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
+ "dev": true,
+ "dependencies": {
+ "punycode": "^1.4.1",
+ "qs": "^6.11.2"
+ }
+ },
+ "node_modules/url-parse": {
+ "version": "1.5.10",
+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+ "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+ "dev": true,
+ "dependencies": {
+ "querystringify": "^2.1.1",
+ "requires-port": "^1.0.0"
+ }
+ },
+ "node_modules/url-parse-lax": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+ "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
+ "dev": true,
+ "dependencies": {
+ "prepend-http": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/url-to-options": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+ "integrity": "sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/use": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/usertiming": {
+ "version": "0.1.8",
+ "resolved": "https://registry.npmjs.org/usertiming/-/usertiming-0.1.8.tgz",
+ "integrity": "sha512-0P7EsAN6Fx/VWFuYaleB1EZZ2UNT8n+lQ1Kdhggo1ZX1vau0Sd6ti3HvKAUWT/2HIXYcgKDUd3XtUrdYdR62MQ==",
+ "dev": true
+ },
+ "node_modules/utif2": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/utif2/-/utif2-4.1.0.tgz",
+ "integrity": "sha512-+oknB9FHrJ7oW7A2WZYajOcv4FcDR4CfoGB0dPNfxbi4GO05RRnFmt5oa23+9w32EanrYcSJWspUiJkLMs+37w==",
+ "dev": true,
+ "dependencies": {
+ "pako": "^1.0.11"
+ }
+ },
+ "node_modules/util": {
+ "version": "0.10.4",
+ "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+ "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "2.0.3"
+ }
+ },
+ "node_modules/util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+ "dev": true
+ },
+ "node_modules/util.promisify": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.2.tgz",
+ "integrity": "sha512-PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA==",
+ "dev": true,
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.2.0",
+ "for-each": "^0.3.3",
+ "has-proto": "^1.0.1",
+ "has-symbols": "^1.0.3",
+ "object.getownpropertydescriptors": "^2.1.6",
+ "safe-array-concat": "^1.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/util/node_modules/inherits": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+ "dev": true
+ },
+ "node_modules/utils-merge": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+ "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/uuid": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+ "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.",
+ "dev": true,
+ "bin": {
+ "uuid": "bin/uuid"
+ }
+ },
+ "node_modules/uvu": {
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/uvu/-/uvu-0.5.6.tgz",
+ "integrity": "sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==",
+ "dev": true,
+ "dependencies": {
+ "dequal": "^2.0.0",
+ "diff": "^5.0.0",
+ "kleur": "^4.0.3",
+ "sade": "^1.7.3"
+ },
+ "bin": {
+ "uvu": "bin.js"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/uvu/node_modules/diff": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+ "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.3.1"
+ }
+ },
+ "node_modules/uvu/node_modules/kleur": {
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+ "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/v8-compile-cache-lib": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+ "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+ "dev": true,
+ "peer": true
+ },
+ "node_modules/v8-to-istanbul": {
+ "version": "9.3.0",
+ "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+ "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/trace-mapping": "^0.3.12",
+ "@types/istanbul-lib-coverage": "^2.0.1",
+ "convert-source-map": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=10.12.0"
+ }
+ },
+ "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+ "dev": true
+ },
+ "node_modules/validate-npm-package-license": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+ "dev": true,
+ "dependencies": {
+ "spdx-correct": "^3.0.0",
+ "spdx-expression-parse": "^3.0.0"
+ }
+ },
+ "node_modules/validator": {
+ "version": "13.11.0",
+ "resolved": "https://registry.npmjs.org/validator/-/validator-13.11.0.tgz",
+ "integrity": "sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/vary": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+ "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/verror": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+ "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+ "dev": true,
+ "engines": [
+ "node >=0.6.0"
+ ],
+ "dependencies": {
+ "assert-plus": "^1.0.0",
+ "core-util-is": "1.0.2",
+ "extsprintf": "^1.2.0"
+ }
+ },
+ "node_modules/vfile": {
+ "version": "5.3.7",
+ "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz",
+ "integrity": "sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==",
+ "dev": true,
+ "dependencies": {
+ "@types/unist": "^2.0.0",
+ "is-buffer": "^2.0.0",
+ "unist-util-stringify-position": "^3.0.0",
+ "vfile-message": "^3.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/vfile-message": {
+ "version": "3.1.4",
+ "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz",
+ "integrity": "sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==",
+ "dev": true,
+ "dependencies": {
+ "@types/unist": "^2.0.0",
+ "unist-util-stringify-position": "^3.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/vfile/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/vinyl": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
+ "integrity": "sha512-Ci3wnR2uuSAWFMSglZuB8Z2apBdtOyz8CV7dC6/U1XbltXBC+IuutUkXQISz01P+US2ouBuesSbV6zILZ6BuzQ==",
+ "dev": true,
+ "dependencies": {
+ "clone": "^1.0.0",
+ "clone-stats": "^0.0.1",
+ "replace-ext": "0.0.1"
+ },
+ "engines": {
+ "node": ">= 0.9"
+ }
+ },
+ "node_modules/vinyl/node_modules/clone": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+ "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8"
+ }
+ },
+ "node_modules/vm-browserify": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+ "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+ "dev": true
+ },
+ "node_modules/vm2": {
+ "version": "3.9.19",
+ "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.19.tgz",
+ "integrity": "sha512-J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg==",
+ "deprecated": "The library contains critical security issues and should not be used for production! The maintenance of the project has been discontinued. Consider migrating your code to isolated-vm.",
+ "dev": true,
+ "dependencies": {
+ "acorn": "^8.7.0",
+ "acorn-walk": "^8.2.0"
+ },
+ "bin": {
+ "vm2": "bin/vm2"
+ },
+ "engines": {
+ "node": ">=6.0"
+ }
+ },
+ "node_modules/vm2/node_modules/acorn-walk": {
+ "version": "8.3.1",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.1.tgz",
+ "integrity": "sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/void-elements": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
+ "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/vscode-oniguruma": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
+ "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==",
+ "dev": true
+ },
+ "node_modules/vscode-textmate": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-8.0.0.tgz",
+ "integrity": "sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==",
+ "dev": true
+ },
+ "node_modules/vue": {
+ "version": "2.7.16",
+ "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
+ "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
+ "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
+ "dev": true,
+ "dependencies": {
+ "@vue/compiler-sfc": "2.7.16",
+ "csstype": "^3.1.0"
+ }
+ },
+ "node_modules/vue-server-renderer": {
+ "version": "2.7.16",
+ "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.7.16.tgz",
+ "integrity": "sha512-U7GgR4rYmHmbs3Z2gqsasfk7JNuTsy/xrR5EMMGRLkjN8+ryDlqQq6Uu3DcmbCATAei814YOxyl0eq2HNqgXyQ==",
+ "dev": true,
+ "dependencies": {
+ "chalk": "^4.1.2",
+ "hash-sum": "^2.0.0",
+ "he": "^1.2.0",
+ "lodash.template": "^4.5.0",
+ "lodash.uniq": "^4.5.0",
+ "resolve": "^1.22.0",
+ "serialize-javascript": "^6.0.0",
+ "source-map": "0.5.6"
+ }
+ },
+ "node_modules/vue-server-renderer/node_modules/source-map": {
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+ "integrity": "sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/w3c-hr-time": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+ "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+ "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+ "dev": true,
+ "dependencies": {
+ "browser-process-hrtime": "^1.0.0"
+ }
+ },
+ "node_modules/w3c-xmlserializer": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+ "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+ "dev": true,
+ "dependencies": {
+ "xml-name-validator": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/walker": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+ "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+ "dev": true,
+ "dependencies": {
+ "makeerror": "1.0.12"
+ }
+ },
+ "node_modules/watchify": {
+ "version": "3.11.1",
+ "resolved": "https://registry.npmjs.org/watchify/-/watchify-3.11.1.tgz",
+ "integrity": "sha512-WwnUClyFNRMB2NIiHgJU9RQPQNqVeFk7OmZaWf5dC5EnNa0Mgr7imBydbaJ7tGTuPM2hz1Cb4uiBvK9NVxMfog==",
+ "dev": true,
+ "dependencies": {
+ "anymatch": "^2.0.0",
+ "browserify": "^16.1.0",
+ "chokidar": "^2.1.1",
+ "defined": "^1.0.0",
+ "outpipe": "^1.1.0",
+ "through2": "^2.0.0",
+ "xtend": "^4.0.0"
+ },
+ "bin": {
+ "watchify": "bin/cmd.js"
+ }
+ },
+ "node_modules/watchify/node_modules/anymatch": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+ "dev": true,
+ "dependencies": {
+ "micromatch": "^3.1.4",
+ "normalize-path": "^2.1.1"
+ }
+ },
+ "node_modules/watchify/node_modules/braces": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+ "dev": true,
+ "dependencies": {
+ "arr-flatten": "^1.1.0",
+ "array-unique": "^0.3.2",
+ "extend-shallow": "^2.0.1",
+ "fill-range": "^4.0.0",
+ "isobject": "^3.0.1",
+ "repeat-element": "^1.1.2",
+ "snapdragon": "^0.8.1",
+ "snapdragon-node": "^2.0.1",
+ "split-string": "^3.0.2",
+ "to-regex": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/watchify/node_modules/define-property": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^1.0.2",
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/watchify/node_modules/fill-range": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+ "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+ "dev": true,
+ "dependencies": {
+ "extend-shallow": "^2.0.1",
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1",
+ "to-regex-range": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/watchify/node_modules/is-descriptor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+ "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^1.0.1",
+ "is-data-descriptor": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/watchify/node_modules/is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "dependencies": {
+ "is-plain-object": "^2.0.4"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/watchify/node_modules/is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/watchify/node_modules/is-number/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/watchify/node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/watchify/node_modules/kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/watchify/node_modules/micromatch": {
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+ "dev": true,
+ "dependencies": {
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "braces": "^2.3.1",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "extglob": "^2.0.4",
+ "fragment-cache": "^0.2.1",
+ "kind-of": "^6.0.2",
+ "nanomatch": "^1.2.9",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/watchify/node_modules/micromatch/node_modules/extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+ "dev": true,
+ "dependencies": {
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/watchify/node_modules/normalize-path": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+ "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+ "dev": true,
+ "dependencies": {
+ "remove-trailing-separator": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/watchify/node_modules/to-regex-range": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+ "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+ "dev": true,
+ "dependencies": {
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/web-animations-js": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz",
+ "integrity": "sha512-TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA==",
+ "dev": true
+ },
+ "node_modules/web-vitals": {
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-4.2.4.tgz",
+ "integrity": "sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==",
+ "dev": true
+ },
+ "node_modules/webidl-conversions": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+ "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+ "dev": true,
+ "engines": {
+ "node": ">=10.4"
+ }
+ },
+ "node_modules/websocket-driver": {
+ "version": "0.7.4",
+ "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+ "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+ "dev": true,
+ "dependencies": {
+ "http-parser-js": ">=0.5.1",
+ "safe-buffer": ">=5.1.0",
+ "websocket-extensions": ">=0.1.1"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/websocket-extensions": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/websocket-stream": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.2.0.tgz",
+ "integrity": "sha512-2ZfiWuEK/bTi8AhXdYh/lFEUwXtGVcbO4vWUy5XJhf7F6nCMAC8hbXXTarxrmv2BFSwdk3P3bhvgiA9wzT+GFQ==",
+ "dev": true,
+ "dependencies": {
+ "duplexify": "^3.6.1",
+ "inherits": "^2.0.1",
+ "readable-stream": "^3.0.0",
+ "safe-buffer": "^5.1.2",
+ "ws": "^6.1.2",
+ "xtend": "^4.0.0"
+ }
+ },
+ "node_modules/websocket-stream/node_modules/duplexify": {
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+ "dev": true,
+ "dependencies": {
+ "end-of-stream": "^1.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.0",
+ "stream-shift": "^1.0.0"
+ }
+ },
+ "node_modules/websocket-stream/node_modules/duplexify/node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/websocket-stream/node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/websocket-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/websocket-stream/node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/websocket-stream/node_modules/ws": {
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+ "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+ "dev": true,
+ "dependencies": {
+ "async-limiter": "~1.0.0"
+ }
+ },
+ "node_modules/whatwg-encoding": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+ "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+ "dev": true,
+ "dependencies": {
+ "iconv-lite": "0.4.24"
+ }
+ },
+ "node_modules/whatwg-mimetype": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+ "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+ "dev": true
+ },
+ "node_modules/whatwg-url": {
+ "version": "8.7.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+ "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+ "dev": true,
+ "dependencies": {
+ "lodash": "^4.7.0",
+ "tr46": "^2.1.0",
+ "webidl-conversions": "^6.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/when": {
+ "version": "3.7.8",
+ "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
+ "integrity": "sha512-5cZ7mecD3eYcMiCH4wtRPA5iFJZ50BJYDfckI5RRpQiktMiYTcn0ccLTZOvcbBume+1304fQztxeNzNS9Gvrnw==",
+ "dev": true
+ },
+ "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"
+ },
+ "bin": {
+ "which": "bin/which"
+ }
+ },
+ "node_modules/which-boxed-primitive": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+ "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+ "dev": true,
+ "dependencies": {
+ "is-bigint": "^1.0.1",
+ "is-boolean-object": "^1.1.0",
+ "is-number-object": "^1.0.4",
+ "is-string": "^1.0.5",
+ "is-symbol": "^1.0.3"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/which-builtin-type": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz",
+ "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==",
+ "dev": true,
+ "dependencies": {
+ "function.prototype.name": "^1.1.5",
+ "has-tostringtag": "^1.0.0",
+ "is-async-function": "^2.0.0",
+ "is-date-object": "^1.0.5",
+ "is-finalizationregistry": "^1.0.2",
+ "is-generator-function": "^1.0.10",
+ "is-regex": "^1.1.4",
+ "is-weakref": "^1.0.2",
+ "isarray": "^2.0.5",
+ "which-boxed-primitive": "^1.0.2",
+ "which-collection": "^1.0.1",
+ "which-typed-array": "^1.1.9"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/which-collection": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+ "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+ "dev": true,
+ "dependencies": {
+ "is-map": "^2.0.1",
+ "is-set": "^2.0.1",
+ "is-weakmap": "^2.0.1",
+ "is-weakset": "^2.0.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/which-module": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+ "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+ "dev": true
+ },
+ "node_modules/which-typed-array": {
+ "version": "1.1.14",
+ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz",
+ "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==",
+ "dev": true,
+ "dependencies": {
+ "available-typed-arrays": "^1.0.6",
+ "call-bind": "^1.0.5",
+ "for-each": "^0.3.3",
+ "gopd": "^1.0.1",
+ "has-tostringtag": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/wicg-inert": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.2.tgz",
+ "integrity": "sha512-Ba9tGNYxXwaqKEi9sJJvPMKuo063umUPsHN0JJsjrs2j8KDSzkWLMZGZ+MH1Jf1Fq4OWZ5HsESJID6nRza2ang==",
+ "dev": true
+ },
+ "node_modules/wide-align": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+ "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^1.0.2 || 2 || 3 || 4"
+ }
+ },
+ "node_modules/widest-line": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
+ "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/window-size": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
+ "integrity": "sha512-2thx4pB0cV3h+Bw7QmMXcEbdmOzv9t0HFplJH/Lz6yu60hXYy5RT8rUu+wlIreVxWsGN20mo+MHeCSfUpQBwPw==",
+ "dev": true,
+ "bin": {
+ "window-size": "cli.js"
+ },
+ "engines": {
+ "node": ">= 0.10.0"
+ }
+ },
+ "node_modules/with": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/with/-/with-7.0.2.tgz",
+ "integrity": "sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==",
+ "dev": true,
+ "dependencies": {
+ "@babel/parser": "^7.9.6",
+ "@babel/types": "^7.9.6",
+ "assert-never": "^1.2.1",
+ "babel-walk": "3.0.0-canary-5"
+ },
+ "engines": {
+ "node": ">= 10.0.0"
+ }
+ },
+ "node_modules/wkx": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz",
+ "integrity": "sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/wordwrap": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+ "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/wrap-ansi": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/wrap-ansi-cjs": {
+ "name": "wrap-ansi",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
+ "node_modules/wrap-ansi-cjs/node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/wrap-ansi/node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+ },
+ "node_modules/write-file-atomic": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+ "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+ "dev": true,
+ "dependencies": {
+ "imurmurhash": "^0.1.4",
+ "signal-exit": "^3.0.7"
+ },
+ "engines": {
+ "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+ }
+ },
+ "node_modules/ws": {
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+ "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+ "dev": true,
+ "dependencies": {
+ "async-limiter": "~1.0.0",
+ "safe-buffer": "~5.1.0",
+ "ultron": "~1.1.0"
+ }
+ },
+ "node_modules/ws/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "node_modules/xdg-basedir": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+ "integrity": "sha512-1Dly4xqlulvPD3fZUQJLY+FUIeqN3N2MM3uqe4rCJftAvOjFa3jFGfctOgluGx4ahPbUCsZkmJILiP0Vi4T6lQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/xhr": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.6.0.tgz",
+ "integrity": "sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==",
+ "dev": true,
+ "dependencies": {
+ "global": "~4.4.0",
+ "is-function": "^1.0.1",
+ "parse-headers": "^2.0.0",
+ "xtend": "^4.0.0"
+ }
+ },
+ "node_modules/xml-name-validator": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+ "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+ "dev": true
+ },
+ "node_modules/xml-parse-from-string": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz",
+ "integrity": "sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g==",
+ "dev": true
+ },
+ "node_modules/xml2js": {
+ "version": "0.2.8",
+ "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
+ "integrity": "sha512-ZHZBIAO55GHCn2jBYByVPHvHS+o3j8/a/qmpEe6kxO3cTnTCWC3Htq9RYJ5G4XMwMMClD2QkXA9SNdPadLyn3Q==",
+ "dev": true,
+ "dependencies": {
+ "sax": "0.5.x"
+ }
+ },
+ "node_modules/xml2js/node_modules/sax": {
+ "version": "0.5.8",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
+ "integrity": "sha512-c0YL9VcSfcdH3F1Qij9qpYJFpKFKMXNOkLWFssBL3RuF7ZS8oZhllR2rWlCRjDTJsfq3R6wbSsaRU6o0rkEdNw==",
+ "dev": true
+ },
+ "node_modules/xmlbuilder": {
+ "version": "9.0.7",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+ "integrity": "sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/xmlchars": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+ "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+ "dev": true
+ },
+ "node_modules/xmlcreate": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
+ "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
+ "dev": true
+ },
+ "node_modules/xmldom": {
+ "version": "0.1.19",
+ "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz",
+ "integrity": "sha512-pDyxjQSFQgNHkU+yjvoF+GXVGJU7e9EnOg/KcGMDihBIKjTsOeDYaECwC/O9bsUWKY+Sd9izfE43JXC46EOHKA==",
+ "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
+ "dev": true,
+ "engines": {
+ "node": ">=0.1"
+ }
+ },
+ "node_modules/xmlhttprequest-ssl": {
+ "version": "1.6.3",
+ "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz",
+ "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/xss": {
+ "version": "1.0.14",
+ "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.14.tgz",
+ "integrity": "sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw==",
+ "dev": true,
+ "dependencies": {
+ "commander": "^2.20.3",
+ "cssfilter": "0.0.10"
+ },
+ "bin": {
+ "xss": "bin/xss"
+ },
+ "engines": {
+ "node": ">= 0.10.0"
+ }
+ },
+ "node_modules/xss/node_modules/commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+ "dev": true
+ },
+ "node_modules/xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4"
+ }
+ },
+ "node_modules/y18n": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+ "dev": true
+ },
+ "node_modules/yaku": {
+ "version": "0.19.3",
+ "resolved": "https://registry.npmjs.org/yaku/-/yaku-0.19.3.tgz",
+ "integrity": "sha512-QgelIZVBPKnWyvd/zoaSVOmv7lzLoa3gsjI+vjc9ts9QLeLCrWTSSHB6Y+Hslo+NntC5HelX/prt0Npt4B+pKA==",
+ "dev": true
+ },
+ "node_modules/yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+ },
+ "node_modules/yamljs": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz",
+ "integrity": "sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==",
+ "dev": true,
+ "dependencies": {
+ "argparse": "^1.0.7",
+ "glob": "^7.0.5"
+ },
+ "bin": {
+ "json2yaml": "bin/json2yaml",
+ "yaml2json": "bin/yaml2json"
+ }
+ },
+ "node_modules/yargs": {
+ "version": "15.4.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+ "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+ "dev": true,
+ "dependencies": {
+ "cliui": "^6.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^4.1.0",
+ "get-caller-file": "^2.0.1",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^2.0.0",
+ "set-blocking": "^2.0.0",
+ "string-width": "^4.2.0",
+ "which-module": "^2.0.0",
+ "y18n": "^4.0.0",
+ "yargs-parser": "^18.1.2"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/yargs-parser": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+ "integrity": "sha512-WhzC+xgstid9MbVUktco/bf+KJG+Uu6vMX0LN1sLJvwmbCQVxb4D8LzogobonKycNasCZLdOzTAk1SK7+K7swg==",
+ "dev": true,
+ "dependencies": {
+ "camelcase": "^4.1.0"
+ }
+ },
+ "node_modules/yargs-parser/node_modules/camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/yargs/node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/yargs/node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/yargs/node_modules/yargs-parser": {
+ "version": "18.1.3",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+ "dev": true,
+ "dependencies": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/yauzl": {
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+ "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+ "dev": true,
+ "dependencies": {
+ "buffer-crc32": "~0.2.3",
+ "fd-slicer": "~1.1.0"
+ }
+ },
+ "node_modules/yeast": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+ "integrity": "sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==",
+ "dev": true
+ },
+ "node_modules/ylru": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/ylru/-/ylru-1.3.2.tgz",
+ "integrity": "sha512-RXRJzMiK6U2ye0BlGGZnmpwJDPgakn6aNQ0A7gHRbD4I0uvK4TW6UqkK1V0pp9jskjJBAXd3dRrbzWkqJ+6cxA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4.0.0"
+ }
+ },
+ "node_modules/yn": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+ "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+ "dev": true,
+ "peer": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "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"
+ }
+ },
+ "node_modules/zen-observable": {
+ "version": "0.8.15",
+ "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz",
+ "integrity": "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==",
+ "dev": true
+ },
+ "node_modules/zen-observable-ts": {
+ "version": "0.8.21",
+ "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz",
+ "integrity": "sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^1.9.3",
+ "zen-observable": "^0.8.0"
+ }
+ },
+ "node_modules/zeromq": {
+ "version": "6.0.0-beta.19",
+ "resolved": "https://registry.npmjs.org/zeromq/-/zeromq-6.0.0-beta.19.tgz",
+ "integrity": "sha512-2eU6H7Z4r9LmTkseGdIfEqp0k3rJr5EpXQw2oC0bUqy3wpoj1M83IU/c3qHPXp0z8IklNMoVmVm130d3g2Xf3g==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "@aminya/node-gyp-build": "4.5.0-aminya.5",
+ "cross-env": "^7.0.3",
+ "node-addon-api": "^7.0.0",
+ "shelljs": "^0.8.5",
+ "shx": "^0.3.4"
+ },
+ "engines": {
+ "node": ">= 10.2"
+ }
+ }
+ }
+}
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
"express": "^4.21.2",
"fast-glob": "^3.1.1",
"fetch-h2": "^2.2.0",
- "firebase": "^7",
+ "firebase": "^11.2.0",
"firebase-admin": "^12.0.0",
"fluent-ffmpeg": "^2.1.2",
"geo-tz": "^7.0.1",
|
diff --git a/test/integration/core-js.js b/test/integration/core-js.js
deleted file mode 100644
--- a/test/integration/core-js.js
+++ /dev/null
@@ -1,2 +0,0 @@
-
-require("core-js").Array.prototype.map.call([], () => {});
diff --git a/test/integration/firebase.js b/test/integration/firebase.js
--- a/test/integration/firebase.js
+++ b/test/integration/firebase.js
@@ -1,6 +1,6 @@
-const firebase = require('firebase/app')
-require('firebase/firestore')
-require('firebase/database')
+const firebase = require('firebase/compat/app')
+require('firebase/compat/firestore')
+require('firebase/compat/database')
firebase.initializeApp({ projectId: 'noop' })
const store = firebase.firestore()
|
Bump firebase from version 7 to 11
Bump firebase from version 7 to 11.
| 2025-02-06T06:34:52
|
javascript
|
Hard
|
|
vercel/nft
| 289
|
vercel__nft-289
|
[
"288"
] |
fd365102c1b393f2e6880096749ef9def0b6bdd5
|
diff --git a/src/utils/static-eval.ts b/src/utils/static-eval.ts
--- a/src/utils/static-eval.ts
+++ b/src/utils/static-eval.ts
@@ -415,6 +415,13 @@ const visitors: Record<string, (this: State, node: Node, walk: Walk) => Promise<
}
return { value: obj };
},
+ 'SequenceExpression': async function SequenceExpression(this: State, node: Node, walk: Walk) {
+ if ('expressions' in node && node.expressions.length === 2 && node.expressions[0].type === 'Literal' && node.expressions[0].value === 0 && node.expressions[1].type === 'MemberExpression') {
+ const arg = await walk(node.expressions[1]);
+ return arg;
+ }
+ return undefined;
+ },
'TemplateLiteral': async function TemplateLiteral(this: State, node: Node, walk: Walk) {
let val: StaticValue | ConditionalValue = { value: '' };
for (var i = 0; i < node.expressions.length; i++) {
|
diff --git a/test/unit/ts-path-join/file.txt b/test/unit/ts-path-join/file.txt
new file mode 100644
--- /dev/null
+++ b/test/unit/ts-path-join/file.txt
@@ -0,0 +1 @@
+file content
\ No newline at end of file
diff --git a/test/unit/ts-path-join/input.js b/test/unit/ts-path-join/input.js
new file mode 100644
--- /dev/null
+++ b/test/unit/ts-path-join/input.js
@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+// See https://devblogs.microsoft.com/typescript/announcing-typescript-4-4/#more-compliant-indirect-calls-for-imported-functions
+// Also https://2ality.com/2015/12/references.html
+const file = (0, path_1.join)(__dirname, 'file.txt');
+console.log(file);
\ No newline at end of file
diff --git a/test/unit/ts-path-join/output.js b/test/unit/ts-path-join/output.js
new file mode 100644
--- /dev/null
+++ b/test/unit/ts-path-join/output.js
@@ -0,0 +1,5 @@
+[
+ "package.json",
+ "test/unit/ts-path-join/file.txt",
+ "test/unit/ts-path-join/input.js"
+]
\ No newline at end of file
|
Output from TypeScript 4.4+ no longer traceable
Source code:
```ts
import { join } from 'path'
const file = join(__dirname, 'file.txt')
```
[Output TS 4.3 or older](https://www.typescriptlang.org/play?target=6&module=1&ts=4.3.5#code/JYWwDg9gTgLgBAbzgKwsAdnAvnAZlCEOAcjAEMYALYgKBoGMJ0BneXYAGwFM4BeFNOgAUAfREATYFHRkQXADQl23AHQwAHjGIBKIA):
```js
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const path_1 = require("path");
const file = path_1.join(__dirname, 'file.txt');
```
[Output TS 4.4 or newer](https://www.typescriptlang.org/play?target=6&module=1&ts=4.4.4#code/JYWwDg9gTgLgBAbzgKwsAdnAvnAZlCEOAcjAEMYALYgKBoGMJ0BneXYAGwFM4BeFNOgAUAfREATYFHRkQXADQl23AHQwAHjGIBKIA):
```js
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const path_1 = require("path");
const file = (0, path_1.join)(__dirname, 'file.txt');
```
|
@guybedford Thoughts on how to solve this one? It seems like TS is doing this to avoid [this method call](https://2ality.com/2015/12/references.html).
@styfle it should be relatively straightforward to substitute the `(0, path1.join)` as a pattern that is supported by the `path.join` style detection. It could be as simple as adding `(0, path.join)` support to the evaluator in supporting the result of this sequence expression being the result of the right side expression. That would be done by adding `SequenceExpression` here - https://github.com/vercel/nft/blob/main/src/utils/static-eval.ts. There may be other touch points but that's the first approach that comes to mind for a fix.
| 2022-05-23T15:40:49
|
javascript
|
Hard
|
vercel/nft
| 33
|
vercel__nft-33
|
[
"31"
] |
d22d12bb51aaf250fc59ce4f7bf697ddd734f574
|
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ node_modules
dist
coverage
test/**/dist
+test/**/actual.js
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,8 +16,5 @@ steps:
versionSpec: '10.x'
displayName: 'Install Node.js'
-- script: |
- node azure-prepare.js
- yarn install
- yarn test
+- script: node azure-prepare.js && yarn install && yarn test
displayName: 'Install Dependencies & Test'
diff --git a/azure-prepare.js b/azure-prepare.js
--- a/azure-prepare.js
+++ b/azure-prepare.js
@@ -11,6 +11,7 @@ if (process.platform === 'win32') {
unlinkSync(join(__dirname, 'test', 'integration', 'highlights.js'));
unlinkSync(join(__dirname, 'test', 'integration', 'hot-shots.js'));
unlinkSync(join(__dirname, 'test', 'integration', 'yoga-layout.js'));
+ unlinkSync(join(__dirname, 'test', 'integration', 'loopback.js'));
delete pkg.devDependencies['@tensorflow/tfjs-node'];
delete pkg.devDependencies['highlights'];
delete pkg.devDependencies['hot-shots'];
diff --git a/jest.config.js b/jest.config.js
--- a/jest.config.js
+++ b/jest.config.js
@@ -2,5 +2,5 @@ module.exports = {
collectCoverageFrom: ["src/**/*.js"],
coverageReporters: ["html", "lcov"],
testEnvironment: "node",
- testMatch: ["<rootDir>/test/?(*.)+(spec|test).js?(x)"]
+ testMatch: ["<rootDir>/test/*(*.)@(spec|test).js?(x)"]
};
diff --git a/src/resolve-dependency.js b/src/resolve-dependency.js
--- a/src/resolve-dependency.js
+++ b/src/resolve-dependency.js
@@ -19,7 +19,7 @@ function resolvePath (path, parent, job) {
function resolveFile (path, parent, job) {
path = job.realpath(path, parent);
- if (path.endsWith('/')) return;
+ if (path.endsWith(sep)) return;
if (job.isFile(path)) return path;
if (job.ts && path.startsWith(job.base) && path.substr(job.base.length).indexOf(sep + 'node_modules' + sep) === -1 && job.isFile(path + '.ts')) return path + '.ts';
if (job.ts && path.startsWith(job.base) && path.substr(job.base.length).indexOf(sep + 'node_modules' + sep) === -1 && job.isFile(path + '.tsx')) return path + '.tsx';
@@ -30,7 +30,7 @@ function resolveFile (path, parent, job) {
function resolveDir (path, parent, job) {
if (!job.isDir(path)) return;
- const realPjsonPath = job.realpath(path + '/package.json', parent);
+ const realPjsonPath = job.realpath(path + sep + 'package.json', parent);
const pjsonSource = job.readFile(realPjsonPath);
if (pjsonSource) {
try {
@@ -60,13 +60,13 @@ function resolvePackage (name, parent, job) {
let packageParent = parent;
if (nodeBuiltins.has(name)) return 'node:' + name;
let separatorIndex;
- const rootSeparatorIndex = packageParent.indexOf('/');
- while ((separatorIndex = packageParent.lastIndexOf('/')) > rootSeparatorIndex) {
+ const rootSeparatorIndex = packageParent.indexOf(sep);
+ while ((separatorIndex = packageParent.lastIndexOf(sep)) > rootSeparatorIndex) {
packageParent = packageParent.substr(0, separatorIndex);
- const nodeModulesDir = packageParent + '/node_modules';
+ const nodeModulesDir = packageParent + sep + 'node_modules';
const stat = job.stat(nodeModulesDir);
if (!stat || !stat.isDirectory()) continue;
- const resolved = resolveFile(nodeModulesDir + '/' + name, parent, job) || resolveDir(nodeModulesDir + '/' + name, parent, job);
+ const resolved = resolveFile(nodeModulesDir + sep + name, parent, job) || resolveDir(nodeModulesDir + sep + name, parent, job);
if (resolved) return resolved;
}
notFound(name, parent);
diff --git a/src/utils/get-package-base.js b/src/utils/get-package-base.js
--- a/src/utils/get-package-base.js
+++ b/src/utils/get-package-base.js
@@ -18,7 +18,9 @@ module.exports.getPackageName = function (id) {
(id[pkgIndex - 1] === '/' || id[pkgIndex - 1] === '\\') &&
(id[pkgIndex + 12] === '/' || id[pkgIndex + 12] === '\\')) {
const pkgNameMatch = id.substr(pkgIndex + 13).match(pkgNameRegEx);
- if (pkgNameMatch) return pkgNameMatch[0];
+ if (pkgNameMatch && pkgNameMatch.length > 0) {
+ return pkgNameMatch[0].replace(/\\/g, '/');
+ }
}
};
diff --git a/src/utils/special-cases.js b/src/utils/special-cases.js
--- a/src/utils/special-cases.js
+++ b/src/utils/special-cases.js
@@ -164,5 +164,6 @@ const specialCases = {
module.exports = function ({ id, ast, emitAsset, emitAssetDirectory, job }) {
const pkgName = getPackageName(id);
const specialCase = specialCases[pkgName];
+ id = id.replace(/\\/g, '/');
if (specialCase) specialCase({ id, ast, emitAsset, emitAssetDirectory, job });
};
|
diff --git a/test/integration.test.js b/test/integration.test.js
--- a/test/integration.test.js
+++ b/test/integration.test.js
@@ -35,7 +35,7 @@ for (const integrationTest of fs.readdirSync(`${__dirname}/integration`)) {
var symlinkPath = await readlink(inPath);
}
catch (e) {
- if (e.code !== 'EINVAL') throw e;
+ if (e.code !== 'EINVAL' && e.code !== 'UNKNOWN') throw e;
}
mkdirp.sync(path.dirname(outPath));
if (symlinkPath) {
@@ -45,7 +45,8 @@ for (const integrationTest of fs.readdirSync(`${__dirname}/integration`)) {
await writeFile(outPath, await readFile(inPath), { mode: 0o777 });
}
}));
- const ps = fork(`${tmpdir}/test/integration/${integrationTest}`, {
+ const testFile = path.join(tmpdir, 'test', 'integration', integrationTest);
+ const ps = fork(testFile, {
stdio: fails ? 'pipe' : 'inherit'
});
const code = await new Promise(resolve => ps.on('close', resolve));
diff --git a/test/integration/typescript.js b/test/integration/typescript.js
--- a/test/integration/typescript.js
+++ b/test/integration/typescript.js
@@ -1,14 +1,22 @@
const { spawn } = require('child_process');
-const path = require('path');
-
const tsc = require.resolve('typescript/bin/tsc');
+const tscjs = require.resolve('typescript/lib/tsc.js');
+const cwd = __dirname;
+
+if (!tsc.endsWith('tsc')) {
+ throw new Error('Expected tsc cli but found ' + tsc);
+}
+
+if (!tscjs.endsWith('tsc.js')) {
+ throw new Error('Expected tsc.js but found ' + tscjs);
+}
-const child = spawn(tsc, { cwd: path.resolve(__dirname, '../fixtures') });
+const child = spawn('node', [tscjs, '--version'], { cwd });
child.stdout.on('data', data => {
- console.error(data.toString());
- throw new Error('Unexpected output.');
+ if (!data || data.toString().length === 0) {
+ throw new Error('Expected stdout output but found none');
+ }
});
child.stderr.on('data', data => {
- console.error(data.toString());
- throw new Error('Unexpected output.')
+ throw new Error('Unexpected stderr output: ' + data.toString());
});
diff --git a/test/unit.test.js b/test/unit.test.js
--- a/test/unit.test.js
+++ b/test/unit.test.js
@@ -1,31 +1,40 @@
const fs = require('fs');
+const { join } = require('path');
const nodeFileTrace = require('../src/node-file-trace');
global._unit = true;
function tryCreateSymlink (target, path) {
+ if (process.platform === 'win32') {
+ console.log('skipping create symlink on Windows');
+ return;
+ }
try {
fs.symlinkSync(target, path);
}
catch (e) {
- if (e.code !== 'EEXIST') throw e;
+ if (e.code !== 'EEXIST' && e.code !== 'UNKNOWN') throw e;
}
}
// ensure test/yarn-workspaces/node_modules/x -> test/yarn-workspaces/packages/x
try {
- fs.mkdirSync(`${__dirname}/unit/yarn-workspaces/node_modules`);
+ fs.mkdirSync(join(__dirname, 'unit', 'yarn-workspaces', 'node_modules'));
}
catch (e) {
- if (e.code !== 'EEXIST') throw e;
+ if (e.code !== 'EEXIST' && e.code !== 'UNKNOWN') throw e;
}
-tryCreateSymlink('../packages/x', `${__dirname}/unit/yarn-workspaces/node_modules/x`);
-tryCreateSymlink('./asset1.txt', `${__dirname}/unit/asset-symlink/asset.txt`);
+tryCreateSymlink('../packages/x', join(__dirname, 'unit', 'yarn-workspaces', 'node_modules', 'x'));
+tryCreateSymlink('./asset1.txt', join(__dirname, 'unit', 'asset-symlink', 'asset.txt'));
-for (const unitTest of fs.readdirSync(`${__dirname}/unit`)) {
+for (const unitTest of fs.readdirSync(join(__dirname, 'unit'))) {
+ if (process.platform === 'win32' && ['yarn-workspaces', 'asset-symlink', 'require-symlink'].includes(unitTest)) {
+ console.log('skipping symlink test on Windows: ' + unitTest);
+ continue;
+ }
it(`should correctly trace ${unitTest}`, async () => {
- const unitPath = `${__dirname}/unit/${unitTest}`;
- const { fileList, reasons } = await nodeFileTrace([`${unitPath}/input.js`], {
+ const unitPath = join(__dirname, 'unit', unitTest);
+ const { fileList, reasons } = await nodeFileTrace([join(unitPath, 'input.js')], {
base: `${__dirname}/../`,
ts: true,
log: true,
@@ -34,7 +43,11 @@ for (const unitTest of fs.readdirSync(`${__dirname}/unit`)) {
});
let expected;
try {
- expected = JSON.parse(fs.readFileSync(`${unitPath}/output.js`).toString());
+ expected = JSON.parse(fs.readFileSync(join(unitPath, 'output.js')).toString());
+ if (process.platform === 'win32') {
+ // When using Windows, the expected output should use backslash
+ expected = expected.map(str => str.replace(/\//g, '\\'));
+ }
}
catch (e) {
console.warn(e);
@@ -45,7 +58,7 @@ for (const unitTest of fs.readdirSync(`${__dirname}/unit`)) {
}
catch (e) {
console.warn(reasons);
- fs.writeFileSync(`${unitPath}/actual.js`, JSON.stringify(fileList, null, 2));
+ fs.writeFileSync(join(unitPath, 'actual.js'), JSON.stringify(fileList, null, 2));
throw e;
}
});
diff --git a/test/unit/ts-filter/input.js b/test/unit/ts-filter/input.js
--- a/test/unit/ts-filter/input.js
+++ b/test/unit/ts-filter/input.js
@@ -1,5 +1,6 @@
+const { join } = require('path');
require('pkg');
// asset reference to ts file in node_modules
// should not cause ts file to be compiled
-fs.readFileSync(__dirname + '/node_modules/pkg/index.ts');
\ No newline at end of file
+fs.readFileSync(join(__dirname, 'node_modules', 'pkg', 'index.ts'));
\ No newline at end of file
|
Needs CI for Windows
To prevent regressions in `now dev` on Windows (i.e. #30).
Recommend [Azure Pipelines](https://azure.microsoft.com/en-us/services/devops/pipelines/).
| 2019-08-02T20:02:55
|
javascript
|
Hard
|
|
opencomponents/oc
| 1,295
|
opencomponents__oc-1295
|
[
"831"
] |
12da5b8f0fb90fb5be5a325fb6d7f7c80798d517
|
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
"multer": "1.4.3",
"nice-cache": "0.0.5",
"oc-client": "4.0.1",
- "oc-client-browser": "1.5.7",
+ "oc-client-browser": "1.5.8",
"oc-empty-response-handler": "1.0.2",
"oc-get-unix-utc-timestamp": "1.0.6",
"oc-s3-storage-adapter": "1.2.0",
@@ -136,4 +136,4 @@
"universalify": "^2.0.0",
"yargs": "17.3.0"
}
-}
+}
\ No newline at end of file
diff --git a/src/registry/routes/helpers/get-component.ts b/src/registry/routes/helpers/get-component.ts
--- a/src/registry/routes/helpers/get-component.ts
+++ b/src/registry/routes/helpers/get-component.ts
@@ -275,7 +275,7 @@ export default function getComponent(conf: Config, repository: Repository) {
err ||
new Error(strings.errors.registry.DATA_OBJECT_IS_UNDEFINED);
return callback({
- status: 500,
+ status: Number(err.status) || 500,
response: {
code: 'GENERIC_ERROR',
error: strings.errors.registry.COMPONENT_EXECUTION_ERROR(
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2405,7 +2405,7 @@
dependencies:
"prettier-linter-helpers" "^1.0.0"
-"eslint-scope@^5.1.1":
+"eslint-scope@^5.1.1", "eslint-scope@5.1.1":
"integrity" "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="
"resolved" "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
"version" "5.1.1"
@@ -2421,14 +2421,6 @@
"esrecurse" "^4.3.0"
"estraverse" "^5.2.0"
-"eslint-scope@5.1.1":
- "integrity" "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="
- "resolved" "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
- "version" "5.1.1"
- dependencies:
- "esrecurse" "^4.3.0"
- "estraverse" "^4.1.1"
-
"eslint-utils@^3.0.0":
"integrity" "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="
"resolved" "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"
@@ -2518,7 +2510,12 @@
"resolved" "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
"version" "4.3.0"
-"estraverse@^5.1.0", "estraverse@^5.2.0":
+"estraverse@^5.1.0":
+ "integrity" "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+ "resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+ "version" "5.3.0"
+
+"estraverse@^5.2.0":
"integrity" "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
"resolved" "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
"version" "5.3.0"
@@ -3858,10 +3855,10 @@
"resolved" "https://registry.npmjs.org/oc-client-browser/-/oc-client-browser-1.5.4.tgz"
"version" "1.5.4"
-"oc-client-browser@1.5.7":
- "integrity" "sha512-TO7FVwJ+FDcrejXWjVkpp1ddgG/7No1nWZGs552iOz8m+Gqfq6ES+d2hnUXz7BtH4GrDr6l9RQwJhci+fqIQtQ=="
- "resolved" "https://registry.npmjs.org/oc-client-browser/-/oc-client-browser-1.5.7.tgz"
- "version" "1.5.7"
+"oc-client-browser@1.5.8":
+ "integrity" "sha512-2EKANYx7u0Vm1qYfU328L3P28KzZTTUJB2Dkbic4/WhE+WskBmdPfJyGoufuJBipXygvlqqXQ5lnaZ6Roq0JuQ=="
+ "resolved" "https://registry.npmjs.org/oc-client-browser/-/oc-client-browser-1.5.8.tgz"
+ "version" "1.5.8"
dependencies:
"universalify" "2.0.0"
|
diff --git a/test/fixtures/mocked-components/async-custom-error.js b/test/fixtures/mocked-components/async-custom-error.js
new file mode 100644
--- /dev/null
+++ b/test/fixtures/mocked-components/async-custom-error.js
@@ -0,0 +1,28 @@
+'use strict';
+
+module.exports = {
+ package: {
+ name: 'async-custom-error-component',
+ version: '1.0.0',
+ oc: {
+ container: false,
+ renderInfo: false,
+ files: {
+ template: {
+ type: 'jade',
+ hashKey: '8c1fbd954f2b0d8cd5cf11c885fed4805225749f',
+ src: 'template.js'
+ },
+ dataProvider: {
+ type: 'node.js',
+ hashKey: '123457',
+ src: 'server.js'
+ }
+ }
+ }
+ },
+ data: '"use strict";module.exports.data = function(ctx, cb){cb(Object.assign(new Error(), {status: 404}));};',
+ view:
+ 'var oc=oc||{};oc.components=oc.components||{},oc.components["8c1fbd954f2b0d8cd5cf11c885fed4805225749f"]' +
+ '=function(){var o=[];return o.push("<div>hello</div>"),o.join("")};'
+};
diff --git a/test/fixtures/mocked-components/index.js b/test/fixtures/mocked-components/index.js
--- a/test/fixtures/mocked-components/index.js
+++ b/test/fixtures/mocked-components/index.js
@@ -5,6 +5,7 @@ module.exports = {
'async-error2-component': require('./async-error2'),
'async-error3-component': require('./async-error3'),
'async-error4-component': require('./async-error4'),
+ 'async-custom-error-component': require('./async-custom-error'),
'error-component': require('./error'),
'npm-component': require('./npm'),
'plugin-component': require('./plugin'),
diff --git a/test/unit/registry-routes-helpers-get-component.js b/test/unit/registry-routes-helpers-get-component.js
--- a/test/unit/registry-routes-helpers-get-component.js
+++ b/test/unit/registry-routes-helpers-get-component.js
@@ -135,6 +135,27 @@ describe('registry : routes : helpers : get-component', () => {
});
});
+ describe('when the component sends a custom status code', () => {
+ before(done => {
+ initialise(mockedComponents['async-custom-error-component']);
+ const getComponent = GetComponent({}, mockedRepository);
+
+ getComponent(
+ {
+ name: 'async-custom-error-component',
+ headers: {},
+ version: '1.X.X',
+ conf: { baseUrl: 'http://components.com/' }
+ },
+ () => done()
+ );
+ });
+
+ it.only('should return that status code to the client', () => {
+ expect(fireStub.args[0][1].status).to.equal(404);
+ });
+ });
+
describe('when rendering a component with a legacy template', () => {
describe("when oc-client requests an unrendered component and it doesn't provide templates header", () => {
const headers = {
|
Improvements: Add support to throw custom status like 404,403 instead of only 500s
## *Who* is the bug affecting?
OpenComponent, callback excepts first argument as error. What so ever we pass in it, string or object, this always make OC to throw 500s, and client side js keeps on retrying to get the same resource, even when we know that the called resource doesn't exists at all (API call being made from OC)
## *What* is affected by this bug?
Server (Node) side
## *When* does this occur?
Rendering
## *How* do we replicate the issue?
Just pass string "some error" or some object as error under first parameter of callback in server.js's exported data.
## Expected behavior (i.e. solution)
Ideally we need a mechanism where developer can send custom status code to consumers.
## What version of OC, Node.js and OS are you using?
OC@0.38.0, Node@8.9.4 & MacOS
## Other Comments
It's not a bug, but a much needed improvement.
| 2022-05-09T11:50:46
|
javascript
|
Easy
|
|
vercel/nft
| 392
|
vercel__nft-392
|
[
"391",
"391"
] |
67d76d22b3aa10b5fb7b4ab46d5a196f05ccf35e
|
diff --git a/package-lock.json b/package-lock.json
--- a/package-lock.json
+++ b/package-lock.json
@@ -122,12 +122,24 @@
"vm2": "^3.9.18",
"vue": "^2.6.10",
"vue-server-renderer": "^2.6.10",
- "when": "^3.7.8"
+ "when": "^3.7.8",
+ "zeromq": "^6.0.0-beta.19"
},
"engines": {
"node": ">=16"
}
},
+ "node_modules/@aminya/node-gyp-build": {
+ "version": "4.5.0-aminya.5",
+ "resolved": "https://registry.npmjs.org/@aminya/node-gyp-build/-/node-gyp-build-4.5.0-aminya.5.tgz",
+ "integrity": "sha512-TO7GldxDfSeSRNZVmhlm0liS2GX2o2Q/qTlcD3iD4ltTM6dir568LTRZ+ZDsDbLfMAkfhrbU+VuzNYImwYfczg==",
+ "dev": true,
+ "bin": {
+ "aminya-node-gyp-build": "bin.js",
+ "aminya-node-gyp-build-optional": "optional.js",
+ "aminya-node-gyp-build-test": "build-test.js"
+ }
+ },
"node_modules/@ampproject/remapping": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
@@ -8654,6 +8666,24 @@
"node": ">=0.8"
}
},
+ "node_modules/cross-env": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+ "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+ "dev": true,
+ "dependencies": {
+ "cross-spawn": "^7.0.1"
+ },
+ "bin": {
+ "cross-env": "src/bin/cross-env.js",
+ "cross-env-shell": "src/bin/cross-env-shell.js"
+ },
+ "engines": {
+ "node": ">=10.14",
+ "npm": ">=6",
+ "yarn": ">=1"
+ }
+ },
"node_modules/cross-fetch": {
"version": "3.1.8",
"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
@@ -13676,6 +13706,15 @@
"node": ">= 0.4"
}
},
+ "node_modules/interpret": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+ "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
"node_modules/intl": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/intl/-/intl-1.2.5.tgz",
@@ -21978,7 +22017,7 @@
},
"node_modules/npm/node_modules/lodash._baseindexof": {
"version": "3.1.0",
- "extraneous": true,
+ "dev": true,
"inBundle": true,
"license": "MIT"
},
@@ -21994,19 +22033,19 @@
},
"node_modules/npm/node_modules/lodash._bindcallback": {
"version": "3.0.1",
- "extraneous": true,
+ "dev": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/npm/node_modules/lodash._cacheindexof": {
"version": "3.0.2",
- "extraneous": true,
+ "dev": true,
"inBundle": true,
"license": "MIT"
},
"node_modules/npm/node_modules/lodash._createcache": {
"version": "3.1.2",
- "extraneous": true,
+ "dev": true,
"inBundle": true,
"license": "MIT",
"dependencies": {
@@ -22021,7 +22060,7 @@
},
"node_modules/npm/node_modules/lodash._getnative": {
"version": "3.9.1",
- "extraneous": true,
+ "dev": true,
"inBundle": true,
"license": "MIT"
},
@@ -22039,7 +22078,7 @@
},
"node_modules/npm/node_modules/lodash.restparam": {
"version": "3.6.1",
- "extraneous": true,
+ "dev": true,
"inBundle": true,
"license": "MIT"
},
@@ -27331,6 +27370,18 @@
"node": ">=0.10.0"
}
},
+ "node_modules/rechoir": {
+ "version": "0.6.2",
+ "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+ "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
+ "dev": true,
+ "dependencies": {
+ "resolve": "^1.1.6"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
"node_modules/redis": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz",
@@ -28730,6 +28781,23 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/shelljs": {
+ "version": "0.8.5",
+ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
+ "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+ "dev": true,
+ "dependencies": {
+ "glob": "^7.0.0",
+ "interpret": "^1.0.0",
+ "rechoir": "^0.6.2"
+ },
+ "bin": {
+ "shjs": "bin/shjs"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/shiki": {
"version": "0.14.7",
"resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.7.tgz",
@@ -28752,6 +28820,31 @@
"nanoid": "^2.1.0"
}
},
+ "node_modules/shx": {
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/shx/-/shx-0.3.4.tgz",
+ "integrity": "sha512-N6A9MLVqjxZYcVn8hLmtneQWIJtp8IKzMP4eMnx+nqkvXoqinUPCbUFLp2UcWTEIUONhlk0ewxr/jaVGlc+J+g==",
+ "dev": true,
+ "dependencies": {
+ "minimist": "^1.2.3",
+ "shelljs": "^0.8.5"
+ },
+ "bin": {
+ "shx": "lib/cli.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/shx/node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/side-channel": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -33578,6 +33671,23 @@
"tslib": "^1.9.3",
"zen-observable": "^0.8.0"
}
+ },
+ "node_modules/zeromq": {
+ "version": "6.0.0-beta.19",
+ "resolved": "https://registry.npmjs.org/zeromq/-/zeromq-6.0.0-beta.19.tgz",
+ "integrity": "sha512-2eU6H7Z4r9LmTkseGdIfEqp0k3rJr5EpXQw2oC0bUqy3wpoj1M83IU/c3qHPXp0z8IklNMoVmVm130d3g2Xf3g==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "@aminya/node-gyp-build": "4.5.0-aminya.5",
+ "cross-env": "^7.0.3",
+ "node-addon-api": "^7.0.0",
+ "shelljs": "^0.8.5",
+ "shx": "^0.3.4"
+ },
+ "engines": {
+ "node": ">= 10.2"
+ }
}
}
}
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -128,7 +128,8 @@
"vm2": "^3.9.18",
"vue": "^2.6.10",
"vue-server-renderer": "^2.6.10",
- "when": "^3.7.8"
+ "when": "^3.7.8",
+ "zeromq": "^6.0.0-beta.19"
},
"engines": {
"node": ">=16"
diff --git a/src/analyze.ts b/src/analyze.ts
--- a/src/analyze.ts
+++ b/src/analyze.ts
@@ -127,6 +127,9 @@ const staticModules = Object.assign(Object.create(null), {
'node-gyp-build': {
default: NODE_GYP_BUILD
},
+ '@aminya/node-gyp-build': {
+ default: NODE_GYP_BUILD
+ },
'nbind': {
init: NBIND_INIT,
default: {
@@ -614,18 +617,39 @@ export default async function analyze(id: string, code: string, job: Job): Promi
}
break;
case NODE_GYP_BUILD:
- if (node.arguments.length === 1 && node.arguments[0].type === 'Identifier' &&
- node.arguments[0].name === '__dirname' && knownBindings.__dirname.shadowDepth === 0) {
+ // handle case: require('node-gyp-build')(__dirname)
+ const withDirname =
+ node.arguments.length === 1 &&
+ node.arguments[0].type === 'Identifier' &&
+ node.arguments[0].name === '__dirname';
+
+ // handle case: require('node-gyp-build')(path.join(__dirname, '..'))
+ const withPathJoinDirname =
+ node.arguments.length === 1 &&
+ node.arguments[0].callee?.object?.name === 'path' &&
+ node.arguments[0].callee?.property?.name === 'join' &&
+ node.arguments[0].arguments.length === 2 &&
+ node.arguments[0].arguments[0].type === 'Identifier' &&
+ node.arguments[0].arguments[0].name === '__dirname' &&
+ node.arguments[0].arguments[1].type === 'Literal'
+
+ if (knownBindings.__dirname.shadowDepth === 0 && (withDirname || withPathJoinDirname)) {
+
+ const pathJoinedDir = withPathJoinDirname
+ ? path.join(dir, node.arguments[0].arguments[1].value)
+ : dir;
+
let resolved: string | undefined;
try {
+ // the pkg could be 'node-gyp-build' or '@aminya/node-gyp-build'
+ const pkgName = node.callee.arguments[0].value;
// use installed version of node-gyp-build since resolving
// binaries can differ among versions
- const nodeGypBuildPath = resolveFrom(dir, 'node-gyp-build')
- resolved = require(nodeGypBuildPath).path(dir)
- }
- catch (e) {
+ const nodeGypBuildPath = resolveFrom(pathJoinedDir, pkgName)
+ resolved = require(nodeGypBuildPath).path(pathJoinedDir)
+ } catch (e) {
try {
- resolved = nodeGypBuild.path(dir);
+ resolved = nodeGypBuild.path(pathJoinedDir);
} catch (e) {}
}
if (resolved) {
|
diff --git a/test/integration/zeromq.js b/test/integration/zeromq.js
new file mode 100644
--- /dev/null
+++ b/test/integration/zeromq.js
@@ -0,0 +1,2 @@
+const zmq = require("zeromq");
+const sock = new zmq.Push;
\ No newline at end of file
diff --git a/test/unit.test.js b/test/unit.test.js
--- a/test/unit.test.js
+++ b/test/unit.test.js
@@ -203,10 +203,10 @@ for (const { testName, isRoot } of unitTests) {
}
let sortedFileList = [...fileList].sort()
- if (testName === 'microtime-node-gyp') {
+ if (testName === 'microtime-node-gyp' || testName === 'zeromq-node-gyp') {
let foundMatchingBinary = false
sortedFileList = sortedFileList.filter(file => {
- if (file.endsWith('node-napi.node') || file.endsWith('node.napi.node')) {
+ if (file.includes('prebuilds') && file.endsWith('.node')) {
// remove from fileList for expected checking
// as it will differ per platform
foundMatchingBinary = true
diff --git a/test/unit/zeromq-node-gyp/input.js b/test/unit/zeromq-node-gyp/input.js
new file mode 100644
--- /dev/null
+++ b/test/unit/zeromq-node-gyp/input.js
@@ -0,0 +1,2 @@
+const zeromq = require('zeromq');
+const sock = new zmq.Push;
\ No newline at end of file
diff --git a/test/unit/zeromq-node-gyp/output.js b/test/unit/zeromq-node-gyp/output.js
new file mode 100644
--- /dev/null
+++ b/test/unit/zeromq-node-gyp/output.js
@@ -0,0 +1,11 @@
+[
+ "node_modules/@aminya/node-gyp-build/index.js",
+ "node_modules/@aminya/node-gyp-build/package.json",
+ "node_modules/zeromq/lib/draft.js",
+ "node_modules/zeromq/lib/index.js",
+ "node_modules/zeromq/lib/native.js",
+ "node_modules/zeromq/lib/util.js",
+ "node_modules/zeromq/package.json",
+ "package.json",
+ "test/unit/zeromq-node-gyp/input.js"
+]
|
Add support for `zeromq`
Some libraries like `zeromq.js` need runtime libraries with bindings which they ship along. Those binaries exist under `node_modules/zeromq/prebuilds`.
Simply by creating a new Next.js app, installing https://github.com/zeromq/zeromq.js and trying to import it and running `npm run dev` and use one of its classes would throw a `No native build was found for platform=linux arch=x64 runtime=node abi=115 uv=1 libc=glibc node=20.11.0 webpack=true loaded from: /app/.next/server`. I found out that if I print [this `dir` variable](https://github.com/aminya/node-gyp-build/blob/4cd1eb0f1ef2ed7d4c36b82e3d547e33cd83c9a0/index.js#L26) used (among other things) to search for binaries in node-gyp-builder it print `.next/server/...` instead of `node_modules/...` and since the binaries have not been copied it fails.
> [!NOTE]
> I provided a reproducible example and a container, but it's easily reproducible on mac and linux: https://github.com/eulersson/zeromq.js-next.js-errors
I tried using the `outputFileTracingIncludes` option as explained in https://nextjs.org/docs/pages/api-reference/next-config-js/output#caveats but without success.
Here's the files I would like to have in `.next/server`.
```
❯ tree node_modules/zeromq/prebuilds
node_modules/zeromq/prebuilds
├── darwin-arm64
│ └── node.napi.glibc.node
├── darwin-x64
│ └── node.napi.glibc.node
├── linux-x64
│ ├── node.napi.glibc.node
│ └── node.napi.musl.node
├── win32-ia32
│ └── node.napi.glibc.node
└── win32-x64
└── node.napi.glibc.node
6 directories, 6 files
```
Since I don't know in what area work should be done I posted the same problem as an issue to the various tools involved:
- https://github.com/vercel/next.js/issues/61844
- https://github.com/zeromq/zeromq.js/issues/600
- https://github.com/prebuild/node-gyp-build/issues/65
Thanks for the help and apologies if I have been generating noise by posting so many issues.
Add support for `zeromq`
Some libraries like `zeromq.js` need runtime libraries with bindings which they ship along. Those binaries exist under `node_modules/zeromq/prebuilds`.
Simply by creating a new Next.js app, installing https://github.com/zeromq/zeromq.js and trying to import it and running `npm run dev` and use one of its classes would throw a `No native build was found for platform=linux arch=x64 runtime=node abi=115 uv=1 libc=glibc node=20.11.0 webpack=true loaded from: /app/.next/server`. I found out that if I print [this `dir` variable](https://github.com/aminya/node-gyp-build/blob/4cd1eb0f1ef2ed7d4c36b82e3d547e33cd83c9a0/index.js#L26) used (among other things) to search for binaries in node-gyp-builder it print `.next/server/...` instead of `node_modules/...` and since the binaries have not been copied it fails.
> [!NOTE]
> I provided a reproducible example and a container, but it's easily reproducible on mac and linux: https://github.com/eulersson/zeromq.js-next.js-errors
I tried using the `outputFileTracingIncludes` option as explained in https://nextjs.org/docs/pages/api-reference/next-config-js/output#caveats but without success.
Here's the files I would like to have in `.next/server`.
```
❯ tree node_modules/zeromq/prebuilds
node_modules/zeromq/prebuilds
├── darwin-arm64
│ └── node.napi.glibc.node
├── darwin-x64
│ └── node.napi.glibc.node
├── linux-x64
│ ├── node.napi.glibc.node
│ └── node.napi.musl.node
├── win32-ia32
│ └── node.napi.glibc.node
└── win32-x64
└── node.napi.glibc.node
6 directories, 6 files
```
Since I don't know in what area work should be done I posted the same problem as an issue to the various tools involved:
- https://github.com/vercel/next.js/issues/61844
- https://github.com/zeromq/zeromq.js/issues/600
- https://github.com/prebuild/node-gyp-build/issues/65
Thanks for the help and apologies if I have been generating noise by posting so many issues.
|
You can try `npx @vercel/nft@latest print path/to/my/file.js` to see which files are included.
If its missing prebuilds, then it is likely an issue with `@vercel/nft`.
You can create a PR with a test and special case, similar to PR https://github.com/vercel/nft/pull/37.
Or if you want to fix the general case (likely a dynamic require somewhere) that would be great too (albeit much harder).
@styfle Many thanks for the guidance. I will investigate that route this afternoon! :)
@styfle Indeed it certainly does not bring in the binaries:
```
❯ npx @vercel/nft@latest print ./node_modules/zeromq/lib/index.js
FILELIST:
node_modules/@aminya/node-gyp-build/index.js
node_modules/@aminya/node-gyp-build/package.json
node_modules/zeromq/lib/draft.js
node_modules/zeromq/lib/index.js
node_modules/zeromq/lib/native.js
node_modules/zeromq/lib/util.js
node_modules/zeromq/package.json
```
@styfle I will provide a PR tomorrow.
Also see this related PR that mentions node-gyp-build
- https://github.com/vercel/nft/pull/286
That might lead to the more general purpose fix instead of a special case.
I will do the general purpose one. I think I understood the tracing logic a bit.
You can try `npx @vercel/nft@latest print path/to/my/file.js` to see which files are included.
If its missing prebuilds, then it is likely an issue with `@vercel/nft`.
You can create a PR with a test and special case, similar to PR https://github.com/vercel/nft/pull/37.
Or if you want to fix the general case (likely a dynamic require somewhere) that would be great too (albeit much harder).
@styfle Many thanks for the guidance. I will investigate that route this afternoon! :)
@styfle Indeed it certainly does not bring in the binaries:
```
❯ npx @vercel/nft@latest print ./node_modules/zeromq/lib/index.js
FILELIST:
node_modules/@aminya/node-gyp-build/index.js
node_modules/@aminya/node-gyp-build/package.json
node_modules/zeromq/lib/draft.js
node_modules/zeromq/lib/index.js
node_modules/zeromq/lib/native.js
node_modules/zeromq/lib/util.js
node_modules/zeromq/package.json
```
@styfle I will provide a PR tomorrow.
Also see this related PR that mentions node-gyp-build
- https://github.com/vercel/nft/pull/286
That might lead to the more general purpose fix instead of a special case.
I will do the general purpose one. I think I understood the tracing logic a bit.
| 2024-02-13T16:23:47
|
javascript
|
Hard
|
opencomponents/oc
| 1,303
|
opencomponents__oc-1303
|
[
"1193"
] |
5699dfe0d0658b1dd0edce2492522ff3be2daed7
|
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -5,13 +5,12 @@ name: Node.js CI
on:
push:
- branches: [ master ]
+ branches: [master]
pull_request:
- branches: [ master ]
+ branches: [master]
jobs:
build:
-
runs-on: ubuntu-latest
strategy:
@@ -20,11 +19,11 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- - uses: actions/checkout@v2
- - name: Use Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v2
- with:
- node-version: ${{ matrix.node-version }}
- cache: 'npm'
- - run: npm install
- - run: npm test
+ - uses: actions/checkout@v2
+ - name: Use Node.js ${{ matrix.node-version }}
+ uses: actions/setup-node@v2
+ with:
+ node-version: ${{ matrix.node-version }}
+ cache: 'npm'
+ - run: npm install
+ - run: npm test
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -92,6 +92,7 @@
"colors": "1.4.0",
"cross-spawn": "7.0.3",
"dependency-graph": "0.11.0",
+ "dotenv": "16.0.1",
"errorhandler": "1.5.1",
"express": "4.18.2",
"form-data": "4.0.0",
diff --git a/src/registry/domain/repository.ts b/src/registry/domain/repository.ts
--- a/src/registry/domain/repository.ts
+++ b/src/registry/domain/repository.ts
@@ -1,6 +1,7 @@
import fs from 'fs-extra';
import getUnixUtcTimestamp from 'oc-get-unix-utc-timestamp';
import path from 'path';
+import dotenv from 'dotenv';
import ComponentsCache from './components-cache';
import getComponentsDetails from './components-details';
@@ -114,6 +115,14 @@ export default function repository(conf: Config) {
content: fs.readFileSync(filePath).toString(),
filePath
};
+ },
+ getEnv(componentName: string): Record<string, string> {
+ const pkg: Component = fs.readJsonSync(
+ path.join(conf.path, `${componentName}/package.json`)
+ );
+ const filePath = path.join(conf.path, componentName, pkg.oc.files.env!);
+
+ return dotenv.parse(fs.readFileSync(filePath).toString());
}
};
@@ -249,6 +258,19 @@ export default function repository(conf: Config) {
return { content, filePath };
},
+ async getEnv(
+ componentName: string,
+ componentVersion: string
+ ): Promise<Record<string, string>> {
+ if (conf.local) {
+ return local.getEnv(componentName);
+ }
+
+ const filePath = getFilePath(componentName, componentVersion, '.env');
+ const file = await cdn.getFile(filePath);
+
+ return dotenv.parse(file);
+ },
getStaticClientPath: (): string =>
`${options!['path']}${getFilePath(
'oc-client',
diff --git a/src/registry/routes/helpers/get-component.ts b/src/registry/routes/helpers/get-component.ts
--- a/src/registry/routes/helpers/get-component.ts
+++ b/src/registry/routes/helpers/get-component.ts
@@ -19,7 +19,7 @@ import strings from '../../../resources';
import * as urlBuilder from '../../domain/url-builder';
import * as validator from '../../domain/validators';
import type { Repository } from '../../domain/repository';
-import { Config } from '../../../types';
+import { Component, Config } from '../../../types';
import { IncomingHttpHeaders } from 'http';
import { fromPromise } from 'universalify';
@@ -54,6 +54,10 @@ export interface GetComponentResult {
};
}
+const noopConsole = Object.fromEntries(
+ Object.keys(console).map(key => [key, _.noop])
+);
+
export default function getComponent(conf: Config, repository: Repository) {
const client = Client({ templates: conf.templates });
const cache = new Cache({
@@ -61,6 +65,22 @@ export default function getComponent(conf: Config, repository: Repository) {
refreshInterval: conf.refreshInterval
});
+ const getEnv = async (
+ component: Component
+ ): Promise<Record<string, string>> => {
+ const cacheKey = `${component.name}/${component.version}/.env`;
+ const cached = cache.get('file-contents', cacheKey);
+
+ if (cached) return cached;
+
+ const env = component.oc.files.env
+ ? await repository.getEnv(component.name, component.version)
+ : {};
+ cache.set('file-contents', cacheKey, env);
+
+ return env;
+ };
+
const renderer = function (
options: RendererOptions,
cb: (result: GetComponentResult) => void
@@ -411,136 +431,149 @@ export default function getComponent(conf: Config, repository: Repository) {
if (!component.oc.files.dataProvider) {
returnComponent(null, {});
} else {
- const cacheKey = `${component.name}/${component.version}/server.js`;
- const cached = cache.get('file-contents', cacheKey);
- const domain = Domain.create();
- const setEmptyResponse =
- emptyResponseHandler.contextDecorator(returnComponent);
- const contextObj = {
- acceptLanguage: acceptLanguageParser.parse(acceptLanguage!),
- baseUrl: conf.baseUrl,
- env: conf.env,
- params,
- plugins: conf.plugins,
- renderComponent: fromPromise(nestedRenderer.renderComponent),
- renderComponents: fromPromise(nestedRenderer.renderComponents),
- requestHeaders: options.headers,
- requestIp: options.ip,
- setEmptyResponse,
- staticPath: repository
- .getStaticFilePath(component.name, component.version, '')
- .replace('https:', ''),
- setHeader: (header?: string, value?: string) => {
- if (!(typeof header === 'string' && typeof value === 'string')) {
- throw strings.errors.registry
- .COMPONENT_SET_HEADER_PARAMETERS_NOT_VALID;
- }
-
- if (header && value) {
- responseHeaders = responseHeaders || {};
- responseHeaders[header.toLowerCase()] = value;
- }
- },
- templates: repository.getTemplatesInfo()
- };
-
- const setCallbackTimeout = () => {
- const executionTimeout = conf.executionTimeout;
- if (executionTimeout) {
- setTimeout(() => {
- const message = `timeout (${executionTimeout * 1000}ms)`;
- returnComponent({ message }, undefined);
- domain.exit();
- }, executionTimeout * 1000);
+ fromPromise(getEnv)(component, (err, env) => {
+ if (err) {
+ componentCallbackDone = true;
+
+ return callback({
+ status: 502,
+ response: {
+ code: 'ENV_RESOLVING_ERROR',
+ error: strings.errors.registry.RESOLVING_ERROR
+ }
+ });
}
- };
- if (!!cached && !conf.hotReloading) {
- domain.on('error', returnComponent);
+ const cacheKey = `${component.name}/${component.version}/server.js`;
+ const cached = cache.get('file-contents', cacheKey);
+ const domain = Domain.create();
+ const setEmptyResponse =
+ emptyResponseHandler.contextDecorator(returnComponent);
+ const contextObj = {
+ acceptLanguage: acceptLanguageParser.parse(acceptLanguage!),
+ baseUrl: conf.baseUrl,
+ env: { ...conf.env, ...env },
+ params,
+ plugins: conf.plugins,
+ renderComponent: fromPromise(nestedRenderer.renderComponent),
+ renderComponents: fromPromise(nestedRenderer.renderComponents),
+ requestHeaders: options.headers,
+ requestIp: options.ip,
+ setEmptyResponse,
+ staticPath: repository
+ .getStaticFilePath(component.name, component.version, '')
+ .replace('https:', ''),
+ setHeader: (header?: string, value?: string) => {
+ if (
+ !(typeof header === 'string' && typeof value === 'string')
+ ) {
+ throw strings.errors.registry
+ .COMPONENT_SET_HEADER_PARAMETERS_NOT_VALID;
+ }
- try {
- domain.run(() => {
- cached(contextObj, returnComponent);
- setCallbackTimeout();
- });
- } catch (e) {
- return returnComponent(e, undefined);
- }
- } else {
- fromPromise(repository.getDataProvider)(
- component.name,
- component.version,
- (err, dataProvider) => {
- if (err) {
- componentCallbackDone = true;
-
- return callback({
- status: 502,
- response: {
- code: 'DATA_RESOLVING_ERROR',
- error: strings.errors.registry.RESOLVING_ERROR
- }
- });
+ if (header && value) {
+ responseHeaders = responseHeaders || {};
+ responseHeaders[header.toLowerCase()] = value;
}
+ },
+ templates: repository.getTemplatesInfo()
+ };
- const context = {
- require: RequireWrapper(conf.dependencies),
- module: {
- exports: {} as Record<
- string,
- (...args: unknown[]) => unknown
- >
- },
- console: conf.local ? console : Object.fromEntries(Object.keys(console).map(key => [key, _.noop])),
- setTimeout,
- Buffer
- };
-
- const handleError = (err: {
- code: string;
- missing: string[];
- }) => {
- if (err.code === 'DEPENDENCY_MISSING_FROM_REGISTRY') {
+ const setCallbackTimeout = () => {
+ const executionTimeout = conf.executionTimeout;
+ if (executionTimeout) {
+ setTimeout(() => {
+ const message = `timeout (${executionTimeout * 1000}ms)`;
+ returnComponent({ message }, undefined);
+ domain.exit();
+ }, executionTimeout * 1000);
+ }
+ };
+
+ if (!!cached && !conf.hotReloading) {
+ domain.on('error', returnComponent);
+
+ try {
+ domain.run(() => {
+ cached(contextObj, returnComponent);
+ setCallbackTimeout();
+ });
+ } catch (e) {
+ return returnComponent(e, undefined);
+ }
+ } else {
+ fromPromise(repository.getDataProvider)(
+ component.name,
+ component.version,
+ (err, dataProvider) => {
+ if (err) {
componentCallbackDone = true;
return callback({
- status: 501,
+ status: 502,
response: {
- code: err.code,
- error: strings.errors.registry.DEPENDENCY_NOT_FOUND(
- err.missing.join(', ')
- ),
- missingDependencies: err.missing
+ code: 'DATA_RESOLVING_ERROR',
+ error: strings.errors.registry.RESOLVING_ERROR
}
});
}
- returnComponent(err, undefined);
- };
-
- const options = conf.local
- ? {
- displayErrors: true,
- filename: dataProvider.filePath
+ const context = {
+ require: RequireWrapper(conf.dependencies),
+ module: {
+ exports: {} as Record<string, (...args: any[]) => any>
+ },
+ console: conf.local ? console : noopConsole,
+ setTimeout,
+ Buffer
+ };
+
+ const handleError = (err: {
+ code: string;
+ missing: string[];
+ }) => {
+ if (err.code === 'DEPENDENCY_MISSING_FROM_REGISTRY') {
+ componentCallbackDone = true;
+
+ return callback({
+ status: 501,
+ response: {
+ code: err.code,
+ error: strings.errors.registry.DEPENDENCY_NOT_FOUND(
+ err.missing.join(', ')
+ ),
+ missingDependencies: err.missing
+ }
+ });
}
- : {};
- try {
- vm.runInNewContext(dataProvider.content, context, options);
- const processData = context.module.exports['data'];
- cache.set('file-contents', cacheKey, processData);
+ returnComponent(err, undefined);
+ };
- domain.on('error', handleError);
- domain.run(() => {
- processData(contextObj, returnComponent);
- setCallbackTimeout();
- });
- } catch (err) {
- handleError(err as any);
+ const options = conf.local
+ ? {
+ displayErrors: true,
+ filename: dataProvider.filePath
+ }
+ : {};
+
+ try {
+ vm.runInNewContext(dataProvider.content, context, options);
+ const processData = context.module.exports['data'];
+ cache.set('file-contents', cacheKey, processData);
+
+ domain.on('error', handleError);
+ domain.run(() => {
+ processData(contextObj, returnComponent);
+ setCallbackTimeout();
+ });
+ } catch (err) {
+ handleError(err as any);
+ }
}
- }
- );
- }
+ );
+ }
+ });
}
}
);
diff --git a/src/types.ts b/src/types.ts
--- a/src/types.ts
+++ b/src/types.ts
@@ -79,6 +79,7 @@ interface OcConfiguration {
type: string;
version: string;
};
+ env?: string;
};
packaged: boolean;
parameters: Record<string, OcParameter>;
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,9 +2,17 @@
# yarn lockfile v1
+"@ampproject/remapping@^2.1.0":
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
+ integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+ dependencies:
+ "@jridgewell/gen-mapping" "^0.1.0"
+ "@jridgewell/trace-mapping" "^0.3.9"
+
"@aws-crypto/crc32@2.0.0":
version "2.0.0"
- resolved "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-crypto/crc32/-/crc32-2.0.0.tgz#4ad432a3c03ec3087c5540ff6e41e6565d2dc153"
integrity sha512-TvE1r2CUueyXOuHdEigYjIZVesInd9KN+K/TFFNfkkxRThiNxO6i4ZqqAVMoEjAamZZ1AA8WXJkjCz7YShHPQA==
dependencies:
"@aws-crypto/util" "^2.0.0"
@@ -13,7 +21,7 @@
"@aws-crypto/crc32c@2.0.0":
version "2.0.0"
- resolved "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-crypto/crc32c/-/crc32c-2.0.0.tgz#4235336ef78f169f6a05248906703b9b78da676e"
integrity sha512-vF0eMdMHx3O3MoOXUfBZry8Y4ZDtcuskjjKgJz8YfIDjLStxTZrYXk+kZqtl6A0uCmmiN/Eb/JbC/CndTV1MHg==
dependencies:
"@aws-crypto/util" "^2.0.0"
@@ -22,14 +30,14 @@
"@aws-crypto/ie11-detection@^2.0.0":
version "2.0.2"
- resolved "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz#9c39f4a5558196636031a933ec1b4792de959d6a"
integrity sha512-5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw==
dependencies:
tslib "^1.11.1"
"@aws-crypto/sha1-browser@2.0.0":
version "2.0.0"
- resolved "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-crypto/sha1-browser/-/sha1-browser-2.0.0.tgz#71e735df20ea1d38f59259c4b1a2e00ca74a0eea"
integrity sha512-3fIVRjPFY8EG5HWXR+ZJZMdWNRpwbxGzJ9IH9q93FpbgCH8u8GHRi46mZXp3cYD7gealmyqpm3ThZwLKJjWJhA==
dependencies:
"@aws-crypto/ie11-detection" "^2.0.0"
@@ -41,7 +49,7 @@
"@aws-crypto/sha256-browser@2.0.0":
version "2.0.0"
- resolved "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz#741c9024df55ec59b51e5b1f5d806a4852699fb5"
integrity sha512-rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A==
dependencies:
"@aws-crypto/ie11-detection" "^2.0.0"
@@ -53,25 +61,34 @@
"@aws-sdk/util-utf8-browser" "^3.0.0"
tslib "^1.11.1"
-"@aws-crypto/sha256-js@2.0.0", "@aws-crypto/sha256-js@^2.0.0":
+"@aws-crypto/sha256-js@2.0.0":
version "2.0.0"
- resolved "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz#f1f936039bdebd0b9e2dd834d65afdc2aac4efcb"
integrity sha512-VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig==
dependencies:
"@aws-crypto/util" "^2.0.0"
"@aws-sdk/types" "^3.1.0"
tslib "^1.11.1"
+"@aws-crypto/sha256-js@^2.0.0":
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.2.tgz#c81e5d378b8a74ff1671b58632779986e50f4c99"
+ integrity sha512-iXLdKH19qPmIC73fVCrHWCSYjN/sxaAvZ3jNNyw6FclmHyjLKg0f69WlC9KTnyElxCR5MO9SKaG00VwlJwyAkQ==
+ dependencies:
+ "@aws-crypto/util" "^2.0.2"
+ "@aws-sdk/types" "^3.110.0"
+ tslib "^1.11.1"
+
"@aws-crypto/supports-web-crypto@^2.0.0":
version "2.0.2"
- resolved "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz#9f02aafad8789cac9c0ab5faaebb1ab8aa841338"
integrity sha512-6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ==
dependencies:
tslib "^1.11.1"
-"@aws-crypto/util@^2.0.0":
+"@aws-crypto/util@^2.0.0", "@aws-crypto/util@^2.0.2":
version "2.0.2"
- resolved "https://registry.npmjs.org/@aws-crypto/util/-/util-2.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-2.0.2.tgz#adf5ff5dfbc7713082f897f1d01e551ce0edb9c0"
integrity sha512-Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA==
dependencies:
"@aws-sdk/types" "^3.110.0"
@@ -80,7 +97,7 @@
"@aws-sdk/abort-controller@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-3.186.0.tgz#dfaccd296d57136930582e1a19203d6cb60debc7"
integrity sha512-JFvvvtEcbYOvVRRXasi64Dd1VcOz5kJmPvtzsJ+HzMHvPbGGs/aopOJAZQJMJttzJmJwVTay0QL6yag9Kk8nYA==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -88,7 +105,7 @@
"@aws-sdk/chunked-blob-reader-native@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.186.0.tgz#46d14e45b3a8a895647b679f0f1e67315223820f"
integrity sha512-klbrNZYWRhfkRMSK9NJObXgU9DD1lqYufH0BjeoYgApg5Dsywa+GpN/1DQveKTxGs08GFnhsc27dJLcNJCmAXw==
dependencies:
"@aws-sdk/util-base64-browser" "3.186.0"
@@ -96,14 +113,14 @@
"@aws-sdk/chunked-blob-reader@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.186.0.tgz#45e994f34d5785e0fa8c9769a3922d8913fe2d68"
integrity sha512-ChpW/teYM0vhV4vG7/ZE4zwr2IWrLX+R/s6LulqgC9x/5fngMUAjT7D8V9UgoCwjKosxBEaKEKuGcgBdODGndg==
dependencies:
tslib "^2.3.1"
"@aws-sdk/client-s3@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.186.0.tgz#07942a691d3a30616f040ce7b3f9668cb027d4c9"
integrity sha512-tUvUkqKh1MQ8g4HDJyekZnSVjJ44pjo0QZmrV9gwpnyCymYoxPShz5zT5CsYyXYTOx81yxIBw6/mkFKEJ8MZ2g==
dependencies:
"@aws-crypto/sha1-browser" "2.0.0"
@@ -163,7 +180,7 @@
"@aws-sdk/client-sso@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.186.0.tgz#233bdd1312dbf88ef9452f8a62c3c3f1ac580330"
integrity sha512-qwLPomqq+fjvp42izzEpBEtGL2+dIlWH5pUCteV55hTEwHgo+m9LJPIrMWkPeoMBzqbNiu5n6+zihnwYlCIlEA==
dependencies:
"@aws-crypto/sha256-browser" "2.0.0"
@@ -200,7 +217,7 @@
"@aws-sdk/client-sts@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.186.0.tgz#12514601b0b01f892ddb11d8a2ab4bee1b03cbf1"
integrity sha512-lyAPI6YmIWWYZHQ9fBZ7QgXjGMTtktL5fk8kOcZ98ja+8Vu0STH1/u837uxqvZta8/k0wijunIL3jWUhjsNRcg==
dependencies:
"@aws-crypto/sha256-browser" "2.0.0"
@@ -242,7 +259,7 @@
"@aws-sdk/config-resolver@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-3.186.0.tgz#68bbf82b572f03ee3ec9ac84d000147e1050149b"
integrity sha512-l8DR7Q4grEn1fgo2/KvtIfIHJS33HGKPQnht8OPxkl0dMzOJ0jxjOw/tMbrIcPnr2T3Fi7LLcj3dY1Fo1poruQ==
dependencies:
"@aws-sdk/signature-v4" "3.186.0"
@@ -253,7 +270,7 @@
"@aws-sdk/credential-provider-env@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.186.0.tgz#55dec9c4c29ebbdff4f3bce72de9e98f7a1f92e1"
integrity sha512-N9LPAqi1lsQWgxzmU4NPvLPnCN5+IQ3Ai1IFf3wM6FFPNoSUd1kIA2c6xaf0BE7j5Kelm0raZOb4LnV3TBAv+g==
dependencies:
"@aws-sdk/property-provider" "3.186.0"
@@ -262,7 +279,7 @@
"@aws-sdk/credential-provider-imds@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.186.0.tgz#73e0f62832726c7734b4f6c50a02ab0d869c00e1"
integrity sha512-iJeC7KrEgPPAuXjCZ3ExYZrRQvzpSdTZopYgUm5TnNZ8S1NU/4nvv5xVy61JvMj3JQAeG8UDYYgC421Foc8wQw==
dependencies:
"@aws-sdk/node-config-provider" "3.186.0"
@@ -273,7 +290,7 @@
"@aws-sdk/credential-provider-ini@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.186.0.tgz#3b3873ccae855ee3f6f15dcd8212c5ca4ec01bf3"
integrity sha512-ecrFh3MoZhAj5P2k/HXo/hMJQ3sfmvlommzXuZ/D1Bj2yMcyWuBhF1A83Fwd2gtYrWRrllsK3IOMM5Jr8UIVZA==
dependencies:
"@aws-sdk/credential-provider-env" "3.186.0"
@@ -287,7 +304,7 @@
"@aws-sdk/credential-provider-node@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.186.0.tgz#0be58623660b41eed3a349a89b31a01d4cc773ea"
integrity sha512-HIt2XhSRhEvVgRxTveLCzIkd/SzEBQfkQ6xMJhkBtfJw1o3+jeCk+VysXM0idqmXytctL0O3g9cvvTHOsUgxOA==
dependencies:
"@aws-sdk/credential-provider-env" "3.186.0"
@@ -303,7 +320,7 @@
"@aws-sdk/credential-provider-process@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.186.0.tgz#e3be60983261a58c212f5c38b6fb76305bbb8ce7"
integrity sha512-ATRU6gbXvWC1TLnjOEZugC/PBXHBoZgBADid4fDcEQY1vF5e5Ux1kmqkJxyHtV5Wl8sE2uJfwWn+FlpUHRX67g==
dependencies:
"@aws-sdk/property-provider" "3.186.0"
@@ -313,7 +330,7 @@
"@aws-sdk/credential-provider-sso@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.186.0.tgz#e1aa466543b3b0877d45b885a1c11b329232df22"
integrity sha512-mJ+IZljgXPx99HCmuLgBVDPLepHrwqnEEC/0wigrLCx6uz3SrAWmGZsNbxSEtb2CFSAaczlTHcU/kIl7XZIyeQ==
dependencies:
"@aws-sdk/client-sso" "3.186.0"
@@ -324,7 +341,7 @@
"@aws-sdk/credential-provider-web-identity@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.186.0.tgz#db43f37f7827b553490dd865dbaa9a2c45f95494"
integrity sha512-KqzI5eBV72FE+8SuOQAu+r53RXGVHg4AuDJmdXyo7Gc4wS/B9FNElA8jVUjjYgVnf0FSiri+l41VzQ44dCopSA==
dependencies:
"@aws-sdk/property-provider" "3.186.0"
@@ -333,7 +350,7 @@
"@aws-sdk/eventstream-codec@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-codec/-/eventstream-codec-3.186.0.tgz#9da9608866b38179edf72987f2bc3b865d11db13"
integrity sha512-3kLcJ0/H+zxFlhTlE1SGoFpzd/SitwXOsTSlYVwrwdISKRjooGg0BJpm1CSTkvmWnQIUlYijJvS96TAJ+fCPIA==
dependencies:
"@aws-crypto/crc32" "2.0.0"
@@ -343,7 +360,7 @@
"@aws-sdk/eventstream-serde-browser@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.186.0.tgz#2a0bd942f977b3e2f1a77822ac091ddebe069475"
integrity sha512-0r2c+yugBdkP5bglGhGOgztjeHdHTKqu2u6bvTByM0nJShNO9YyqWygqPqDUOE5axcYQE1D0aFDGzDtP3mGJhw==
dependencies:
"@aws-sdk/eventstream-serde-universal" "3.186.0"
@@ -352,7 +369,7 @@
"@aws-sdk/eventstream-serde-config-resolver@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.186.0.tgz#6c277058bb0fa14752f0b6d7043576e0b5f13da4"
integrity sha512-xhwCqYrAX5c7fg9COXVw6r7Sa3BO5cCfQMSR5S1QisE7do8K1GDKEHvUCheOx+RLon+P3glLjuNBMdD0HfCVNA==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -360,7 +377,7 @@
"@aws-sdk/eventstream-serde-node@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.186.0.tgz#dabeab714f447790c5dd31d401c5a3822b795109"
integrity sha512-9p/gdukJYfmA+OEYd6MfIuufxrrfdt15lBDM3FODuc9j09LSYSRHSxthkIhiM5XYYaaUM+4R0ZlSMdaC3vFDFQ==
dependencies:
"@aws-sdk/eventstream-serde-universal" "3.186.0"
@@ -369,7 +386,7 @@
"@aws-sdk/eventstream-serde-universal@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.186.0.tgz#85a88a2cd5c336b1271976fa8db70654ec90fbf4"
integrity sha512-rIgPmwUxn2tzainBoh+cxAF+b7o01CcW+17yloXmawsi0kiR7QK7v9m/JTGQPWKtHSsPOrtRzuiWQNX57SlcsQ==
dependencies:
"@aws-sdk/eventstream-codec" "3.186.0"
@@ -378,7 +395,7 @@
"@aws-sdk/fetch-http-handler@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.186.0.tgz#c1adc5f741e1ba9ad9d3fb13c9c2afdc88530a85"
integrity sha512-k2v4AAHRD76WnLg7arH94EvIclClo/YfuqO7NoQ6/KwOxjRhs4G6TgIsAZ9E0xmqoJoV81Xqy8H8ldfy9F8LEw==
dependencies:
"@aws-sdk/protocol-http" "3.186.0"
@@ -389,7 +406,7 @@
"@aws-sdk/hash-blob-browser@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.186.0.tgz#e875f5ca75819fd2d9d7c65a924f6fbd91fac78c"
integrity sha512-u8QvmXGySqy2QRbkAfx1bX/idSiejuy2q3WKamGysy9Ylogprr5kq2v0E+7vnLo9rBjuquUbVvI5eskIgZDMmg==
dependencies:
"@aws-sdk/chunked-blob-reader" "3.186.0"
@@ -399,7 +416,7 @@
"@aws-sdk/hash-node@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/hash-node/-/hash-node-3.186.0.tgz#8cb13aae8f46eb360fed76baf5062f66f27dfb70"
integrity sha512-G3zuK8/3KExDTxqrGqko+opOMLRF0BwcwekV/wm3GKIM/NnLhHblBs2zd/yi7VsEoWmuzibfp6uzxgFpEoJ87w==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -408,7 +425,7 @@
"@aws-sdk/hash-stream-node@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/hash-stream-node/-/hash-stream-node-3.186.0.tgz#260e6c6e6fbc67433444a8ab9d134c1f988036bb"
integrity sha512-n+VphPuMbl2iKrW1zVpoqQQDuPej/Hr4+I5UdZC39Cq/XfgDqh6QDy73Q9OypGuyEKrxZ5E5Pa+BWi4pGtt08w==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -416,7 +433,7 @@
"@aws-sdk/invalid-dependency@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/invalid-dependency/-/invalid-dependency-3.186.0.tgz#aa6331ccf404cb659ec38483116080e4b82b0663"
integrity sha512-hjeZKqORhG2DPWYZ776lQ9YO3gjw166vZHZCZU/43kEYaCZHsF4mexHwHzreAY6RfS25cH60Um7dUh1aeVIpkw==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -424,14 +441,14 @@
"@aws-sdk/is-array-buffer@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/is-array-buffer/-/is-array-buffer-3.186.0.tgz#7700e36f29d416c2677f4bf8816120f96d87f1b7"
integrity sha512-fObm+P6mjWYzxoFY4y2STHBmSdgKbIAXez0xope563mox62I8I4hhVPUCaDVydXvDpJv8tbedJMk0meJl22+xA==
dependencies:
tslib "^2.3.1"
"@aws-sdk/md5-js@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/md5-js/-/md5-js-3.186.0.tgz#5b21dedab0e4847b599e793fefdd4cff189f92c8"
integrity sha512-Pp86oeTi8qtfY4fIZYrHOqRWJc0PjolxETdtWBUhtjC8HY81ckZMqe+5Aosy8mtQJus/k83S0CJAyfE2ko/a6Q==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -441,7 +458,7 @@
"@aws-sdk/middleware-bucket-endpoint@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.186.0.tgz#8182fe4502144a8cf624805194560ed979c04b7f"
integrity sha512-Vrb/ZXxWohhq86lGnp8E+H9AyNJFEt70fjFavkMCrQe7mx4+WHNc5agsTRPF+IESV0MgsbDtELP72Gzqc4fpWQ==
dependencies:
"@aws-sdk/protocol-http" "3.186.0"
@@ -452,7 +469,7 @@
"@aws-sdk/middleware-content-length@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-content-length/-/middleware-content-length-3.186.0.tgz#8cc7aeec527738c46fdaf4a48b17c5cbfdc7ce58"
integrity sha512-Ol3c1ks3IK1s+Okc/rHIX7w2WpXofuQdoAEme37gHeml+8FtUlWH/881h62xfMdf+0YZpRuYv/eM7lBmJBPNJw==
dependencies:
"@aws-sdk/protocol-http" "3.186.0"
@@ -461,7 +478,7 @@
"@aws-sdk/middleware-expect-continue@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.186.0.tgz#ca8b81ddb968bcfe90704403377a69808d3f24da"
integrity sha512-ITGzpajC5jPl+1TDRJCWb2ASQuy0qcMijKP6xcCRPcuAyHPgrH59f+3CCfqNcnehNJptHoD5hFIU6r+WcOF8hQ==
dependencies:
"@aws-sdk/protocol-http" "3.186.0"
@@ -470,7 +487,7 @@
"@aws-sdk/middleware-flexible-checksums@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.186.0.tgz#a7bfbde70327bfd0baeb101a2b7de092425c4d1b"
integrity sha512-zb1a5b2JHNMbD0pkozs/TLIfxbvZVpAcF947LEDblD5OsC8UW/a3hTVDvq7K7TLT6jgrgEzMKJbqoxqGzPQlLA==
dependencies:
"@aws-crypto/crc32" "2.0.0"
@@ -482,7 +499,7 @@
"@aws-sdk/middleware-host-header@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.186.0.tgz#fce4f1219ce1835e2348c787d8341080b0024e34"
integrity sha512-5bTzrRzP2IGwyF3QCyMGtSXpOOud537x32htZf344IvVjrqZF/P8CDfGTkHkeBCIH+wnJxjK+l/QBb3ypAMIqQ==
dependencies:
"@aws-sdk/protocol-http" "3.186.0"
@@ -491,7 +508,7 @@
"@aws-sdk/middleware-location-constraint@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.186.0.tgz#ef99c5a9a08f436e1f0a9beb49aeaae3a4fee3d8"
integrity sha512-86swCv/+BYhXMCiAU6rVRk/z009bfpGfjnVBuoFfFbHp6zS3Ak11UotTzhw/Yyiyb06p/qL4vFfRERrMYnpmew==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -499,7 +516,7 @@
"@aws-sdk/middleware-logger@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.186.0.tgz#8a027fbbb1b8098ccc888bce51f34b000c0a0550"
integrity sha512-/1gGBImQT8xYh80pB7QtyzA799TqXtLZYQUohWAsFReYB7fdh5o+mu2rX0FNzZnrLIh2zBUNs4yaWGsnab4uXg==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -507,7 +524,7 @@
"@aws-sdk/middleware-recursion-detection@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.186.0.tgz#9d9d3212e9a954b557840bb80415987f4484487e"
integrity sha512-Za7k26Kovb4LuV5tmC6wcVILDCt0kwztwSlB991xk4vwNTja8kKxSt53WsYG8Q2wSaW6UOIbSoguZVyxbIY07Q==
dependencies:
"@aws-sdk/protocol-http" "3.186.0"
@@ -516,7 +533,7 @@
"@aws-sdk/middleware-retry@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-3.186.0.tgz#0ff9af58d73855863683991a809b40b93c753ad1"
integrity sha512-/VI9emEKhhDzlNv9lQMmkyxx3GjJ8yPfXH3HuAeOgM1wx1BjCTLRYEWnTbQwq7BDzVENdneleCsGAp7yaj80Aw==
dependencies:
"@aws-sdk/protocol-http" "3.186.0"
@@ -528,7 +545,7 @@
"@aws-sdk/middleware-sdk-s3@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.186.0.tgz#c7faaf83653760a3faffba35f2bf4f5f51e595c7"
integrity sha512-NffDytJCSNm+fkQs0sP3ePgtIkgd6Xqxfx1YI+Qzwlnej3Jdh9doDhuxxT/fQoJPfgf77y0iMC4a3tNr69fW6g==
dependencies:
"@aws-sdk/middleware-bucket-endpoint" "3.186.0"
@@ -539,7 +556,7 @@
"@aws-sdk/middleware-sdk-sts@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.186.0.tgz#18f3d6b7b42c1345b5733ac3e3119d370a403e94"
integrity sha512-GDcK0O8rjtnd+XRGnxzheq1V2jk4Sj4HtjrxW/ROyhzLOAOyyxutBt+/zOpDD6Gba3qxc69wE+Cf/qngOkEkDw==
dependencies:
"@aws-sdk/middleware-signing" "3.186.0"
@@ -551,7 +568,7 @@
"@aws-sdk/middleware-serde@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-3.186.0.tgz#f7944241ad5fb31cb15cd250c9e92147942b9ec6"
integrity sha512-6FEAz70RNf18fKL5O7CepPSwTKJEIoyG9zU6p17GzKMgPeFsxS5xO94Hcq5tV2/CqeHliebjqhKY7yi+Pgok7g==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -559,7 +576,7 @@
"@aws-sdk/middleware-signing@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.186.0.tgz#37633bf855667b4841464e0044492d0aec5778b9"
integrity sha512-riCJYG/LlF/rkgVbHkr4xJscc0/sECzDivzTaUmfb9kJhAwGxCyNqnTvg0q6UO00kxSdEB9zNZI2/iJYVBijBQ==
dependencies:
"@aws-sdk/property-provider" "3.186.0"
@@ -571,7 +588,7 @@
"@aws-sdk/middleware-ssec@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-3.186.0.tgz#54edcc6aa8de6f72c0e01f500a8828c338988309"
integrity sha512-nNBp3t1GvCTp+uN3stJMzHb1H/jmId+qPBFUwvCItrSUL6lLnJi+OxFr/cNuZpJdlLR3FyX0jyJEKMsBEJHAkA==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -579,14 +596,14 @@
"@aws-sdk/middleware-stack@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-3.186.0.tgz#da3445fe74b867ee6d7eec4f0dde28aaca1125d6"
integrity sha512-fENMoo0pW7UBrbuycPf+3WZ+fcUgP9PnQ0jcOK3WWZlZ9d2ewh4HNxLh4EE3NkNYj4VIUFXtTUuVNHlG8trXjQ==
dependencies:
tslib "^2.3.1"
"@aws-sdk/middleware-user-agent@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.186.0.tgz#6d881e9cea5fe7517e220f3a47c2f3557c7f27fc"
integrity sha512-fb+F2PF9DLKOVMgmhkr+ltN8ZhNJavTla9aqmbd01846OLEaN1n5xEnV7p8q5+EznVBWDF38Oz9Ae5BMt3Hs7w==
dependencies:
"@aws-sdk/protocol-http" "3.186.0"
@@ -595,7 +612,7 @@
"@aws-sdk/node-config-provider@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/node-config-provider/-/node-config-provider-3.186.0.tgz#64259429d39f2ef5a76663162bf2e8db6032a322"
integrity sha512-De93mgmtuUUeoiKXU8pVHXWKPBfJQlS/lh1k2H9T2Pd9Tzi0l7p5ttddx4BsEx4gk+Pc5flNz+DeptiSjZpa4A==
dependencies:
"@aws-sdk/property-provider" "3.186.0"
@@ -605,7 +622,7 @@
"@aws-sdk/node-http-handler@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-3.186.0.tgz#8be1598a9187637a767dc337bf22fe01461e86eb"
integrity sha512-CbkbDuPZT9UNJ4dAZJWB3BV+Z65wFy7OduqGkzNNrKq6ZYMUfehthhUOTk8vU6RMe/0FkN+J0fFXlBx/bs/cHw==
dependencies:
"@aws-sdk/abort-controller" "3.186.0"
@@ -616,7 +633,7 @@
"@aws-sdk/property-provider@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/property-provider/-/property-provider-3.186.0.tgz#af41e615662a2749d3ff7da78c41f79f4be95b3b"
integrity sha512-nWKqt36UW3xV23RlHUmat+yevw9up+T+953nfjcmCBKtgWlCWu/aUzewTRhKj3VRscbN+Wer95SBw9Lr/MMOlQ==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -624,7 +641,7 @@
"@aws-sdk/protocol-http@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-3.186.0.tgz#99115870846312dd4202b5e2cc68fe39324b9bfa"
integrity sha512-l/KYr/UBDUU5ginqTgHtFfHR3X6ljf/1J1ThIiUg3C3kVC/Zwztm7BEOw8hHRWnWQGU/jYasGYcrcPLdQqFZyQ==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -632,7 +649,7 @@
"@aws-sdk/querystring-builder@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-builder/-/querystring-builder-3.186.0.tgz#a380db0e1c71004932d9e2f3e6dc6761d1165c47"
integrity sha512-mweCpuLufImxfq/rRBTEpjGuB4xhQvbokA+otjnUxlPdIobytLqEs7pCGQfLzQ7+1ZMo8LBXt70RH4A2nSX/JQ==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -641,7 +658,7 @@
"@aws-sdk/querystring-parser@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-parser/-/querystring-parser-3.186.0.tgz#4db6d31ad4df0d45baa2a35e371fbaa23e45ddd2"
integrity sha512-0iYfEloghzPVXJjmnzHamNx1F1jIiTW9Svy5ZF9LVqyr/uHZcQuiWYsuhWloBMLs8mfWarkZM02WfxZ8buAuhg==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -649,12 +666,12 @@
"@aws-sdk/service-error-classification@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-3.186.0.tgz#6e4e1d4b53d68bd28c28d9cf0b3b4cb6a6a59dbb"
integrity sha512-DRl3ORk4tF+jmH5uvftlfaq0IeKKpt0UPAOAFQ/JFWe+TjOcQd/K+VC0iiIG97YFp3aeFmH1JbEgsNxd+8fdxw==
"@aws-sdk/shared-ini-file-loader@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.186.0.tgz#a2d285bb3c4f8d69f7bfbde7a5868740cd3f7795"
integrity sha512-2FZqxmICtwN9CYid4dwfJSz/gGFHyStFQ3HCOQ8DsJUf2yREMSBsVmKqsyWgOrYcQ98gPcD5GIa7QO5yl3XF6A==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -662,7 +679,7 @@
"@aws-sdk/signature-v4-multi-region@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.186.0.tgz#1fd17ee73dc0a9974d8d3ea601b01f762a08c390"
integrity sha512-99+WIti/zaoYgRAFTWSC2206E71gi+bPtPFbijLzQHMpmB3QlzPYobx3xyepgQ+LL0FQcfqD5zFtdmlcoWTddQ==
dependencies:
"@aws-sdk/protocol-http" "3.186.0"
@@ -673,7 +690,7 @@
"@aws-sdk/signature-v4@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-3.186.0.tgz#bbd56e71af95548abaeec6307ea1dfe7bd26b4e4"
integrity sha512-18i96P5c4suMqwSNhnEOqhq4doqqyjH4fn0YV3F8TkekHPIWP4mtIJ0PWAN4eievqdtcKgD/GqVO6FaJG9texw==
dependencies:
"@aws-sdk/is-array-buffer" "3.186.0"
@@ -685,21 +702,28 @@
"@aws-sdk/smithy-client@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/smithy-client/-/smithy-client-3.186.0.tgz#67514544fb55d7eff46300e1e73311625cf6f916"
integrity sha512-rdAxSFGSnrSprVJ6i1BXi65r4X14cuya6fYe8dSdgmFSa+U2ZevT97lb3tSINCUxBGeMXhENIzbVGkRZuMh+DQ==
dependencies:
"@aws-sdk/middleware-stack" "3.186.0"
"@aws-sdk/types" "3.186.0"
tslib "^2.3.1"
-"@aws-sdk/types@3.186.0", "@aws-sdk/types@^3.1.0", "@aws-sdk/types@^3.110.0":
+"@aws-sdk/types@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/types/-/types-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.186.0.tgz#f6fb6997b6a364f399288bfd5cd494bc680ac922"
integrity sha512-NatmSU37U+XauMFJCdFI6nougC20JUFZar+ump5wVv0i54H+2Refg1YbFDxSs0FY28TSB9jfhWIpfFBmXgL5MQ==
+"@aws-sdk/types@^3.1.0", "@aws-sdk/types@^3.110.0":
+ version "3.226.0"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.226.0.tgz#3dba2ba223fbb8ac1ebc84de0e036ce69a81d469"
+ integrity sha512-MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A==
+ dependencies:
+ tslib "^2.3.1"
+
"@aws-sdk/url-parser@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/url-parser/-/url-parser-3.186.0.tgz#e42f845cd405c1920fdbdcc796a350d4ace16ae9"
integrity sha512-jfdJkKqJZp8qjjwEjIGDqbqTuajBsddw02f86WiL8bPqD8W13/hdqbG4Fpwc+Bm6GwR6/4MY6xWXFnk8jDUKeA==
dependencies:
"@aws-sdk/querystring-parser" "3.186.0"
@@ -708,21 +732,21 @@
"@aws-sdk/util-arn-parser@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-arn-parser/-/util-arn-parser-3.186.0.tgz#fba484cc1e42bb4e1770391e73efb49e577758b6"
integrity sha512-hhTziyXeiNylZfZ6yXmaAhOUSmS3xQiofXRm1CcxMttHWmTOI6OrepKa2kOkNZsZe28vfuy4I7vbWPi2LcwSqA==
dependencies:
tslib "^2.3.1"
"@aws-sdk/util-base64-browser@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-base64-browser/-/util-base64-browser-3.186.0.tgz#0310482752163fa819718ce9ea9250836b20346d"
integrity sha512-TpQL8opoFfzTwUDxKeon/vuc83kGXpYqjl6hR8WzmHoQgmFfdFlV+0KXZOohra1001OP3FhqvMqaYbO8p9vXVQ==
dependencies:
tslib "^2.3.1"
"@aws-sdk/util-base64-node@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-base64-node/-/util-base64-node-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-base64-node/-/util-base64-node-3.186.0.tgz#500bd04b1ef7a6a5c0a2d11c0957a415922e05c7"
integrity sha512-wH5Y/EQNBfGS4VkkmiMyZXU+Ak6VCoFM1GKWopV+sj03zR2D4FHexi4SxWwEBMpZCd6foMtihhbNBuPA5fnh6w==
dependencies:
"@aws-sdk/util-buffer-from" "3.186.0"
@@ -730,21 +754,21 @@
"@aws-sdk/util-body-length-browser@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.186.0.tgz#a898eda9f874f6974a9c5c60fcc76bcb6beac820"
integrity sha512-zKtjkI/dkj9oGkjo+7fIz+I9KuHrVt1ROAeL4OmDESS8UZi3/O8uMDFMuCp8jft6H+WFuYH6qRVWAVwXMiasXw==
dependencies:
tslib "^2.3.1"
"@aws-sdk/util-body-length-node@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-body-length-node/-/util-body-length-node-3.186.0.tgz#95efbacbd13cb739b942c126c5d16ecf6712d4db"
integrity sha512-U7Ii8u8Wvu9EnBWKKeuwkdrWto3c0j7LG677Spe6vtwWkvY70n9WGfiKHTgBpVeLNv8jvfcx5+H0UOPQK1o9SQ==
dependencies:
tslib "^2.3.1"
"@aws-sdk/util-buffer-from@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-buffer-from/-/util-buffer-from-3.186.0.tgz#01f7edb683d2f40374d0ca8ef2d16346dc8040a1"
integrity sha512-be2GCk2lsLWg/2V5Y+S4/9pOMXhOQo4DR4dIqBdR2R+jrMMHN9Xsr5QrkT6chcqLaJ/SBlwiAEEi3StMRmCOXA==
dependencies:
"@aws-sdk/is-array-buffer" "3.186.0"
@@ -752,14 +776,14 @@
"@aws-sdk/util-config-provider@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-config-provider/-/util-config-provider-3.186.0.tgz#52ce3711edceadfac1b75fccc7c615e90c33fb2f"
integrity sha512-71Qwu/PN02XsRLApyxG0EUy/NxWh/CXxtl2C7qY14t+KTiRapwbDkdJ1cMsqYqghYP4BwJoj1M+EFMQSSlkZQQ==
dependencies:
tslib "^2.3.1"
"@aws-sdk/util-defaults-mode-browser@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.186.0.tgz#d30b2f572e273d7d98287274c37c9ee00b493507"
integrity sha512-U8GOfIdQ0dZ7RRVpPynGteAHx4URtEh+JfWHHVfS6xLPthPHWTbyRhkQX++K/F8Jk+T5U8Anrrqlea4TlcO2DA==
dependencies:
"@aws-sdk/property-provider" "3.186.0"
@@ -769,7 +793,7 @@
"@aws-sdk/util-defaults-mode-node@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.186.0.tgz#8572453ba910fd2ab08d2cfee130ce5a0db83ba7"
integrity sha512-N6O5bpwCiE4z8y7SPHd7KYlszmNOYREa+mMgtOIXRU3VXSEHVKVWTZsHKvNTTHpW0qMqtgIvjvXCo3vsch5l3A==
dependencies:
"@aws-sdk/config-resolver" "3.186.0"
@@ -781,28 +805,28 @@
"@aws-sdk/util-hex-encoding@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.186.0.tgz#7ed58b923997c6265f4dce60c8704237edb98895"
integrity sha512-UL9rdgIZz1E/jpAfaKH8QgUxNK9VP5JPgoR0bSiaefMjnsoBh0x/VVMsfUyziOoJCMLebhJzFowtwrSKEGsxNg==
dependencies:
tslib "^2.3.1"
"@aws-sdk/util-locate-window@^3.0.0":
- version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.186.0.tgz"
- integrity sha512-fmQLkH16ga6c5fWsA+kBYklQJjlPlcc8uayTR4avi5g3Nxqm6wPpyUwo5CppwjwWMeS+NXG0HgITtkkGntcRNg==
+ version "3.208.0"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz#0f598fc238a1256e4bcb64d01459f03a922dd4c3"
+ integrity sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg==
dependencies:
tslib "^2.3.1"
"@aws-sdk/util-middleware@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-middleware/-/util-middleware-3.186.0.tgz#ba2e286b206cbead306b6d2564f9d0495f384b40"
integrity sha512-fddwDgXtnHyL9mEZ4s1tBBsKnVQHqTUmFbZKUUKPrg9CxOh0Y/zZxEa5Olg/8dS/LzM1tvg0ATkcyd4/kEHIhg==
dependencies:
tslib "^2.3.1"
"@aws-sdk/util-stream-browser@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-stream-browser/-/util-stream-browser-3.186.0.tgz#c20f486809998857846c9f31db4871774af35989"
integrity sha512-fXlIA4jkcGN8YVrwtNWuR3JDoQZrs47uKJrg++3T0qf9EyPRgtki7tUITZpcDx+0qnm24yyLAedIXYzYt2iGcA==
dependencies:
"@aws-sdk/fetch-http-handler" "3.186.0"
@@ -814,7 +838,7 @@
"@aws-sdk/util-stream-node@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-stream-node/-/util-stream-node-3.186.0.tgz#7c8f3c22e97d28bdde7029cd46abfda33e83e2a1"
integrity sha512-CTb8PmgGQx/3FYA1n1+ksnzIUpJGC7jEHk/E06cmWloixhSIRJuBXJ8b1AgSVDVrY/8wfYO/2VW28Dp7wZfmOw==
dependencies:
"@aws-sdk/node-http-handler" "3.186.0"
@@ -824,14 +848,14 @@
"@aws-sdk/util-uri-escape@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-uri-escape/-/util-uri-escape-3.186.0.tgz#1752a93dfe58ec88196edb6929806807fd8986da"
integrity sha512-imtOrJFpIZAipAg8VmRqYwv1G/x4xzyoxOJ48ZSn1/ZGnKEEnB6n6E9gwYRebi4mlRuMSVeZwCPLq0ey5hReeQ==
dependencies:
tslib "^2.3.1"
"@aws-sdk/util-user-agent-browser@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.186.0.tgz#02e214887d30a69176c6a6c2d6903ce774b013b4"
integrity sha512-fbRcTTutMk4YXY3A2LePI4jWSIeHOT8DaYavpc/9Xshz/WH9RTGMmokeVOcClRNBeDSi5cELPJJ7gx6SFD3ZlQ==
dependencies:
"@aws-sdk/types" "3.186.0"
@@ -840,23 +864,30 @@
"@aws-sdk/util-user-agent-node@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.186.0.tgz#1ef74973442c8650c7b64ff2fd15cf3c09d8c004"
integrity sha512-oWZR7hN6NtOgnT6fUvHaafgbipQc2xJCRB93XHiF9aZGptGNLJzznIOP7uURdn0bTnF73ejbUXWLQIm8/6ue6w==
dependencies:
"@aws-sdk/node-config-provider" "3.186.0"
"@aws-sdk/types" "3.186.0"
tslib "^2.3.1"
-"@aws-sdk/util-utf8-browser@3.186.0", "@aws-sdk/util-utf8-browser@^3.0.0":
+"@aws-sdk/util-utf8-browser@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.186.0.tgz#5fee6385cfc3effa2be704edc2998abfd6633082"
integrity sha512-n+IdFYF/4qT2WxhMOCeig8LndDggaYHw3BJJtfIBZRiS16lgwcGYvOUmhCkn0aSlG1f/eyg9YZHQG0iz9eLdHQ==
dependencies:
tslib "^2.3.1"
+"@aws-sdk/util-utf8-browser@^3.0.0":
+ version "3.188.0"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz#484762bd600401350e148277731d6744a4a92225"
+ integrity sha512-jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q==
+ dependencies:
+ tslib "^2.3.1"
+
"@aws-sdk/util-utf8-node@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-node/-/util-utf8-node-3.186.0.tgz#722d9b0f5675ae2e9d79cf67322126d9c9d8d3d8"
integrity sha512-7qlE0dOVdjuRbZTb7HFywnHHCrsN7AeQiTnsWT63mjXGDbPeUWQQw3TrdI20um3cxZXnKoeudGq8K6zbXyQ4iA==
dependencies:
"@aws-sdk/util-buffer-from" "3.186.0"
@@ -864,7 +895,7 @@
"@aws-sdk/util-waiter@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/util-waiter/-/util-waiter-3.186.0.tgz#f0c87fa7587348216da739270fa3fe49f15c6524"
integrity sha512-oSm45VadBBWC/K2W1mrRNzm9RzbXt6VopBQ5iTDU7B3qIXlyAG9k1JqOvmYIdYq1oOgjM3Hv2+9sngi3+MZs1A==
dependencies:
"@aws-sdk/abort-controller" "3.186.0"
@@ -873,214 +904,210 @@
"@aws-sdk/xml-builder@3.186.0":
version "3.186.0"
- resolved "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.186.0.tgz"
+ resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.186.0.tgz#8eec67d85771a291b89e750a7f0bf832ad6f4879"
integrity sha512-9Ss3w1yenQNFYdHpa7OFL81M6Okef8UzY263SCCodhCg1ZKwN+vN1T4C7zhcMpxWsmDD/UmEpN+eXCLnFNE8PQ==
dependencies:
tslib "^2.3.1"
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"
- integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
+ version "7.18.6"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
+ integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
dependencies:
- "@babel/highlight" "^7.16.7"
+ "@babel/highlight" "^7.18.6"
-"@babel/compat-data@^7.16.4":
- version "7.16.8"
- resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz"
- integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
+"@babel/compat-data@^7.20.0":
+ version "7.20.5"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
+ integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
"@babel/core@^7.14.2":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz"
- integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==
- dependencies:
- "@babel/code-frame" "^7.16.7"
- "@babel/generator" "^7.16.7"
- "@babel/helper-compilation-targets" "^7.16.7"
- "@babel/helper-module-transforms" "^7.16.7"
- "@babel/helpers" "^7.16.7"
- "@babel/parser" "^7.16.7"
- "@babel/template" "^7.16.7"
- "@babel/traverse" "^7.16.7"
- "@babel/types" "^7.16.7"
+ version "7.20.5"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
+ integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
+ dependencies:
+ "@ampproject/remapping" "^2.1.0"
+ "@babel/code-frame" "^7.18.6"
+ "@babel/generator" "^7.20.5"
+ "@babel/helper-compilation-targets" "^7.20.0"
+ "@babel/helper-module-transforms" "^7.20.2"
+ "@babel/helpers" "^7.20.5"
+ "@babel/parser" "^7.20.5"
+ "@babel/template" "^7.18.10"
+ "@babel/traverse" "^7.20.5"
+ "@babel/types" "^7.20.5"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
- json5 "^2.1.2"
+ json5 "^2.2.1"
semver "^6.3.0"
- source-map "^0.5.0"
-"@babel/generator@^7.16.7", "@babel/generator@^7.16.8":
- version "7.16.8"
- resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"
- integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
+"@babel/generator@^7.20.5":
+ version "7.20.5"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
+ integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
dependencies:
- "@babel/types" "^7.16.8"
+ "@babel/types" "^7.20.5"
+ "@jridgewell/gen-mapping" "^0.3.2"
jsesc "^2.5.1"
- source-map "^0.5.0"
-"@babel/helper-compilation-targets@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz"
- integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
+"@babel/helper-compilation-targets@^7.20.0":
+ version "7.20.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
+ integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
dependencies:
- "@babel/compat-data" "^7.16.4"
- "@babel/helper-validator-option" "^7.16.7"
- browserslist "^4.17.5"
+ "@babel/compat-data" "^7.20.0"
+ "@babel/helper-validator-option" "^7.18.6"
+ browserslist "^4.21.3"
semver "^6.3.0"
-"@babel/helper-environment-visitor@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"
- integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
- dependencies:
- "@babel/types" "^7.16.7"
-
-"@babel/helper-function-name@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"
- integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
- dependencies:
- "@babel/helper-get-function-arity" "^7.16.7"
- "@babel/template" "^7.16.7"
- "@babel/types" "^7.16.7"
-
-"@babel/helper-get-function-arity@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"
- integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
- dependencies:
- "@babel/types" "^7.16.7"
-
-"@babel/helper-hoist-variables@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"
- integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
- dependencies:
- "@babel/types" "^7.16.7"
-
-"@babel/helper-module-imports@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"
- integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
- dependencies:
- "@babel/types" "^7.16.7"
-
-"@babel/helper-module-transforms@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz"
- integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==
- dependencies:
- "@babel/helper-environment-visitor" "^7.16.7"
- "@babel/helper-module-imports" "^7.16.7"
- "@babel/helper-simple-access" "^7.16.7"
- "@babel/helper-split-export-declaration" "^7.16.7"
- "@babel/helper-validator-identifier" "^7.16.7"
- "@babel/template" "^7.16.7"
- "@babel/traverse" "^7.16.7"
- "@babel/types" "^7.16.7"
-
-"@babel/helper-simple-access@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz"
- integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==
- dependencies:
- "@babel/types" "^7.16.7"
-
-"@babel/helper-split-export-declaration@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"
- integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
- dependencies:
- "@babel/types" "^7.16.7"
-
-"@babel/helper-validator-identifier@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"
- integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
-"@babel/helper-validator-option@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"
- integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
-
-"@babel/helpers@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz"
- integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==
- dependencies:
- "@babel/template" "^7.16.7"
- "@babel/traverse" "^7.16.7"
- "@babel/types" "^7.16.7"
-
-"@babel/highlight@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz"
- integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==
- dependencies:
- "@babel/helper-validator-identifier" "^7.16.7"
+"@babel/helper-environment-visitor@^7.18.9":
+ version "7.18.9"
+ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
+ integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
+
+"@babel/helper-function-name@^7.19.0":
+ version "7.19.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+ integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
+ dependencies:
+ "@babel/template" "^7.18.10"
+ "@babel/types" "^7.19.0"
+
+"@babel/helper-hoist-variables@^7.18.6":
+ version "7.18.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
+ integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
+ dependencies:
+ "@babel/types" "^7.18.6"
+
+"@babel/helper-module-imports@^7.18.6":
+ version "7.18.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
+ integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+ dependencies:
+ "@babel/types" "^7.18.6"
+
+"@babel/helper-module-transforms@^7.20.2":
+ version "7.20.2"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
+ integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
+ dependencies:
+ "@babel/helper-environment-visitor" "^7.18.9"
+ "@babel/helper-module-imports" "^7.18.6"
+ "@babel/helper-simple-access" "^7.20.2"
+ "@babel/helper-split-export-declaration" "^7.18.6"
+ "@babel/helper-validator-identifier" "^7.19.1"
+ "@babel/template" "^7.18.10"
+ "@babel/traverse" "^7.20.1"
+ "@babel/types" "^7.20.2"
+
+"@babel/helper-simple-access@^7.20.2":
+ version "7.20.2"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
+ integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
+ dependencies:
+ "@babel/types" "^7.20.2"
+
+"@babel/helper-split-export-declaration@^7.18.6":
+ version "7.18.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
+ integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
+ dependencies:
+ "@babel/types" "^7.18.6"
+
+"@babel/helper-string-parser@^7.19.4":
+ version "7.19.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
+ integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
+
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+ version "7.19.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+ integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
+"@babel/helper-validator-option@^7.18.6":
+ version "7.18.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
+ integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
+
+"@babel/helpers@^7.20.5":
+ version "7.20.6"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763"
+ integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
+ dependencies:
+ "@babel/template" "^7.18.10"
+ "@babel/traverse" "^7.20.5"
+ "@babel/types" "^7.20.5"
+
+"@babel/highlight@^7.18.6":
+ version "7.18.6"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+ integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.18.6"
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.16.7", "@babel/parser@^7.16.8":
- version "7.16.8"
- resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz"
- integrity sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==
-
-"@babel/template@^7.16.7":
- version "7.16.7"
- resolved "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"
- integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
- dependencies:
- "@babel/code-frame" "^7.16.7"
- "@babel/parser" "^7.16.7"
- "@babel/types" "^7.16.7"
-
-"@babel/traverse@^7.16.7":
- version "7.16.8"
- resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.8.tgz"
- integrity sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==
- dependencies:
- "@babel/code-frame" "^7.16.7"
- "@babel/generator" "^7.16.8"
- "@babel/helper-environment-visitor" "^7.16.7"
- "@babel/helper-function-name" "^7.16.7"
- "@babel/helper-hoist-variables" "^7.16.7"
- "@babel/helper-split-export-declaration" "^7.16.7"
- "@babel/parser" "^7.16.8"
- "@babel/types" "^7.16.8"
+"@babel/parser@^7.18.10", "@babel/parser@^7.20.5":
+ version "7.20.5"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
+ integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
+
+"@babel/template@^7.18.10":
+ version "7.18.10"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
+ integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
+ dependencies:
+ "@babel/code-frame" "^7.18.6"
+ "@babel/parser" "^7.18.10"
+ "@babel/types" "^7.18.10"
+
+"@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5":
+ version "7.20.5"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
+ integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
+ dependencies:
+ "@babel/code-frame" "^7.18.6"
+ "@babel/generator" "^7.20.5"
+ "@babel/helper-environment-visitor" "^7.18.9"
+ "@babel/helper-function-name" "^7.19.0"
+ "@babel/helper-hoist-variables" "^7.18.6"
+ "@babel/helper-split-export-declaration" "^7.18.6"
+ "@babel/parser" "^7.20.5"
+ "@babel/types" "^7.20.5"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.16.7", "@babel/types@^7.16.8":
- version "7.16.8"
- resolved "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"
- integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
+"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5":
+ version "7.20.5"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
+ integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
dependencies:
- "@babel/helper-validator-identifier" "^7.16.7"
+ "@babel/helper-string-parser" "^7.19.4"
+ "@babel/helper-validator-identifier" "^7.19.1"
to-fast-properties "^2.0.0"
"@cspotcode/source-map-support@^0.8.0":
version "0.8.1"
- resolved "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"
+ resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
dependencies:
"@jridgewell/trace-mapping" "0.3.9"
"@csstools/convert-colors@^1.4.0":
version "1.4.0"
- resolved "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz"
+ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
"@csstools/normalize.css@*":
version "12.0.0"
- resolved "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-12.0.0.tgz#a9583a75c3f150667771f30b60d9f059473e62c4"
integrity sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg==
"@eslint/eslintrc@^1.3.3":
version "1.3.3"
- resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
dependencies:
ajv "^6.12.4"
@@ -1095,7 +1122,7 @@
"@humanwhocodes/config-array@^0.10.5":
version "0.10.7"
- resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.7.tgz#6d53769fd0c222767e6452e8ebda825c22e9f0dc"
integrity sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==
dependencies:
"@humanwhocodes/object-schema" "^1.2.1"
@@ -1104,47 +1131,85 @@
"@humanwhocodes/module-importer@^1.0.1":
version "1.0.1"
- resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
"@humanwhocodes/object-schema@^1.2.1":
version "1.2.1"
- resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-"@jridgewell/resolve-uri@^3.0.3":
+"@jridgewell/gen-mapping@^0.1.0":
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
+ integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
+ dependencies:
+ "@jridgewell/set-array" "^1.0.0"
+ "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+ integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+ dependencies:
+ "@jridgewell/set-array" "^1.0.1"
+ "@jridgewell/sourcemap-codec" "^1.4.10"
+ "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
version "3.1.0"
- resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
-"@jridgewell/sourcemap-codec@^1.4.10":
+"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+ integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/source-map@^0.3.2":
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+ integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+ dependencies:
+ "@jridgewell/gen-mapping" "^0.3.0"
+ "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
version "1.4.14"
- resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
+ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
"@jridgewell/trace-mapping@0.3.9":
version "0.3.9"
- resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"
+ resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
dependencies:
"@jridgewell/resolve-uri" "^3.0.3"
"@jridgewell/sourcemap-codec" "^1.4.10"
+"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9":
+ version "0.3.17"
+ resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
+ integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+ dependencies:
+ "@jridgewell/resolve-uri" "3.1.0"
+ "@jridgewell/sourcemap-codec" "1.4.14"
+
"@kwsites/file-exists@^1.1.1":
version "1.1.1"
- resolved "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99"
integrity sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==
dependencies:
debug "^4.1.1"
"@kwsites/promise-deferred@^1.1.1":
version "1.1.1"
- resolved "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz#8ace5259254426ccef57f3175bc64ed7095ed919"
integrity sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==
"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
- resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
dependencies:
"@nodelib/fs.stat" "2.0.5"
@@ -1152,12 +1217,12 @@
"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
version "2.0.5"
- resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
"@nodelib/fs.walk@^1.2.3":
version "1.2.8"
- resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
dependencies:
"@nodelib/fs.scandir" "2.1.5"
@@ -1165,157 +1230,169 @@
"@sindresorhus/is@^4.0.0":
version "4.6.0"
- resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz"
+ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
"@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.3":
- version "1.8.3"
- resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz"
- integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
+ version "1.8.6"
+ resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9"
+ integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==
+ dependencies:
+ type-detect "4.0.8"
+
+"@sinonjs/commons@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3"
+ integrity sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==
dependencies:
type-detect "4.0.8"
"@sinonjs/fake-timers@^7.0.4":
version "7.1.2"
- resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz#2524eae70c4910edccf99b2f4e6efc5894aff7b5"
integrity sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==
dependencies:
"@sinonjs/commons" "^1.7.0"
"@sinonjs/fake-timers@^8.1.0":
version "8.1.0"
- resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7"
integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==
dependencies:
"@sinonjs/commons" "^1.7.0"
"@sinonjs/samsam@^6.0.2":
- version "6.0.2"
- resolved "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.0.2.tgz"
- integrity sha512-jxPRPp9n93ci7b8hMfJOFDPRLFYadN6FSpeROFTR4UNF4i5b+EK6m4QXPO46BDhFgRy1JuS87zAnFOzCUwMJcQ==
+ version "6.1.3"
+ resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-6.1.3.tgz#4e30bcd4700336363302a7d72cbec9b9ab87b104"
+ integrity sha512-nhOb2dWPeb1sd3IQXL/dVPnKHDOAFfvichtBf4xV00/rU1QbPCQqKMbvIheIjqwVjh7qIgf2AHTHi391yMOMpQ==
dependencies:
"@sinonjs/commons" "^1.6.0"
lodash.get "^4.4.2"
type-detect "^4.0.8"
"@sinonjs/text-encoding@^0.7.1":
- version "0.7.1"
- resolved "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz"
- integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
+ version "0.7.2"
+ resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918"
+ integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==
"@szmarczak/http-timer@^4.0.5":
version "4.0.6"
- resolved "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"
+ resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
dependencies:
defer-to-connect "^2.0.0"
"@tsconfig/node10@^1.0.7":
- version "1.0.8"
- resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz"
- integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+ integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
"@tsconfig/node12@^1.0.7":
- version "1.0.9"
- resolved "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz"
- integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==
+ version "1.0.11"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+ integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
"@tsconfig/node14@^1.0.0":
- version "1.0.1"
- resolved "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz"
- integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+ integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
"@tsconfig/node16@^1.0.2":
- version "1.0.2"
- resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz"
- integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
+ integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
"@types/accept-language-parser@1.5.3":
version "1.5.3"
- resolved "https://registry.npmjs.org/@types/accept-language-parser/-/accept-language-parser-1.5.3.tgz"
+ resolved "https://registry.yarnpkg.com/@types/accept-language-parser/-/accept-language-parser-1.5.3.tgz#462f65a7d3900d0390415fa774e060c601519bdd"
integrity sha512-S8oM29O6nnRC3/+rwYV7GBYIIgNIZ52PCxqBG7OuItq9oATnYWy8FfeLKwvq5F7pIYjeeBSCI7y+l+Z9UEQpVQ==
"@types/async@3.2.15":
version "3.2.15"
- resolved "https://registry.npmjs.org/@types/async/-/async-3.2.15.tgz"
+ resolved "https://registry.yarnpkg.com/@types/async/-/async-3.2.15.tgz#26d4768fdda0e466f18d6c9918ca28cc89a4e1fe"
integrity sha512-PAmPfzvFA31mRoqZyTVsgJMsvbynR429UTTxhmfsUCrWGh3/fxOrzqBtaTPJsn4UtzTv4Vb0+/O7CARWb69N4g==
"@types/babel-types@*", "@types/babel-types@^7.0.0":
version "7.0.11"
- resolved "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.11.tgz"
+ resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.11.tgz#263b113fa396fac4373188d73225297fb86f19a9"
integrity sha512-pkPtJUUY+Vwv6B1inAz55rQvivClHJxc9aVEPPmaq2cbyeMLCiDpbKpcKyX4LAwpNGi+SHBv0tHv6+0gXv0P2A==
"@types/babylon@^6.16.2":
version "6.16.6"
- resolved "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.6.tgz"
+ resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.6.tgz#a1e7e01567b26a5ebad321a74d10299189d8d932"
integrity sha512-G4yqdVlhr6YhzLXFKy5F7HtRBU8Y23+iWy7UKthMq/OSQnL1hbsoeXESQ2LY8zEDlknipDG3nRGhUC9tkwvy/w==
dependencies:
"@types/babel-types" "*"
"@types/body-parser@*":
version "1.19.2"
- resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"
+ resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
dependencies:
"@types/connect" "*"
"@types/node" "*"
"@types/cacheable-request@^6.0.1":
- version "6.0.2"
- resolved "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz"
- integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
+ integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
dependencies:
"@types/http-cache-semantics" "*"
- "@types/keyv" "*"
+ "@types/keyv" "^3.1.4"
"@types/node" "*"
- "@types/responselike" "*"
+ "@types/responselike" "^1.0.0"
"@types/connect@*":
version "3.4.35"
- resolved "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"
+ resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
dependencies:
"@types/node" "*"
"@types/cross-spawn@6.0.2":
version "6.0.2"
- resolved "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/@types/cross-spawn/-/cross-spawn-6.0.2.tgz#168309de311cd30a2b8ae720de6475c2fbf33ac7"
integrity sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==
dependencies:
"@types/node" "*"
"@types/errorhandler@1.5.0":
version "1.5.0"
- resolved "https://registry.npmjs.org/@types/errorhandler/-/errorhandler-1.5.0.tgz"
+ resolved "https://registry.yarnpkg.com/@types/errorhandler/-/errorhandler-1.5.0.tgz#2e6be2e419e505130c6342d11b3981867db6de2b"
integrity sha512-g5jrn2aofEn7O2OW/T+PlmGUUD/AtrX7DI87zrxz6rK5XIyvQf3FbPJrwgYaVjVOaCyvEkx9yxLd/XlEA43OcA==
dependencies:
"@types/express" "*"
-"@types/eslint-scope@^3.7.0":
- version "3.7.1"
- resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz"
- integrity sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==
+"@types/eslint-scope@^3.7.3":
+ version "3.7.4"
+ resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
+ integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
dependencies:
"@types/eslint" "*"
"@types/estree" "*"
"@types/eslint@*":
- version "8.2.0"
- resolved "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.0.tgz"
- integrity sha512-74hbvsnc+7TEDa1z5YLSe4/q8hGYB3USNvCuzHUJrjPV6hXaq8IXcngCrHkuvFt0+8rFz7xYXrHgNayIX0UZvQ==
+ version "8.4.10"
+ resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb"
+ integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==
dependencies:
"@types/estree" "*"
"@types/json-schema" "*"
-"@types/estree@*", "@types/estree@^0.0.50":
- version "0.0.50"
- resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz"
- integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
+"@types/estree@*":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
+ integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
+
+"@types/estree@^0.0.51":
+ version "0.0.51"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+ integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
"@types/express-serve-static-core@^4.17.18":
- version "4.17.26"
- resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.26.tgz"
- integrity sha512-zeu3tpouA043RHxW0gzRxwCHchMgftE8GArRsvYT0ByDMbn19olQHx5jLue0LxWY6iYtXb7rXmuVtSkhy9YZvQ==
+ version "4.17.31"
+ resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f"
+ integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==
dependencies:
"@types/node" "*"
"@types/qs" "*"
@@ -1323,7 +1400,7 @@
"@types/express@*", "@types/express@4.17.14":
version "4.17.14"
- resolved "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz"
+ resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c"
integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==
dependencies:
"@types/body-parser" "*"
@@ -1333,14 +1410,14 @@
"@types/fs-extra@9.0.13":
version "9.0.13"
- resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz"
+ resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==
dependencies:
"@types/node" "*"
"@types/got@^9.6.12":
version "9.6.12"
- resolved "https://registry.npmjs.org/@types/got/-/got-9.6.12.tgz"
+ resolved "https://registry.yarnpkg.com/@types/got/-/got-9.6.12.tgz#fd42a6e1f5f64cd6bb422279b08c30bb5a15a56f"
integrity sha512-X4pj/HGHbXVLqTpKjA2ahI4rV/nNBc9mGO2I/0CgAra+F2dKgMXnENv2SRpemScBzBAI4vMelIVYViQxlSE6xA==
dependencies:
"@types/node" "*"
@@ -1349,113 +1426,118 @@
"@types/http-cache-semantics@*":
version "4.0.1"
- resolved "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
- version "7.0.9"
- resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"
- integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+ version "7.0.11"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
+ integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
-"@types/keyv@*":
+"@types/keyv@^3.1.4":
version "3.1.4"
- resolved "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz"
+ resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
dependencies:
"@types/node" "*"
"@types/livereload@0.9.2":
version "0.9.2"
- resolved "https://registry.npmjs.org/@types/livereload/-/livereload-0.9.2.tgz"
+ resolved "https://registry.yarnpkg.com/@types/livereload/-/livereload-0.9.2.tgz#e5259bc2f38f6dc631a7139a2383cd70e267fe81"
integrity sha512-bsqybchTSujFlMlVZWFvL4X1+q7MLe+VxJ0WZgwgP87MHNzkO34JqwkYe+STvtUyRDv2ee3kHdVVXBKsZRLB6w==
dependencies:
"@types/ws" "*"
"@types/lodash@4.14.186":
version "4.14.186"
- resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.186.tgz#862e5514dd7bd66ada6c70ee5fce844b06c8ee97"
integrity sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==
-"@types/mime@^1":
- version "1.3.2"
- resolved "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"
- integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+"@types/mime@*":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
+ integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
"@types/morgan@1.9.3":
version "1.9.3"
- resolved "https://registry.npmjs.org/@types/morgan/-/morgan-1.9.3.tgz"
+ resolved "https://registry.yarnpkg.com/@types/morgan/-/morgan-1.9.3.tgz#ae04180dff02c437312bc0cfb1e2960086b2f540"
integrity sha512-BiLcfVqGBZCyNCnCH3F4o2GmDLrpy0HeBVnNlyZG4fo88ZiE9SoiBe3C+2ezuwbjlEyT+PDZ17//TAlRxAn75Q==
dependencies:
"@types/node" "*"
"@types/multer@1.4.7":
version "1.4.7"
- resolved "https://registry.npmjs.org/@types/multer/-/multer-1.4.7.tgz"
+ resolved "https://registry.yarnpkg.com/@types/multer/-/multer-1.4.7.tgz#89cf03547c28c7bbcc726f029e2a76a7232cc79e"
integrity sha512-/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==
dependencies:
"@types/express" "*"
-"@types/node@*", "@types/node@18.8.4":
+"@types/node@*":
+ version "18.11.12"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.12.tgz#89e7f8aa8c88abf432f9bd594888144d7dba10aa"
+ integrity sha512-FgD3NtTAKvyMmD44T07zz2fEf+OKwutgBCEVM8GcvMGVGaDktiLNTDvPwC/LUe3PinMW+X6CuLOF2Ui1mAlSXg==
+
+"@types/node@18.8.4":
version "18.8.4"
- resolved "https://registry.npmjs.org/@types/node/-/node-18.8.4.tgz"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.8.4.tgz#54be907698f40de8a45770b48486aa3cbd3adff7"
integrity sha512-WdlVphvfR/GJCLEMbNA8lJ0lhFNBj4SW3O+O5/cEGw9oYrv0al9zTwuQsq+myDUXgNx2jgBynoVgZ2MMJ6pbow==
"@types/parse-author@2.0.1":
version "2.0.1"
- resolved "https://registry.npmjs.org/@types/parse-author/-/parse-author-2.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/@types/parse-author/-/parse-author-2.0.1.tgz#9e441bdbf837085976e2aa798e54dffa1dac3d69"
integrity sha512-2RNXvvDY+7ITl/Q3znDpW9DxyAckKgLCXpoiBHN9BeLH1aV7z/W657P2+PK3wVUgGWXtc99ZQy3LkJTGlxLsvA==
"@types/parse-json@^4.0.0":
version "4.0.0"
- resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
"@types/qs@*":
version "6.9.7"
- resolved "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"
+ resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
"@types/range-parser@*":
version "1.2.4"
- resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"
+ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
"@types/read@0.0.29":
version "0.0.29"
- resolved "https://registry.npmjs.org/@types/read/-/read-0.0.29.tgz"
+ resolved "https://registry.yarnpkg.com/@types/read/-/read-0.0.29.tgz#812468fb2dd009f37132045ab4788d89dd89cf43"
integrity sha512-TisW3O3OhpP8/ZwaiqV7kewh9gnoH7PfqHd4hkCM9ogiqWEagu43WXpHWqgPbltXhembYJDpYB3cVwUIOweHXg==
"@types/response-time@2.3.5":
version "2.3.5"
- resolved "https://registry.npmjs.org/@types/response-time/-/response-time-2.3.5.tgz"
+ resolved "https://registry.yarnpkg.com/@types/response-time/-/response-time-2.3.5.tgz#e85ff348caefd0f8d3e8902424c681a59aafc31e"
integrity sha512-4ANzp+I3K7sztFFAGPALWBvSl4ayaDSKzI2Bok+WNz+en2eB2Pvk6VCjR47PBXBWOkEg2r4uWpZOlXA5DNINOQ==
dependencies:
"@types/express" "*"
"@types/node" "*"
-"@types/responselike@*", "@types/responselike@^1.0.0":
+"@types/responselike@^1.0.0":
version "1.0.0"
- resolved "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
dependencies:
"@types/node" "*"
"@types/semver@7.3.12":
version "7.3.12"
- resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.12.tgz"
+ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c"
integrity sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==
"@types/serve-static@*":
- version "1.13.10"
- resolved "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz"
- integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
+ version "1.15.0"
+ resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155"
+ integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==
dependencies:
- "@types/mime" "^1"
+ "@types/mime" "*"
"@types/node" "*"
"@types/tar-fs@*":
version "2.0.1"
- resolved "https://registry.npmjs.org/@types/tar-fs/-/tar-fs-2.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/@types/tar-fs/-/tar-fs-2.0.1.tgz#6391dcad1b03dea2d79fac07371585ab54472bb1"
integrity sha512-qlsQyIY9sN7p221xHuXKNoMfUenOcvEBN4zI8dGsYbYCqHtTarXOEXSIgUnK+GcR0fZDse6pAIc5pIrCh9NefQ==
dependencies:
"@types/node" "*"
@@ -1463,45 +1545,45 @@
"@types/tar-stream@*":
version "2.2.2"
- resolved "https://registry.npmjs.org/@types/tar-stream/-/tar-stream-2.2.2.tgz"
+ resolved "https://registry.yarnpkg.com/@types/tar-stream/-/tar-stream-2.2.2.tgz#be9d0be9404166e4b114151f93e8442e6ab6fb1d"
integrity sha512-1AX+Yt3icFuU6kxwmPakaiGrJUwG44MpuiqPg4dSolRFk6jmvs4b3IbUol9wKDLIgU76gevn3EwE8y/DkSJCZQ==
dependencies:
"@types/node" "*"
"@types/targz@1.0.1":
version "1.0.1"
- resolved "https://registry.npmjs.org/@types/targz/-/targz-1.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/@types/targz/-/targz-1.0.1.tgz#8b68a867b5dc28a755fd57e62d8b17f94e28462f"
integrity sha512-Uf5QxuLICkVOmSyDhPicBpIXk2oLIqaldObfr/WsTKTAPk666OpbeL0wZuNXwc5yg9OH1cBVj1rpMHGBJe4ilg==
dependencies:
"@types/tar-fs" "*"
"@types/tough-cookie@*":
- version "4.0.1"
- resolved "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.1.tgz"
- integrity sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg==
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
+ integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
"@types/ws@*":
- version "8.2.1"
- resolved "https://registry.npmjs.org/@types/ws/-/ws-8.2.1.tgz"
- integrity sha512-SqQ+LhVZaJi7c7sYVkjWALDigi/Wy7h7Iu72gkQp8Y8OWw/DddEVBrTSKu86pQftV2+Gm8lYM61hadPKqyaIeg==
+ version "8.5.3"
+ resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d"
+ integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==
dependencies:
"@types/node" "*"
"@types/yargs-parser@*":
- version "20.2.1"
- resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"
- integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==
+ version "21.0.0"
+ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
+ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
"@types/yargs@17.0.13":
version "17.0.13"
- resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.13.tgz"
+ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76"
integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==
dependencies:
"@types/yargs-parser" "*"
"@typescript-eslint/eslint-plugin@5.40.0":
version "5.40.0"
- resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.0.tgz"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.0.tgz#0159bb71410eec563968288a17bd4478cdb685bd"
integrity sha512-FIBZgS3DVJgqPwJzvZTuH4HNsZhHMa9SjxTKAZTlMsPw/UzpEjcf9f4dfgDJEHjK+HboUJo123Eshl6niwEm/Q==
dependencies:
"@typescript-eslint/scope-manager" "5.40.0"
@@ -1515,7 +1597,7 @@
"@typescript-eslint/parser@5.40.0":
version "5.40.0"
- resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.40.0.tgz"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.0.tgz#432bddc1fe9154945660f67c1ba6d44de5014840"
integrity sha512-Ah5gqyX2ySkiuYeOIDg7ap51/b63QgWZA7w6AHtFrag7aH0lRQPbLzUjk0c9o5/KZ6JRkTTDKShL4AUrQa6/hw==
dependencies:
"@typescript-eslint/scope-manager" "5.40.0"
@@ -1525,7 +1607,7 @@
"@typescript-eslint/scope-manager@5.40.0":
version "5.40.0"
- resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.40.0.tgz"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.0.tgz#d6ea782c8e3a2371ba3ea31458dcbdc934668fc4"
integrity sha512-d3nPmjUeZtEWRvyReMI4I1MwPGC63E8pDoHy0BnrYjnJgilBD3hv7XOiETKLY/zTwI7kCnBDf2vWTRUVpYw0Uw==
dependencies:
"@typescript-eslint/types" "5.40.0"
@@ -1533,7 +1615,7 @@
"@typescript-eslint/type-utils@5.40.0":
version "5.40.0"
- resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.40.0.tgz"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.40.0.tgz#4964099d0158355e72d67a370249d7fc03331126"
integrity sha512-nfuSdKEZY2TpnPz5covjJqav+g5qeBqwSHKBvz7Vm1SAfy93SwKk/JeSTymruDGItTwNijSsno5LhOHRS1pcfw==
dependencies:
"@typescript-eslint/typescript-estree" "5.40.0"
@@ -1543,12 +1625,12 @@
"@typescript-eslint/types@5.40.0":
version "5.40.0"
- resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.40.0.tgz"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.0.tgz#8de07e118a10b8f63c99e174a3860f75608c822e"
integrity sha512-V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw==
"@typescript-eslint/typescript-estree@5.40.0":
version "5.40.0"
- resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz#e305e6a5d65226efa5471ee0f12e0ffaab6d3075"
integrity sha512-b0GYlDj8TLTOqwX7EGbw2gL5EXS2CPEWhF9nGJiGmEcmlpNBjyHsTwbqpyIEPVpl6br4UcBOYlcI2FJVtJkYhg==
dependencies:
"@typescript-eslint/types" "5.40.0"
@@ -1561,7 +1643,7 @@
"@typescript-eslint/utils@5.40.0":
version "5.40.0"
- resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.40.0.tgz"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.40.0.tgz#647f56a875fd09d33c6abd70913c3dd50759b772"
integrity sha512-MO0y3T5BQ5+tkkuYZJBjePewsY+cQnfkYeRqS6tPh28niiIwPnQ1t59CSRcs1ZwJJNOdWw7rv9pF8aP58IMihA==
dependencies:
"@types/json-schema" "^7.0.9"
@@ -1574,7 +1656,7 @@
"@typescript-eslint/visitor-keys@5.40.0":
version "5.40.0"
- resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.0.tgz"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.0.tgz#dd2d38097f68e0d2e1e06cb9f73c0173aca54b68"
integrity sha512-ijJ+6yig+x9XplEpG2K6FUdJeQGGj/15U3S56W9IqXKJqleuD7zJ2AX/miLezwxpd7ZxDAqO87zWufKg+RPZyQ==
dependencies:
"@typescript-eslint/types" "5.40.0"
@@ -1582,12 +1664,12 @@
"@ungap/promise-all-settled@1.1.2":
version "1.1.2"
- resolved "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
"@webassemblyjs/ast@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
dependencies:
"@webassemblyjs/helper-numbers" "1.11.1"
@@ -1595,22 +1677,22 @@
"@webassemblyjs/floating-point-hex-parser@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
"@webassemblyjs/helper-api-error@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
"@webassemblyjs/helper-buffer@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
"@webassemblyjs/helper-numbers@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
dependencies:
"@webassemblyjs/floating-point-hex-parser" "1.11.1"
@@ -1619,12 +1701,12 @@
"@webassemblyjs/helper-wasm-bytecode@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
"@webassemblyjs/helper-wasm-section@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
dependencies:
"@webassemblyjs/ast" "1.11.1"
@@ -1634,26 +1716,26 @@
"@webassemblyjs/ieee754@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
dependencies:
"@xtuc/ieee754" "^1.2.0"
"@webassemblyjs/leb128@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
dependencies:
"@xtuc/long" "4.2.2"
"@webassemblyjs/utf8@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
"@webassemblyjs/wasm-edit@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
dependencies:
"@webassemblyjs/ast" "1.11.1"
@@ -1667,7 +1749,7 @@
"@webassemblyjs/wasm-gen@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
dependencies:
"@webassemblyjs/ast" "1.11.1"
@@ -1678,7 +1760,7 @@
"@webassemblyjs/wasm-opt@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
dependencies:
"@webassemblyjs/ast" "1.11.1"
@@ -1688,7 +1770,7 @@
"@webassemblyjs/wasm-parser@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
dependencies:
"@webassemblyjs/ast" "1.11.1"
@@ -1700,7 +1782,7 @@
"@webassemblyjs/wast-printer@1.11.1":
version "1.11.1"
- resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
dependencies:
"@webassemblyjs/ast" "1.11.1"
@@ -1708,27 +1790,27 @@
"@xtuc/ieee754@^1.2.0":
version "1.2.0"
- resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
"@xtuc/long@4.2.2":
version "4.2.2"
- resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"
+ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
abbrev@1:
version "1.1.1"
- resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
accept-language-parser@1.5.0:
version "1.5.0"
- resolved "https://registry.npmjs.org/accept-language-parser/-/accept-language-parser-1.5.0.tgz"
- integrity sha1-iHfFQECo3LWeCgfZwf3kIpgzR5E=
+ resolved "https://registry.yarnpkg.com/accept-language-parser/-/accept-language-parser-1.5.0.tgz#8877c54040a8dcb59e0a07d9c1fde42298334791"
+ integrity sha512-QhyTbMLYo0BBGg1aWbeMG4ekWtds/31BrEU+DONOg/7ax23vxpL03Pb7/zBmha2v7vdD3AyzZVWBVGEZxKOXWw==
accepts@~1.3.7, accepts@~1.3.8:
version "1.3.8"
- resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"
+ resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
dependencies:
mime-types "~2.1.34"
@@ -1736,68 +1818,68 @@ accepts@~1.3.7, accepts@~1.3.8:
acorn-globals@^3.0.0:
version "3.1.0"
- resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz"
- integrity sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=
+ resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+ integrity sha512-uWttZCk96+7itPxK8xCzY86PnxKTMrReKDqrHzv42VQY0K30PUO8WY13WMOuI+cOdX4EIdzdvQ8k6jkuGRFMYw==
dependencies:
acorn "^4.0.4"
acorn-import-assertions@^1.7.6:
version "1.8.0"
- resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"
+ resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
acorn-jsx@^5.3.2:
version "5.3.2"
- resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
+ resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
acorn-walk@^8.1.1:
version "8.2.0"
- resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
acorn@^3.1.0:
version "3.3.0"
- resolved "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"
- integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+ integrity sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==
acorn@^4.0.4:
version "4.0.13"
- resolved "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"
- integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+ integrity sha512-fu2ygVGuMmlzG8ZeRJ0bvR41nsAkxxhbyk8bZ1SS521Z7vmgJFTQQlfz/Mp/nJexGBz+v8sC9bM6+lNgskt4Ug==
acorn@^7.1.1:
version "7.4.1"
- resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-acorn@^8.4.1, acorn@^8.8.0:
- version "8.8.0"
- resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"
- integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
+acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0:
+ version "8.8.1"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+ integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
ajv-formats@^2.1.1:
version "2.1.1"
- resolved "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
dependencies:
ajv "^8.0.0"
ajv-keywords@^3.5.2:
version "3.5.2"
- resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
+ resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
ajv-keywords@^5.0.0:
version "5.1.0"
- resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
dependencies:
fast-deep-equal "^3.1.3"
ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
version "6.12.6"
- resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
dependencies:
fast-deep-equal "^3.1.1"
@@ -1806,9 +1888,9 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
uri-js "^4.2.2"
ajv@^8.0.0, ajv@^8.8.0:
- version "8.8.2"
- resolved "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz"
- integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==
+ version "8.11.2"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.2.tgz#aecb20b50607acf2569b6382167b65a96008bb78"
+ integrity sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
@@ -1817,8 +1899,8 @@ ajv@^8.0.0, ajv@^8.8.0:
align-text@^0.1.1, align-text@^0.1.3:
version "0.1.4"
- resolved "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"
- integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
+ resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+ integrity sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==
dependencies:
kind-of "^3.0.2"
longest "^1.0.1"
@@ -1826,104 +1908,104 @@ align-text@^0.1.1, align-text@^0.1.3:
ansi-colors@4.1.1:
version "4.1.1"
- resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
ansi-regex@^2.0.0:
version "2.1.1"
- resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
- integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+ integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
ansi-regex@^5.0.1:
version "5.0.1"
- resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
ansi-styles@^2.2.1:
version "2.2.1"
- resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
- integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+ integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
ansi-styles@^3.2.1:
version "3.2.1"
- resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
dependencies:
color-convert "^1.9.0"
ansi-styles@^4.0.0, ansi-styles@^4.1.0:
version "4.3.0"
- resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
dependencies:
color-convert "^2.0.1"
anymatch@~3.1.2:
- version "3.1.2"
- resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"
- integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+ integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
dependencies:
normalize-path "^3.0.0"
picomatch "^2.0.4"
append-field@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz"
- integrity sha1-HjRA6RXwsSA9I3SOeO3XubW0PlY=
+ resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56"
+ integrity sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==
arg@^4.1.0:
version "4.1.3"
- resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"
+ resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
argparse@^2.0.1:
version "2.0.1"
- resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
array-flatten@1.1.1:
version "1.1.1"
- resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
- integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+ resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+ integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
array-union@^2.1.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
asap@~2.0.3:
version "2.0.6"
- resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"
- integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+ resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+ integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
assertion-error@^1.1.0:
version "1.1.0"
- resolved "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
async@3.1.1:
version "3.1.1"
- resolved "https://registry.npmjs.org/async/-/async-3.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/async/-/async-3.1.1.tgz#dd3542db03de837979c9ebbca64ca01b06dc98df"
integrity sha512-X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g==
async@3.2.4, async@^3.2.1:
version "3.2.4"
- resolved "https://registry.npmjs.org/async/-/async-3.2.4.tgz"
+ resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
asynckit@^0.4.0:
version "0.4.0"
- resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
- integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+ resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+ integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
author-regex@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz"
- integrity sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=
+ resolved "https://registry.yarnpkg.com/author-regex/-/author-regex-1.0.0.tgz#d08885be6b9bbf9439fe087c76287245f0a81450"
+ integrity sha512-KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g==
autoprefixer@10.4.0:
version "10.4.0"
- resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.0.tgz"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8"
integrity sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==
dependencies:
browserslist "^4.17.5"
@@ -1935,7 +2017,7 @@ autoprefixer@10.4.0:
autoprefixer@^9.6.1:
version "9.8.8"
- resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a"
integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==
dependencies:
browserslist "^4.12.0"
@@ -1948,8 +2030,8 @@ autoprefixer@^9.6.1:
babel-code-frame@^6.26.0:
version "6.26.0"
- resolved "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"
- integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
+ resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+ integrity sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==
dependencies:
chalk "^1.1.3"
esutils "^2.0.2"
@@ -1957,7 +2039,7 @@ babel-code-frame@^6.26.0:
babel-core@^6.25.0, babel-core@^6.26.0:
version "6.26.3"
- resolved "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz"
+ resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
dependencies:
babel-code-frame "^6.26.0"
@@ -1982,7 +2064,7 @@ babel-core@^6.25.0, babel-core@^6.26.0:
babel-generator@^6.26.0:
version "6.26.1"
- resolved "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz"
+ resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
dependencies:
babel-messages "^6.23.0"
@@ -1996,8 +2078,8 @@ babel-generator@^6.26.0:
babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz"
- integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=
+ resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+ integrity sha512-gCtfYORSG1fUMX4kKraymq607FWgMWg+j42IFPc18kFQEsmtaibP4UrqsXt8FlEJle25HUd4tsoDR7H2wDhe9Q==
dependencies:
babel-helper-explode-assignable-expression "^6.24.1"
babel-runtime "^6.22.0"
@@ -2005,8 +2087,8 @@ babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
babel-helper-call-delegate@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz"
- integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=
+ resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+ integrity sha512-RL8n2NiEj+kKztlrVJM9JT1cXzzAdvWFh76xh/H1I4nKwunzE4INBXn8ieCZ+wh4zWszZk7NBS1s/8HR5jDkzQ==
dependencies:
babel-helper-hoist-variables "^6.24.1"
babel-runtime "^6.22.0"
@@ -2015,8 +2097,8 @@ babel-helper-call-delegate@^6.24.1:
babel-helper-define-map@^6.24.1:
version "6.26.0"
- resolved "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz"
- integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=
+ resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+ integrity sha512-bHkmjcC9lM1kmZcVpA5t2om2nzT/xiZpo6TJq7UlZ3wqKfzia4veeXbIhKvJXAMzhhEBd3cR1IElL5AenWEUpA==
dependencies:
babel-helper-function-name "^6.24.1"
babel-runtime "^6.26.0"
@@ -2025,8 +2107,8 @@ babel-helper-define-map@^6.24.1:
babel-helper-explode-assignable-expression@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz"
- integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo=
+ resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+ integrity sha512-qe5csbhbvq6ccry9G7tkXbzNtcDiH4r51rrPUbwwoTzZ18AqxWYRZT6AOmxrpxKnQBW0pYlBI/8vh73Z//78nQ==
dependencies:
babel-runtime "^6.22.0"
babel-traverse "^6.24.1"
@@ -2034,8 +2116,8 @@ babel-helper-explode-assignable-expression@^6.24.1:
babel-helper-function-name@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz"
- integrity sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=
+ resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+ integrity sha512-Oo6+e2iX+o9eVvJ9Y5eKL5iryeRdsIkwRYheCuhYdVHsdEQysbc2z2QkqCLIYnNxkT5Ss3ggrHdXiDI7Dhrn4Q==
dependencies:
babel-helper-get-function-arity "^6.24.1"
babel-runtime "^6.22.0"
@@ -2045,32 +2127,32 @@ babel-helper-function-name@^6.24.1:
babel-helper-get-function-arity@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz"
- integrity sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=
+ resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+ integrity sha512-WfgKFX6swFB1jS2vo+DwivRN4NB8XUdM3ij0Y1gnC21y1tdBoe6xjVnd7NSI6alv+gZXCtJqvrTeMW3fR/c0ng==
dependencies:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
babel-helper-hoist-variables@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz"
- integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY=
+ resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+ integrity sha512-zAYl3tqerLItvG5cKYw7f1SpvIxS9zi7ohyGHaI9cgDUjAT6YcY9jIEH5CstetP5wHIVSceXwNS7Z5BpJg+rOw==
dependencies:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
babel-helper-optimise-call-expression@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz"
- integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=
+ resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+ integrity sha512-Op9IhEaxhbRT8MDXx2iNuMgciu2V8lDvYCNQbDGjdBNCjaMvyLf4wl4A3b8IgndCyQF8TwfgsQ8T3VD8aX1/pA==
dependencies:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
babel-helper-regex@^6.24.1:
version "6.26.0"
- resolved "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz"
- integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=
+ resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+ integrity sha512-VlPiWmqmGJp0x0oK27Out1D+71nVVCTSdlbhIVoaBAj2lUgrNjBCRR9+llO4lTSb2O4r7PJg+RobRkhBrf6ofg==
dependencies:
babel-runtime "^6.26.0"
babel-types "^6.26.0"
@@ -2078,8 +2160,8 @@ babel-helper-regex@^6.24.1:
babel-helper-remap-async-to-generator@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz"
- integrity sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=
+ resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+ integrity sha512-RYqaPD0mQyQIFRu7Ho5wE2yvA/5jxqCIj/Lv4BXNq23mHYu/vxikOy2JueLiBxQknwapwrJeNCesvY0ZcfnlHg==
dependencies:
babel-helper-function-name "^6.24.1"
babel-runtime "^6.22.0"
@@ -2089,8 +2171,8 @@ babel-helper-remap-async-to-generator@^6.24.1:
babel-helper-replace-supers@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz"
- integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo=
+ resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+ integrity sha512-sLI+u7sXJh6+ToqDr57Bv973kCepItDhMou0xCP2YPVmR1jkHSCY+p1no8xErbV1Siz5QE8qKT1WIwybSWlqjw==
dependencies:
babel-helper-optimise-call-expression "^6.24.1"
babel-messages "^6.23.0"
@@ -2101,60 +2183,60 @@ babel-helper-replace-supers@^6.24.1:
babel-helpers@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"
- integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
+ resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+ integrity sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==
dependencies:
babel-runtime "^6.22.0"
babel-template "^6.24.1"
babel-loader@^8.2.2:
- version "8.2.3"
- resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz"
- integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==
+ version "8.3.0"
+ resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
+ integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==
dependencies:
find-cache-dir "^3.3.1"
- loader-utils "^1.4.0"
+ loader-utils "^2.0.0"
make-dir "^3.1.0"
schema-utils "^2.6.5"
babel-messages@^6.23.0:
version "6.23.0"
- resolved "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"
- integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
+ resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+ integrity sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==
dependencies:
babel-runtime "^6.22.0"
babel-plugin-check-es2015-constants@^6.22.0:
version "6.22.0"
- resolved "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz"
- integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=
+ resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+ integrity sha512-B1M5KBP29248dViEo1owyY32lk1ZSH2DaNNrXLGt8lyjjHm7pBqAdQ7VKUPR6EEDO323+OvT3MQXbCin8ooWdA==
dependencies:
babel-runtime "^6.22.0"
babel-plugin-syntax-async-functions@^6.8.0:
version "6.13.0"
- resolved "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz"
- integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=
+ resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+ integrity sha512-4Zp4unmHgw30A1eWI5EpACji2qMocisdXhAftfhXoSV9j0Tvj6nRFE3tOmRY912E0FMRm/L5xWE7MGVT2FoLnw==
babel-plugin-syntax-exponentiation-operator@^6.8.0:
version "6.13.0"
- resolved "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz"
- integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=
+ resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+ integrity sha512-Z/flU+T9ta0aIEKl1tGEmN/pZiI1uXmCiGFRegKacQfEJzp7iNsKloZmyJlQr+75FCJtiFfGIK03SiCvCt9cPQ==
babel-plugin-syntax-object-rest-spread@^6.8.0:
version "6.13.0"
- resolved "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"
- integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
+ resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+ integrity sha512-C4Aq+GaAj83pRQ0EFgTvw5YO6T3Qz2KGrNRwIj9mSoNHVvdZY4KO2uA6HNtNXCw993iSZnckY1aLW8nOi8i4+w==
babel-plugin-syntax-trailing-function-commas@^6.22.0:
version "6.22.0"
- resolved "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz"
- integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=
+ resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+ integrity sha512-Gx9CH3Q/3GKbhs07Bszw5fPTlU+ygrOGfAhEt7W2JICwufpC4SuO0mG0+4NykPBSYPMJhqvVlDBU17qB1D+hMQ==
babel-plugin-transform-async-to-generator@^6.22.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz"
- integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+ integrity sha512-7BgYJujNCg0Ti3x0c/DL3tStvnKS6ktIYOmo9wginv/dfZOrbSZ+qG4IRRHMBOzZ5Awb1skTiAsQXg/+IWkZYw==
dependencies:
babel-helper-remap-async-to-generator "^6.24.1"
babel-plugin-syntax-async-functions "^6.8.0"
@@ -2162,22 +2244,22 @@ babel-plugin-transform-async-to-generator@^6.22.0:
babel-plugin-transform-es2015-arrow-functions@^6.22.0:
version "6.22.0"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz"
- integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+ integrity sha512-PCqwwzODXW7JMrzu+yZIaYbPQSKjDTAsNNlK2l5Gg9g4rz2VzLnZsStvp/3c46GfXpwkyufb3NCyG9+50FF1Vg==
dependencies:
babel-runtime "^6.22.0"
babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
version "6.22.0"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz"
- integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+ integrity sha512-2+ujAT2UMBzYFm7tidUsYh+ZoIutxJ3pN9IYrF1/H6dCKtECfhmB8UkHVpyxDwkj0CYbQG35ykoz925TUnBc3A==
dependencies:
babel-runtime "^6.22.0"
babel-plugin-transform-es2015-block-scoping@^6.23.0:
version "6.26.0"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz"
- integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+ integrity sha512-YiN6sFAQ5lML8JjCmr7uerS5Yc/EMbgg9G8ZNmk2E3nYX4ckHR01wrkeeMijEf5WHNK5TW0Sl0Uu3pv3EdOJWw==
dependencies:
babel-runtime "^6.26.0"
babel-template "^6.26.0"
@@ -2187,8 +2269,8 @@ babel-plugin-transform-es2015-block-scoping@^6.23.0:
babel-plugin-transform-es2015-classes@^6.23.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz"
- integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+ integrity sha512-5Dy7ZbRinGrNtmWpquZKZ3EGY8sDgIVB4CU8Om8q8tnMLrD/m94cKglVcHps0BCTdZ0TJeeAWOq2TK9MIY6cag==
dependencies:
babel-helper-define-map "^6.24.1"
babel-helper-function-name "^6.24.1"
@@ -2202,38 +2284,38 @@ babel-plugin-transform-es2015-classes@^6.23.0:
babel-plugin-transform-es2015-computed-properties@^6.22.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz"
- integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+ integrity sha512-C/uAv4ktFP/Hmh01gMTvYvICrKze0XVX9f2PdIXuriCSvUmV9j+u+BB9f5fJK3+878yMK6dkdcq+Ymr9mrcLzw==
dependencies:
babel-runtime "^6.22.0"
babel-template "^6.24.1"
babel-plugin-transform-es2015-destructuring@^6.23.0:
version "6.23.0"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz"
- integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+ integrity sha512-aNv/GDAW0j/f4Uy1OEPZn1mqD+Nfy9viFGBfQ5bZyT35YqOiqx7/tXdyfZkJ1sC21NyEsBdfDY6PYmLHF4r5iA==
dependencies:
babel-runtime "^6.22.0"
babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz"
- integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+ integrity sha512-ossocTuPOssfxO2h+Z3/Ea1Vo1wWx31Uqy9vIiJusOP4TbF7tPs9U0sJ9pX9OJPf4lXRGj5+6Gkl/HHKiAP5ug==
dependencies:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
babel-plugin-transform-es2015-for-of@^6.23.0:
version "6.23.0"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz"
- integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+ integrity sha512-DLuRwoygCoXx+YfxHLkVx5/NpeSbVwfoTeBykpJK7JhYWlL/O8hgAK/reforUnZDlxasOrVPPJVI/guE3dCwkw==
dependencies:
babel-runtime "^6.22.0"
babel-plugin-transform-es2015-function-name@^6.22.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz"
- integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+ integrity sha512-iFp5KIcorf11iBqu/y/a7DK3MN5di3pNCzto61FqCNnUX4qeBwcV1SLqe10oXNnCaxBUImX3SckX2/o1nsrTcg==
dependencies:
babel-helper-function-name "^6.24.1"
babel-runtime "^6.22.0"
@@ -2241,15 +2323,15 @@ babel-plugin-transform-es2015-function-name@^6.22.0:
babel-plugin-transform-es2015-literals@^6.22.0:
version "6.22.0"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz"
- integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+ integrity sha512-tjFl0cwMPpDYyoqYA9li1/7mGFit39XiNX5DKC/uCNjBctMxyL1/PT/l4rSlbvBG1pOKI88STRdUsWXB3/Q9hQ==
dependencies:
babel-runtime "^6.22.0"
babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz"
- integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+ integrity sha512-LnIIdGWIKdw7zwckqx+eGjcS8/cl8D74A3BpJbGjKTFFNJSMrjN4bIh22HY1AlkUbeLG6X6OZj56BDvWD+OeFA==
dependencies:
babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
babel-runtime "^6.22.0"
@@ -2257,7 +2339,7 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015
babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
version "6.26.2"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz"
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==
dependencies:
babel-plugin-transform-strict-mode "^6.24.1"
@@ -2267,8 +2349,8 @@ babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-e
babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz"
- integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+ integrity sha512-ONFIPsq8y4bls5PPsAWYXH/21Hqv64TBxdje0FvU3MhIV6QM2j5YS7KvAzg/nTIVLot2D2fmFQrFWCbgHlFEjg==
dependencies:
babel-helper-hoist-variables "^6.24.1"
babel-runtime "^6.22.0"
@@ -2276,8 +2358,8 @@ babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
babel-plugin-transform-es2015-modules-umd@^6.23.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz"
- integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+ integrity sha512-LpVbiT9CLsuAIp3IG0tfbVo81QIhn6pE8xBJ7XSeCtFlMltuar5VuBV6y6Q45tpui9QWcy5i0vLQfCfrnF7Kiw==
dependencies:
babel-plugin-transform-es2015-modules-amd "^6.24.1"
babel-runtime "^6.22.0"
@@ -2285,16 +2367,16 @@ babel-plugin-transform-es2015-modules-umd@^6.23.0:
babel-plugin-transform-es2015-object-super@^6.22.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz"
- integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+ integrity sha512-8G5hpZMecb53vpD3mjs64NhI1au24TAmokQ4B+TBFBjN9cVoGoOvotdrMMRmHvVZUEvqGUPWL514woru1ChZMA==
dependencies:
babel-helper-replace-supers "^6.24.1"
babel-runtime "^6.22.0"
babel-plugin-transform-es2015-parameters@^6.23.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz"
- integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+ integrity sha512-8HxlW+BB5HqniD+nLkQ4xSAVq3bR/pcYW9IigY+2y0dI+Y7INFeTbfAQr+63T3E4UDsZGjyb+l9txUnABWxlOQ==
dependencies:
babel-helper-call-delegate "^6.24.1"
babel-helper-get-function-arity "^6.24.1"
@@ -2305,23 +2387,23 @@ babel-plugin-transform-es2015-parameters@^6.23.0:
babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz"
- integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+ integrity sha512-mDdocSfUVm1/7Jw/FIRNw9vPrBQNePy6wZJlR8HAUBLybNp1w/6lr6zZ2pjMShee65t/ybR5pT8ulkLzD1xwiw==
dependencies:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
babel-plugin-transform-es2015-spread@^6.22.0:
version "6.22.0"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz"
- integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+ integrity sha512-3Ghhi26r4l3d0Js933E5+IhHwk0A1yiutj9gwvzmFbVV0sPMYk2lekhOufHBswX7NCoSeF4Xrl3sCIuSIa+zOg==
dependencies:
babel-runtime "^6.22.0"
babel-plugin-transform-es2015-sticky-regex@^6.22.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz"
- integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+ integrity sha512-CYP359ADryTo3pCsH0oxRo/0yn6UsEZLqYohHmvLQdfS9xkf+MbCzE3/Kolw9OYIY4ZMilH25z/5CbQbwDD+lQ==
dependencies:
babel-helper-regex "^6.24.1"
babel-runtime "^6.22.0"
@@ -2329,22 +2411,22 @@ babel-plugin-transform-es2015-sticky-regex@^6.22.0:
babel-plugin-transform-es2015-template-literals@^6.22.0:
version "6.22.0"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz"
- integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+ integrity sha512-x8b9W0ngnKzDMHimVtTfn5ryimars1ByTqsfBDwAqLibmuuQY6pgBQi5z1ErIsUOWBdw1bW9FSz5RZUojM4apg==
dependencies:
babel-runtime "^6.22.0"
babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
version "6.23.0"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz"
- integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+ integrity sha512-fz6J2Sf4gYN6gWgRZaoFXmq93X+Li/8vf+fb0sGDVtdeWvxC9y5/bTD7bvfWMEq6zetGEHpWjtzRGSugt5kNqw==
dependencies:
babel-runtime "^6.22.0"
babel-plugin-transform-es2015-unicode-regex@^6.22.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz"
- integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+ integrity sha512-v61Dbbihf5XxnYjtBN04B/JBvsScY37R1cZT5r9permN1cp+b70DY3Ib3fIkgn1DI9U3tGgBJZVD8p/mE/4JbQ==
dependencies:
babel-helper-regex "^6.24.1"
babel-runtime "^6.22.0"
@@ -2352,8 +2434,8 @@ babel-plugin-transform-es2015-unicode-regex@^6.22.0:
babel-plugin-transform-exponentiation-operator@^6.22.0:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz"
- integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+ integrity sha512-LzXDmbMkklvNhprr20//RStKVcT8Cu+SQtX18eMHLhjHf2yFzwtQ0S2f0jQ+89rokoNdmwoSqYzAhq86FxlLSQ==
dependencies:
babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
babel-plugin-syntax-exponentiation-operator "^6.8.0"
@@ -2361,30 +2443,30 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:
babel-plugin-transform-object-rest-spread@^6.26.0:
version "6.26.0"
- resolved "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz"
- integrity sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+ integrity sha512-ocgA9VJvyxwt+qJB0ncxV8kb/CjfTcECUY4tQ5VT7nP6Aohzobm8CDFaQ5FHdvZQzLmf0sgDxB8iRXZXxwZcyA==
dependencies:
babel-plugin-syntax-object-rest-spread "^6.8.0"
babel-runtime "^6.26.0"
babel-plugin-transform-regenerator@^6.22.0:
version "6.26.0"
- resolved "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz"
- integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+ integrity sha512-LS+dBkUGlNR15/5WHKe/8Neawx663qttS6AGqoOUhICc9d1KciBvtrQSuc0PI+CxQ2Q/S1aKuJ+u64GtLdcEZg==
dependencies:
regenerator-transform "^0.10.0"
babel-plugin-transform-strict-mode@^6.24.1:
version "6.24.1"
- resolved "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz"
- integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+ integrity sha512-j3KtSpjyLSJxNoCDrhwiJad8kw0gJ9REGj8/CqL0HeRyLnvUNYV9zcqluL6QJSXh3nfsLEmSLvwRfGzrgR96Pw==
dependencies:
babel-runtime "^6.22.0"
babel-types "^6.24.1"
babel-preset-env@^1.6.0, babel-preset-env@^1.6.1, babel-preset-env@^1.7.0:
version "1.7.0"
- resolved "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz"
+ resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==
dependencies:
babel-plugin-check-es2015-constants "^6.22.0"
@@ -2420,8 +2502,8 @@ babel-preset-env@^1.6.0, babel-preset-env@^1.6.1, babel-preset-env@^1.7.0:
babel-register@^6.26.0:
version "6.26.0"
- resolved "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"
- integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
+ resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+ integrity sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==
dependencies:
babel-core "^6.26.0"
babel-runtime "^6.26.0"
@@ -2433,16 +2515,16 @@ babel-register@^6.26.0:
babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
version "6.26.0"
- resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
- integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+ resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+ integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
dependencies:
core-js "^2.4.0"
regenerator-runtime "^0.11.0"
babel-template@^6.24.1, babel-template@^6.26.0:
version "6.26.0"
- resolved "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz"
- integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
+ resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+ integrity sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==
dependencies:
babel-runtime "^6.26.0"
babel-traverse "^6.26.0"
@@ -2452,8 +2534,8 @@ babel-template@^6.24.1, babel-template@^6.26.0:
babel-traverse@^6.24.1, babel-traverse@^6.26.0:
version "6.26.0"
- resolved "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz"
- integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
+ resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+ integrity sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==
dependencies:
babel-code-frame "^6.26.0"
babel-messages "^6.23.0"
@@ -2467,8 +2549,8 @@ babel-traverse@^6.24.1, babel-traverse@^6.26.0:
babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
version "6.26.0"
- resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz"
- integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
+ resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+ integrity sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==
dependencies:
babel-runtime "^6.26.0"
esutils "^2.0.2"
@@ -2477,22 +2559,22 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
babylon@^6.18.0:
version "6.18.0"
- resolved "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"
+ resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
balanced-match@^1.0.0:
version "1.0.2"
- resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
basic-auth-connect@1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"
- integrity sha1-/bC0OWLKe0BFanwrtI/hc9otISI=
+ resolved "https://registry.yarnpkg.com/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz#fdb0b43962ca7b40456a7c2bb48fe173da2d2122"
+ integrity sha512-kiV+/DTgVro4aZifY/hwRwALBISViL5NP4aReaR2EVJEObpbUBHIkdJh/YpcoEiYt7nBodZ6U2ajZeZvSxUCCg==
basic-auth@~2.0.1:
version "2.0.1"
- resolved "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
dependencies:
safe-buffer "5.1.2"
@@ -2504,12 +2586,12 @@ big.js@^5.2.2:
binary-extensions@^2.0.0:
version "2.2.0"
- resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
bl@^1.0.0:
version "1.2.3"
- resolved "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz"
+ resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
integrity sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==
dependencies:
readable-stream "^2.3.5"
@@ -2517,7 +2599,7 @@ bl@^1.0.0:
body-parser@1.20.1:
version "1.20.1"
- resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"
+ resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
dependencies:
bytes "3.1.2"
@@ -2535,56 +2617,55 @@ body-parser@1.20.1:
bowser@^2.11.0:
version "2.11.0"
- resolved "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz"
+ resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f"
integrity sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==
brace-expansion@^1.1.7:
version "1.1.11"
- resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
dependencies:
balanced-match "^1.0.0"
concat-map "0.0.1"
-braces@^3.0.1, braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
version "3.0.2"
- resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
dependencies:
fill-range "^7.0.1"
browser-stdout@1.3.1:
version "1.3.1"
- resolved "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"
+ resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
browserslist@^3.2.6:
version "3.2.8"
- resolved "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==
dependencies:
caniuse-lite "^1.0.30000844"
electron-to-chromium "^1.3.47"
-browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.17.5, browserslist@^4.6.4:
- version "4.19.1"
- resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz"
- integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
+browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.17.5, browserslist@^4.21.3, browserslist@^4.6.4:
+ version "4.21.4"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
+ integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
dependencies:
- caniuse-lite "^1.0.30001286"
- electron-to-chromium "^1.4.17"
- escalade "^3.1.1"
- node-releases "^2.0.1"
- picocolors "^1.0.0"
+ caniuse-lite "^1.0.30001400"
+ electron-to-chromium "^1.4.251"
+ node-releases "^2.0.6"
+ update-browserslist-db "^1.0.9"
buffer-alloc-unsafe@^1.1.0:
version "1.1.0"
- resolved "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
buffer-alloc@^1.2.0:
version "1.2.0"
- resolved "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
dependencies:
buffer-alloc-unsafe "^1.1.0"
@@ -2592,45 +2673,45 @@ buffer-alloc@^1.2.0:
buffer-fill@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz"
- integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+ resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+ integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
buffer-from@^1.0.0:
version "1.1.2"
- resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
builtin-modules@3.1.0:
version "3.1.0"
- resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
builtin-modules@3.3.0:
version "3.3.0"
- resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz"
+ resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
busboy@^0.2.11:
version "0.2.14"
- resolved "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"
- integrity sha1-bCpiLvz0fFe7vh4qnDetNseSVFM=
+ resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"
+ integrity sha512-InWFDomvlkEj+xWLBfU3AvnbVYqeTWmQopiW0tWWEy5yehYm2YkGEc59sUmw/4ty5Zj/b0WHGs1LgecuBSBGrg==
dependencies:
dicer "0.2.5"
readable-stream "1.1.x"
bytes@3.1.2:
version "3.1.2"
- resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
cacheable-lookup@^5.0.3:
version "5.0.4"
- resolved "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
cacheable-request@^7.0.2:
version "7.0.2"
- resolved "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
dependencies:
clone-response "^1.0.2"
@@ -2643,7 +2724,7 @@ cacheable-request@^7.0.2:
call-bind@^1.0.0:
version "1.0.2"
- resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
dependencies:
function-bind "^1.1.1"
@@ -2651,35 +2732,35 @@ call-bind@^1.0.0:
callsites@^3.0.0:
version "3.1.0"
- resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
camelcase@^1.0.2:
version "1.2.1"
- resolved "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
- integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+ integrity sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==
camelcase@^6.0.0:
- version "6.2.1"
- resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz"
- integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+ integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001286:
- version "1.0.30001300"
- resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001300.tgz"
- integrity sha512-cVjiJHWGcNlJi8TZVKNMnvMid3Z3TTdDHmLDzlOdIiZq138Exvo0G+G0wTdVYolxKb4AYwC+38pxodiInVtJSA==
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001400:
+ version "1.0.30001439"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz#ab7371faeb4adff4b74dad1718a6fd122e45d9cb"
+ integrity sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==
center-align@^0.1.1:
version "0.1.3"
- resolved "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"
- integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
+ resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+ integrity sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==
dependencies:
align-text "^0.1.3"
lazy-cache "^1.0.3"
chai@4.3.6:
version "4.3.6"
- resolved "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz"
+ resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.6.tgz#ffe4ba2d9fa9d6680cc0b370adae709ec9011e9c"
integrity sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==
dependencies:
assertion-error "^1.1.0"
@@ -2692,7 +2773,7 @@ chai@4.3.6:
chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0:
version "4.1.2"
- resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
dependencies:
ansi-styles "^4.1.0"
@@ -2700,8 +2781,8 @@ chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0:
chalk@^1.1.3:
version "1.1.3"
- resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
- integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+ integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
dependencies:
ansi-styles "^2.2.1"
escape-string-regexp "^1.0.2"
@@ -2711,7 +2792,7 @@ chalk@^1.1.3:
chalk@^2.0.0:
version "2.4.2"
- resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
dependencies:
ansi-styles "^3.2.1"
@@ -2720,17 +2801,17 @@ chalk@^2.0.0:
character-parser@1.2.2:
version "1.2.2"
- resolved "https://registry.npmjs.org/character-parser/-/character-parser-1.2.2.tgz"
- integrity sha1-ktPdSL/cmtXpE+yVPZD21XGkZ9M=
+ resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-1.2.2.tgz#92d3dd48bfdc9ad5e913ec953d90f6d571a467d3"
+ integrity sha512-LnSfFgPsK7vhyh9zx5zZj6ygRow7Yr4pd2gpa6W7m5PwzgcClAlP0gIueETtKsGFQ3Onm9fBntaRMSG5sDAI9A==
check-error@^1.0.2:
version "1.0.2"
- resolved "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"
- integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
+ resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+ integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==
chokidar@3.5.2:
version "3.5.2"
- resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"
+ resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
dependencies:
anymatch "~3.1.2"
@@ -2745,7 +2826,7 @@ chokidar@3.5.2:
chokidar@3.5.3, chokidar@^3.5.0:
version "3.5.3"
- resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"
+ resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
dependencies:
anymatch "~3.1.2"
@@ -2760,25 +2841,25 @@ chokidar@3.5.3, chokidar@^3.5.0:
chownr@^1.0.1:
version "1.1.4"
- resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
+ resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
chrome-trace-event@^1.0.2:
version "1.0.3"
- resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
clean-css@^4.0.5, clean-css@^4.1.4, clean-css@^4.2.1:
version "4.2.4"
- resolved "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz"
+ resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178"
integrity sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==
dependencies:
source-map "~0.6.0"
cliui@^2.1.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"
- integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+ integrity sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==
dependencies:
center-align "^0.1.1"
right-align "^0.1.1"
@@ -2786,7 +2867,7 @@ cliui@^2.1.0:
cliui@^7.0.2:
version "7.0.4"
- resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
dependencies:
string-width "^4.2.0"
@@ -2795,7 +2876,7 @@ cliui@^7.0.2:
cliui@^8.0.1:
version "8.0.1"
- resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
dependencies:
string-width "^4.2.0"
@@ -2803,73 +2884,73 @@ cliui@^8.0.1:
wrap-ansi "^7.0.0"
clone-response@^1.0.2:
- version "1.0.2"
- resolved "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"
- integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3"
+ integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==
dependencies:
mimic-response "^1.0.0"
color-convert@^1.9.0:
version "1.9.3"
- resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
dependencies:
color-name "1.1.3"
color-convert@^2.0.1:
version "2.0.1"
- resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
dependencies:
color-name "~1.1.4"
color-name@1.1.3:
version "1.1.3"
- resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
- integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+ integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
color-name@~1.1.4:
version "1.1.4"
- resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
colors@1.4.0:
version "1.4.0"
- resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"
+ resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
combined-stream@^1.0.6, combined-stream@^1.0.8:
version "1.0.8"
- resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
+ resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
dependencies:
delayed-stream "~1.0.0"
commander@^2.20.0, commander@~2.20.3:
version "2.20.3"
- resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
commander@~2.9.0:
version "2.9.0"
- resolved "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
- integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+ integrity sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A==
dependencies:
graceful-readlink ">= 1.0.0"
commondir@^1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
- integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+ resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+ integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
concat-map@0.0.1:
version "0.0.1"
- resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
- integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+ resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+ integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
concat-stream@^1.5.2:
version "1.6.2"
- resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"
+ resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
dependencies:
buffer-from "^1.0.0"
@@ -2879,7 +2960,7 @@ concat-stream@^1.5.2:
constantinople@~3.1.0:
version "3.1.2"
- resolved "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647"
integrity sha512-yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw==
dependencies:
"@types/babel-types" "^7.0.0"
@@ -2889,47 +2970,45 @@ constantinople@~3.1.0:
content-disposition@0.5.4:
version "0.5.4"
- resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"
+ resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
dependencies:
safe-buffer "5.2.1"
content-type@~1.0.4:
version "1.0.4"
- resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
convert-source-map@^1.5.1, convert-source-map@^1.7.0:
- version "1.8.0"
- resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"
- integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
- dependencies:
- safe-buffer "~5.1.1"
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+ integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
cookie-signature@1.0.6:
version "1.0.6"
- resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
- integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+ resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+ integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
cookie@0.5.0:
version "0.5.0"
- resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
+ resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
core-js@^2.4.0, core-js@^2.5.0:
version "2.6.12"
- resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-util-is@~1.0.0:
version "1.0.3"
- resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
cosmiconfig@^7.0.0:
- version "7.0.1"
- resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"
- integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+ integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
dependencies:
"@types/parse-json" "^4.0.0"
import-fresh "^3.2.1"
@@ -2939,12 +3018,12 @@ cosmiconfig@^7.0.0:
create-require@^1.1.0:
version "1.1.1"
- resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
cross-spawn@7.0.3, cross-spawn@^7.0.2:
version "7.0.3"
- resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
dependencies:
path-key "^3.1.0"
@@ -2953,192 +3032,202 @@ cross-spawn@7.0.3, cross-spawn@^7.0.2:
css-blank-pseudo@^0.1.4:
version "0.1.4"
- resolved "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz"
+ resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5"
integrity sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==
dependencies:
postcss "^7.0.5"
css-has-pseudo@^0.10.0:
version "0.10.0"
- resolved "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz"
+ resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz#3c642ab34ca242c59c41a125df9105841f6966ee"
integrity sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==
dependencies:
postcss "^7.0.6"
postcss-selector-parser "^5.0.0-rc.4"
css-loader@^6.2.0:
- version "6.5.1"
- resolved "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz"
- integrity sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==
+ version "6.7.2"
+ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.2.tgz#26bc22401b5921686a10fbeba75d124228302304"
+ integrity sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==
dependencies:
icss-utils "^5.1.0"
- postcss "^8.2.15"
+ postcss "^8.4.18"
postcss-modules-extract-imports "^3.0.0"
postcss-modules-local-by-default "^4.0.0"
postcss-modules-scope "^3.0.0"
postcss-modules-values "^4.0.0"
- postcss-value-parser "^4.1.0"
- semver "^7.3.5"
+ postcss-value-parser "^4.2.0"
+ semver "^7.3.8"
css-prefers-color-scheme@^3.1.1:
version "3.1.1"
- resolved "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4"
integrity sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==
dependencies:
postcss "^7.0.5"
cssdb@^4.4.0:
version "4.4.0"
- resolved "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz"
+ resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0"
integrity sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ==
cssesc@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
cssesc@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
debug@2.6.9, debug@^2.6.8, debug@^2.6.9:
version "2.6.9"
- resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
dependencies:
ms "2.0.0"
debug@4.3.2:
version "4.3.2"
- resolved "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
dependencies:
ms "2.1.2"
debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
version "4.3.4"
- resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
dependencies:
ms "2.1.2"
decamelize@^1.0.0:
version "1.2.0"
- resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
- integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+ integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
decamelize@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
decompress-response@^6.0.0:
version "6.0.0"
- resolved "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
dependencies:
mimic-response "^3.1.0"
deep-eql@^3.0.1:
version "3.0.1"
- resolved "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
dependencies:
type-detect "^4.0.0"
deep-is@^0.1.3:
version "0.1.4"
- resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
defer-to-connect@^2.0.0:
version "2.0.1"
- resolved "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
define-lazy-prop@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
delayed-stream@~1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
- integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+ resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+ integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
depd@2.0.0, depd@~2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
depd@~1.1.0:
version "1.1.2"
- resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
- integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+ resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+ integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
dependency-graph@0.11.0:
version "0.11.0"
- resolved "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz"
+ resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==
destroy@1.2.0:
version "1.2.0"
- resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
detect-indent@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"
- integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
+ resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+ integrity sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==
dependencies:
repeating "^2.0.0"
dicer@0.2.5:
version "0.2.5"
- resolved "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"
- integrity sha1-WZbAhrszIYyBLAkL3cCc0S+stw8=
+ resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.2.5.tgz#5996c086bb33218c812c090bddc09cd12facb70f"
+ integrity sha512-FDvbtnq7dzlPz0wyYlOExifDEZcu8h+rErEXgfxqmLfRfC/kJidEFh4+effJRO3P0xmfqyPbSMG0LveNRfTKVg==
dependencies:
readable-stream "1.1.x"
streamsearch "0.1.2"
-diff@5.0.0, diff@^5.0.0:
+diff@5.0.0:
version "5.0.0"
- resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
diff@^4.0.1:
version "4.0.2"
- resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+diff@^5.0.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
+ integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
+
dir-glob@^3.0.1:
version "3.0.1"
- resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
dependencies:
path-type "^4.0.0"
doctrine@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
dependencies:
esutils "^2.0.2"
+dotenv@16.0.1:
+ version "16.0.1"
+ resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.1.tgz#8f8f9d94876c35dac989876a5d3a82a267fdce1d"
+ integrity sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==
+
ee-first@1.1.1:
version "1.1.1"
- resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
- integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+ resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+ integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
-electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.17:
- version "1.4.46"
- resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.46.tgz"
- integrity sha512-UtV0xUA/dibCKKP2JMxOpDtXR74zABevuUEH4K0tvduFSIoxRVcYmQsbB51kXsFTX8MmOyWMt8tuZAlmDOqkrQ==
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.251:
+ version "1.4.284"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
+ integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
emoji-regex@^8.0.0:
version "8.0.0"
- resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
emojis-list@^3.0.0:
@@ -3148,46 +3237,46 @@ emojis-list@^3.0.0:
encodeurl@~1.0.2:
version "1.0.2"
- resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
end-of-stream@^1.0.0, end-of-stream@^1.1.0:
version "1.4.4"
- resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
+ resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
dependencies:
once "^1.4.0"
-enhanced-resolve@^5.8.3:
- version "5.8.3"
- resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz"
- integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==
+enhanced-resolve@^5.10.0:
+ version "5.12.0"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
+ integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
dependencies:
graceful-fs "^4.2.4"
tapable "^2.2.0"
entities@2.2.0:
version "2.2.0"
- resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
errno@^0.1.3:
version "0.1.8"
- resolved "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz"
+ resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
dependencies:
prr "~1.0.1"
error-ex@^1.3.1:
version "1.3.2"
- resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
+ resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
dependencies:
is-arrayish "^0.2.1"
errorhandler@1.5.1:
version "1.5.1"
- resolved "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.1.tgz"
+ resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91"
integrity sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==
dependencies:
accepts "~1.3.7"
@@ -3195,44 +3284,44 @@ errorhandler@1.5.1:
es-module-lexer@^0.9.0:
version "0.9.3"
- resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz"
+ resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
escalade@^3.1.1:
version "3.1.1"
- resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
escape-html@~1.0.3:
version "1.0.3"
- resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
- integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+ resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+ integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
version "1.0.5"
- resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
- integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+ integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
eslint-config-prettier@8.5.0:
version "8.5.0"
- resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz"
+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
eslint-plugin-prettier@4.2.1:
version "4.2.1"
- resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
dependencies:
prettier-linter-helpers "^1.0.0"
eslint-scope@5.1.1, eslint-scope@^5.1.1:
version "5.1.1"
- resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
dependencies:
esrecurse "^4.3.0"
@@ -3240,7 +3329,7 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
eslint-scope@^7.1.1:
version "7.1.1"
- resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
dependencies:
esrecurse "^4.3.0"
@@ -3248,24 +3337,24 @@ eslint-scope@^7.1.1:
eslint-utils@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
dependencies:
eslint-visitor-keys "^2.0.0"
eslint-visitor-keys@^2.0.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
eslint-visitor-keys@^3.3.0:
version "3.3.0"
- resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
eslint@8.25.0:
version "8.25.0"
- resolved "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.25.0.tgz#00eb962f50962165d0c4ee3327708315eaa8058b"
integrity sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==
dependencies:
"@eslint/eslintrc" "^1.3.3"
@@ -3308,9 +3397,9 @@ eslint@8.25.0:
text-table "^0.2.0"
espree@^9.4.0:
- version "9.4.0"
- resolved "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz"
- integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
+ version "9.4.1"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd"
+ integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==
dependencies:
acorn "^8.8.0"
acorn-jsx "^5.3.2"
@@ -3318,46 +3407,46 @@ espree@^9.4.0:
esquery@^1.4.0:
version "1.4.0"
- resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"
+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
dependencies:
estraverse "^5.1.0"
esrecurse@^4.3.0:
version "4.3.0"
- resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
+ resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
dependencies:
estraverse "^5.2.0"
estraverse@^4.1.1:
version "4.3.0"
- resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
+ resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
estraverse@^5.1.0, estraverse@^5.2.0:
version "5.3.0"
- resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+ resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
esutils@^2.0.2:
version "2.0.3"
- resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
etag@~1.8.1:
version "1.8.1"
- resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"
+ resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
events@^3.2.0:
version "3.3.0"
- resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz"
+ resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
express@4.18.2:
version "4.18.2"
- resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz"
+ resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
dependencies:
accepts "~1.3.8"
@@ -3393,28 +3482,26 @@ express@4.18.2:
vary "~1.1.2"
falafel@^2.0.0:
- version "2.2.4"
- resolved "https://registry.npmjs.org/falafel/-/falafel-2.2.4.tgz"
- integrity sha512-0HXjo8XASWRmsS0X1EkhwEMZaD3Qvp7FfURwjLKjG1ghfRm/MGZl2r4cWUTv41KdNghTw4OUMmVtdGQp3+H+uQ==
+ version "2.2.5"
+ resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.2.5.tgz#3ccb4970a09b094e9e54fead2deee64b4a589d56"
+ integrity sha512-HuC1qF9iTnHDnML9YZAdCDQwT0yKl/U55K4XSUXqGAA2GLoafFgWRqdAbhWJxXaYD4pyoVxAJ8wH670jMpI9DQ==
dependencies:
acorn "^7.1.1"
- foreach "^2.0.5"
isarray "^2.0.1"
- object-keys "^1.0.6"
fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
version "3.1.3"
- resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
+ resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
fast-diff@^1.1.2:
version "1.2.0"
- resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
fast-glob@^3.2.9:
version "3.2.12"
- resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
@@ -3425,43 +3512,43 @@ fast-glob@^3.2.9:
fast-json-stable-stringify@^2.0.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
fast-levenshtein@^2.0.6:
version "2.0.6"
- resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
- integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+ resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+ integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
fast-xml-parser@3.19.0:
version "3.19.0"
- resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz"
+ resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01"
integrity sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg==
fastq@^1.6.0:
- version "1.13.0"
- resolved "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"
- integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+ version "1.14.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz#107f69d7295b11e0fccc264e1fc6389f623731ce"
+ integrity sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==
dependencies:
reusify "^1.0.4"
file-entry-cache@^6.0.1:
version "6.0.1"
- resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
dependencies:
flat-cache "^3.0.4"
fill-range@^7.0.1:
version "7.0.1"
- resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
dependencies:
to-regex-range "^5.0.1"
finalhandler@1.2.0:
version "1.2.0"
- resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
dependencies:
debug "2.6.9"
@@ -3474,7 +3561,7 @@ finalhandler@1.2.0:
find-cache-dir@^3.3.1:
version "3.3.2"
- resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"
+ resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
dependencies:
commondir "^1.0.1"
@@ -3483,7 +3570,7 @@ find-cache-dir@^3.3.1:
find-up@5.0.0, find-up@^5.0.0:
version "5.0.0"
- resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
dependencies:
locate-path "^6.0.0"
@@ -3491,7 +3578,7 @@ find-up@5.0.0, find-up@^5.0.0:
find-up@^4.0.0:
version "4.1.0"
- resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
dependencies:
locate-path "^5.0.0"
@@ -3499,7 +3586,7 @@ find-up@^4.0.0:
flat-cache@^3.0.4:
version "3.0.4"
- resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
dependencies:
flatted "^3.1.0"
@@ -3507,27 +3594,22 @@ flat-cache@^3.0.4:
flat@^5.0.2:
version "5.0.2"
- resolved "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
flatted@^3.1.0:
- version "3.2.4"
- resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"
- integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
+ version "3.2.7"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+ integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
flatten@^1.0.2:
version "1.0.3"
- resolved "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
-foreach@^2.0.5:
- version "2.0.5"
- resolved "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"
- integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
-
form-data@4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
dependencies:
asynckit "^0.4.0"
@@ -3536,7 +3618,7 @@ form-data@4.0.0:
form-data@^2.5.0:
version "2.5.1"
- resolved "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
dependencies:
asynckit "^0.4.0"
@@ -3545,27 +3627,27 @@ form-data@^2.5.0:
forwarded@0.2.0:
version "0.2.0"
- resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
fraction.js@^4.1.1:
- version "4.1.2"
- resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz"
- integrity sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
+ integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
fresh@0.5.2:
version "0.5.2"
- resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"
+ resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
fs-constants@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
fs-extra@10.0.0:
version "10.0.0"
- resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
dependencies:
graceful-fs "^4.2.0"
@@ -3574,7 +3656,7 @@ fs-extra@10.0.0:
fs-extra@10.1.0, fs-extra@^10.0.0:
version "10.1.0"
- resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
dependencies:
graceful-fs "^4.2.0"
@@ -3583,7 +3665,7 @@ fs-extra@10.1.0, fs-extra@^10.0.0:
fs-extra@8.1.0:
version "8.1.0"
- resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
dependencies:
graceful-fs "^4.2.0"
@@ -3592,8 +3674,8 @@ fs-extra@8.1.0:
fs.realpath@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
- integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+ resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+ integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
fsevents@~2.3.2:
version "2.3.2"
@@ -3602,27 +3684,27 @@ fsevents@~2.3.2:
function-bind@^1.1.1:
version "1.1.1"
- resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
gensync@^1.0.0-beta.2:
version "1.0.0-beta.2"
- resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"
+ resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
get-caller-file@^2.0.5:
version "2.0.5"
- resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
+ resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
get-func-name@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz"
- integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+ resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+ integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
get-intrinsic@^1.0.2:
version "1.1.3"
- resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"
+ resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
dependencies:
function-bind "^1.1.1"
@@ -3631,38 +3713,38 @@ get-intrinsic@^1.0.2:
get-stream@^5.1.0:
version "5.2.0"
- resolved "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
dependencies:
pump "^3.0.0"
getport@0.1.0:
version "0.1.0"
- resolved "https://registry.npmjs.org/getport/-/getport-0.1.0.tgz"
- integrity sha1-q93z1dHnfdlnzPorA2oKH7Jv1/c=
+ resolved "https://registry.yarnpkg.com/getport/-/getport-0.1.0.tgz#abddf3d5d1e77dd967ccfa2b036a0a1fb26fd7f7"
+ integrity sha512-hx+r6Q5IutZH+5k+zeZe78J4vzgW9IqLzfz8+hqMa9NrM1ccpgPIxrxqiBg+aioJMKcCK5qNKKcGdes3PeTlKQ==
glob-parent@^5.1.2, glob-parent@~5.1.2:
version "5.1.2"
- resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
dependencies:
is-glob "^4.0.1"
glob-parent@^6.0.1:
version "6.0.2"
- resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
dependencies:
is-glob "^4.0.3"
glob-to-regexp@^0.4.1:
version "0.4.1"
- resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"
+ resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
glob@7.1.7:
version "7.1.7"
- resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
dependencies:
fs.realpath "^1.0.0"
@@ -3672,9 +3754,9 @@ glob@7.1.7:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@7.2.0, glob@^7.1.3:
+glob@7.2.0:
version "7.2.0"
- resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
dependencies:
fs.realpath "^1.0.0"
@@ -3684,26 +3766,38 @@ glob@7.2.0, glob@^7.1.3:
once "^1.3.0"
path-is-absolute "^1.0.0"
+glob@^7.1.3:
+ version "7.2.3"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+ integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^3.1.1"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
globals@^11.1.0:
version "11.12.0"
- resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
globals@^13.15.0:
- version "13.17.0"
- resolved "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"
- integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==
+ version "13.18.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.18.0.tgz#fb224daeeb2bb7d254cd2c640f003528b8d0c1dc"
+ integrity sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==
dependencies:
type-fest "^0.20.2"
globals@^9.18.0:
version "9.18.0"
- resolved "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
globby@^11.1.0:
version "11.1.0"
- resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
dependencies:
array-union "^2.1.0"
@@ -3715,7 +3809,7 @@ globby@^11.1.0:
got@11.8.5:
version "11.8.5"
- resolved "https://registry.npmjs.org/got/-/got-11.8.5.tgz"
+ resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==
dependencies:
"@sindresorhus/is" "^4.0.0"
@@ -3730,29 +3824,29 @@ got@11.8.5:
p-cancelable "^2.0.0"
responselike "^2.0.0"
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
- version "4.2.8"
- resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"
- integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+ version "4.2.10"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+ integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
"graceful-readlink@>= 1.0.0":
version "1.0.1"
- resolved "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
- integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
+ resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+ integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==
grapheme-splitter@^1.0.4:
version "1.0.4"
- resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
growl@1.10.5:
version "1.10.5"
- resolved "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz"
+ resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
handlebars@4.7.7:
version "4.7.7"
- resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz"
+ resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
dependencies:
minimist "^1.2.5"
@@ -3764,54 +3858,54 @@ handlebars@4.7.7:
has-ansi@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
- integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+ resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+ integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
dependencies:
ansi-regex "^2.0.0"
has-flag@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
- integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+ integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
has-flag@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
has-symbols@^1.0.3:
version "1.0.3"
- resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
has@^1.0.3:
version "1.0.3"
- resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
dependencies:
function-bind "^1.1.1"
he@1.2.0:
version "1.2.0"
- resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
home-or-tmp@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"
- integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
+ resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+ integrity sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==
dependencies:
os-homedir "^1.0.0"
os-tmpdir "^1.0.1"
http-cache-semantics@^4.0.0:
version "4.1.0"
- resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
http-errors@2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
dependencies:
depd "2.0.0"
@@ -3822,7 +3916,7 @@ http-errors@2.0.0:
http2-wrapper@^1.0.0-beta.5.2:
version "1.0.3"
- resolved "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
dependencies:
quick-lru "^5.1.1"
@@ -3830,29 +3924,29 @@ http2-wrapper@^1.0.0-beta.5.2:
husky@7.0.4:
version "7.0.4"
- resolved "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535"
integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==
iconv-lite@0.4.24:
version "0.4.24"
- resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
dependencies:
safer-buffer ">= 2.1.2 < 3"
icss-utils@^5.0.0, icss-utils@^5.1.0:
version "5.1.0"
- resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
ignore@^5.2.0:
- version "5.2.0"
- resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"
- integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.1.tgz#c2b1f76cb999ede1502f3a226a9310fdfe88d46c"
+ integrity sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==
import-fresh@^3.0.0, import-fresh@^3.2.1:
version "3.3.0"
- resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
+ resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
dependencies:
parent-module "^1.0.0"
@@ -3860,17 +3954,17 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
imurmurhash@^0.1.4:
version "0.1.4"
- resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
- integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+ resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+ integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
indexes-of@^1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"
- integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
+ resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+ integrity sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==
infinite-loop-loader@1.0.9:
version "1.0.9"
- resolved "https://registry.npmjs.org/infinite-loop-loader/-/infinite-loop-loader-1.0.9.tgz"
+ resolved "https://registry.yarnpkg.com/infinite-loop-loader/-/infinite-loop-loader-1.0.9.tgz#4b6a3e8bec03326527f00c3a5cb78a5bddc40e52"
integrity sha512-3QZzbe54UDpX3KT/VWDZA58CWke62X92e2sqWYyESXiM/ZSI8C5e/KktvfpwsJsjjQXro2LxqwqGTX/7d9PCOw==
dependencies:
falafel "^2.0.0"
@@ -3878,230 +3972,216 @@ infinite-loop-loader@1.0.9:
inflight@^1.0.4:
version "1.0.6"
- resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
- integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+ resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+ integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
dependencies:
once "^1.3.0"
wrappy "1"
inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
version "2.0.4"
- resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
injectr@0.5.1:
version "0.5.1"
- resolved "https://registry.npmjs.org/injectr/-/injectr-0.5.1.tgz"
- integrity sha1-QdYa/jx3kxYGobEjI9kZs88BO4k=
+ resolved "https://registry.yarnpkg.com/injectr/-/injectr-0.5.1.tgz#41d61afe3c77931606a1b12323d919b3cf013b89"
+ integrity sha512-FsJZd/+/fVFm+flaQcAZFXNLyWLvg6MgBdxbl80lnhJHBbI8+7s28VLaXH0fJvjaLy2irJOh2JDSvVGBFQPXhg==
invariant@^2.2.2:
version "2.2.4"
- resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"
+ resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
dependencies:
loose-envify "^1.0.0"
ipaddr.js@1.9.1:
version "1.9.1"
- resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
+ resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
is-arrayish@^0.2.1:
version "0.2.1"
- resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
- integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+ resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+ integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
is-binary-path@~2.1.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
dependencies:
binary-extensions "^2.0.0"
is-buffer@^1.1.5:
version "1.1.6"
- resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
+ resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
is-docker@^2.0.0, is-docker@^2.1.1:
version "2.2.1"
- resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
is-extglob@^2.1.1:
version "2.1.1"
- resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
- integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+ resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+ integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
is-finite@^1.0.0:
version "1.1.0"
- resolved "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
is-fullwidth-code-point@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
version "4.0.3"
- resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
dependencies:
is-extglob "^2.1.1"
is-number@^7.0.0:
version "7.0.0"
- resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
is-plain-obj@^2.1.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
is-promise@^2.0.0:
version "2.2.2"
- resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"
+ resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
is-unicode-supported@^0.1.0:
version "0.1.0"
- resolved "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
is-wsl@^2.2.0:
version "2.2.0"
- resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
dependencies:
is-docker "^2.0.0"
isarray@0.0.1:
version "0.0.1"
- resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
- integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+ integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
isarray@^2.0.1:
version "2.0.5"
- resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
isarray@~1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
- integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+ integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
isexe@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
- integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+ resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+ integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-jest-worker@^27.0.6:
- version "27.4.2"
- resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.2.tgz"
- integrity sha512-0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag==
+jest-worker@^27.4.5:
+ version "27.5.1"
+ resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+ integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
dependencies:
"@types/node" "*"
merge-stream "^2.0.0"
supports-color "^8.0.0"
js-sdsl@^4.1.4:
- version "4.1.5"
- resolved "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz"
- integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0"
+ integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
js-tokens@^3.0.2:
version "3.0.2"
- resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"
- integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+ resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+ integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==
js-yaml@4.1.0, js-yaml@^4.1.0:
version "4.1.0"
- resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
dependencies:
argparse "^2.0.1"
jsesc@^1.3.0:
version "1.3.0"
- resolved "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"
- integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
+ resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+ integrity sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==
jsesc@^2.5.1:
version "2.5.2"
- resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
+ resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
jsesc@~0.5.0:
version "0.5.0"
- resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
- integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+ resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+ integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
json-buffer@3.0.1:
version "3.0.1"
- resolved "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
-json-parse-better-errors@^1.0.2:
- version "1.0.2"
- resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"
- integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
version "2.3.1"
- resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
+ resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
json-schema-traverse@^0.4.1:
version "0.4.1"
- resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
json-schema-traverse@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
json-stable-stringify-without-jsonify@^1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
- integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+ resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+ integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
json5@^0.5.1:
version "0.5.1"
- resolved "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"
- integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+ resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+ integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==
-json5@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
- integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
- dependencies:
- minimist "^1.2.0"
-
-json5@^2.1.2:
- version "2.2.0"
- resolved "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"
- integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
- dependencies:
- minimist "^1.2.5"
+json5@^2.1.2, json5@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+ integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
jsonfile@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
optionalDependencies:
graceful-fs "^4.1.6"
jsonfile@^6.0.1:
version "6.1.0"
- resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
dependencies:
universalify "^2.0.0"
@@ -4110,72 +4190,72 @@ jsonfile@^6.0.1:
jstransformer-clean-css@^2.0.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/jstransformer-clean-css/-/jstransformer-clean-css-2.1.0.tgz"
- integrity sha1-uiS7u/gSEweJjizxvoZDyq/PTio=
+ resolved "https://registry.yarnpkg.com/jstransformer-clean-css/-/jstransformer-clean-css-2.1.0.tgz#ba24bbbbf8121307898e2cf1be8643caafcf4e2a"
+ integrity sha512-pAKBSgC9+s45yRlDduzVTHi/XTgA1N0Mt5MBCVFBc+Avja3CdTDzON1v8mFU6kuSGM7zvYC2kFxSCzPie3gW6Q==
dependencies:
clean-css "^4.0.5"
jstransformer-markdown@^1.1.1:
version "1.2.1"
- resolved "https://registry.npmjs.org/jstransformer-markdown/-/jstransformer-markdown-1.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/jstransformer-markdown/-/jstransformer-markdown-1.2.1.tgz#ecc9221c5f0dd5471bfaf070ea00f2bc01f43236"
integrity sha512-rNLxNC3LIGAc26Qcro73eWoosKymqyNVDn909KIq2QHVHGWZ+d+JzOCrHsmUt3DNAKF+hkJQJ1JufAhFEdZ5gw==
dependencies:
markdown "^0.5.0"
jstransformer-uglify-css@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/jstransformer-uglify-css/-/jstransformer-uglify-css-1.0.0.tgz"
- integrity sha1-6KLXqeLvMjYqm6aUgKFW/MC+nfI=
+ resolved "https://registry.yarnpkg.com/jstransformer-uglify-css/-/jstransformer-uglify-css-1.0.0.tgz#e8a2d7a9e2ef32362a9ba69480a156fcc0be9df2"
+ integrity sha512-ixsMnFRf8F76v6eT1b0u3uT0q3n5Jo4DpRyrZDb7x0aTL0rlfFdC+Jo2MQEr4M7RRh96OHRjNwmoZftEJ2/wdQ==
dependencies:
jstransformer-clean-css "^2.0.0"
jstransformer-uglify-js@^1.2.0:
version "1.2.0"
- resolved "https://registry.npmjs.org/jstransformer-uglify-js/-/jstransformer-uglify-js-1.2.0.tgz"
- integrity sha1-8mtfsqmbsPU1T4hMtQtZFLxSJKg=
+ resolved "https://registry.yarnpkg.com/jstransformer-uglify-js/-/jstransformer-uglify-js-1.2.0.tgz#f26b5fb2a99bb0f5354f884cb50b5914bc5224a8"
+ integrity sha512-wAFnS6vbrIgGBd46vDNFT4bU3U6KlT/osdR2QWC0rv3EaE42KmaYcAmr2RLkImKqnH0ZMP2izmDKHjoXKF/wZw==
dependencies:
uglify-js "^2.8.10"
jstransformer@1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"
- integrity sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=
+ resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+ integrity sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==
dependencies:
is-promise "^2.0.0"
promise "^7.0.1"
just-extend@^4.0.2:
version "4.2.1"
- resolved "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==
keyv@^4.0.0:
- version "4.1.1"
- resolved "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz"
- integrity sha512-tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ==
+ version "4.5.2"
+ resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
+ integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==
dependencies:
json-buffer "3.0.1"
kind-of@^3.0.2:
version "3.2.2"
- resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
- integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+ integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
dependencies:
is-buffer "^1.1.5"
klona@^2.0.5:
version "2.0.5"
- resolved "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz"
+ resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
lazy-cache@^1.0.3:
version "1.0.4"
- resolved "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"
- integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
+ resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+ integrity sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==
levn@^0.4.1:
version "0.4.1"
- resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"
+ resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
dependencies:
prelude-ls "^1.2.1"
@@ -4183,17 +4263,17 @@ levn@^0.4.1:
lines-and-columns@^1.1.6:
version "1.2.4"
- resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
+ resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
livereload-js@^3.3.1:
- version "3.3.2"
- resolved "https://registry.npmjs.org/livereload-js/-/livereload-js-3.3.2.tgz"
- integrity sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-3.4.1.tgz#ba90fbc708ed1b9a024bb89c4ee12c96ea03d66f"
+ integrity sha512-5MP0uUeVCec89ZbNOT/i97Mc+q3SxXmiUGhRFOTmhrGPn//uWVQdCvcLJDy64MSBR5MidFdOR7B9viumoavy6g==
livereload@0.9.3:
version "0.9.3"
- resolved "https://registry.npmjs.org/livereload/-/livereload-0.9.3.tgz"
+ resolved "https://registry.yarnpkg.com/livereload/-/livereload-0.9.3.tgz#a714816375ed52471408bede8b49b2ee6a0c55b1"
integrity sha512-q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw==
dependencies:
chokidar "^3.5.0"
@@ -4202,51 +4282,51 @@ livereload@0.9.3:
ws "^7.4.3"
loader-runner@^4.2.0:
- version "4.2.0"
- resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz"
- integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
+ integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
-loader-utils@^1.4.0:
- version "1.4.2"
- resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
- integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
+loader-utils@^2.0.0:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+ integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
dependencies:
big.js "^5.2.2"
emojis-list "^3.0.0"
- json5 "^1.0.1"
+ json5 "^2.1.2"
locate-path@^5.0.0:
version "5.0.0"
- resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
dependencies:
p-locate "^4.1.0"
locate-path@^6.0.0:
version "6.0.0"
- resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
dependencies:
p-locate "^5.0.0"
lodash.get@^4.4.2:
version "4.4.2"
- resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"
- integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+ resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+ integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
lodash.merge@^4.6.2:
version "4.6.2"
- resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
+ resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
lodash@4.17.21, lodash@^4.17.21, lodash@^4.17.4:
version "4.17.21"
- resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
log-symbols@4.1.0:
version "4.1.0"
- resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
dependencies:
chalk "^4.1.0"
@@ -4254,62 +4334,62 @@ log-symbols@4.1.0:
longest@^1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
- integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
+ resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+ integrity sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==
loose-envify@^1.0.0:
version "1.4.0"
- resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
+ resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
dependencies:
js-tokens "^3.0.0 || ^4.0.0"
loupe@^2.3.1:
- version "2.3.4"
- resolved "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz"
- integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==
+ version "2.3.6"
+ resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53"
+ integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==
dependencies:
get-func-name "^2.0.0"
lowercase-keys@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
lru-cache@^6.0.0:
version "6.0.0"
- resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
dependencies:
yallist "^4.0.0"
make-dir@^3.0.2, make-dir@^3.1.0:
version "3.1.0"
- resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
dependencies:
semver "^6.0.0"
make-error@^1.1.1:
version "1.3.6"
- resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
+ resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
markdown@^0.5.0:
version "0.5.0"
- resolved "https://registry.npmjs.org/markdown/-/markdown-0.5.0.tgz"
- integrity sha1-KCBbVlqK51kt4gdGPWY33BgnIrI=
+ resolved "https://registry.yarnpkg.com/markdown/-/markdown-0.5.0.tgz#28205b565a8ae7592de207463d6637dc182722b2"
+ integrity sha512-ctGPIcuqsYoJ493sCtFK7H4UEgMWAUdXeBhPbdsg1W0LsV9yJELAHRsMmWfTgao6nH0/x5gf9FmsbxiXnrgaIQ==
dependencies:
nopt "~2.1.1"
media-typer@0.3.0:
version "0.3.0"
- resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
- integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+ resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+ integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
memory-fs@0.5.0:
version "0.5.0"
- resolved "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz"
+ resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
dependencies:
errno "^0.1.3"
@@ -4317,100 +4397,100 @@ memory-fs@0.5.0:
merge-descriptors@1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
- integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+ resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+ integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
merge-stream@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
merge2@^1.3.0, merge2@^1.4.1:
version "1.4.1"
- resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
+ resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
methods@~1.1.2:
version "1.1.2"
- resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
- integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+ resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+ integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
micromatch@^4.0.4:
- version "4.0.4"
- resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"
- integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+ version "4.0.5"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+ integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
dependencies:
- braces "^3.0.1"
- picomatch "^2.2.3"
+ braces "^3.0.2"
+ picomatch "^2.3.1"
-mime-db@1.51.0:
- version "1.51.0"
- resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"
- integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
+mime-db@1.52.0:
+ version "1.52.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+ integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.24, mime-types@~2.1.34:
- version "2.1.34"
- resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"
- integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
+ version "2.1.35"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+ integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
dependencies:
- mime-db "1.51.0"
+ mime-db "1.52.0"
mime@1.6.0:
version "1.6.0"
- resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
mimic-response@^1.0.0:
version "1.0.1"
- resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
mimic-response@^3.1.0:
version "3.1.0"
- resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
mini-css-extract-plugin@^2.1.0:
- version "2.4.5"
- resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.5.tgz"
- integrity sha512-oEIhRucyn1JbT/1tU2BhnwO6ft1jjH1iCX9Gc59WFMg0n5773rQU0oyQ0zzeYFFuBfONaRbQJyGoPtuNseMxjA==
+ version "2.7.2"
+ resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz#e049d3ea7d3e4e773aad585c6cb329ce0c7b72d7"
+ integrity sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==
dependencies:
schema-utils "^4.0.0"
minimal-request@3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/minimal-request/-/minimal-request-3.0.0.tgz"
- integrity sha1-Z1e0V7z/3dB4/ekCFjHK3snhl7c=
+ resolved "https://registry.yarnpkg.com/minimal-request/-/minimal-request-3.0.0.tgz#6757b457bcffddd078fde9021631cadec9e197b7"
+ integrity sha512-rv5OZxebmcOGWPGKJaq+J2lHGOal5Oq+BuxO4F1i8v/PdaJU6Sd6fkzc/8zwqoCyLZ4SkZ6e4v35q8UE9tlIpA==
-minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
+minimatch@3.0.4:
version "3.0.4"
- resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
dependencies:
brace-expansion "^1.1.7"
-minimatch@^3.1.2:
+minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
version "3.1.2"
- resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
dependencies:
brace-expansion "^1.1.7"
-minimist@1.2.7, minimist@^1.2.0, minimist@^1.2.5:
+minimist@1.2.7, minimist@^1.2.5, minimist@^1.2.6:
version "1.2.7"
- resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@~0.5.0:
- version "0.5.5"
- resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"
- integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+ version "0.5.6"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+ integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
dependencies:
- minimist "^1.2.5"
+ minimist "^1.2.6"
mocha@9.1.3:
version "9.1.3"
- resolved "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz"
+ resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.3.tgz#8a623be6b323810493d8c8f6f7667440fa469fdb"
integrity sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==
dependencies:
"@ungap/promise-all-settled" "1.1.2"
@@ -4440,7 +4520,7 @@ mocha@9.1.3:
morgan@1.10.0:
version "1.10.0"
- resolved "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"
+ resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
dependencies:
basic-auth "~2.0.1"
@@ -4451,22 +4531,22 @@ morgan@1.10.0:
ms@2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
- integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+ integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
ms@2.1.2:
version "2.1.2"
- resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
ms@2.1.3:
version "2.1.3"
- resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
multer@1.4.3:
version "1.4.3"
- resolved "https://registry.npmjs.org/multer/-/multer-1.4.3.tgz"
+ resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.3.tgz#4db352d6992e028ac0eacf7be45c6efd0264297b"
integrity sha512-np0YLKncuZoTzufbkM6wEKp68EhWJXcU6fq6QqrSwkckd2LlMgd1UqhUJLj6NS/5sZ8dE8LYDWslsltJznnXlg==
dependencies:
append-field "^1.0.0"
@@ -4480,45 +4560,45 @@ multer@1.4.3:
mute-stream@~0.0.4:
version "0.0.8"
- resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
+ resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
nanoid@3.1.25:
version "3.1.25"
- resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
-nanoid@^3.1.30:
- version "3.1.30"
- resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz"
- integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==
+nanoid@^3.3.4:
+ version "3.3.4"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+ integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
natural-compare@^1.4.0:
version "1.4.0"
- resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
- integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+ resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+ integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
negotiator@0.6.3:
version "0.6.3"
- resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"
+ resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
neo-async@^2.6.0, neo-async@^2.6.2:
version "2.6.2"
- resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
+ resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
nice-cache@0.0.5, nice-cache@^0.0.5:
version "0.0.5"
- resolved "https://registry.npmjs.org/nice-cache/-/nice-cache-0.0.5.tgz"
- integrity sha1-vSp+BkyTklxFrQGQZIPNwyh0IIY=
+ resolved "https://registry.yarnpkg.com/nice-cache/-/nice-cache-0.0.5.tgz#bd2a7e064c93925c45ad01906483cdc328742086"
+ integrity sha512-qZT3REsTF4ryWbIWhyv1pCsFW9porhkbpu/JBQ7iWgKBHOVWWDGlFzmI7PsN+2OPUTqZrpsVh+n8/R8+MDausA==
nise@^5.1.0:
- version "5.1.0"
- resolved "https://registry.npmjs.org/nise/-/nise-5.1.0.tgz"
- integrity sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==
+ version "5.1.3"
+ resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.3.tgz#f46197e5f60ae9a96401b602bd9d8239b1ee8656"
+ integrity sha512-U597iWTTBBYIV72986jyU382/MMZ70ApWcRmkoF1AZ75bpqOtI3Gugv/6+0jLgoDOabmcSwYBkSSAWIp1eA5cg==
dependencies:
- "@sinonjs/commons" "^1.7.0"
+ "@sinonjs/commons" "^2.0.0"
"@sinonjs/fake-timers" "^7.0.4"
"@sinonjs/text-encoding" "^0.7.1"
just-extend "^4.0.2"
@@ -4526,80 +4606,75 @@ nise@^5.1.0:
node-dir@0.1.17, node-dir@^0.1.17:
version "0.1.17"
- resolved "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz"
- integrity sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=
+ resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
+ integrity sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==
dependencies:
minimatch "^3.0.2"
node-emoji@1.11.0:
version "1.11.0"
- resolved "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz"
+ resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c"
integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==
dependencies:
lodash "^4.17.21"
-node-releases@^2.0.1:
- version "2.0.1"
- resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz"
- integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+node-releases@^2.0.6:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
+ integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
nopt@~2.1.1:
version "2.1.2"
- resolved "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"
- integrity sha1-bMzZd7gBMqB3MdbozljCyDA8+a8=
+ resolved "https://registry.yarnpkg.com/nopt/-/nopt-2.1.2.tgz#6cccd977b80132a07731d6e8ce58c2c8303cf9af"
+ integrity sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==
dependencies:
abbrev "1"
normalize-path@^3.0.0, normalize-path@~3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
normalize-range@^0.1.2:
version "0.1.2"
- resolved "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
- integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
+ resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+ integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
normalize-url@^6.0.1:
version "6.1.0"
- resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
num2fraction@^1.2.2:
version "1.2.2"
- resolved "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"
- integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
+ resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+ integrity sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==
object-assign@^4.1.1:
version "4.1.1"
- resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
- integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+ resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+ integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
object-inspect@^1.9.0:
version "1.12.2"
- resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
-object-keys@^1.0.6:
- version "1.1.1"
- resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"
- integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
oc-client-browser@1.5.4:
version "1.5.4"
- resolved "https://registry.npmjs.org/oc-client-browser/-/oc-client-browser-1.5.4.tgz"
+ resolved "https://registry.yarnpkg.com/oc-client-browser/-/oc-client-browser-1.5.4.tgz#7b4e59f3d49794e364c0ab7f693193fb7ddcbeaa"
integrity sha512-TzCoG487q9az++tbpCNRtb3KFvDGUuirC7rqmrEUjykgx+zSVGwwj1EL3qazg8MDrwFPrtxq4s2MQHIYgJGnnA==
oc-client-browser@1.5.9:
version "1.5.9"
- resolved "https://registry.npmjs.org/oc-client-browser/-/oc-client-browser-1.5.9.tgz"
+ resolved "https://registry.yarnpkg.com/oc-client-browser/-/oc-client-browser-1.5.9.tgz#12bc674357928112840cacb890211f659c9f0993"
integrity sha512-phH1rw1EYeAQH2dmpmoto1guqtOlCAfdiocJdWnrr4z7f+g26a+WS1GPasqn5qR3uIK/NpIShQZaijUHeTgbSQ==
dependencies:
universalify "2.0.0"
oc-client@4.0.1:
version "4.0.1"
- resolved "https://registry.npmjs.org/oc-client/-/oc-client-4.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/oc-client/-/oc-client-4.0.1.tgz#da7a2e6eb9a0b7a9cf5de86eebf2b7d476f5c549"
integrity sha512-WSJ/r+eIQBF6rSlsBSF+rOl1J9fbjP9QHWgd96dma7WMCPFf5DSO5ll1hJ2pCzt+Zxi2Cu/y8vlpaVSLVOuATA==
dependencies:
minimal-request "3.0.0"
@@ -4612,12 +4687,12 @@ oc-client@4.0.1:
oc-empty-response-handler@1.0.2:
version "1.0.2"
- resolved "https://registry.npmjs.org/oc-empty-response-handler/-/oc-empty-response-handler-1.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/oc-empty-response-handler/-/oc-empty-response-handler-1.0.2.tgz#94a717891abd58e8f4929aa5adb98ff99393cda6"
integrity sha512-iO6sbQU7ztAnXaf6J4cT73JDIcpmvYuQgwhFsI4TzaV3Spd4rxzb/ZgvWcFmLVFXN2O7m65eqBOWn756FCZVbw==
oc-external-dependencies-handler@1.1.0:
version "1.1.0"
- resolved "https://registry.npmjs.org/oc-external-dependencies-handler/-/oc-external-dependencies-handler-1.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/oc-external-dependencies-handler/-/oc-external-dependencies-handler-1.1.0.tgz#0c32a5456968c3c8739bab0ff0e464e9f97cf7f3"
integrity sha512-oDGTPsQisDCvlSCWz6uaHhwTCtvAN1R+q61qQrqcBoiKnzMntejGQstZ/d4CsCyxdGE8vG/kh4HWFd3mvRDQIg==
dependencies:
builtin-modules "3.1.0"
@@ -4626,7 +4701,7 @@ oc-external-dependencies-handler@1.1.0:
oc-generic-template-compiler@2.1.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/oc-generic-template-compiler/-/oc-generic-template-compiler-2.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/oc-generic-template-compiler/-/oc-generic-template-compiler-2.1.0.tgz#bac5e2c153141599443f0e051de744257b3f7f7c"
integrity sha512-hBmjESYYF0QOI/9M8C9sujXydDZ1WilltrG5LxkNlw2mYE+PfdLNhg3/JHTK2DxdzWEaj0DYvuNRH6M44g6rmA==
dependencies:
async "3.1.1"
@@ -4636,32 +4711,32 @@ oc-generic-template-compiler@2.1.0:
oc-generic-template-renderer@2.0.8:
version "2.0.8"
- resolved "https://registry.npmjs.org/oc-generic-template-renderer/-/oc-generic-template-renderer-2.0.8.tgz"
+ resolved "https://registry.yarnpkg.com/oc-generic-template-renderer/-/oc-generic-template-renderer-2.0.8.tgz#00db1ba9cea3e86c76ecb4f45ee5ac82cada3483"
integrity sha512-+h5kSsrpqR97rWfK88m4bShFrqtSxreZgwtH8TSl4BO+tMH96U6LM9svyVypyCEqElHHYauzhLKaygJLlkj4Vg==
oc-generic-template-renderer@2.0.9:
version "2.0.9"
- resolved "https://registry.npmjs.org/oc-generic-template-renderer/-/oc-generic-template-renderer-2.0.9.tgz"
+ resolved "https://registry.yarnpkg.com/oc-generic-template-renderer/-/oc-generic-template-renderer-2.0.9.tgz#d5f3e431b7e943059f517a60c693267a0c01dce5"
integrity sha512-wMcx1r5Dx1O4bJur7SnThvzCos3xTrGSChQfGh+PEYCGQjE+sVaCjfs1a71LQOXOm5VpjEyKupSI139wxJwO2A==
oc-get-unix-utc-timestamp@1.0.3:
version "1.0.3"
- resolved "https://registry.npmjs.org/oc-get-unix-utc-timestamp/-/oc-get-unix-utc-timestamp-1.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/oc-get-unix-utc-timestamp/-/oc-get-unix-utc-timestamp-1.0.3.tgz#2a0991a909cddd743034515ba99bceb0ac4a5760"
integrity sha512-513uPzMpotd1IcaymKfjKFKBfTtVdPwMfce+Ra7kstujpNWonPRnpw3W8bo37R4Ngxi7tAvbIPplwvQLTCx9Kg==
oc-get-unix-utc-timestamp@1.0.6:
version "1.0.6"
- resolved "https://registry.npmjs.org/oc-get-unix-utc-timestamp/-/oc-get-unix-utc-timestamp-1.0.6.tgz"
+ resolved "https://registry.yarnpkg.com/oc-get-unix-utc-timestamp/-/oc-get-unix-utc-timestamp-1.0.6.tgz#8fa98b64caa6d3d2aee33c892440f272f0b2e07b"
integrity sha512-IOSSXuic8t1i2up7TalGrqwfT6gJgSKLP3Zm8+2U15/LB3m89uw//RJtRlkUefZKVbLn/HXn9NtkP+6R7K+dOg==
oc-hash-builder@1.0.5:
version "1.0.5"
- resolved "https://registry.npmjs.org/oc-hash-builder/-/oc-hash-builder-1.0.5.tgz"
+ resolved "https://registry.yarnpkg.com/oc-hash-builder/-/oc-hash-builder-1.0.5.tgz#10ae5d6f36207aad8a2d286ffae21f4409bb6069"
integrity sha512-eDCzfzshYSYbY329Zb4bpNafjIfohM7Xa33UOyNXqGIggfzMA66DpOSqgjs/SRjS9TDhc8L+orqgZ5PRLsw3xg==
oc-jade-legacy@1.11.1:
version "1.11.1"
- resolved "https://registry.npmjs.org/oc-jade-legacy/-/oc-jade-legacy-1.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/oc-jade-legacy/-/oc-jade-legacy-1.11.1.tgz#b4d7dd1c321b597a1cd9caa66c6a4c406358b2ca"
integrity sha512-LTLltjUNdzb0Lp051VJ6j9tPuwP1/5yH2ScUNlo1XiADNtVeNKb34arPLKXxBPDPjxfEQSoUzdMNrPRUHUXSEA==
dependencies:
character-parser "1.2.2"
@@ -4677,7 +4752,7 @@ oc-jade-legacy@1.11.1:
oc-minify-file@2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/oc-minify-file/-/oc-minify-file-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/oc-minify-file/-/oc-minify-file-2.0.0.tgz#07939515a69c7a28f0a0f2ae3b1c824a812a3d98"
integrity sha512-N3K64PpzGC8zT4a+CpPyoyV7V8CW3vwcPwhYnEcjsnhY/+QH4Q+PmsA8meQ1kpqXt0O2OgLPoCTuteR8qX8YQQ==
dependencies:
babel-core "^6.25.0"
@@ -4700,7 +4775,7 @@ oc-s3-storage-adapter@2.1.1:
oc-server-compiler@3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/oc-server-compiler/-/oc-server-compiler-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/oc-server-compiler/-/oc-server-compiler-3.0.0.tgz#824e0023447303677615b33fedbaebbe377c5db5"
integrity sha512-QZvTdajGNjIdHDHS9iTRJEd8d0VGHCcHlRjnDERluWpgsAVE7e7gRh9mVIxhwoKvxJwlUFyCKEyTOevnp7Z/8w==
dependencies:
"@babel/core" "^7.14.2"
@@ -4717,7 +4792,7 @@ oc-server-compiler@3.0.0:
oc-statics-compiler@2.1.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/oc-statics-compiler/-/oc-statics-compiler-2.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/oc-statics-compiler/-/oc-statics-compiler-2.1.0.tgz#96f1af91b0bae730cd16083247d6651de68320c6"
integrity sha512-5zb4PCatjyL4NgBNyiiwN2b3rBxpZCf2uhJiYwSPM7IgKZ21Aixj5tM12dfUWggvF7jwm5WQ/YhHNpUsAZJ5KA==
dependencies:
async "3.1.1"
@@ -4734,7 +4809,7 @@ oc-storage-adapters-utils@2.0.2:
oc-template-es6-compiler@2.1.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/oc-template-es6-compiler/-/oc-template-es6-compiler-2.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/oc-template-es6-compiler/-/oc-template-es6-compiler-2.1.0.tgz#ab0ea8615eb1e3505704d113025d62486f9b2732"
integrity sha512-8M13YlwafEFWqfkK14RZ4+FeGzEq7l8MLvCdwW+m6v3+SspkC/xCq37SeuOBRrVTiEYT82fkw3lw+k9qzTfIug==
dependencies:
async "3.1.1"
@@ -4764,21 +4839,21 @@ oc-template-es6-compiler@2.1.0:
oc-template-es6@1.0.6:
version "1.0.6"
- resolved "https://registry.npmjs.org/oc-template-es6/-/oc-template-es6-1.0.6.tgz"
+ resolved "https://registry.yarnpkg.com/oc-template-es6/-/oc-template-es6-1.0.6.tgz#9daaea688650878a2a59e6ee027bff76aa503cf6"
integrity sha512-bHUnnPpvMXwKo7i+wIZmqKglVzo0ovfilorbIv4LrUqXOMX+UdmUtG3pQTB4RrfB4BfHgt3awJ8dq6E5UfztcQ==
dependencies:
oc-generic-template-renderer "2.0.8"
oc-template-es6@1.0.7:
version "1.0.7"
- resolved "https://registry.npmjs.org/oc-template-es6/-/oc-template-es6-1.0.7.tgz"
+ resolved "https://registry.yarnpkg.com/oc-template-es6/-/oc-template-es6-1.0.7.tgz#96aadf354a2152aac70e959688d59b73c0efb01e"
integrity sha512-Q1l9QLR0+niJKZVDhhxFfIeNmyvf+BUhVtKK0LLIegSZ8sbcWG5FUpHUBdxFnpKJ1oParidvJUxGvkTPi/kFTA==
dependencies:
oc-generic-template-renderer "2.0.9"
oc-template-handlebars-compiler@6.5.0:
version "6.5.0"
- resolved "https://registry.npmjs.org/oc-template-handlebars-compiler/-/oc-template-handlebars-compiler-6.5.0.tgz"
+ resolved "https://registry.yarnpkg.com/oc-template-handlebars-compiler/-/oc-template-handlebars-compiler-6.5.0.tgz#e41744a23c1c539475655c44ab010ae5cb21021f"
integrity sha512-wfiHBJrza1FEgqpNIPU31vFnOhpZdA3gdo5C6eyw2b47/1ofCN/Zy8S0afeqp4vSt0uDewrtcw55KB8rVlLJ5g==
dependencies:
async "3.1.1"
@@ -4795,7 +4870,7 @@ oc-template-handlebars-compiler@6.5.0:
oc-template-handlebars@6.0.24:
version "6.0.24"
- resolved "https://registry.npmjs.org/oc-template-handlebars/-/oc-template-handlebars-6.0.24.tgz"
+ resolved "https://registry.yarnpkg.com/oc-template-handlebars/-/oc-template-handlebars-6.0.24.tgz#33f58e4243594259126747a590959c7b6ca10587"
integrity sha512-+X4qvzUEshom8pCf0Zafm/uv69r3ugeCLdKK80I3sox8HM735k/7zooavCB2dTyEIbZEQwVHblyqEP84WICVBQ==
dependencies:
handlebars "4.7.7"
@@ -4805,7 +4880,7 @@ oc-template-handlebars@6.0.24:
oc-template-handlebars@6.0.25:
version "6.0.25"
- resolved "https://registry.npmjs.org/oc-template-handlebars/-/oc-template-handlebars-6.0.25.tgz"
+ resolved "https://registry.yarnpkg.com/oc-template-handlebars/-/oc-template-handlebars-6.0.25.tgz#e13222fa297ac2719756b2b6d6ca9675c192b228"
integrity sha512-fuu8mGGOef6BmoXRZUeJ7SZbhVF3P9IdtgfTv88pcs8Vdr1Kmt6nOZYQWxRXMCZkZV0VUI0zCuG8Zs6DWDfg3w==
dependencies:
handlebars "4.7.7"
@@ -4815,7 +4890,7 @@ oc-template-handlebars@6.0.25:
oc-template-jade-compiler@7.3.0:
version "7.3.0"
- resolved "https://registry.npmjs.org/oc-template-jade-compiler/-/oc-template-jade-compiler-7.3.0.tgz"
+ resolved "https://registry.yarnpkg.com/oc-template-jade-compiler/-/oc-template-jade-compiler-7.3.0.tgz#0ec3fa7f744a29a782f47240f58079a09ae0a44b"
integrity sha512-Fl1d+4Kvg6RTGVmmmww9mv7SzpbTbq/+uOrR9zTWvU7HpCQ0kwsEOq96EpZmE3632I8vloj8/xyOGZoWzzR+aw==
dependencies:
fs-extra "8.1.0"
@@ -4834,57 +4909,57 @@ oc-template-jade-compiler@7.3.0:
oc-template-jade@7.0.5:
version "7.0.5"
- resolved "https://registry.npmjs.org/oc-template-jade/-/oc-template-jade-7.0.5.tgz"
+ resolved "https://registry.yarnpkg.com/oc-template-jade/-/oc-template-jade-7.0.5.tgz#c8c8b86bdc0fe193b3164978fb05a3053716daf1"
integrity sha512-HDAAFPLXlfa/YbzyX/i3uYVarQdvbgif+Kb1HquqlV05nDEy7cS3KBWYL0EvEtOvdio1k5m9KgPp7wnMQBF/tg==
dependencies:
oc-generic-template-renderer "2.0.8"
oc-template-jade@7.0.6:
version "7.0.6"
- resolved "https://registry.npmjs.org/oc-template-jade/-/oc-template-jade-7.0.6.tgz"
+ resolved "https://registry.yarnpkg.com/oc-template-jade/-/oc-template-jade-7.0.6.tgz#3d2d65c71517edbef726cd0bb78568bd1f9c50bd"
integrity sha512-NrSZ2hvC3ABjP819kInMOCLeoG5BQZ2itUwnRLK+JBvxu3rXu1YzlLoVMjE/1sdDZ3/JIJmIkwc2ThVl2wqDng==
dependencies:
oc-generic-template-renderer "2.0.9"
oc-templates-messages@1.0.4:
version "1.0.4"
- resolved "https://registry.npmjs.org/oc-templates-messages/-/oc-templates-messages-1.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/oc-templates-messages/-/oc-templates-messages-1.0.4.tgz#3376a99a1cfe9f75fbd35cd927e6b63d0e7f57bd"
integrity sha512-40VPYCN5bYsEbXKmlh+/1FrZCT/2GWEac1YOdVfFhekCX8KcfYlU4c9PDeElSqljP6oUayyaqD5mcToqhw4TCg==
oc-view-wrapper@1.0.6:
version "1.0.6"
- resolved "https://registry.npmjs.org/oc-view-wrapper/-/oc-view-wrapper-1.0.6.tgz"
+ resolved "https://registry.yarnpkg.com/oc-view-wrapper/-/oc-view-wrapper-1.0.6.tgz#984b349d2a4f732c6de5d46eb5fd215eaf9cd067"
integrity sha512-S4Upv+RBQpd/pfN82xG2cFJ6lgDcCgcZF4Zw1qwDvyoGlTAv/MomYVXYO+eW9JMRa7iEYveeT9yBNkIhBXnnaw==
-on-finished@2.4.1:
+on-finished@2.4.1, on-finished@^2.3.0:
version "2.4.1"
- resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"
+ resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
dependencies:
ee-first "1.1.1"
-on-finished@^2.3.0, on-finished@~2.3.0:
+on-finished@~2.3.0:
version "2.3.0"
- resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"
- integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+ resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+ integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
dependencies:
ee-first "1.1.1"
on-headers@~1.0.1, on-headers@~1.0.2:
version "1.0.2"
- resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
once@^1.3.0, once@^1.3.1, once@^1.4.0:
version "1.4.0"
- resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
- integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+ resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+ integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
dependencies:
wrappy "1"
open@8.4.0:
version "8.4.0"
- resolved "https://registry.npmjs.org/open/-/open-8.4.0.tgz"
+ resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
dependencies:
define-lazy-prop "^2.0.0"
@@ -4893,7 +4968,7 @@ open@8.4.0:
optionator@^0.9.1:
version "0.9.1"
- resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
dependencies:
deep-is "^0.1.3"
@@ -4905,74 +4980,74 @@ optionator@^0.9.1:
"opts@>= 1.2.0":
version "2.0.2"
- resolved "https://registry.npmjs.org/opts/-/opts-2.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/opts/-/opts-2.0.2.tgz#a17e189fbbfee171da559edd8a42423bc5993ce1"
integrity sha512-k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg==
os-homedir@^1.0.0:
version "1.0.2"
- resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"
- integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+ resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+ integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
os-tmpdir@^1.0.1:
version "1.0.2"
- resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
- integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+ resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+ integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
p-cancelable@^2.0.0:
version "2.1.1"
- resolved "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
p-limit@^2.2.0:
version "2.3.0"
- resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
dependencies:
p-try "^2.0.0"
p-limit@^3.0.2, p-limit@^3.1.0:
version "3.1.0"
- resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
dependencies:
yocto-queue "^0.1.0"
p-locate@^4.1.0:
version "4.1.0"
- resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
dependencies:
p-limit "^2.2.0"
p-locate@^5.0.0:
version "5.0.0"
- resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
dependencies:
p-limit "^3.0.2"
p-try@^2.0.0:
version "2.2.0"
- resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
parent-module@^1.0.0:
version "1.0.1"
- resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
dependencies:
callsites "^3.0.0"
parse-author@2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz"
- integrity sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=
+ resolved "https://registry.yarnpkg.com/parse-author/-/parse-author-2.0.0.tgz#d3460bf1ddd0dfaeed42da754242e65fb684a81f"
+ integrity sha512-yx5DfvkN8JsHL2xk2Os9oTia467qnvRgey4ahSm2X8epehBLx/gWLcy5KI+Y36ful5DzGbCS6RazqZGgy1gHNw==
dependencies:
author-regex "^1.0.0"
parse-json@^5.0.0:
version "5.2.0"
- resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
dependencies:
"@babel/code-frame" "^7.0.0"
@@ -4982,71 +5057,71 @@ parse-json@^5.0.0:
parseurl@~1.3.3:
version "1.3.3"
- resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
+ resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
path-exists@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
- integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+ resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+ integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
path-key@^3.1.0:
version "3.1.1"
- resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
path-to-regexp@0.1.7:
version "0.1.7"
- resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
- integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+ resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+ integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
path-to-regexp@^1.7.0:
version "1.8.0"
- resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz"
+ resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
dependencies:
isarray "0.0.1"
path-type@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
pathval@^1.1.1:
version "1.1.1"
- resolved "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
picocolors@^0.2.1:
version "0.2.1"
- resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
picocolors@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
- version "2.3.0"
- resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"
- integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+ integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
pkg-dir@^4.1.0:
version "4.2.0"
- resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
dependencies:
find-up "^4.0.0"
postcss-attribute-case-insensitive@^4.0.1:
version "4.0.2"
- resolved "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880"
integrity sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==
dependencies:
postcss "^7.0.2"
@@ -5054,12 +5129,12 @@ postcss-attribute-case-insensitive@^4.0.1:
postcss-browser-comments@^4:
version "4.0.0"
- resolved "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz#bcfc86134df5807f5d3c0eefa191d42136b5e72a"
integrity sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==
postcss-color-functional-notation@^2.0.1:
version "2.0.1"
- resolved "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz#5efd37a88fbabeb00a2966d1e53d98ced93f74e0"
integrity sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==
dependencies:
postcss "^7.0.2"
@@ -5067,7 +5142,7 @@ postcss-color-functional-notation@^2.0.1:
postcss-color-gray@^5.0.0:
version "5.0.0"
- resolved "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz#532a31eb909f8da898ceffe296fdc1f864be8547"
integrity sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==
dependencies:
"@csstools/convert-colors" "^1.4.0"
@@ -5076,7 +5151,7 @@ postcss-color-gray@^5.0.0:
postcss-color-hex-alpha@^5.0.3:
version "5.0.3"
- resolved "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz#a8d9ca4c39d497c9661e374b9c51899ef0f87388"
integrity sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==
dependencies:
postcss "^7.0.14"
@@ -5084,7 +5159,7 @@ postcss-color-hex-alpha@^5.0.3:
postcss-color-mod-function@^3.0.3:
version "3.0.3"
- resolved "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz#816ba145ac11cc3cb6baa905a75a49f903e4d31d"
integrity sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==
dependencies:
"@csstools/convert-colors" "^1.4.0"
@@ -5093,7 +5168,7 @@ postcss-color-mod-function@^3.0.3:
postcss-color-rebeccapurple@^4.0.1:
version "4.0.1"
- resolved "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz#c7a89be872bb74e45b1e3022bfe5748823e6de77"
integrity sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==
dependencies:
postcss "^7.0.2"
@@ -5101,14 +5176,14 @@ postcss-color-rebeccapurple@^4.0.1:
postcss-custom-media@^7.0.8:
version "7.0.8"
- resolved "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz#fffd13ffeffad73621be5f387076a28b00294e0c"
integrity sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==
dependencies:
postcss "^7.0.14"
postcss-custom-properties@^8.0.11:
version "8.0.11"
- resolved "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz#2d61772d6e92f22f5e0d52602df8fae46fa30d97"
integrity sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==
dependencies:
postcss "^7.0.17"
@@ -5116,7 +5191,7 @@ postcss-custom-properties@^8.0.11:
postcss-custom-selectors@^5.1.2:
version "5.1.2"
- resolved "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz#64858c6eb2ecff2fb41d0b28c9dd7b3db4de7fba"
integrity sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==
dependencies:
postcss "^7.0.2"
@@ -5124,7 +5199,7 @@ postcss-custom-selectors@^5.1.2:
postcss-dir-pseudo-class@^5.0.0:
version "5.0.0"
- resolved "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz#6e3a4177d0edb3abcc85fdb6fbb1c26dabaeaba2"
integrity sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==
dependencies:
postcss "^7.0.2"
@@ -5132,7 +5207,7 @@ postcss-dir-pseudo-class@^5.0.0:
postcss-double-position-gradients@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz#fc927d52fddc896cb3a2812ebc5df147e110522e"
integrity sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==
dependencies:
postcss "^7.0.5"
@@ -5140,7 +5215,7 @@ postcss-double-position-gradients@^1.0.0:
postcss-env-function@^2.0.2:
version "2.0.2"
- resolved "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-2.0.2.tgz#0f3e3d3c57f094a92c2baf4b6241f0b0da5365d7"
integrity sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==
dependencies:
postcss "^7.0.2"
@@ -5148,40 +5223,40 @@ postcss-env-function@^2.0.2:
postcss-flexbugs-fixes@^5.0.2:
version "5.0.2"
- resolved "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz#2028e145313074fc9abe276cb7ca14e5401eb49d"
integrity sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==
postcss-focus-visible@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz#477d107113ade6024b14128317ade2bd1e17046e"
integrity sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==
dependencies:
postcss "^7.0.2"
postcss-focus-within@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz#763b8788596cee9b874c999201cdde80659ef680"
integrity sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==
dependencies:
postcss "^7.0.2"
postcss-font-variant@^4.0.0:
version "4.0.1"
- resolved "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz#42d4c0ab30894f60f98b17561eb5c0321f502641"
integrity sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==
dependencies:
postcss "^7.0.2"
postcss-gap-properties@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz#431c192ab3ed96a3c3d09f2ff615960f902c1715"
integrity sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==
dependencies:
postcss "^7.0.2"
postcss-image-set-function@^3.0.1:
version "3.0.1"
- resolved "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz#28920a2f29945bed4c3198d7df6496d410d3f288"
integrity sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==
dependencies:
postcss "^7.0.2"
@@ -5189,14 +5264,14 @@ postcss-image-set-function@^3.0.1:
postcss-initial@^3.0.0:
version "3.0.4"
- resolved "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz#9d32069a10531fe2ecafa0b6ac750ee0bc7efc53"
integrity sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==
dependencies:
postcss "^7.0.2"
postcss-lab-function@^2.0.1:
version "2.0.1"
- resolved "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz#bb51a6856cd12289ab4ae20db1e3821ef13d7d2e"
integrity sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==
dependencies:
"@csstools/convert-colors" "^1.4.0"
@@ -5205,7 +5280,7 @@ postcss-lab-function@^2.0.1:
postcss-loader@^6.1.1:
version "6.2.1"
- resolved "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef"
integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==
dependencies:
cosmiconfig "^7.0.0"
@@ -5214,26 +5289,26 @@ postcss-loader@^6.1.1:
postcss-logical@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5"
integrity sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==
dependencies:
postcss "^7.0.2"
postcss-media-minmax@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz#b75bb6cbc217c8ac49433e12f22048814a4f5ed5"
integrity sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==
dependencies:
postcss "^7.0.2"
postcss-modules-extract-imports@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
postcss-modules-local-by-default@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
dependencies:
icss-utils "^5.0.0"
@@ -5242,28 +5317,28 @@ postcss-modules-local-by-default@^4.0.0:
postcss-modules-scope@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
dependencies:
postcss-selector-parser "^6.0.4"
postcss-modules-values@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
dependencies:
icss-utils "^5.0.0"
postcss-nesting@^7.0.0:
version "7.0.1"
- resolved "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052"
integrity sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==
dependencies:
postcss "^7.0.2"
postcss-normalize@^10.0.1:
version "10.0.1"
- resolved "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-10.0.1.tgz#464692676b52792a06b06880a176279216540dd7"
integrity sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA==
dependencies:
"@csstools/normalize.css" "*"
@@ -5272,30 +5347,30 @@ postcss-normalize@^10.0.1:
postcss-overflow-shorthand@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz#31ecf350e9c6f6ddc250a78f0c3e111f32dd4c30"
integrity sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==
dependencies:
postcss "^7.0.2"
postcss-page-break@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-2.0.0.tgz#add52d0e0a528cabe6afee8b46e2abb277df46bf"
integrity sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==
dependencies:
postcss "^7.0.2"
postcss-place@^4.0.1:
version "4.0.1"
- resolved "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-4.0.1.tgz#e9f39d33d2dc584e46ee1db45adb77ca9d1dcc62"
integrity sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==
dependencies:
postcss "^7.0.2"
postcss-values-parser "^2.0.0"
postcss-preset-env@^6.7.0:
- version "6.7.0"
- resolved "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz"
- integrity sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==
+ version "6.7.1"
+ resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.1.tgz#26563d2e9395d626a45a836450844540694bfcef"
+ integrity sha512-rlRkgX9t0v2On33n7TK8pnkcYOATGQSv48J2RS8GsXhqtg+xk6AummHP88Y5mJo0TLJelBjePvSjScTNkj3+qw==
dependencies:
autoprefixer "^9.6.1"
browserslist "^4.6.4"
@@ -5337,7 +5412,7 @@ postcss-preset-env@^6.7.0:
postcss-pseudo-class-any-link@^6.0.0:
version "6.0.0"
- resolved "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz#2ed3eed393b3702879dec4a87032b210daeb04d1"
integrity sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==
dependencies:
postcss "^7.0.2"
@@ -5345,14 +5420,14 @@ postcss-pseudo-class-any-link@^6.0.0:
postcss-replace-overflow-wrap@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz#61b360ffdaedca84c7c918d2b0f0d0ea559ab01c"
integrity sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==
dependencies:
postcss "^7.0.2"
postcss-selector-matches@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz#71c8248f917ba2cc93037c9637ee09c64436fcff"
integrity sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==
dependencies:
balanced-match "^1.0.0"
@@ -5360,7 +5435,7 @@ postcss-selector-matches@^4.0.0:
postcss-selector-not@^4.0.0:
version "4.0.1"
- resolved "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz#263016eef1cf219e0ade9a913780fc1f48204cbf"
integrity sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==
dependencies:
balanced-match "^1.0.0"
@@ -5368,7 +5443,7 @@ postcss-selector-not@^4.0.0:
postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
version "5.0.0"
- resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
dependencies:
cssesc "^2.0.0"
@@ -5376,21 +5451,21 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
uniq "^1.0.1"
postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
- version "6.0.6"
- resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"
- integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
+ version "6.0.11"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
+ integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
dependencies:
cssesc "^3.0.0"
util-deprecate "^1.0.2"
-postcss-value-parser@^4.1.0:
+postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
version "4.2.0"
- resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
version "2.0.1"
- resolved "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
integrity sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==
dependencies:
flatten "^1.0.2"
@@ -5399,58 +5474,58 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
version "7.0.39"
- resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
dependencies:
picocolors "^0.2.1"
source-map "^0.6.1"
-postcss@^8.2.15, postcss@^8.3.5:
- version "8.4.4"
- resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz"
- integrity sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==
+postcss@^8.3.5, postcss@^8.4.18:
+ version "8.4.19"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc"
+ integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==
dependencies:
- nanoid "^3.1.30"
+ nanoid "^3.3.4"
picocolors "^1.0.0"
- source-map-js "^1.0.1"
+ source-map-js "^1.0.2"
prelude-ls@^1.2.1:
version "1.2.1"
- resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
prettier-linter-helpers@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
dependencies:
fast-diff "^1.1.2"
prettier@2.7.1:
version "2.7.1"
- resolved "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
private@^0.1.6, private@^0.1.8:
version "0.1.8"
- resolved "https://registry.npmjs.org/private/-/private-0.1.8.tgz"
+ resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
process-nextick-args@~2.0.0:
version "2.0.1"
- resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
promise@^7.0.1:
version "7.3.1"
- resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"
+ resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
dependencies:
asap "~2.0.3"
proxy-addr@~2.0.7:
version "2.0.7"
- resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"
+ resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
dependencies:
forwarded "0.2.0"
@@ -5458,12 +5533,12 @@ proxy-addr@~2.0.7:
prr@~1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"
- integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+ resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+ integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
pump@^1.0.0:
version "1.0.3"
- resolved "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz"
+ resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==
dependencies:
end-of-stream "^1.1.0"
@@ -5471,7 +5546,7 @@ pump@^1.0.0:
pump@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
dependencies:
end-of-stream "^1.1.0"
@@ -5479,41 +5554,41 @@ pump@^3.0.0:
punycode@^2.1.0:
version "2.1.1"
- resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
qs@6.11.0:
version "6.11.0"
- resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
dependencies:
side-channel "^1.0.4"
queue-microtask@^1.2.2:
version "1.2.3"
- resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
+ resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
quick-lru@^5.1.1:
version "5.1.1"
- resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
randombytes@^2.1.0:
version "2.1.0"
- resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
dependencies:
safe-buffer "^5.1.0"
range-parser@~1.2.1:
version "1.2.1"
- resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
raw-body@2.5.1:
version "2.5.1"
- resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
+ resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
dependencies:
bytes "3.1.2"
@@ -5523,15 +5598,15 @@ raw-body@2.5.1:
read@1.0.7:
version "1.0.7"
- resolved "https://registry.npmjs.org/read/-/read-1.0.7.tgz"
- integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
+ resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+ integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
dependencies:
mute-stream "~0.0.4"
readable-stream@1.1.x:
version "1.1.14"
- resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
- integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+ integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.1"
@@ -5540,7 +5615,7 @@ readable-stream@1.1.x:
readable-stream@^2.0.1, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5:
version "2.3.7"
- resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
dependencies:
core-util-is "~1.0.0"
@@ -5553,24 +5628,24 @@ readable-stream@^2.0.1, readable-stream@^2.2.2, readable-stream@^2.3.0, readable
readdirp@~3.6.0:
version "3.6.0"
- resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
+ resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
dependencies:
picomatch "^2.2.1"
regenerate@^1.2.1:
version "1.4.2"
- resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"
+ resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
regenerator-runtime@^0.11.0:
version "0.11.1"
- resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
regenerator-transform@^0.10.0:
version "0.10.1"
- resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz"
+ resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==
dependencies:
babel-runtime "^6.18.0"
@@ -5579,13 +5654,13 @@ regenerator-transform@^0.10.0:
regexpp@^3.2.0:
version "3.2.0"
- resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
regexpu-core@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz"
- integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+ integrity sha512-tJ9+S4oKjxY8IZ9jmjnp/mtytu1u3iyIQAfmI51IKWH6bFf7XR1ybtaO6j7INhZKXOTYADk7V5qxaqLkmNxiZQ==
dependencies:
regenerate "^1.2.1"
regjsgen "^0.2.0"
@@ -5593,117 +5668,117 @@ regexpu-core@^2.0.0:
regjsgen@^0.2.0:
version "0.2.0"
- resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz"
- integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+ resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+ integrity sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g==
regjsparser@^0.1.4:
version "0.1.5"
- resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz"
- integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
+ resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+ integrity sha512-jlQ9gYLfk2p3V5Ag5fYhA7fv7OHzd1KUH0PRP46xc3TgwjwgROIW572AfYg/X9kaNq/LJnu6oJcFRXlIrGoTRw==
dependencies:
jsesc "~0.5.0"
repeat-string@^1.5.2:
version "1.6.1"
- resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
- integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+ resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+ integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
repeating@^2.0.0:
version "2.0.1"
- resolved "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"
- integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
+ resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+ integrity sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==
dependencies:
is-finite "^1.0.0"
require-directory@^2.1.1:
version "2.1.1"
- resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
- integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+ resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+ integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
require-from-string@^2.0.2:
version "2.0.2"
- resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
require-package-name@2.0.1:
version "2.0.1"
- resolved "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz"
- integrity sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk=
+ resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"
+ integrity sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==
resolve-alpn@^1.0.0:
version "1.2.1"
- resolved "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
resolve-from@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
response-time@2.3.2:
version "2.3.2"
- resolved "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"
- integrity sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo=
+ resolved "https://registry.yarnpkg.com/response-time/-/response-time-2.3.2.tgz#ffa71bab952d62f7c1d49b7434355fbc68dffc5a"
+ integrity sha512-MUIDaDQf+CVqflfTdQ5yam+aYCkXj1PY8fjlPDQ6ppxJlmgZb864pHtA750mayywNg8tx4rS7qH9JXd/OF+3gw==
dependencies:
depd "~1.1.0"
on-headers "~1.0.1"
responselike@^2.0.0:
- version "2.0.0"
- resolved "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz"
- integrity sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
+ integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
dependencies:
lowercase-keys "^2.0.0"
reusify@^1.0.4:
version "1.0.4"
- resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
right-align@^0.1.1:
version "0.1.3"
- resolved "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"
- integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
+ resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+ integrity sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==
dependencies:
align-text "^0.1.1"
rimraf@3.0.2, rimraf@^3.0.2:
version "3.0.2"
- resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
dependencies:
glob "^7.1.3"
run-parallel@^1.1.9:
version "1.2.0"
- resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
dependencies:
queue-microtask "^1.2.2"
-safe-buffer@5.1.2, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
- resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-safe-buffer@5.2.1:
+safe-buffer@5.2.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1:
version "5.2.1"
- resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
"safer-buffer@>= 2.1.2 < 3":
version "2.1.2"
- resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
sanitize.css@*:
version "13.0.0"
- resolved "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-13.0.0.tgz#2675553974b27964c75562ade3bd85d79879f173"
integrity sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA==
schema-utils@^2.6.5:
version "2.7.1"
- resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
dependencies:
"@types/json-schema" "^7.0.5"
@@ -5712,7 +5787,7 @@ schema-utils@^2.6.5:
schema-utils@^3.1.0, schema-utils@^3.1.1:
version "3.1.1"
- resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
dependencies:
"@types/json-schema" "^7.0.8"
@@ -5721,7 +5796,7 @@ schema-utils@^3.1.0, schema-utils@^3.1.1:
schema-utils@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
dependencies:
"@types/json-schema" "^7.0.9"
@@ -5731,44 +5806,44 @@ schema-utils@^4.0.0:
semver-extra@3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/semver-extra/-/semver-extra-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/semver-extra/-/semver-extra-3.0.0.tgz#98230dd8517b702c0715aea6c269a96fceaccebc"
integrity sha512-v0ukVTyrD5BSlQeKZShjED51gRWI551YlsjAbmrXZLM+dkfiHeLu+5NJoMPepQ1XvfWWXZcEjaGmpX9uzfUWuQ==
dependencies:
semver "^6.3.0"
semver-regex@^3.1.2:
version "3.1.4"
- resolved "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.4.tgz"
+ resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.4.tgz#13053c0d4aa11d070a2f2872b6b1e3ae1e1971b4"
integrity sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA==
semver-sort@1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/semver-sort/-/semver-sort-1.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/semver-sort/-/semver-sort-1.0.0.tgz#fd07da3904703ee0f1424152674644895f636086"
integrity sha512-JicVlQKz/C//4BiPmbHEDou6HihXxo5xqB/8Hm9FaLJ6HHkRRvYgCECq4u/z0XF8kyJQ/KAZt++A/kYz/oOSSg==
dependencies:
semver "^5.0.3"
semver-regex "^3.1.2"
-semver@7.3.8, semver@^7.3.5, semver@^7.3.7:
+semver@7.3.8, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
version "7.3.8"
- resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
dependencies:
lru-cache "^6.0.0"
semver@^5.0.3, semver@^5.3.0:
version "5.7.1"
- resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
semver@^6.0.0, semver@^6.3.0:
version "6.3.0"
- resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
send@0.18.0:
version "0.18.0"
- resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
+ resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
dependencies:
debug "2.6.9"
@@ -5787,21 +5862,21 @@ send@0.18.0:
serialize-error@8.1.0:
version "8.1.0"
- resolved "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-8.1.0.tgz#3a069970c712f78634942ddd50fbbc0eaebe2f67"
integrity sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==
dependencies:
type-fest "^0.20.2"
serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
version "6.0.0"
- resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
dependencies:
randombytes "^2.1.0"
serve-static@1.15.0:
version "1.15.0"
- resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"
+ resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
dependencies:
encodeurl "~1.0.2"
@@ -5811,24 +5886,24 @@ serve-static@1.15.0:
setprototypeof@1.2.0:
version "1.2.0"
- resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
shebang-command@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
dependencies:
shebang-regex "^3.0.0"
shebang-regex@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
side-channel@^1.0.4:
version "1.0.4"
- resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
+ resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
dependencies:
call-bind "^1.0.0"
@@ -5837,7 +5912,7 @@ side-channel@^1.0.4:
simple-git@2.48.0:
version "2.48.0"
- resolved "https://registry.npmjs.org/simple-git/-/simple-git-2.48.0.tgz"
+ resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.48.0.tgz#87c262dba8f84d7b96bb3a713e9e34701c1f6e3b"
integrity sha512-z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A==
dependencies:
"@kwsites/file-exists" "^1.1.1"
@@ -5846,7 +5921,7 @@ simple-git@2.48.0:
sinon@12.0.1:
version "12.0.1"
- resolved "https://registry.npmjs.org/sinon/-/sinon-12.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/sinon/-/sinon-12.0.1.tgz#331eef87298752e1b88a662b699f98e403c859e9"
integrity sha512-iGu29Xhym33ydkAT+aNQFBINakjq69kKO6ByPvTsm3yyIACfyQttRTP03aBP/I8GfhFmLzrnKwNNkr0ORb1udg==
dependencies:
"@sinonjs/commons" "^1.8.3"
@@ -5858,62 +5933,57 @@ sinon@12.0.1:
slash@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"
- integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+ resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+ integrity sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==
slash@^3.0.0:
version "3.0.0"
- resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-source-map-js@^1.0.1:
- version "1.0.1"
- resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz"
- integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==
+source-map-js@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+ integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
source-map-support@^0.4.15:
version "0.4.18"
- resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
dependencies:
source-map "^0.5.6"
source-map-support@~0.5.20:
version "0.5.21"
- resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
version "0.5.7"
- resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
- integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+ integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
version "0.6.1"
- resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-source-map@~0.7.2:
- version "0.7.3"
- resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"
- integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
statuses@2.0.1:
version "2.0.1"
- resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
streamsearch@0.1.2:
version "0.1.2"
- resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"
- integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
+ resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
+ integrity sha512-jos8u++JKm0ARcSUTAZXOVC0mSox7Bhn6sBgty73P1f3JGf7yG2clTbBNHUdde/kdvP2FESam+vM6l8jBrNxHA==
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
- resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
@@ -5922,69 +5992,69 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
string_decoder@~0.10.x:
version "0.10.31"
- resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
- integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+ integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
string_decoder@~1.1.1:
version "1.1.1"
- resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
dependencies:
safe-buffer "~5.1.0"
strip-ansi@^3.0.0:
version "3.0.1"
- resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
- integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+ integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
dependencies:
ansi-regex "^2.0.0"
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
- resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"
strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
version "3.1.1"
- resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
supports-color@8.1.1, supports-color@^8.0.0:
version "8.1.1"
- resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
dependencies:
has-flag "^4.0.0"
supports-color@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
- integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+ integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
supports-color@^5.3.0:
version "5.5.0"
- resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
dependencies:
has-flag "^3.0.0"
supports-color@^7.1.0, supports-color@^7.2.0:
version "7.2.0"
- resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
dependencies:
has-flag "^4.0.0"
tapable@^2.1.1, tapable@^2.2.0:
version "2.2.1"
- resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"
+ resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
tar-fs@^1.8.1:
version "1.16.3"
- resolved "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz"
+ resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==
dependencies:
chownr "^1.0.1"
@@ -5994,7 +6064,7 @@ tar-fs@^1.8.1:
tar-stream@^1.1.2:
version "1.6.2"
- resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz"
+ resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
dependencies:
bl "^1.0.0"
@@ -6007,76 +6077,77 @@ tar-stream@^1.1.2:
targz@1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/targz/-/targz-1.0.1.tgz"
- integrity sha1-j3alI2lM3t+7XWCkB2/27uzFOY8=
+ resolved "https://registry.yarnpkg.com/targz/-/targz-1.0.1.tgz#8f76a523694cdedfbb5d60a4076ff6eeecc5398f"
+ integrity sha512-6q4tP9U55mZnRuMTBqnqc3nwYQY3kv+QthCFZuMk+Tn1qYUnMPmL/JZ/mzgXINzFpSqfU+242IFmFU9VPvqaQw==
dependencies:
tar-fs "^1.8.1"
terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.1.4:
- version "5.2.5"
- resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.5.tgz"
- integrity sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g==
+ version "5.3.6"
+ resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
+ integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==
dependencies:
- jest-worker "^27.0.6"
+ "@jridgewell/trace-mapping" "^0.3.14"
+ jest-worker "^27.4.5"
schema-utils "^3.1.1"
serialize-javascript "^6.0.0"
- source-map "^0.6.1"
- terser "^5.7.2"
+ terser "^5.14.1"
-terser@^5.7.2:
- version "5.10.0"
- resolved "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"
- integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
+terser@^5.14.1:
+ version "5.16.1"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880"
+ integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==
dependencies:
+ "@jridgewell/source-map" "^0.3.2"
+ acorn "^8.5.0"
commander "^2.20.0"
- source-map "~0.7.2"
source-map-support "~0.5.20"
text-table@^0.2.0:
version "0.2.0"
- resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
- integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+ resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+ integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
to-buffer@^1.1.1:
version "1.1.1"
- resolved "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
to-fast-properties@^1.0.3:
version "1.0.3"
- resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"
- integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
+ resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+ integrity sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==
to-fast-properties@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
- integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+ resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+ integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
to-regex-range@^5.0.1:
version "5.0.1"
- resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
dependencies:
is-number "^7.0.0"
toidentifier@1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
trim-right@^1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"
- integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
+ resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+ integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==
try-require@1.2.1:
version "1.2.1"
- resolved "https://registry.npmjs.org/try-require/-/try-require-1.2.1.tgz"
- integrity sha1-NEiaLKwMCcHMEO2RugEVlNQzO+I=
+ resolved "https://registry.yarnpkg.com/try-require/-/try-require-1.2.1.tgz#34489a2cac0c09c1cc10ed91ba011594d4333be2"
+ integrity sha512-aMzrGUIA/R2LwUgvsOusx+GTy8ERyNjpBzbWgS1Qx4oTFlXCMxY3PyyXbPE1pvrvK/CXpO+BBREEqrTkNroC+A==
ts-node@10.9.1:
version "10.9.1"
- resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz"
+ resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
dependencies:
"@cspotcode/source-map-support" "^0.8.0"
@@ -6095,46 +6166,46 @@ ts-node@10.9.1:
tslib@^1.11.1, tslib@^1.8.1:
version "1.14.1"
- resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
tslib@^2.3.1:
- version "2.4.0"
- resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"
- integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
+ integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
tsutils@^3.21.0:
version "3.21.0"
- resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
dependencies:
tslib "^1.8.1"
type-check@^0.4.0, type-check@~0.4.0:
version "0.4.0"
- resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
dependencies:
prelude-ls "^1.2.1"
type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8:
version "4.0.8"
- resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"
+ resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
type-fest@2.8.0:
version "2.8.0"
- resolved "https://registry.npmjs.org/type-fest/-/type-fest-2.8.0.tgz"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.8.0.tgz#39d7c9f9c508df8d6ce1cf5a966b0e6568dcc50d"
integrity sha512-O+V9pAshf9C6loGaH0idwsmugI2LxVNR7DtS40gVo2EXZVYFgz9OuNtOhgHLdHdapOEWNdvz9Ob/eeuaWwwlxA==
type-fest@^0.20.2:
version "0.20.2"
- resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
type-is@^1.6.4, type-is@~1.6.18:
version "1.6.18"
- resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
+ resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
dependencies:
media-typer "0.3.0"
@@ -6142,17 +6213,17 @@ type-is@^1.6.4, type-is@~1.6.18:
typedarray@^0.0.6:
version "0.0.6"
- resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
- integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+ resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+ integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
typescript@4.8.4:
version "4.8.4"
- resolved "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
-uglify-js@3.7.6, uglify-js@^3.1.4:
+uglify-js@3.7.6:
version "3.7.6"
- resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.6.tgz"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.6.tgz#0783daa867d4bc962a37cc92f67f6e3238c47485"
integrity sha512-yYqjArOYSxvqeeiYH2VGjZOqq6SVmhxzaPjJC1W2F9e+bqvFL9QXQ2osQuKUFjM2hGjKG2YclQnRKWQSt/nOTQ==
dependencies:
commander "~2.20.3"
@@ -6160,162 +6231,175 @@ uglify-js@3.7.6, uglify-js@^3.1.4:
uglify-js@^2.7.5, uglify-js@^2.8.10:
version "2.8.29"
- resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"
- integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+ integrity sha512-qLq/4y2pjcU3vhlhseXGGJ7VbFO4pBANu0kwl8VCa9KEI0V8VfZIx2Fy3w01iSTA/pGwKZSmu/+I4etLNDdt5w==
dependencies:
source-map "~0.5.1"
yargs "~3.10.0"
optionalDependencies:
uglify-to-browserify "~1.0.0"
+uglify-js@^3.1.4:
+ version "3.17.4"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+ integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+
uglify-to-browserify@~1.0.0:
version "1.0.2"
- resolved "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
- integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
+ resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+ integrity sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==
uniq@^1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"
- integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
+ resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+ integrity sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==
universalify@2.0.0, universalify@^2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
universalify@^0.1.0:
version "0.1.2"
- resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
unpipe@1.0.0, unpipe@~1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
+update-browserslist-db@^1.0.9:
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
+ integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+ dependencies:
+ escalade "^3.1.1"
+ picocolors "^1.0.0"
+
uri-js@^4.2.2:
version "4.4.1"
- resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
+ resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
dependencies:
punycode "^2.1.0"
util-deprecate@^1.0.2, util-deprecate@~1.0.1:
version "1.0.2"
- resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
- integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+ resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+ integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
utils-merge@1.0.1:
version "1.0.1"
- resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
- integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+ resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+ integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
uuid@^8.3.2:
version "8.3.2"
- resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
v8-compile-cache-lib@^3.0.1:
version "3.0.1"
- resolved "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
vary@~1.1.2:
version "1.1.2"
- resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
- integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+ resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+ integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
void-elements@~2.0.1:
version "2.0.1"
- resolved "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"
- integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
+ resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+ integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
-watchpack@^2.3.0:
- version "2.3.0"
- resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.3.0.tgz"
- integrity sha512-MnN0Q1OsvB/GGHETrFeZPQaOelWh/7O+EiFlj8sM9GPjtQkis7k01aAxrg/18kTfoIVcLL+haEVFlXDaSRwKRw==
+watchpack@^2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+ integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
dependencies:
glob-to-regexp "^0.4.1"
graceful-fs "^4.1.2"
-webpack-sources@^3.2.2:
- version "3.2.2"
- resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz"
- integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==
+webpack-sources@^3.2.3:
+ version "3.2.3"
+ resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+ integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
webpack@^5.61.0:
- version "5.64.4"
- resolved "https://registry.npmjs.org/webpack/-/webpack-5.64.4.tgz"
- integrity sha512-LWhqfKjCLoYJLKJY8wk2C3h77i8VyHowG3qYNZiIqD6D0ZS40439S/KVuc/PY48jp2yQmy0mhMknq8cys4jFMw==
+ version "5.75.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
+ integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
dependencies:
- "@types/eslint-scope" "^3.7.0"
- "@types/estree" "^0.0.50"
+ "@types/eslint-scope" "^3.7.3"
+ "@types/estree" "^0.0.51"
"@webassemblyjs/ast" "1.11.1"
"@webassemblyjs/wasm-edit" "1.11.1"
"@webassemblyjs/wasm-parser" "1.11.1"
- acorn "^8.4.1"
+ acorn "^8.7.1"
acorn-import-assertions "^1.7.6"
browserslist "^4.14.5"
chrome-trace-event "^1.0.2"
- enhanced-resolve "^5.8.3"
+ enhanced-resolve "^5.10.0"
es-module-lexer "^0.9.0"
eslint-scope "5.1.1"
events "^3.2.0"
glob-to-regexp "^0.4.1"
- graceful-fs "^4.2.4"
- json-parse-better-errors "^1.0.2"
+ graceful-fs "^4.2.9"
+ json-parse-even-better-errors "^2.3.1"
loader-runner "^4.2.0"
mime-types "^2.1.27"
neo-async "^2.6.2"
schema-utils "^3.1.0"
tapable "^2.1.1"
terser-webpack-plugin "^5.1.3"
- watchpack "^2.3.0"
- webpack-sources "^3.2.2"
+ watchpack "^2.4.0"
+ webpack-sources "^3.2.3"
which@2.0.2, which@^2.0.1:
version "2.0.2"
- resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
dependencies:
isexe "^2.0.0"
window-size@0.1.0:
version "0.1.0"
- resolved "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
- integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
+ resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+ integrity sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==
with@~5.1.1:
version "5.1.1"
- resolved "https://registry.npmjs.org/with/-/with-5.1.1.tgz"
- integrity sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4=
+ resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
+ integrity sha512-uAnSsFGfSpF6DNhBXStvlZILfHJfJu4eUkfbRGk94kGO1Ta7bg6FwfvoOhhyHAJuFbCw+0xk4uJ3u57jLvlCJg==
dependencies:
acorn "^3.1.0"
acorn-globals "^3.0.0"
word-wrap@^1.2.3:
version "1.2.3"
- resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
+ resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
wordwrap@0.0.2:
version "0.0.2"
- resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
- integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
+ resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+ integrity sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==
wordwrap@^1.0.0:
version "1.0.0"
- resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"
- integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+ resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+ integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
workerpool@6.1.5:
version "6.1.5"
- resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz"
+ resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==
wrap-ansi@^7.0.0:
version "7.0.0"
- resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
@@ -6324,47 +6408,52 @@ wrap-ansi@^7.0.0:
wrappy@1:
version "1.0.2"
- resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
- integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+ resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+ integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
ws@^7.4.3:
- version "7.5.6"
- resolved "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz"
- integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
+ version "7.5.9"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+ integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
xtend@^4.0.0:
version "4.0.2"
- resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
+ resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
y18n@^5.0.5:
version "5.0.8"
- resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
yallist@^4.0.0:
version "4.0.0"
- resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
yaml@^1.10.0:
version "1.10.2"
- resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
+ resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-yargs-parser@20.2.4, yargs-parser@^20.2.2:
+yargs-parser@20.2.4:
version "20.2.4"
- resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+yargs-parser@^20.2.2:
+ version "20.2.9"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+ integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
yargs-parser@^21.0.0:
- version "21.0.0"
- resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz"
- integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==
+ version "21.1.1"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+ integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
yargs-unparser@2.0.0:
version "2.0.0"
- resolved "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz"
+ resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
dependencies:
camelcase "^6.0.0"
@@ -6374,7 +6463,7 @@ yargs-unparser@2.0.0:
yargs@16.2.0:
version "16.2.0"
- resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
dependencies:
cliui "^7.0.2"
@@ -6387,7 +6476,7 @@ yargs@16.2.0:
yargs@17.6.0:
version "17.6.0"
- resolved "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c"
integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==
dependencies:
cliui "^8.0.1"
@@ -6400,8 +6489,8 @@ yargs@17.6.0:
yargs@~3.10.0:
version "3.10.0"
- resolved "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"
- integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+ integrity sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==
dependencies:
camelcase "^1.0.2"
cliui "^2.1.0"
@@ -6410,10 +6499,10 @@ yargs@~3.10.0:
yn@3.1.1:
version "3.1.1"
- resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"
+ resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
yocto-queue@^0.1.0:
version "0.1.0"
- resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
+ resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
|
diff --git a/test/fixtures/mocked-components/env.js b/test/fixtures/mocked-components/env.js
new file mode 100644
--- /dev/null
+++ b/test/fixtures/mocked-components/env.js
@@ -0,0 +1,29 @@
+'use strict';
+
+module.exports = {
+ package: {
+ name: 'env-component',
+ version: '1.0.0',
+ oc: {
+ container: false,
+ renderInfo: false,
+ files: {
+ template: {
+ type: 'jade',
+ hashKey: '8c1fbd954f2b0d8cd5cf11c885fed4805225749f',
+ src: 'template.js'
+ },
+ dataProvider: {
+ type: 'node.js',
+ hashKey: '123456',
+ src: 'server.js'
+ },
+ env: '.env'
+ }
+ }
+ },
+ data: '"use strict";module.exports.data=function (ctx, cb){cb(null,{ mySecret:ctx.env.secret});};',
+ view:
+ 'var oc=oc||{};oc.components=oc.components||{},oc.components["8c1fbd954f2b0d8cd5cf11c885fed4805225749f"]' +
+ '=function(){var o=[];return o.push("<div>hello</div>"),o.join("")};'
+};
diff --git a/test/fixtures/mocked-components/index.js b/test/fixtures/mocked-components/index.js
--- a/test/fixtures/mocked-components/index.js
+++ b/test/fixtures/mocked-components/index.js
@@ -6,6 +6,7 @@ module.exports = {
'async-error3-component': require('./async-error3'),
'async-error4-component': require('./async-error4'),
'async-custom-error-component': require('./async-custom-error'),
+ 'env-component': require('./env'),
'error-component': require('./error'),
'npm-component': require('./npm'),
'plugin-component': require('./plugin'),
diff --git a/test/unit/registry-domain-repository.js b/test/unit/registry-domain-repository.js
--- a/test/unit/registry-domain-repository.js
+++ b/test/unit/registry-domain-repository.js
@@ -268,6 +268,26 @@ describe('registry : domain : repository', () => {
});
});
+ describe('when getting the .env file', () => {
+ before(done => {
+ s3Mock.getFile.resolves(`
+ VAR1=VAL1
+ VAR2=VAL2
+ `);
+ savePromiseResult(repository.getEnv('hello-world', '1.0.0'), done);
+ });
+
+ it('should respond without an error', () => {
+ expect(response.error).to.be.undefined;
+ });
+
+ it('should return the component info', () => {
+ expect(response.result).not.to.be.empty;
+ expect(response.result.VAR1).to.equal('VAL1');
+ expect(response.result.VAR2).to.equal('VAL2');
+ });
+ });
+
describe('when getting a static file url', () => {
let url;
before(() => {
diff --git a/test/unit/registry-routes-helpers-get-component.js b/test/unit/registry-routes-helpers-get-component.js
--- a/test/unit/registry-routes-helpers-get-component.js
+++ b/test/unit/registry-routes-helpers-get-component.js
@@ -41,6 +41,9 @@ describe('registry : routes : helpers : get-component', () => {
mockedRepository = {
getCompiledView: sinon.stub().resolves(params.view),
getComponent: sinon.stub().resolves(params.package),
+ getEnv: params.package.oc.files.env
+ ? sinon.stub().resolves({ secret: 'secretvalue' })
+ : sinon.stub().rejects(),
getDataProvider: sinon
.stub()
.resolves({ content: params.data, filePath: '/path/to/server.js' }),
@@ -69,6 +72,41 @@ describe('registry : routes : helpers : get-component', () => {
};
};
+ describe('when the component has an env file', () => {
+ let callBack;
+
+ before(done => {
+ const headers = {
+ 'user-agent': 'oc-client-0/0-0-0',
+ templates: 'oc-template-jade,6.0.1;oc-template-handlebars,6.0.2',
+ accept: 'application/vnd.oc.unrendered+json'
+ };
+ initialise(mockedComponents['env-component']);
+ const getComponent = GetComponent({}, mockedRepository);
+
+ callBack = sinon.spy(() => done());
+ getComponent(
+ {
+ name: 'env-component',
+ headers,
+ parameters: {},
+ version: '1.X.X',
+ conf: {
+ env: { registry: 'REGISTRYVALUE' },
+ baseUrl: 'http://components.com/'
+ }
+ },
+ callBack
+ );
+ });
+
+ it('should put the env data as part of the context, available to the server', () => {
+ expect(callBack.args[0][0].response.data).to.deep.equal({
+ mySecret: 'secretvalue'
+ });
+ });
+ });
+
describe('when getting a component with success', () => {
before(done => {
initialise(mockedComponents['async-error2-component']);
|
Ability to have environment variables in your OC components
Slightly related to issue #769, if it happens that you package your component beforehand, and then publish the same packaged OC to different registries, it would be nice to have a way to have env variables for each registry. Right now the only way of doing that is having to fully package/publish on each registry, changing values on the server side for each one. What I would propose is to have a new file (.env) that gets loaded side by side with the dataProvider, and passed as part of the context.
So you could define it in your package.json
```json
{
"oc": {
"files": {
"data": "server.js",
"template": {
"src": "index.js",
"type": "oc-template-react"
},
"env": "myFolder/.myEnvFile"
},
}
}
```
The compiler will add that your .myEnvFile as `.env` in your `_package` folder, upload it to your private storage, and then load it.
There's two options of where to pass this.
1) As part of the context object `env` property. This means it will get mixed with the OC registry level environment variables you decide to push.
2) As part of `process.env` global object. That way you separate OC registry envs from OC component ones.
### Changes needed for this
1) Change all storage adapters so they consider `.env`, along with `server.js` to be a private file.
2) Change `oc-generic-template-compiler` so it copies `.env` file to _package folder, given that it's defined in package.json. Update templates afterwards to use the new version of the compiler.
3) Change `get-component.js` in OC, so that it also checks for retreiving the `.env` file, and adds it to the context object before running the dataProvider code.
|
I believe `context.env` is only used to pass environment name and there are no other things passed in it, so we could have something like:
`context.env.values` which would have the environment variables.
However, `process.env` seems to be a standard for interacting with env variables so maybe it's better to use that after all. Is `process` separated between different components?
AFAIK there's nothing stopping you code-wise to pass extra parameters in the `env` object (whatever is there it will be passed directly to your oc data provider context [see here](https://github.com/opencomponents/oc/blob/master/src/registry/routes/helpers/get-component.js#L376)).
About process.env, the only thing is that right now the `process` object is not passed **[at all](https://github.com/opencomponents/oc/blob/master/src/registry/routes/helpers/get-component.js#L438)**, so either we start passing the whole `process` object and we merge process.env with our env values, or we pass a fake `process` object that only has the `env` property.
In general there are a number of boundaries that are created for security. If component A relies on process.env.foo to be there, but then component B overwrites that it could break component B for instance.
At the moment that's done by making sure globals such as `process` are not usable on the server.
If you can figure out an elegant way to use `.env` files as convention and process it on build time so that you have full encapsulation on a component level, why not, that could be useful.
The proposed solution would not overwrite environment variables between components (I think), since each one will have it's own context object with their own .env file (stored along server.js in the storage).
Basically [here](https://github.com/opencomponents/oc/blob/master/src/registry/routes/helpers/get-component.js#L373), we could check after that if `oc.files.env` exists, and if it does, do a `repository.getEnv` (new method to get the env file and parse it as a JS object), then merge that new object either in `contextObj.env` or in the `context` passed to your `vm.runInNewContext` method (with a fake process object or the real one). At most you will override env variables from the OC registry, but never from another component, as your own will always take precedence. Creating a fake process.env object with just the `.env` variables avoids overriding at all levels.
Can I ask you what would you need this for? An example of what would you use a env setting here that you just couldn't embed in the server.js (or just require it).
When I used OC I remember I typically had something in my server like
```
const settings = require('./settings.json')[context.env.name];
...
```
And that was enough for connection strings or any other thing that was env specific. And being not in the `oc.files` webpack would bundle it it on the server for me to keep it private.
The issue with your solution is that it may affect performance a bit as the (multi-tenant) registry application will need to merge envs and I suspect that may still need to be env specific (like dev vs qa vs prod) so it wouldn't be as simple as merging two objects? But if you can give me an example perhaps we can clarify.
That approach works for us for a lot of environment variables that are not sensitive, but if we also want to use private keys, it would mean that the private keys will be versioned in the repo where we contain our OC, which is not ideal. With the `.env` approach, we can just replace the keys in the middle of packaging/publishing on the pipeline itself (we package once at the beginning, then for each environment/registry we unpack, change the .env file values, and publish those built files)
I'm not sure I understand the last part of why would you need to merge multiple envs, as the concept is similar of the
`const settings = require('./settings.json')[context.env.name];` approach (same as you only have one `settings.json` per component/version, you also have only one `.env` file published with it), perhaps I don't know what a multi-tenant registry application really means?
I also had this same issue yet resolved it by creating a plug-in that can read env/secrets from a different source.
Did you manage to limit env/secrets to a single component? i.e. component-a only accesses secrets for component-a not for component-b
> Did you manage to limit env/secrets to a single component? i.e. component-a only accesses secrets for component-a not for component-b
Yes, I can share an example how I did it. My configs and secrets are kubernetes artifacts, but they could be stored in any other resource or remote file system.
If you could share how your solution works would be nice, although I think it solves different problems (living keys that can change and you always want to retreieve the freshest?)
Hi @kmcrawford this conversation got forgotten I guess :P we're kind of coming back to it on our side, however, before we'd jump into something similar to what is proposed in that issue it would be awesome to be awesome to get a peek at how you're doing it
@pbazydlo let me look into open sourcing the solution.
that would be cool, if it helps the main thing I'm not sure about is how you could achieve isolation across different components with the current plugin system
In the oc plug-in framework there isn’t the ability to know who is calling your function. Our method is to store configurations by the package name of the calling service. Which needs to be passed in to the plug-in as a parameter. If isolation is required for security, I’d assume that a different registry would be required to prevent components from accessing configurations that they don’t have access to. But if the oc plug-in framework knew the name/version of the calling service then it could by default provide isolation.
| 2022-07-22T15:53:37
|
javascript
|
Easy
|
prettier/plugin-ruby
| 910
|
prettier__plugin-ruby-910
|
[
"904"
] |
88c45c25ad245f07450047773178ddb692a2f9ee
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
### Added
- [#859](https://github.com/prettier/plugin-ruby/issues/859) - azz, kddeisz - Support the `--insert-pragma` option for the incremental adoption workflow.
+- [#904](https://github.com/prettier/plugin-ruby/issues/904) - Hansenq, kddeisz - Support the `%s` symbol literal syntax.
### Changed
diff --git a/src/ruby/nodes/strings.js b/src/ruby/nodes/strings.js
--- a/src/ruby/nodes/strings.js
+++ b/src/ruby/nodes/strings.js
@@ -82,12 +82,97 @@ function printChar(path, { rubySingleQuote }, _print) {
return concat([quote, body.slice(1), quote]);
}
+function printPercentSDynaSymbol(path, opts, print) {
+ const node = path.getValue();
+ const parts = [];
+
+ // Push on the quote, which includes the opening character.
+ parts.push(node.quote);
+
+ path.each((childPath) => {
+ const childNode = childPath.getValue();
+
+ if (childNode.type !== "@tstring_content") {
+ // Here we are printing an embedded variable or expression.
+ parts.push(print(childPath));
+ } else {
+ // Here we are printing plain string content.
+ parts.push(join(literalline, childNode.body.split("\n")));
+ }
+ }, "body");
+
+ // Push on the closing character, which is the opposite of the third
+ // character from the opening.
+ parts.push(quotePairs[node.quote[2]]);
+
+ return concat(parts);
+}
+
+// We don't actually want to print %s symbols, as they're much more rarely seen
+// in the wild. But we're going to be forced into it if it's a multi-line symbol
+// or if the quoting would get super complicated.
+function shouldPrintPercentSDynaSymbol(node) {
+ // We shouldn't print a %s dyna symbol if it was not already that way in the
+ // original source.
+ if (node.quote[0] !== "%") {
+ return false;
+ }
+
+ // Here we're going to check if there is a closing character, a new line, or a
+ // quote in the content of the dyna symbol. If there is, then quoting could
+ // get weird, so just bail out and stick to the original bounds in the source.
+ const closing = quotePairs[node.quote[2]];
+
+ return node.body.some(
+ (child) =>
+ child.type === "@tstring_content" &&
+ (child.body.includes("\n") ||
+ child.body.includes(closing) ||
+ child.body.includes("'") ||
+ child.body.includes('"'))
+ );
+}
+
// Prints a dynamic symbol. Assumes there's a quote property attached to the
// node that will tell us which quote to use when printing. We're just going to
// use whatever quote was provided.
+//
+// In the case of a plain dyna symbol, node.quote will be either :" or :'
+// For %s dyna symbols, node.quote will be %s[, %s(, %s{, or %s<
function printDynaSymbol(path, opts, print) {
const node = path.getValue();
- const parts = [node.quote].concat(path.map(print, "body")).concat(node.quote);
+
+ if (shouldPrintPercentSDynaSymbol(node)) {
+ return printPercentSDynaSymbol(path, opts, print);
+ }
+
+ const parts = [];
+ let quote;
+
+ if (isQuoteLocked(node)) {
+ if (node.quote.startsWith("%")) {
+ quote = opts.rubySingleQuote ? "'" : '"';
+ } else {
+ quote = node.quote.slice(1);
+ }
+ } else {
+ quote = opts.rubySingleQuote && isSingleQuotable(node) ? "'" : '"';
+ }
+
+ parts.push(quote);
+ path.each((childPath) => {
+ const child = childPath.getValue();
+
+ if (child.type !== "@tstring_content") {
+ parts.push(print(childPath));
+ } else {
+ parts.push(
+ join(literalline, normalizeQuotes(child.body, quote).split("\n"))
+ );
+ }
+ }, "body");
+
+ parts.push(quote);
// If we're inside of an assoc_new node as the key, then it will handle
// printing the : on its own since it could change sides.
diff --git a/src/ruby/parser.rb b/src/ruby/parser.rb
--- a/src/ruby/parser.rb
+++ b/src/ruby/parser.rb
@@ -1092,7 +1092,7 @@ def on_dyna_symbol(string)
beging.merge(
type: :dyna_symbol,
- quote: beging[:body][1],
+ quote: beging[:body],
body: string[:body],
el: ending[:el],
ec: ending[:ec]
diff --git a/src/utils/skipAssignIndent.js b/src/utils/skipAssignIndent.js
--- a/src/utils/skipAssignIndent.js
+++ b/src/utils/skipAssignIndent.js
@@ -1,4 +1,11 @@
-const skippable = ["array", "hash", "heredoc", "lambda", "regexp_literal"];
+const skippable = [
+ "array",
+ "dyna_symbol",
+ "hash",
+ "heredoc",
+ "lambda",
+ "regexp_literal"
+];
function skipAssignIndent(node) {
return (
|
diff --git a/test/js/ruby/nodes/strings.test.js b/test/js/ruby/nodes/strings.test.js
--- a/test/js/ruby/nodes/strings.test.js
+++ b/test/js/ruby/nodes/strings.test.js
@@ -169,14 +169,43 @@ describe("strings", () => {
test("with single quotes", () => expect(":'abc'").toMatchFormat());
- test("with double quotes", () => expect(`:"abc"`).toMatchFormat());
+ test("with double quotes", () => expect(`:"abc"`).toChangeFormat(":'abc'"));
- test("with false interpolation and single quotes", () =>
- expect(":'abc#{foo}abc'").toMatchFormat());
+ test("with double quotes with double quotes desired", () =>
+ expect(`:"abc"`).toMatchFormat({ rubySingleQuote: false }));
+
+ test("with false interpolation and single quotes, no rubySingleQuote", () =>
+ expect(":'abc#{foo}abc'").toMatchFormat({ rubySingleQuote: false }));
test("with real interpolation and double quotes", () =>
expect(`:"abc#{foo}abc"`).toMatchFormat());
+ test("with real interpolation and double quotes, rubySingleQuote", () =>
+ expect(`:"abc#{foo}abc"`).toMatchFormat({ rubySingleQuote: true }));
+
+ test("%s literal", () => expect("%s[abc]").toChangeFormat(":'abc'"));
+
+ test("%s literal with false interpolation", () =>
+ expect("%s[abc#{d}]").toChangeFormat(":'abc#{d}'"));
+
+ test("%s literal as hash key", () =>
+ expect("{ %s[abc] => d }").toChangeFormat("{ 'abc': d }"));
+
+ test("%s literal as hash key, no rubySingleQuote", () =>
+ expect("{ %s[abc] => d }").toChangeFormat(`{ "abc": d }`, {
+ rubySingleQuote: false
+ }));
+
+ test("%s literal with newlines", () => {
+ const content = ruby(`
+ a = %s[
+ a
+ ]
+ `);
+
+ return expect(content).toMatchFormat();
+ });
+
test("gets correct quotes", () => {
const content = "where('lint_tool_configs.plugin': plugins + %w[core])";
|
Prettier doesn't format multiline %s(...) strings properly
## Metadata
Note that this issue doesn't happen with `%(...)`; only with `%s(...)`.
- Ruby version: 3..0.0
- `@prettier/plugin-ruby`: 1.5.5
- Options:
- [x] `rubyHashLabel`
- [x] `rubyModifier`
- [x] `rubySingleQuote`
- [ ] `rubyToProc`
- [x] `trailingComma`
## Input
```ruby
logger.warn %s(
This is a multiline string
that I want to print out to the console
)
logger.warn(%s[
This is a multiline string
that I want to print out to the console
])
```
## Current output
```ruby
logger.warn :s
This is a multiline string
that I want to print out to the console
s
logger.warn(
:s
This is a multiline string
that I want to print out to the console
s,
)
# Syntax error on everything below this
```
## Expected output
```ruby
logger.warn "
This is a multiline string
that I want to print out to the console
"
logger.warn("
This is a multiline string
that I want to print out to the console
")
```
|
Ah, it looks like this is our codebase's mistake--`%s(...)` creates a symbol, not a string, and it's not really standard to create a multi-line symbol. I'll close this out for now.
https://ruby-doc.org/core-2.3.0/doc/syntax/literals_rdoc.html#label-Percent+Strings
Thanks for reporting! This is actually a bug in prettier though, even if your codebase has a bug. I'll get this fixed.
| 2021-06-23T14:29:35
|
javascript
|
Hard
|
vercel/nft
| 189
|
vercel__nft-189
|
[
"188"
] |
751a32f09b3da12b20133174ddc692c40eb33b7a
|
diff --git a/src/analyze.ts b/src/analyze.ts
--- a/src/analyze.ts
+++ b/src/analyze.ts
@@ -251,7 +251,7 @@ export default async function analyze(id: string, code: string, job: Job): Promi
//@ts-ignore
if (!ast) {
try {
- ast = acorn.parse(code, { ecmaVersion: 2020, sourceType: 'module' });
+ ast = acorn.parse(code, { ecmaVersion: 2020, sourceType: 'module', allowAwaitOutsideFunction: true });
isESM = true;
}
catch (e) {
@@ -837,7 +837,7 @@ export default async function analyze(id: string, code: string, job: Job): Promi
}
if ('value' in staticChildValue && isAbsolutePathOrUrl(staticChildValue.value)) {
- try {
+ try {
const resolved = resolveAbsolutePathOrUrl(staticChildValue.value);
emitAssetPath(resolved);
}
@@ -855,7 +855,7 @@ export default async function analyze(id: string, code: string, job: Job): Promi
}
else if (staticChildNode && staticChildNode.type === 'ArrayExpression' && 'value' in staticChildValue && staticChildValue.value instanceof Array) {
for (const value of staticChildValue.value) {
- try {
+ try {
const resolved = resolveAbsolutePathOrUrl(value);
emitAssetPath(resolved);
}
|
diff --git a/test/unit/top-level-await/input.js b/test/unit/top-level-await/input.js
new file mode 100644
--- /dev/null
+++ b/test/unit/top-level-await/input.js
@@ -0,0 +1,3 @@
+import {dep} from './module';
+
+await Promise.resolve(console.log(dep));
diff --git a/test/unit/top-level-await/module.js b/test/unit/top-level-await/module.js
new file mode 100644
--- /dev/null
+++ b/test/unit/top-level-await/module.js
@@ -0,0 +1 @@
+export const dep = 'dep';
\ No newline at end of file
diff --git a/test/unit/top-level-await/output.js b/test/unit/top-level-await/output.js
new file mode 100644
--- /dev/null
+++ b/test/unit/top-level-await/output.js
@@ -0,0 +1,5 @@
+[
+ "package.json",
+ "test/unit/top-level-await/input.js",
+ "test/unit/top-level-await/module.js"
+]
\ No newline at end of file
|
Add support for `top-level await`
just noticed an Error in `warnings`:
```
Error: Failed to parse xxx.js as module:
Cannot use keyword 'await' outside an async function
at Object.analyze [as default] ...
```
it already supported in node>=14.8.0, so i think there will be more and more projects using top-level await in the future.
|
Looks like we need to pass [allowAwaitOutsideFunction](https://github.com/acornjs/acorn/tree/master/acorn#interface) to acorn.
Would you like to submit a PR with a test to fix this?
| 2021-04-27T01:57:20
|
javascript
|
Hard
|
vercel/nft
| 123
|
vercel__nft-123
|
[
"122"
] |
19f05753caf6a6c1269beb70a71e4531a7c0b8fc
|
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -94,6 +94,7 @@
"pdfkit": "^0.10.0",
"pg": "^7.11.0",
"phantomjs-prebuilt": "^2.1.16",
+ "polyfill-library": "3.93.0",
"pug": "^2.0.4",
"react": "^16.8.6",
"react-dom": "^16.8.6",
diff --git a/src/utils/wrappers.js b/src/utils/wrappers.js
--- a/src/utils/wrappers.js
+++ b/src/utils/wrappers.js
@@ -309,7 +309,8 @@ function handleWrappers (ast) {
wrapper.callee.body.body[0].type === 'VariableDeclaration' &&
wrapper.callee.body.body[0].declarations.length === 1 &&
wrapper.callee.body.body[0].declarations[0].type === 'VariableDeclarator' &&
- wrapper.callee.body.body[0].declarations[0].id.type === 'Identifier' && (
+ wrapper.callee.body.body[0].declarations[0].id.type === 'Identifier' &&
+ wrapper.callee.body.body[0].declarations[0].init && (
wrapper.callee.body.body[0].declarations[0].init.type === 'ObjectExpression' &&
wrapper.callee.body.body[0].declarations[0].init.properties.length === 0 ||
wrapper.callee.body.body[0].declarations[0].init.type === 'CallExpression' &&
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -263,6 +263,19 @@
resolved "https://registry.yarnpkg.com/@ffmpeg-installer/win32-x64/-/win32-x64-4.1.0.tgz#17e8699b5798d4c60e36e2d6326a8ebe5e95a2c5"
integrity sha512-Drt5u2vzDnIONf4ZEkKtFlbvwj6rI3kxw1Ck9fpudmtgaZIHD4ucsWB2lCZBXRxJgXR+2IMSti+4rtM4C4rXgg==
+"@financial-times/polyfill-useragent-normaliser@^1.7.0":
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.7.0.tgz#6f830e7692bce601446c5833cc3917c3c187838f"
+ integrity sha512-cN2O4Eq2eLdg0j5sEszT6wxhOswPvR1Hgss2NmttuCvTFnVSE3saxg+Hl/buDaMGb193UrczPYPRUWNLKPQn8Q==
+ dependencies:
+ "@financial-times/useragent_parser" "^1.5.1"
+ semver "^7.1.1"
+
+"@financial-times/useragent_parser@^1.5.1":
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/@financial-times/useragent_parser/-/useragent_parser-1.5.1.tgz#14ef3e420b7a6617512e02bdd79189b5cb37f65d"
+ integrity sha512-g6MJ5tVszip1wAOq41yk8Z0WJqjfpu3hKaos/IaechYC4RqIn8bTanNR/EGD6oeOdJ9/fTPbQQX5/3ZQwSTXtQ==
+
"@firebase/app-types@0.4.0":
version "0.4.0"
resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.4.0.tgz#bb2c651f3b275fef549050cff28af752839c75c0"
@@ -424,6 +437,30 @@
resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.21.tgz#1116075d3d821e058a8c321385552c51fa3a6680"
integrity sha512-eL4xPPjTBceYKa27tN3SahSD/7k5ioKFGeZZZX67+aLuxxFts2eTCcotRAeKcjGu1xTz7GnWUkMsj4NZZTIGXg==
+"@formatjs/intl-pluralrules@^1.1.2":
+ version "1.5.9"
+ resolved "https://registry.yarnpkg.com/@formatjs/intl-pluralrules/-/intl-pluralrules-1.5.9.tgz#c363c833c0ccde11eb508de4c09d3eaa232e819a"
+ integrity sha512-37E1ZG+Oqo3qrpUfumzNcFTV+V+NCExmTkkQ9Zw4FSlvJ4WhbbeYdieVapUVz9M0cLy8XrhCkfuM/Kn03iKReg==
+ dependencies:
+ "@formatjs/intl-utils" "^2.3.0"
+
+"@formatjs/intl-relativetimeformat@^3.0.2":
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-3.1.0.tgz#a657d67e8e26a5985d72a80699be874c9bc470d3"
+ integrity sha512-xSW9RMJtZZTGAlT7qCom+0INLYgshowpBN0Xf+j4kME+U/g/ogTVRFeGvCZX3nDQ21vdTHAabR3AIGQRX7NU1g==
+ dependencies:
+ "@formatjs/intl-utils" "^1.1.0"
+
+"@formatjs/intl-utils@^1.1.0":
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-1.6.0.tgz#43b094232b9ef98b57a270bcecee99168d329e9f"
+ integrity sha512-5D0C4tQgNFJNaJ17BYum0GfAcKNK3oa1VWzgkv/AN7i52fg4r69ZLcpEGpf6tZiX9Qld8CDwTQOeFt6fuOqgVw==
+
+"@formatjs/intl-utils@^2.3.0":
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.3.0.tgz#2dc8c57044de0340eb53a7ba602e59abf80dc799"
+ integrity sha512-KWk80UPIzPmUg+P0rKh6TqspRw0G6eux1PuJr+zz47ftMaZ9QDwbGzHZbtzWkl5hgayM/qrKRutllRC7D/vVXQ==
+
"@google-cloud/bigquery@^4.1.4":
version "4.1.4"
resolved "https://registry.yarnpkg.com/@google-cloud/bigquery/-/bigquery-4.1.4.tgz#df1c7ba7af4780e516e38852cc8af618c6ecdcfb"
@@ -1447,6 +1484,11 @@
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.10.tgz#17a8ec65cd8e88f51b418ceb271af18d3137df67"
integrity sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==
+"@webcomponents/template@^1.4.0":
+ version "1.4.2"
+ resolved "https://registry.yarnpkg.com/@webcomponents/template/-/template-1.4.2.tgz#d4210ddd47159539dcf83e6c43cece95807f7f0e"
+ integrity sha512-UMDbju+BTgZmMvGXczjxqM4lukmWrnPrxpDX/nMTM/nGFeNhRBc/5mamQnhyys4EZVGReRL/TLeTxse6fRLltQ==
+
"@wry/equality@^0.1.2":
version "0.1.9"
resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.9.tgz#b13e18b7a8053c6858aa6c85b54911fb31e3a909"
@@ -1459,6 +1501,11 @@
resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.17.0.tgz#f6121a15cf7ec76a65c17a3aa7d38e98151ea76e"
integrity sha512-PEu1L+bqj5c/BbkmBu3IRKOP10jprmJu4+EtHaFBQzeTfGcXnzbrssUVhzXpGi2X6Dw5S1FvwLWFGP3X5uEKYA==
+Base64@^1.0.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/Base64/-/Base64-1.1.0.tgz#810ef21afa8357df92ad7b5389188c446b9cb956"
+ integrity sha512-qeacf8dvGpf+XAT27ESHMh7z84uRzj/ua2pQdJg483m3bEXv/kVFtDnMgvf70BQGqzbZhR9t6BmASzKvqfJf3Q==
+
JSONStream@^1.0.3, JSONStream@^1.3.1, JSONStream@^1.3.4, JSONStream@^1.3.5:
version "1.3.5"
resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -2198,6 +2245,11 @@ atob@^2.1.1:
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+audio-context-polyfill@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/audio-context-polyfill/-/audio-context-polyfill-1.0.0.tgz#4b728faf0a19555194d4fbd05582f833fdcd137b"
+ integrity sha1-S3KPrwoZVVGU1PvQVYL4M/3NE3s=
+
auth0@^2.18.0:
version "2.18.0"
resolved "https://registry.yarnpkg.com/auth0/-/auth0-2.18.0.tgz#9360d7b2cb7bb201dc44c774032cfeefd8762a98"
@@ -3882,6 +3934,11 @@ cuid@^2.1.0:
resolved "https://registry.yarnpkg.com/cuid/-/cuid-2.1.6.tgz#dc3a20b5a7497d36d32c0bf8a2997524c9c796c4"
integrity sha512-ZFp7PS6cSYMJNch9fc3tyHdE4T8TDo3Y5qAxb0KSA9mpiYDo7z9ql1CznFuuzxea9STVIDy0tJWm2lYiX2ZU1Q==
+current-script-polyfill@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz#f31cf7e4f3e218b0726e738ca92a02d3488ef615"
+ integrity sha1-8xz35PPiGLBybnOMqSoC00iO9hU=
+
cyclist@~0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
@@ -3954,7 +4011,7 @@ debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
dependencies:
ms "2.0.0"
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
+debug@4, debug@4.1.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -4000,7 +4057,7 @@ deep-extend@^0.6.0:
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-deep-is@~0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -4174,6 +4231,11 @@ diff-sequences@^24.3.0:
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz#0f20e8a1df1abddaf4d9c226680952e64118b975"
integrity sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw==
+diff@4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+ integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
diffie-hellman@^5.0.0:
version "5.0.3"
resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -4656,6 +4718,11 @@ event-kit@^2.0.0, event-kit@^2.2.0:
resolved "https://registry.yarnpkg.com/event-kit/-/event-kit-2.5.3.tgz#d47e4bc116ec0aacd00263791fa1a55eb5e79ba1"
integrity sha512-b7Qi1JNzY4BfAYfnIRanLk0DOD1gdkWHT4GISIn8Q2tAf3LpU8SP2CMwWaq40imYoKWbtN4ZhbSRxvsnikooZQ==
+event-source-polyfill@^1.0.12:
+ version "1.0.15"
+ resolved "https://registry.yarnpkg.com/event-source-polyfill/-/event-source-polyfill-1.0.15.tgz#a28e116281be677af4b055b67d95517e35c92435"
+ integrity sha512-IVmd8jWwX6ag5rXIdVCPBjBChiHBceLb1/7aKPIK7CUeJ5Br7alx029+ZpQlK4jW4Hk2qncy3ClJP97S8ltvmg==
+
event-target-shim@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
@@ -5254,6 +5321,13 @@ fresh@0.5.2, fresh@~0.5.2:
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+from2-string@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/from2-string/-/from2-string-1.1.0.tgz#18282b27d08a267cb3030cd2b8b4b0f212af752a"
+ integrity sha1-GCgrJ9CKJnyzAwzSuLSw8hKvdSo=
+ dependencies:
+ from2 "^2.0.3"
+
from2@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/from2/-/from2-1.3.0.tgz#88413baaa5f9a597cfde9221d86986cd3c061dfd"
@@ -5262,7 +5336,7 @@ from2@^1.3.0:
inherits "~2.0.1"
readable-stream "~1.1.10"
-from2@^2.1.0, from2@^2.1.1:
+from2@^2.0.3, from2@^2.1.0, from2@^2.1.1:
version "2.3.0"
resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
@@ -5716,6 +5790,11 @@ got@^8.0.0:
url-parse-lax "^3.0.0"
url-to-options "^1.0.1"
+graceful-fs@^4.1.10:
+ version "4.2.4"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+ integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
@@ -6059,6 +6138,11 @@ html-encoding-sniffer@^1.0.2:
dependencies:
whatwg-encoding "^1.0.1"
+html5shiv@^3.7.3:
+ version "3.7.3"
+ resolved "https://registry.yarnpkg.com/html5shiv/-/html5shiv-3.7.3.tgz#d78a84a367bcb9a710100d57802c387b084631d2"
+ integrity sha1-14qEo2e8uacQEA1XgCw4ewhGMdI=
+
htmlescape@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
@@ -6373,6 +6457,11 @@ intl-messageformat@^2.2.0:
dependencies:
intl-messageformat-parser "1.4.0"
+intl@^1.2.5:
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
+ integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=
+
into-stream@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
@@ -6798,6 +6887,11 @@ is-upper-case@^1.1.0:
dependencies:
upper-case "^1.1.0"
+is-url@^1.2.2:
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
+ integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
+
is-utf8@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
@@ -6823,6 +6917,15 @@ is-wsl@^1.1.0:
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+is2@2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/is2/-/is2-2.0.1.tgz#8ac355644840921ce435d94f05d3a94634d3481a"
+ integrity sha512-+WaJvnaA7aJySz2q/8sLjMb2Mw14KTplHmSwcSpZ/fWJPkUmqw3YTzSWbPJ7OAwRvdYTWF2Wg+yYJ1AdP5Z8CA==
+ dependencies:
+ deep-is "^0.1.3"
+ ip-regex "^2.1.0"
+ is-url "^1.2.2"
+
is@^3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/is/-/is-3.3.0.tgz#61cff6dd3c4193db94a3d62582072b44e5645d79"
@@ -7382,6 +7485,11 @@ js-library-detector@^5.4.0:
resolved "https://registry.yarnpkg.com/js-library-detector/-/js-library-detector-5.4.0.tgz#d1b08dfbdc3886258f888bd441801ef9e5b69567"
integrity sha512-lSTEC9Q3L/cXOhYIilW3GH/v4tOnPIN40NTIBHRcn2vxTwGhMyySQTQpJ0W68ISGzOgvwVe7KCfQ9PJi6MsOIw==
+js-polyfills@^0.1.40:
+ version "0.1.42"
+ resolved "https://registry.yarnpkg.com/js-polyfills/-/js-polyfills-0.1.42.tgz#5d484902b361e3cf601fd23ad0f30bafcc93f148"
+ integrity sha1-XUhJArNh489gH9I60PMLr8yT8Ug=
+
js-stringify@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
@@ -7505,6 +7613,11 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+json3@^3.3.2:
+ version "3.3.3"
+ resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
+ integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
+
json5@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
@@ -8623,6 +8736,11 @@ merge-stream@^1.0.1:
dependencies:
readable-stream "^2.0.1"
+merge2@^1.0.3:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+ integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
merge2@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
@@ -8820,6 +8938,13 @@ mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
dependencies:
minimist "0.0.8"
+mnemonist@^0.32.0:
+ version "0.32.0"
+ resolved "https://registry.yarnpkg.com/mnemonist/-/mnemonist-0.32.0.tgz#2c6d1dd12cb69ca2ed79a636ba9ffe5a6e9f2573"
+ integrity sha512-WMVGPpT8guWwnsnw+WibOvInBnPfXFG+9SD+mg2+YgPEuW9Gdz9D2MEi05ko6RG1ui0RHljc+yYAvOHQn3GbbQ==
+ dependencies:
+ obliterator "^1.5.0"
+
module-deps@^6.0.0:
version "6.2.1"
resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.2.1.tgz#cfe558784060e926824f474b4e647287837cda50"
@@ -8983,6 +9108,11 @@ msgpack5@^4.2.0:
readable-stream "^2.3.6"
safe-buffer "^5.1.2"
+mutationobserver-shim@^0.3.2:
+ version "0.3.7"
+ resolved "https://registry.yarnpkg.com/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz#8bf633b0c0b0291a1107255ed32c13088a8c5bf3"
+ integrity sha512-oRIDTyZQU96nAiz2AQyngwx1e89iApl2hN5AOYwyxLUB47UYsU3Wv9lJWqH5y/QdiYkc5HQLi23ZNB3fELdHcQ==
+
mute-stream@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@@ -9663,6 +9793,11 @@ object.pick@^1.3.0:
dependencies:
isobject "^3.0.1"
+obliterator@^1.5.0:
+ version "1.6.1"
+ resolved "https://registry.yarnpkg.com/obliterator/-/obliterator-1.6.1.tgz#dea03e8ab821f6c4d96a299e17aef6a3af994ef3"
+ integrity sha512-9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig==
+
omggif@^1.0.9:
version "1.0.9"
resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.9.tgz#dcb7024dacd50c52b4d303f04802c91c057c765f"
@@ -10378,6 +10513,11 @@ picomatch@^2.0.5:
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
+picturefill@^3.0.1:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/picturefill/-/picturefill-3.0.3.tgz#a5c38eeb02d74def38e1790ff61e166166b4f224"
+ integrity sha512-JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g==
+
pify@^2.0.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -10446,6 +10586,49 @@ pngjs@^3.0.0, pngjs@^3.3.3:
resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
+polyfill-library@3.93.0:
+ version "3.93.0"
+ resolved "https://registry.yarnpkg.com/polyfill-library/-/polyfill-library-3.93.0.tgz#75c091a4f8eaddd338ce1b8408c6e44ce17ef635"
+ integrity sha512-Sv4A4hUK5/s95EqUtOnbZawQj2o9aVsnZbIQ6pCg400I0Ip4mWNLyDhpXwj78WV6OWvGhh4LBNjm5G43c1R5TA==
+ dependencies:
+ "@financial-times/polyfill-useragent-normaliser" "^1.7.0"
+ "@formatjs/intl-pluralrules" "^1.1.2"
+ "@formatjs/intl-relativetimeformat" "^3.0.2"
+ "@webcomponents/template" "^1.4.0"
+ Base64 "^1.0.0"
+ abort-controller "^3.0.0"
+ audio-context-polyfill "^1.0.0"
+ current-script-polyfill "^1.0.0"
+ diff "4.0.2"
+ event-source-polyfill "^1.0.12"
+ from2-string "^1.1.0"
+ glob "^7.1.1"
+ graceful-fs "^4.1.10"
+ html5shiv "^3.7.3"
+ intl "^1.2.5"
+ js-polyfills "^0.1.40"
+ json3 "^3.3.2"
+ merge2 "^1.0.3"
+ mkdirp "^0.5.0"
+ mnemonist "^0.32.0"
+ mutationobserver-shim "^0.3.2"
+ picturefill "^3.0.1"
+ resize-observer-polyfill "^1.5.1"
+ rimraf "^3.0.0"
+ smoothscroll-polyfill "^0.4.4"
+ spdx-licenses "^1.0.0"
+ stream-cache "^0.0.2"
+ stream-from-promise "^1.0.0"
+ stream-to-string "^1.1.0"
+ toposort "^2.0.2"
+ uglify-js "^2.7.5"
+ unorm "^1.6.0"
+ usertiming "^0.1.8"
+ web-animations-js "^2.2.5"
+ whatwg-fetch "^3.0.0"
+ wicg-inert "^3.0.0"
+ yaku "0.19.3"
+
pop-iterate@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/pop-iterate/-/pop-iterate-1.0.1.tgz#ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"
@@ -10584,6 +10767,11 @@ promise-polyfill@8.1.0:
resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.0.tgz#30059da54d1358ce905ac581f287e184aedf995d"
integrity sha512-OzSf6gcCUQ01byV4BgwyUCswlaQQ6gzXc23aLQWhicvfX9kfsUiUhgt3CCQej8jDnl8/PhGF31JdHX2/MzF3WA==
+promise-polyfill@^1.1.6:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-1.1.6.tgz#cd04eff46f5c95c3a7d045591d79b5e3e01f12d7"
+ integrity sha1-zQTv9G9clcOn0EVZHXm14+AfEtc=
+
promise-retry@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
@@ -11391,6 +11579,11 @@ require_optional@^1.0.1:
resolve-from "^2.0.0"
semver "^5.1.0"
+resize-observer-polyfill@^1.5.1:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
+ integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
+
resolve-cwd@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -11537,6 +11730,13 @@ rimraf@2, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.
dependencies:
glob "^7.1.3"
+rimraf@^3.0.0:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+ integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+ dependencies:
+ glob "^7.1.3"
+
ripemd160@^2.0.0, ripemd160@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -12011,6 +12211,11 @@ smart-buffer@4.0.2:
resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==
+smoothscroll-polyfill@^0.4.4:
+ version "0.4.4"
+ resolved "https://registry.yarnpkg.com/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz#3a259131dc6930e6ca80003e1cb03b603b69abf8"
+ integrity sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==
+
smtp-connection@2.12.0:
version "2.12.0"
resolved "https://registry.yarnpkg.com/smtp-connection/-/smtp-connection-2.12.0.tgz#d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"
@@ -12234,6 +12439,14 @@ spdx-license-ids@^3.0.0:
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"
integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==
+spdx-licenses@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/spdx-licenses/-/spdx-licenses-1.0.0.tgz#e883cc8fab52cbfea9acc5cf6cb01244b08eff79"
+ integrity sha512-BmeFZRYH9XXf56omx0LuiG+gBXRqwmrKsOtcsGTJh8tw9U0cgRKTrOnyDpP1uvI1AVEkoRKYaAvR902ByotFOw==
+ dependencies:
+ debug "4.1.1"
+ is2 "2.0.1"
+
speedline-core@1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/speedline-core/-/speedline-core-1.4.2.tgz#bb061444a218d67b4cd52f63a262386197b90c8a"
@@ -12405,6 +12618,11 @@ stream-browserify@^2.0.0:
inherits "~2.0.1"
readable-stream "^2.0.2"
+stream-cache@^0.0.2:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/stream-cache/-/stream-cache-0.0.2.tgz#1ac5ad6832428ca55667dbdee395dad4e6db118f"
+ integrity sha1-GsWtaDJCjKVWZ9ve45Xa1ObbEY8=
+
stream-combiner2@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
@@ -12435,6 +12653,11 @@ stream-events@^1.0.1, stream-events@^1.0.4, stream-events@^1.0.5:
dependencies:
stubs "^3.0.0"
+stream-from-promise@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/stream-from-promise/-/stream-from-promise-1.0.0.tgz#763687f7dd777e4c894f6408333fc6b3fc8a61bb"
+ integrity sha1-djaH9913fkyJT2QIMz/Gs/yKYbs=
+
stream-http@^2.0.0, stream-http@^2.8.3:
version "2.8.3"
resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
@@ -12472,6 +12695,13 @@ stream-splicer@^2.0.0:
inherits "^2.0.1"
readable-stream "^2.0.2"
+stream-to-string@^1.1.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/stream-to-string/-/stream-to-string-1.2.0.tgz#3ca506a097ecbf78b0e0aee0b6fa5c4565412a15"
+ integrity sha512-8drZlFIKBHSMdX9GCWv8V9AAWnQcTqw0iAI6/GC7UJ0H0SwKeFKjOoZfGY1tOU00GGU7FYZQoJ/ZCUEoXhD7yQ==
+ dependencies:
+ promise-polyfill "^1.1.6"
+
streamsearch@0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
@@ -13074,6 +13304,11 @@ toposort-class@^1.0.1:
resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988"
integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg=
+toposort@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+ integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
+
tough-cookie@3.x:
version "3.0.1"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
@@ -13219,7 +13454,7 @@ uglify-es@^3.3.9:
commander "~2.13.0"
source-map "~0.6.1"
-uglify-js@^2.6.1:
+uglify-js@^2.6.1, uglify-js@^2.7.5:
version "2.8.29"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
@@ -13412,6 +13647,11 @@ unix-dgram@2.0.x:
bindings "^1.3.0"
nan "^2.13.2"
+unorm@^1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.6.0.tgz#029b289661fba714f1a9af439eb51d9b16c205af"
+ integrity sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==
+
unpipe@1.0.0, unpipe@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -13520,6 +13760,11 @@ use@^3.1.0:
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+usertiming@^0.1.8:
+ version "0.1.8"
+ resolved "https://registry.yarnpkg.com/usertiming/-/usertiming-0.1.8.tgz#35378e7f41a248d40e658d05f80423469a7b0650"
+ integrity sha1-NTeOf0GiSNQOZY0F+AQjRpp7BlA=
+
utif@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/utif/-/utif-2.0.1.tgz#9e1582d9bbd20011a6588548ed3266298e711759"
@@ -13722,6 +13967,11 @@ weak-map@^1.0.5:
resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.5.tgz#79691584d98607f5070bd3b70a40e6bb22e401eb"
integrity sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=
+web-animations-js@^2.2.5:
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.3.2.tgz#a51963a359c543f97b47c7d4bc2d811f9fc9e153"
+ integrity sha512-TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA==
+
webidl-conversions@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
@@ -13765,7 +14015,7 @@ whatwg-fetch@2.0.4:
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
-whatwg-fetch@>=0.10.0:
+whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
@@ -13825,6 +14075,11 @@ which@1, which@^1.1.1, which@^1.2.10, which@^1.2.12, which@^1.2.9, which@^1.3.0,
dependencies:
isexe "^2.0.0"
+wicg-inert@^3.0.0:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.0.3.tgz#7d05eaed64176887ee4c66fc0c4d6fe4b38ccce5"
+ integrity sha512-XwXf8K0NN4cpagjBlZ2/j/5Sjf6dW3HNbfywEy1y6Z8PJKvSHVGiuc5Id/9RZ6EmGq+GQCGTo7B2SK0Misbr6g==
+
wide-align@^1.1.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -14066,6 +14321,11 @@ y18n@^3.2.0, y18n@^3.2.1:
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+yaku@0.19.3:
+ version "0.19.3"
+ resolved "https://registry.yarnpkg.com/yaku/-/yaku-0.19.3.tgz#886edda49b27ac98061bb8bdc7d56543c4dc61d1"
+ integrity sha512-QgelIZVBPKnWyvd/zoaSVOmv7lzLoa3gsjI+vjc9ts9QLeLCrWTSSHB6Y+Hslo+NntC5HelX/prt0Npt4B+pKA==
+
yallist@^2.0.0, yallist@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
|
diff --git a/test/integration/polyfill-library.js b/test/integration/polyfill-library.js
new file mode 100644
--- /dev/null
+++ b/test/integration/polyfill-library.js
@@ -0,0 +1,12 @@
+const polyfill = require('polyfill-library')
+
+async function handler() {
+ const script = await polyfill.getPolyfillString({
+ minify: false,
+ features: { 'es6': { flags: ['gated'] } }
+ })
+ return script
+}
+
+handler().then(script => console.log(typeof script)).catch(console.error)
+
|
Fails to trace `polyfill-library` package: Cannot read property 'type' of null
## Versions
Tested with `polyfill-library@3.93.0` and `node-file-trace@0.6.3`.
## Input file
```js
const polyfill = require('polyfill-library')
async function handler() {
const script = await polyfill.getPolyfillString({
minify: false,
features: { 'es6': { flags: ['gated'] }
})
return script
}
handler().then(script => console.log(typeof script)).catch(console.error)
```
## Error
```
TypeError: Cannot read property 'type' of null
at handleWrappers (/usr/local/lib/node_modules/@zeit/node-file-trace/src/utils/wrappers.js:313:60)
at module.exports (/usr/local/lib/node_modules/@zeit/node-file-trace/src/analyze.js:398:3)
at Job.emitDependency (/usr/local/lib/node_modules/@zeit/node-file-trace/src/node-file-trace.js:245:40)
at /usr/local/lib/node_modules/@zeit/node-file-trace/src/node-file-trace.js:256:22
at Array.map (<anonymous>)
at Job.emitDependency (/usr/local/lib/node_modules/@zeit/node-file-trace/src/node-file-trace.js:252:22)
at async /usr/local/lib/node_modules/@zeit/node-file-trace/src/node-file-trace.js:270:9
at async Promise.all (index 2)
at async Job.emitDependency (/usr/local/lib/node_modules/@zeit/node-file-trace/src/node-file-trace.js:251:5)
at async /usr/local/lib/node_modules/@zeit/node-file-trace/src/node-file-trace.js:270:9
```
| 2020-06-15T04:45:58
|
javascript
|
Hard
|
|
Spomky-Labs/otphp
| 166
|
Spomky-Labs__otphp-166
|
[
"165"
] |
8cf16dcb41d35f04842ef38e7e61bfaa228f6c2b
|
diff --git a/doc/AppConfig.md b/doc/AppConfig.md
--- a/doc/AppConfig.md
+++ b/doc/AppConfig.md
@@ -15,7 +15,7 @@ You just have to:
<?php
use OTPHP\TOTP;
-$totp = TOTP::create('JBSWY3DPEHPK3PXP'); // New TOTP with custom secret
+$totp = TOTP::createFromSecret('JBSWY3DPEHPK3PXP'); // New TOTP with custom secret
$totp->setLabel('alice@google.com'); // The label (string)
$totp->getProvisioningUri(); // Will return otpauth://totp/alice%40google.com?secret=JBSWY3DPEHPK3PXP
@@ -34,7 +34,7 @@ Hereafter two examples using the Google Chart API (this API is deprecated since
<?php
use OTPHP\TOTP;
-$totp = TOTP::create(); // New TOTP
+$totp = TOTP::generate(); // New TOTP
$totp->setLabel('alice@google.com'); // The label (string)
$google_chart = $totp->getQrCodeUri('https://chart.googleapis.com/chart?chs=200x200&chld=M|0&cht=qr&chl={PROVISIONING_URI}', '{PROVISIONING_URI}');
@@ -48,7 +48,7 @@ Please note that this URI MUST contain a placeholder for the OTP Provisioning UR
<?php
use OTPHP\TOTP;
-$totp = TOTP::create(); // New TOTP
+$totp = TOTP::generate(); // New TOTP
$totp->setLabel('alice@google.com'); // The label (string)
$goqr_me = $totp->getQrCodeUri(
@@ -74,7 +74,7 @@ Now run the following and compare the output
<?php
use OTPHP\TOTP;
-$totp = TOTP::create('JBSWY3DPEHPK3PXP'); // New TOTP with custom secret
+$totp = TOTP::createFromSecret('JBSWY3DPEHPK3PXP'); // New TOTP with custom secret
$totp->setLabel('alice@google.com'); // The label (string)
echo 'Current OTP: ' . $totp->now();
@@ -92,13 +92,11 @@ Now run the following and compare the output
<?php
use OTPHP\TOTP;
-$totp = TOTP::create(
- 'JBSWY3DPEHPK3PXP', // New TOTP with custom secret
- 10, // The period (int)
- 'sha512', // The digest algorithm (string)
- 8 // The number of digits (int)
-);
-$totp->setLabel('alice@google.com'); // The label (string)
+$totp = TOTP::createFromSecret('JBSWY3DPEHPK3PXP'); // New TOTP with custom secret
+$totp->setPeriod(10); // The period (int)
+$totp->setDigest('sha512'); // The digest algorithm (string)
+$totp->setDigits(8); // The number of digits (int)
+$totp->setLabel('alice@google.com'); // The label (string)
echo 'Current OTP: ' . $totp->now();
```
diff --git a/doc/Customize.md b/doc/Customize.md
--- a/doc/Customize.md
+++ b/doc/Customize.md
@@ -21,7 +21,7 @@ use OTPHP\TOTP;
use ParagonIE\ConstantTime\Base32;
$mySecret = trim(Base32::encodeUpper(random_bytes(128)), '='); // We generate our own 1024 bits secret
-$otp = TOTP::create($mySecret);
+$otp = TOTP::createFromSecret($mySecret);
```
*Please note that the trailing `=` are automatically removed by the library.*
@@ -35,15 +35,11 @@ By default, the period for a TOTP is 30 seconds and the counter for a HOTP is 0.
use OTPHP\TOTP;
use OTPHP\HOTP;
-$otp = TOTP::create(
- null, // Let the secret be defined by the class
- 10 // The period is now 10 seconds
-);
+$otp = TOTP::generate();
+$otp->setPeriod(10); // The period is now 10 seconds
-$otp = HOTP::create(
- null, // Let the secret be defined by the class
- 1000 // The counter is now 1000. We recommend you start at `0`, but you can set any value (at least 0)
-);
+$otp = HOTP::generate();
+$otp->setCounter(1000); // The counter is now 1000. We recommend you start at `0`, but you can set any value (at least 0)
```
## Digest
@@ -59,11 +55,9 @@ You must verify that the algorithm you want to use is supported by the applicati
<?php
use OTPHP\TOTP;
-$totp = TOTP::create(
- null, // Let the secret be defined by the class
- 30, // The period (30 seconds)
- 'ripemd160' // The digest algorithm
-);
+$totp = TOTP::generate();
+$totp->setPeriod(30); // The period (30 seconds)
+$totp->setDigest('ripemd160'); // The digest algorithm
```
## Digits
@@ -75,12 +69,10 @@ You can decide to use more (or less) digits. More than 10 may be difficult to us
<?php
use OTPHP\TOTP;
-$totp = TOTP::create(
- null, // Let the secret be defined by the class
- 30, // The period (30 seconds)
- 'sha1', // The digest algorithm
- 8 // The output will generate 8 digits
-);
+$totp = TOTP::generate();
+$totp->setPeriod(30); // The period (30 seconds)
+$totp->setDigest('sha1'); // The digest algorithm
+$totp->setDigits(8); // The output will generate 8 digits
```
## Epoch (TOTP only)
@@ -100,12 +92,10 @@ example encode the timestamp in the secret to make it different each time.
use OTPHP\TOTP;
// Without epoch
-$otp = TOTP::create(
- null, // Let the secret be defined by the class
- 5, // The period (5 seconds)
- 'sha1', // The digest algorithm
- 6 // The output will generate 6 digits
-);
+$otp = TOTP::generate();
+$otp->setPeriod(5); // The period (5 seconds)
+$otp->setDigest('sha1'); // The digest algorithm
+$otp->setDigits(6); // The output will generate 6 digits
$password = $otp->at(1519401289); // Current period is: 1519401285 - 1519401289
@@ -113,13 +103,11 @@ $otp->verify($password, 1519401289); // Second 1: true
$otp->verify($password, 1519401290); // Second 2: false
// With epoch
-$otp = TOTP::create(
- null, // Let the secret be defined by the class
- 5, // The period (5 seconds)
- 'sha1', // The digest algorithm
- 6, // The output will generate 6 digits
- 1519401289 // The epoch is now 02/23/2018 @ 3:54:49pm (UTC)
-);
+$otp = TOTP::generate();
+$otp->setPeriod(5); // The period (30 seconds)
+$otp->setDigest('sha1'); // The digest algorithm
+$otp->setDigits(6); // The output will generate 8 digits
+$otp->setEpoch(1519401289); // The epoch is now 02/23/2018 @ 3:54:49pm (UTC)
$password = $otp->at(1519401289); // Current period is: 1519401289 - 1519401293
@@ -140,7 +128,7 @@ These parameters are available in the provisioning URI or from the method `getPa
<?php
use OTPHP\TOTP;
-$totp = TOTP::create('JBSWY3DPEHPK3PXP'); // New TOTP
+$totp = TOTP::createFromSecret('JBSWY3DPEHPK3PXP'); // New TOTP
$totp->setLabel('alice@google.com'); // The label
$totp->setParameter('foo', 'bar');
@@ -156,7 +144,7 @@ it is useful to set the issuer parameter to identify the service that provided t
<?php
use OTPHP\TOTP;
-$totp = TOTP::create('JBSWY3DPEHPK3PXP'); // New TOTP with custom secret
+$totp = TOTP::createFromSecret('JBSWY3DPEHPK3PXP'); // New TOTP with custom secret
$totp->setLabel('alice@google.com'); // The label (string)
$totp->setIssuer('My Service');
```
@@ -187,7 +175,7 @@ Some applications such as FreeOTP can load images from an URI (`image` parameter
<?php
use OTPHP\TOTP;
-$totp = TOTP::create('JBSWY3DPEHPK3PXP'); // New TOTP with custom secret
+$totp = TOTP::createFromSecret('JBSWY3DPEHPK3PXP'); // New TOTP with custom secret
$totp->setLabel('alice@google.com'); // The label (string)
$totp->setParameter('image', 'https://foo.bar/otp.png');
diff --git a/doc/QA.md b/doc/QA.md
--- a/doc/QA.md
+++ b/doc/QA.md
@@ -24,12 +24,10 @@ $digits = 6;
$digest = 'sha1';
$period = 30;
-$totp = TOTP::create(
- $user->getOtpSecret(),
- $period,
- $digest,
- $digits
-);
+$totp = TOTP::createFromSecret($user->getOtpSecret());
+$totp->setPeriod($period);
+$totp->setDigest($digest);
+$totp->setDigits($digits);
$totp->setLabel($user->getEmail());
$totp->verify($_POST['otp']);
@@ -76,7 +74,7 @@ If you try the following code lines, you may see 2 different OTPs.
<?php
use OTPHP\TOTP;
-$totp = TOTP::create(null, 10); // TOTP with an 10 seconds period
+$totp = TOTP::generate(10); // TOTP with an 10 seconds period
for ($i = 0; $i < 10; $i++) {
echo 'Current OTP is: '. $totp->now();
diff --git a/doc/index.md b/doc/index.md
--- a/doc/index.md
+++ b/doc/index.md
@@ -42,13 +42,13 @@ use OTPHP\TOTP;
// A random secret will be generated from this.
// You should store the secret with the user for verification.
-$otp = TOTP::create();
+$otp = TOTP::generate();
echo "The OTP secret is: {$otp->getSecret()}\n";
// Note: use your own way to load the user secret.
// The function "load_user_secret" is simply a placeholder.
$secret = load_user_secret();
-$otp = TOTP::create($secret);
+$otp = TOTP::createFromSecret($secret);
echo "The current OTP is: {$otp->now()}\n";
```
@@ -74,7 +74,7 @@ echo "<img src='{$grCodeUri}'>";
Now that your applications are configured, you can verify the generated OTPs:
```php
-$otp = TOTP::create($secret); // create TOTP object from the secret.
+$otp = TOTP::createFromSecret($secret); // create TOTP object from the secret.
$otp->verify($input); // Returns true if the input is verified, otherwise false.
```
diff --git a/phpstan.neon b/phpstan.neon
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -5,6 +5,7 @@ parameters:
- tests
ignoreErrors:
- '#Variable property access on \$this\(OTPHP\\OTP\)\.#'
+ - '#^Method OTPHP\\OTP::generateSecret\(\) should return non-empty-string but returns string\.$#'
includes:
- vendor/phpstan/phpstan-strict-rules/rules.neon
diff --git a/src/Factory.php b/src/Factory.php
--- a/src/Factory.php
+++ b/src/Factory.php
@@ -62,12 +62,12 @@ private static function createOTP(Url $parsed_url): OTPInterface
{
switch ($parsed_url->getHost()) {
case 'totp':
- $totp = TOTP::create($parsed_url->getSecret());
+ $totp = TOTP::createFromSecret($parsed_url->getSecret());
$totp->setLabel(self::getLabel($parsed_url->getPath()));
return $totp;
case 'hotp':
- $hotp = HOTP::create($parsed_url->getSecret());
+ $hotp = HOTP::createFromSecret($parsed_url->getSecret());
$hotp->setLabel(self::getLabel($parsed_url->getPath()));
return $hotp;
diff --git a/src/HOTP.php b/src/HOTP.php
--- a/src/HOTP.php
+++ b/src/HOTP.php
@@ -12,19 +12,36 @@
*/
final class HOTP extends OTP implements HOTPInterface
{
- protected function __construct(null|string $secret, int $counter, string $digest, int $digits)
- {
- parent::__construct($secret, $digest, $digits);
- $this->setCounter($counter);
- }
-
public static function create(
null|string $secret = null,
- int $counter = 0,
- string $digest = 'sha1',
- int $digits = 6
+ int $counter = self::DEFAULT_COUNTER,
+ string $digest = self::DEFAULT_DIGEST,
+ int $digits = self::DEFAULT_DIGITS
): self {
- return new self($secret, $counter, $digest, $digits);
+ $htop = $secret !== null
+ ? self::createFromSecret($secret)
+ : self::generate()
+ ;
+ $htop->setCounter($counter);
+ $htop->setDigest($digest);
+ $htop->setDigits($digits);
+
+ return $htop;
+ }
+
+ public static function createFromSecret(string $secret): self
+ {
+ $htop = new self($secret);
+ $htop->setCounter(self::DEFAULT_COUNTER);
+ $htop->setDigest(self::DEFAULT_DIGEST);
+ $htop->setDigits(self::DEFAULT_DIGITS);
+
+ return $htop;
+ }
+
+ public static function generate(): self
+ {
+ return self::createFromSecret(self::generateSecret());
}
public function getCounter(): int
@@ -58,7 +75,7 @@ public function verify(string $otp, null|int $counter = null, null|int $window =
return $this->verifyOtpWithWindow($otp, $counter, $window);
}
- protected function setCounter(int $counter): void
+ public function setCounter(int $counter): void
{
$this->setParameter('counter', $counter);
}
diff --git a/src/HOTPInterface.php b/src/HOTPInterface.php
--- a/src/HOTPInterface.php
+++ b/src/HOTPInterface.php
@@ -6,15 +6,22 @@
interface HOTPInterface extends OTPInterface
{
+ public const DEFAULT_COUNTER = 0;
+
/**
* The initial counter (a positive integer).
*/
public function getCounter(): int;
/**
- * Create a new TOTP object.
+ * Create a new HOTP object.
*
* If the secret is null, a random 64 bytes secret will be generated.
+ *
+ * @param null|non-empty-string $secret
+ * @param non-empty-string $digest
+ *
+ * @deprecated Deprecated since v11.1, use ::createFromSecret or ::generate instead
*/
public static function create(
null|string $secret = null,
@@ -22,4 +29,6 @@ public static function create(
string $digest = 'sha1',
int $digits = 6
): self;
+
+ public function setCounter(int $counter): void;
}
diff --git a/src/OTP.php b/src/OTP.php
--- a/src/OTP.php
+++ b/src/OTP.php
@@ -17,11 +17,12 @@ abstract class OTP implements OTPInterface
{
use ParameterTrait;
- protected function __construct(null|string $secret, string $digest, int $digits)
+ /**
+ * @param non-empty-string $secret
+ */
+ protected function __construct(string $secret)
{
$this->setSecret($secret);
- $this->setDigest($digest);
- $this->setDigits($digits);
}
public function getQrCodeUri(string $uri, string $placeholder): string
@@ -36,6 +37,14 @@ public function at(int $input): string
return $this->generateOTP($input);
}
+ /**
+ * @return non-empty-string
+ */
+ final protected static function generateSecret(): string
+ {
+ return Base32::encodeUpper(random_bytes(64));
+ }
+
/**
* The OTP at the specified input.
*/
diff --git a/src/OTPInterface.php b/src/OTPInterface.php
--- a/src/OTPInterface.php
+++ b/src/OTPInterface.php
@@ -6,6 +6,34 @@
interface OTPInterface
{
+ public const DEFAULT_DIGITS = 6;
+
+ public const DEFAULT_DIGEST = 'sha1';
+
+ /**
+ * Create a OTP object from an existing secret.
+ *
+ * @param non-empty-string $secret
+ */
+ public static function createFromSecret(string $secret): self;
+
+ /**
+ * Create a new OTP object. A random 64 bytes secret will be generated.
+ */
+ public static function generate(): self;
+
+ /**
+ * @param non-empty-string $secret
+ */
+ public function setSecret(string $secret): void;
+
+ public function setDigits(int $digits): void;
+
+ /**
+ * @param non-empty-string $digest
+ */
+ public function setDigest(string $digest): void;
+
/**
* @return string Return the OTP at the specified timestamp
*/
diff --git a/src/ParameterTrait.php b/src/ParameterTrait.php
--- a/src/ParameterTrait.php
+++ b/src/ParameterTrait.php
@@ -9,7 +9,6 @@
use InvalidArgumentException;
use function is_int;
use function is_string;
-use ParagonIE\ConstantTime\Base32;
trait ParameterTrait
{
@@ -122,6 +121,21 @@ public function setParameter(string $parameter, mixed $value): void
}
}
+ public function setSecret(string $secret): void
+ {
+ $this->setParameter('secret', $secret);
+ }
+
+ public function setDigits(int $digits): void
+ {
+ $this->setParameter('digits', $digits);
+ }
+
+ public function setDigest(string $digest): void
+ {
+ $this->setParameter('algorithm', $digest);
+ }
+
/**
* @return array<string, callable>
*/
@@ -136,10 +150,6 @@ protected function getParameterMap(): array
return $value;
},
'secret' => static function ($value): string {
- if ($value === null) {
- $value = Base32::encodeUpper(random_bytes(64));
- }
-
return mb_strtoupper(trim($value, '='));
},
'algorithm' => static function ($value): string {
@@ -166,21 +176,6 @@ protected function getParameterMap(): array
];
}
- private function setSecret(null|string $secret): void
- {
- $this->setParameter('secret', $secret);
- }
-
- private function setDigits(int $digits): void
- {
- $this->setParameter('digits', $digits);
- }
-
- private function setDigest(string $digest): void
- {
- $this->setParameter('algorithm', $digest);
- }
-
private function hasColon(string $value): bool
{
$colons = [':', '%3A', '%3a'];
diff --git a/src/TOTP.php b/src/TOTP.php
--- a/src/TOTP.php
+++ b/src/TOTP.php
@@ -12,21 +12,39 @@
*/
final class TOTP extends OTP implements TOTPInterface
{
- protected function __construct(null|string $secret, int $period, string $digest, int $digits, int $epoch = 0)
- {
- parent::__construct($secret, $digest, $digits);
- $this->setPeriod($period);
- $this->setEpoch($epoch);
- }
-
public static function create(
null|string $secret = null,
- int $period = 30,
- string $digest = 'sha1',
- int $digits = 6,
- int $epoch = 0
+ int $period = self::DEFAULT_PERIOD,
+ string $digest = self::DEFAULT_DIGEST,
+ int $digits = self::DEFAULT_DIGITS,
+ int $epoch = self::DEFAULT_EPOCH
): self {
- return new self($secret, $period, $digest, $digits, $epoch);
+ $totp = $secret !== null
+ ? self::createFromSecret($secret)
+ : self::generate()
+ ;
+ $totp->setPeriod($period);
+ $totp->setDigest($digest);
+ $totp->setDigits($digits);
+ $totp->setEpoch($epoch);
+
+ return $totp;
+ }
+
+ public static function createFromSecret(string $secret): self
+ {
+ $totp = new self($secret);
+ $totp->setPeriod(self::DEFAULT_PERIOD);
+ $totp->setDigest(self::DEFAULT_DIGEST);
+ $totp->setDigits(self::DEFAULT_DIGITS);
+ $totp->setEpoch(self::DEFAULT_EPOCH);
+
+ return $totp;
+ }
+
+ public static function generate(): self
+ {
+ return self::createFromSecret(self::generateSecret());
}
public function getPeriod(): int
@@ -99,11 +117,16 @@ public function getProvisioningUri(): string
return $this->generateURI('totp', $params);
}
- protected function setPeriod(int $period): void
+ public function setPeriod(int $period): void
{
$this->setParameter('period', $period);
}
+ public function setEpoch(int $epoch): void
+ {
+ $this->setParameter('epoch', $epoch);
+ }
+
/**
* @return array<string, callable>
*/
@@ -142,11 +165,6 @@ protected function filterOptions(array &$options): void
ksort($options);
}
- private function setEpoch(int $epoch): void
- {
- $this->setParameter('epoch', $epoch);
- }
-
private function timecode(int $timestamp): int
{
return (int) floor(($timestamp - $this->getEpoch()) / $this->getPeriod());
diff --git a/src/TOTPInterface.php b/src/TOTPInterface.php
--- a/src/TOTPInterface.php
+++ b/src/TOTPInterface.php
@@ -6,18 +6,31 @@
interface TOTPInterface extends OTPInterface
{
+ public const DEFAULT_PERIOD = 30;
+
+ public const DEFAULT_EPOCH = 0;
+
/**
* Create a new TOTP object.
*
* If the secret is null, a random 64 bytes secret will be generated.
+ *
+ * @param null|non-empty-string $secret
+ * @param non-empty-string $digest
+ *
+ * @deprecated Deprecated since v11.1, use ::createFromSecret or ::generate instead
*/
public static function create(
null|string $secret = null,
- int $period = 30,
- string $digest = 'sha1',
- int $digits = 6
+ int $period = self::DEFAULT_PERIOD,
+ string $digest = self::DEFAULT_DIGEST,
+ int $digits = self::DEFAULT_DIGITS
): self;
+ public function setPeriod(int $period): void;
+
+ public function setEpoch(int $epoch): void;
+
/**
* Return the TOTP at the current time.
*/
diff --git a/src/Url.php b/src/Url.php
--- a/src/Url.php
+++ b/src/Url.php
@@ -13,6 +13,9 @@
*/
final class Url
{
+ /**
+ * @param non-empty-string $secret
+ */
public function __construct(
private readonly string $scheme,
private readonly string $host,
@@ -38,6 +41,9 @@ public function getPath(): string
return $this->path;
}
+ /**
+ * @return non-empty-string
+ */
public function getSecret(): string
{
return $this->secret;
|
diff --git a/tests/HOTPTest.php b/tests/HOTPTest.php
--- a/tests/HOTPTest.php
+++ b/tests/HOTPTest.php
@@ -21,7 +21,7 @@ public function labelNotDefined(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('The label is not set.');
- $hotp = HOTP::create();
+ $hotp = HOTP::generate();
$hotp->getProvisioningUri();
}
@@ -30,10 +30,10 @@ public function labelNotDefined(): void
*/
public function issuerHasColon(): void
{
+ $otp = HOTP::createFromSecret('JDDK4U6G3BJLEZ7Y');
+
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Issuer must not contain a colon.');
- $otp = HOTP::create('JDDK4U6G3BJLEZ7Y', 0, 'sha512', 8);
- $otp->setLabel('alice');
$otp->setIssuer('foo%3Abar');
}
@@ -42,10 +42,10 @@ public function issuerHasColon(): void
*/
public function issuerHasColon2(): void
{
+ $otp = HOTP::createFromSecret('JDDK4U6G3BJLEZ7Y');
+
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Issuer must not contain a colon.');
- $otp = HOTP::create('JDDK4U6G3BJLEZ7Y', 0, 'sha512', 8);
- $otp->setLabel('alice');
$otp->setIssuer('foo%3abar');
}
@@ -54,11 +54,11 @@ public function issuerHasColon2(): void
*/
public function labelHasColon(): void
{
+ $otp = HOTP::createFromSecret('JDDK4U6G3BJLEZ7Y');
+
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Label must not contain a colon.');
- $otp = HOTP::create('JDDK4U6G3BJLEZ7Y', 0, 'sha512', 8);
$otp->setLabel('foo%3Abar');
- $otp->getProvisioningUri();
}
/**
@@ -66,11 +66,11 @@ public function labelHasColon(): void
*/
public function labelHasColon2(): void
{
+ $otp = HOTP::createFromSecret('JDDK4U6G3BJLEZ7Y');
+
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Label must not contain a colon.');
- $otp = HOTP::create('JDDK4U6G3BJLEZ7Y', 0, 'sha512', 8);
$otp->setLabel('foo:bar');
- $otp->getProvisioningUri();
}
/**
@@ -78,9 +78,11 @@ public function labelHasColon2(): void
*/
public function digitsIsNot1OrMore(): void
{
+ $htop = HOTP::createFromSecret('JDDK4U6G3BJLEZ7Y');
+
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Digits must be at least 1.');
- HOTP::create('JDDK4U6G3BJLEZ7Y', 0, 'sha512', 0);
+ $htop->setDigits(0);
}
/**
@@ -88,9 +90,11 @@ public function digitsIsNot1OrMore(): void
*/
public function counterIsNot1OrMore(): void
{
+ $htop = HOTP::createFromSecret('JDDK4U6G3BJLEZ7Y');
+
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Counter must be at least 0.');
- HOTP::create('JDDK4U6G3BJLEZ7Y', -500);
+ $htop->setCounter(-500);
}
/**
@@ -98,9 +102,11 @@ public function counterIsNot1OrMore(): void
*/
public function digestIsNotSupported(): void
{
+ $htop = HOTP::createFromSecret('JDDK4U6G3BJLEZ7Y');
+
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('The "foo" digest is not supported.');
- HOTP::create('JDDK4U6G3BJLEZ7Y', 0, 'foo');
+ $htop->setDigest('foo');
}
/**
@@ -110,11 +116,10 @@ public function digestIsNotSupported(): void
*/
public function secretShouldBeBase32Encoded(): void
{
+ $otp = HOTP::createFromSecret(random_bytes(32));
+
$this->expectException(RuntimeException::class);
$this->expectExceptionMessage('Unable to decode the secret. Is it correctly base32 encoded?');
- $secret = random_bytes(32);
-
- $otp = HOTP::create($secret);
$otp->at(0);
}
@@ -123,7 +128,7 @@ public function secretShouldBeBase32Encoded(): void
*/
public function objectCreationValid(): void
{
- $otp = HOTP::create();
+ $otp = HOTP::generate();
static::assertMatchesRegularExpression('/^[A-Z2-7]+$/', $otp->getSecret());
}
@@ -184,7 +189,13 @@ private function createHOTP(
string $label = 'alice@foo.bar',
string $issuer = 'My Project'
): HOTP {
- $otp = HOTP::create($secret, $counter, $digest, $digits);
+ static::assertNotSame('', $secret);
+ static::assertNotSame('', $digest);
+
+ $otp = HOTP::createFromSecret($secret);
+ $otp->setCounter($counter);
+ $otp->setDigest($digest);
+ $otp->setDigits($digits);
$otp->setLabel($label);
$otp->setIssuer($issuer);
diff --git a/tests/TOTPTest.php b/tests/TOTPTest.php
--- a/tests/TOTPTest.php
+++ b/tests/TOTPTest.php
@@ -24,7 +24,7 @@ public function labelNotDefined(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('The label is not set.');
- $otp = TOTP::create();
+ $otp = TOTP::generate();
$otp->getProvisioningUri();
}
@@ -33,7 +33,11 @@ public function labelNotDefined(): void
*/
public function customParameter(): void
{
- $otp = TOTP::create('JDDK4U6G3BJLEZ7Y', 20, 'sha512', 8, 100);
+ $otp = TOTP::createFromSecret('JDDK4U6G3BJLEZ7Y');
+ $otp->setPeriod(20);
+ $otp->setDigest('sha512');
+ $otp->setDigits(8);
+ $otp->setEpoch(100);
$otp->setLabel('alice@foo.bar');
$otp->setIssuer('My Project');
$otp->setParameter('foo', 'bar.baz');
@@ -49,7 +53,7 @@ public function customParameter(): void
*/
public function objectCreationValid(): void
{
- $otp = TOTP::create();
+ $otp = TOTP::generate();
static::assertMatchesRegularExpression('/^[A-Z2-7]+$/', $otp->getSecret());
}
@@ -59,9 +63,11 @@ public function objectCreationValid(): void
*/
public function periodIsNot1OrMore(): void
{
+ $totp = TOTP::createFromSecret('JDDK4U6G3BJLEZ7Y');
+
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Period must be at least 1.');
- TOTP::create('JDDK4U6G3BJLEZ7Y', -20, 'sha512', 8);
+ $totp->setPeriod(-20);
}
/**
@@ -69,9 +75,11 @@ public function periodIsNot1OrMore(): void
*/
public function epochIsNot0OrMore(): void
{
+ $totp = TOTP::createFromSecret('JDDK4U6G3BJLEZ7Y');
+
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Epoch must be greater than or equal to 0.');
- TOTP::create('JDDK4U6G3BJLEZ7Y', 30, 'sha512', 8, -1);
+ $totp->setEpoch(-1);
}
/**
@@ -83,7 +91,7 @@ public function secretShouldBeBase32Encoded(): void
$this->expectExceptionMessage('Unable to decode the secret. Is it correctly base32 encoded?');
$secret = random_bytes(32);
- $otp = TOTP::create($secret);
+ $otp = TOTP::createFromSecret($secret);
$otp->now();
}
@@ -402,7 +410,14 @@ private function createTOTP(
string $issuer = 'My Project',
int $epoch = 0
): TOTP {
- $otp = TOTP::create($secret, $period, $digest, $digits, $epoch);
+ static::assertNotSame('', $secret);
+ static::assertNotSame('', $digest);
+
+ $otp = TOTP::createFromSecret($secret);
+ $otp->setPeriod($period);
+ $otp->setDigest($digest);
+ $otp->setDigits($digits);
+ $otp->setEpoch($epoch);
$otp->setLabel($label);
$otp->setIssuer($issuer);
|
`OTPInterface::create(null|string $secret = null)` is prone to misuse
### Description
`OTPInterface::create(null|string $secret = null)` API is fundamentally flawed: what happens if the user intention is to create an OTP from a *known* secret, but the variable passed is **unintentionally** `null`?
Factory methods should be splitted by intentions.
### Example
The following solutions are for `TOTP`, but can and should be applied to `HOTP` as well:
```php
interface TOTPInterface extends OTPInterface
{
/**
* @param non-empty-string $secret
*/
public static function createFromSecret(
string $secret,
int $period = 30,
string $digest = 'sha1',
int $digits = 6
): self;
public static function generate(
int $period = 30,
string $digest = 'sha1',
int $digits = 6
): self;
}
```
|
Hi,
I fully agree with you. As you say, named constructors prevent errors like the one you mentioned.
A user-friendly API change could be:
1. Add the 2 new methods in `v11.1`
2. Deprecate `::create` in `v11.1`
3. Drop `::create` in `v12`
Looks like the best approach.
As TOTP and HOTP classes are marked final, these named constructor can be added in the next minor version.
| 2022-10-13T13:20:45
|
php
|
Easy
|
Spomky-Labs/otphp
| 87
|
Spomky-Labs__otphp-87
|
[
"80"
] |
fd4ba9a0498779ff1297cae8e6bd6dc918c5918d
|
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
],
"require": {
"php": "^5.5|^7.0",
- "christian-riesen/base32": "^1.1",
+ "paragonie/constant_time_encoding": "^1.0|^2.0",
"beberlei/assert": "^2.4",
"symfony/polyfill-mbstring": "^1.1",
"symfony/polyfill-php56": "^1.1",
diff --git a/src/OTP.php b/src/OTP.php
--- a/src/OTP.php
+++ b/src/OTP.php
@@ -12,7 +12,7 @@
namespace OTPHP;
use Assert\Assertion;
-use Base32\Base32;
+use ParagonIE\ConstantTime\Base32;
abstract class OTP implements OTPInterface
{
@@ -108,7 +108,7 @@ protected function generateURI($type, array $options)
*/
private function getDecodedSecret()
{
- $secret = Base32::decode($this->getSecret());
+ $secret = Base32::decodeUpper($this->getSecret());
return $secret;
}
diff --git a/src/ParameterTrait.php b/src/ParameterTrait.php
--- a/src/ParameterTrait.php
+++ b/src/ParameterTrait.php
@@ -12,7 +12,7 @@
namespace OTPHP;
use Assert\Assertion;
-use Base32\Base32;
+use ParagonIE\ConstantTime\Base32;
trait ParameterTrait
{
@@ -65,7 +65,7 @@ private function setSecret($secret)
{
Assertion::nullOrString($secret, 'The secret must be a string or null.');
if (null === $secret) {
- $secret = trim(Base32::encode(random_bytes(32)), '=');
+ $secret = trim(Base32::encodeUpper(random_bytes(32)), '=');
}
$this->parameters['secret'] = $secret;
|
diff --git a/tests/TOTPTest.php b/tests/TOTPTest.php
--- a/tests/TOTPTest.php
+++ b/tests/TOTPTest.php
@@ -9,8 +9,8 @@
* of the MIT license. See the LICENSE file for details.
*/
-use Base32\Base32;
use OTPHP\TOTP;
+use ParagonIE\ConstantTime\Base32;
class TOTPTest extends \PHPUnit_Framework_TestCase
{
@@ -150,9 +150,9 @@ public function testVectors($totp, $timestamp, $expected_value)
*/
public function testVectorsData()
{
- $totp_sha1 = $this->createTOTP(8, 'sha1', 30, Base32::encode('12345678901234567890'));
- $totp_sha256 = $this->createTOTP(8, 'sha256', 30, Base32::encode('12345678901234567890123456789012'));
- $totp_sha512 = $this->createTOTP(8, 'sha512', 30, Base32::encode('1234567890123456789012345678901234567890123456789012345678901234'));
+ $totp_sha1 = $this->createTOTP(8, 'sha1', 30, Base32::encodeUpper('12345678901234567890'));
+ $totp_sha256 = $this->createTOTP(8, 'sha256', 30, Base32::encodeUpper('12345678901234567890123456789012'));
+ $totp_sha512 = $this->createTOTP(8, 'sha512', 30, Base32::encodeUpper('1234567890123456789012345678901234567890123456789012345678901234'));
return [
[$totp_sha1, 59, '94287082'],
|
Consider switching to paragonie/constant_time_encoding
| Q | A
| -------------------- | -----
| Bug report? | no
| Feature request? | yes
| BC Break report? | no
| RFC? / Specification | no
| Library version | 8.3.x, 9.x
The base 32 encoding library used by this project doesn't claim to protect against timing attacks.
It uses substr and strlen, which as per http://blog.ircmaxell.com/2014/11/its-all-about-time.html are not timing safe.
https://github.com/paragonie/constant_time_encoding is designed to prevent timing attacks
If you're interested in this change, could poke at it some.
|
Hi @larowlan,
This is a very interesting report. I will change both v8 and v9 branches in favor of this dependency.
As it is easier to bruteforce a n digits code, I am not sure there is a potential security issue at the moment, but that is a risk that I do not want to take.
Thanks.
Thanks, let me know if you want help, happy to work on it if you're in support of the change
| 2017-07-24T10:23:56
|
php
|
Hard
|
Spomky-Labs/otphp
| 85
|
Spomky-Labs__otphp-85
|
[
"80"
] |
824496eb1c6a69125fee9cb543590175e452b7ab
|
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
],
"require": {
"php": "^7.1",
- "christian-riesen/base32": "^1.1",
+ "paragonie/constant_time_encoding": "^2.0",
"beberlei/assert": "^2.4"
},
"require-dev": {
diff --git a/src/OTP.php b/src/OTP.php
--- a/src/OTP.php
+++ b/src/OTP.php
@@ -14,7 +14,7 @@
namespace OTPHP;
use Assert\Assertion;
-use Base32\Base32;
+use ParagonIE\ConstantTime\Base32;
abstract class OTP implements OTPInterface
{
@@ -108,7 +108,7 @@ protected function generateURI(string $type, array $options): string
*/
private function getDecodedSecret(): string
{
- $secret = Base32::decode($this->getSecret());
+ $secret = Base32::decodeUpper($this->getSecret());
return $secret;
}
diff --git a/src/ParameterTrait.php b/src/ParameterTrait.php
--- a/src/ParameterTrait.php
+++ b/src/ParameterTrait.php
@@ -14,7 +14,7 @@
namespace OTPHP;
use Assert\Assertion;
-use Base32\Base32;
+use ParagonIE\ConstantTime\Base32;
trait ParameterTrait
{
@@ -205,7 +205,7 @@ protected function getParameterMap(): array
},
'secret' => function ($value) {
if (null === $value) {
- $value = trim(Base32::encode(random_bytes(64)), '=');
+ $value = trim(Base32::encodeUpper(random_bytes(64)), '=');
}
return $value;
diff --git a/src/TOTP.php b/src/TOTP.php
--- a/src/TOTP.php
+++ b/src/TOTP.php
@@ -147,7 +147,7 @@ public function getProvisioningUri(): string
*/
private function timecode(int $timestamp): int
{
- return (int) ((($timestamp * 1000) / ($this->getPeriod() * 1000)));
+ return (int) floor($timestamp / $this->getPeriod());
}
/**
|
diff --git a/tests/TOTPTest.php b/tests/TOTPTest.php
--- a/tests/TOTPTest.php
+++ b/tests/TOTPTest.php
@@ -13,8 +13,8 @@
namespace OTPHP\Test;
-use Base32\Base32;
use OTPHP\TOTP;
+use ParagonIE\ConstantTime\Base32;
use PHPUnit\Framework\TestCase;
final class TOTPTest extends TestCase
@@ -137,9 +137,9 @@ public function testVectors($totp, $timestamp, $expected_value)
*/
public function dataVectors()
{
- $totp_sha1 = $this->createTOTP(8, 'sha1', 30, Base32::encode('12345678901234567890'));
- $totp_sha256 = $this->createTOTP(8, 'sha256', 30, Base32::encode('12345678901234567890123456789012'));
- $totp_sha512 = $this->createTOTP(8, 'sha512', 30, Base32::encode('1234567890123456789012345678901234567890123456789012345678901234'));
+ $totp_sha1 = $this->createTOTP(8, 'sha1', 30, Base32::encodeUpper('12345678901234567890'));
+ $totp_sha256 = $this->createTOTP(8, 'sha256', 30, Base32::encodeUpper('12345678901234567890123456789012'));
+ $totp_sha512 = $this->createTOTP(8, 'sha512', 30, Base32::encodeUpper('1234567890123456789012345678901234567890123456789012345678901234'));
return [
[$totp_sha1, 59, '94287082'],
|
Consider switching to paragonie/constant_time_encoding
| Q | A
| -------------------- | -----
| Bug report? | no
| Feature request? | yes
| BC Break report? | no
| RFC? / Specification | no
| Library version | 8.3.x, 9.x
The base 32 encoding library used by this project doesn't claim to protect against timing attacks.
It uses substr and strlen, which as per http://blog.ircmaxell.com/2014/11/its-all-about-time.html are not timing safe.
https://github.com/paragonie/constant_time_encoding is designed to prevent timing attacks
If you're interested in this change, could poke at it some.
|
Hi @larowlan,
This is a very interesting report. I will change both v8 and v9 branches in favor of this dependency.
As it is easier to bruteforce a n digits code, I am not sure there is a potential security issue at the moment, but that is a risk that I do not want to take.
Thanks.
Thanks, let me know if you want help, happy to work on it if you're in support of the change
| 2017-07-24T10:17:59
|
php
|
Hard
|
Spomky-Labs/otphp
| 61
|
Spomky-Labs__otphp-61
|
[
"60"
] |
1c47b5c4a01a0aa73d627b5a9955288b3d5f53f9
|
diff --git a/src/Factory.php b/src/Factory.php
--- a/src/Factory.php
+++ b/src/Factory.php
@@ -20,7 +20,7 @@ final class Factory
*
* @throws \InvalidArgumentException
*
- * @return \OTPHP\TOTP|\OTPHP\HOTP
+ * @return \OTPHP\TOTPInterface|\OTPHP\HOTPInterface
*/
public static function loadFromProvisioningUri($uri)
{
diff --git a/src/HOTP.php b/src/HOTP.php
--- a/src/HOTP.php
+++ b/src/HOTP.php
@@ -18,13 +18,13 @@ final class HOTP extends OTP implements HOTPInterface
/**
* HOTP constructor.
*
- * @param string $label
+ * @param string|null $label
* @param string|null $secret
* @param int $counter
* @param string $digest
* @param int $digits
*/
- public function __construct($label, $secret = null, $counter = 0, $digest = 'sha1', $digits = 6)
+ public function __construct($label = null, $secret = null, $counter = 0, $digest = 'sha1', $digits = 6)
{
parent::__construct($label, $secret, $digest, $digits);
$this->setCounter($counter);
diff --git a/src/OTP.php b/src/OTP.php
--- a/src/OTP.php
+++ b/src/OTP.php
@@ -11,6 +11,7 @@
namespace OTPHP;
+use Assert\Assertion;
use Base32\Base32;
abstract class OTP implements OTPInterface
@@ -20,7 +21,7 @@ abstract class OTP implements OTPInterface
/**
* OTP constructor.
*
- * @param string $label
+ * @param string|null $label
* @param string|null $secret
* @param string $digest
* @param int $digits
@@ -56,11 +57,7 @@ protected function generateOTP($input)
$hmac[] = hexdec($hex);
}
$offset = $hmac[count($hmac) - 1] & 0xF;
- $code = ($hmac[$offset + 0] & 0x7F) << 24 |
- ($hmac[$offset + 1] & 0xFF) << 16 |
- ($hmac[$offset + 2] & 0xFF) << 8 |
- ($hmac[$offset + 3] & 0xFF);
-
+ $code = ($hmac[$offset + 0] & 0x7F) << 24 | ($hmac[$offset + 1] & 0xFF) << 16 | ($hmac[$offset + 2] & 0xFF) << 8 | ($hmac[$offset + 3] & 0xFF);
$otp = $code % pow(10, $this->getDigits());
return str_pad((string) $otp, $this->getDigits(), '0', STR_PAD_LEFT);
@@ -96,22 +93,14 @@ protected function filterOptions(array &$options)
*/
protected function generateURI($type, array $options)
{
+ $label = $this->getLabel();
+ Assertion::string($label, 'The label is not set.');
+ Assertion::false($this->hasColon($label), 'Label must not contain a colon.');
$options = array_merge($options, $this->getParameters());
-
$this->filterOptions($options);
+ $params = str_replace(['+', '%7E'], ['%20', '~'], http_build_query($options));
- $params = str_replace(
- ['+', '%7E'],
- ['%20', '~'],
- http_build_query($options)
- );
-
- return sprintf(
- 'otpauth://%s/%s?%s',
- $type,
- rawurlencode((null !== $this->getIssuer() ? $this->getIssuer().':' : '').$this->getLabel()),
- $params
- );
+ return sprintf('otpauth://%s/%s?%s', $type, rawurlencode((null !== $this->getIssuer() ? $this->getIssuer().':' : '').$label), $params);
}
/**
diff --git a/src/ParameterTrait.php b/src/ParameterTrait.php
--- a/src/ParameterTrait.php
+++ b/src/ParameterTrait.php
@@ -80,12 +80,11 @@ public function getLabel()
}
/**
- * @param string $label
+ * @param string|null $label
*/
private function setLabel($label)
{
- Assertion::string($label, 'Label must be a string.');
- Assertion::false($this->hasColon($label), 'Label must not contain a colon.');
+ Assertion::nullOrString($label, 'Label must be null or a string.');
$this->label = $label;
}
@@ -165,6 +164,8 @@ private function setDigest($digest)
/**
* @param string $parameter
+ *
+ * @return bool
*/
public function hasParameter($parameter)
{
diff --git a/src/TOTP.php b/src/TOTP.php
--- a/src/TOTP.php
+++ b/src/TOTP.php
@@ -18,13 +18,13 @@ final class TOTP extends OTP implements TOTPInterface
/**
* TOTP constructor.
*
- * @param string $label
+ * @param string|null $label
* @param string|null $secret
* @param int $period
* @param string $digest
* @param int $digits
*/
- public function __construct($label, $secret = null, $period = 30, $digest = 'sha1', $digits = 6)
+ public function __construct($label = null, $secret = null, $period = 30, $digest = 'sha1', $digits = 6)
{
parent::__construct($label, $secret, $digest, $digits);
$this->setPeriod($period);
|
diff --git a/tests/HOTPTest.php b/tests/HOTPTest.php
--- a/tests/HOTPTest.php
+++ b/tests/HOTPTest.php
@@ -15,11 +15,22 @@ class HOTPTest extends \PHPUnit_Framework_TestCase
{
/**
* @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Label must be a string.
+ * @expectedExceptionMessage Label must be null or a string.
+ */
+ public function testLabelNotNullAndNotAStringDefined()
+ {
+ new HOTP(1234, 'JDDK4U6G3BJLEZ7Y', 0, 'sha512', 8);
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage The label is not set.
*/
public function testLabelNotDefined()
{
- new HOTP(null, 'JDDK4U6G3BJLEZ7Y', 0, 'sha512', 8);
+ $hotp = new HOTP();
+ $this->assertTrue(is_string($hotp->at(0)));
+ $hotp->getProvisioningUri();
}
/**
@@ -48,7 +59,8 @@ public function testIssuerHasColon2()
*/
public function testLabelHasColon()
{
- new HOTP('foo%3Abar', 'JDDK4U6G3BJLEZ7Y', 0, 'sha512', 8);
+ $hotp = new HOTP('foo%3Abar', 'JDDK4U6G3BJLEZ7Y', 0, 'sha512', 8);
+ $hotp->getProvisioningUri();
}
/**
@@ -57,7 +69,8 @@ public function testLabelHasColon()
*/
public function testLabelHasColon2()
{
- new HOTP('foo:bar', 'JDDK4U6G3BJLEZ7Y', 0, 'sha512', 8);
+ $hotp = new HOTP('foo:bar', 'JDDK4U6G3BJLEZ7Y', 0, 'sha512', 8);
+ $hotp->getProvisioningUri();
}
/**
diff --git a/tests/TOTPTest.php b/tests/TOTPTest.php
--- a/tests/TOTPTest.php
+++ b/tests/TOTPTest.php
@@ -14,6 +14,17 @@
class TOTPTest extends \PHPUnit_Framework_TestCase
{
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage The label is not set.
+ */
+ public function testLabelNotDefined()
+ {
+ $hotp = new TOTP();
+ $this->assertTrue(is_string($hotp->now()));
+ $hotp->getProvisioningUri();
+ }
+
public function testCustomParameter()
{
$otp = new TOTP('alice@foo.bar', 'JDDK4U6G3BJLEZ7Y', 20, 'sha512', 8);
|
Why is label required for the constructor?
When only verifying a TOTP code, it doesn't look like label is needed anywhere, yet it is a required constructor parameter for the TOTP class.
This means passing in a blank string or random junk for the sake of making it happy.
Can this be changed to make it neater? Otherwise a simple static function could be use that eliminates the need to construct a TOTP object just to call verify.
|
Hi @lukos,
You are right: the label is only needed when the provisioning URI is computed.
Depending on the schemen (TOTP/HOTP), you just need the secret, the digest, the digits and additional parameters required by the scheme (counter, interval).
I will not add a static method, from my POV it should be easier to modify the [setLabel](https://github.com/Spomky-Labs/otphp/blob/master/src/ParameterTrait.php#L85) method by allowing a null label and verify that label in the [generateURI](https://github.com/Spomky-Labs/otphp/blob/master/src/OTP.php#L97) one.
WDYT?
| 2016-12-07T11:17:26
|
php
|
Hard
|
Spomky-Labs/otphp
| 13
|
Spomky-Labs__otphp-13
|
[
"12"
] |
a7b5c5602e528a1dc04aacf4295e5c4940074cf4
|
diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,11 +11,9 @@ before_script:
- curl -s http://getcomposer.org/installer | php
- php composer.phar update --dev --no-interaction
-phpunit: php vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml --prefer-dist --dev
-
script:
- mkdir -p build/logs
- - php vendor/bin/phpunit -c phpunit.xml.dist
+ - php vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
after_script:
- php vendor/bin/coveralls -v
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -17,17 +17,16 @@
},
"require-dev": {
"phpunit/phpunit": "4.*",
- "satooshi/php-coveralls": "dev-master"
+ "satooshi/php-coveralls": "0.*"
},
"suggest": {
},
"autoload": {
- "psr-0": { "OTPHP": "lib/" }
+ "psr-4": { "OTPHP\\": "lib/" }
},
"extra": {
"branch-alias": {
"dev-master": "3.0.x-dev"
}
- },
- "target-dir": "Spomky/OTPHP"
+ }
}
diff --git a/composer.lock b/composer.lock
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "0cfab358e8ca6f585c4b12928c12f96e",
+ "hash": "1d2b1c3875b7232fb42a6e9cf157b8e7",
"packages": [
{
"name": "christian-riesen/base32",
@@ -147,16 +147,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "2.0.8",
+ "version": "2.0.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "58401826c8cfc8fd689b60026e91c337df374bca"
+ "reference": "ed8ac99ce38c3fd134128c898f7ca74665abef7f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/58401826c8cfc8fd689b60026e91c337df374bca",
- "reference": "58401826c8cfc8fd689b60026e91c337df374bca",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ed8ac99ce38c3fd134128c898f7ca74665abef7f",
+ "reference": "ed8ac99ce38c3fd134128c898f7ca74665abef7f",
"shasum": ""
},
"require": {
@@ -208,7 +208,7 @@
"testing",
"xunit"
],
- "time": "2014-05-26 14:55:24"
+ "time": "2014-06-29 08:14:40"
},
{
"name": "phpunit/php-file-iterator",
@@ -395,16 +395,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.1.1",
+ "version": "4.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "1d6b554732382879045e11c56decd4be76130720"
+ "reference": "a71c4842c5fb836d8b200624583b859ec34e8a26"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1d6b554732382879045e11c56decd4be76130720",
- "reference": "1d6b554732382879045e11c56decd4be76130720",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a71c4842c5fb836d8b200624583b859ec34e8a26",
+ "reference": "a71c4842c5fb836d8b200624583b859ec34e8a26",
"shasum": ""
},
"require": {
@@ -465,20 +465,20 @@
"testing",
"xunit"
],
- "time": "2014-05-24 10:48:51"
+ "time": "2014-07-18 07:15:58"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "2.1.0",
+ "version": "2.1.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "da0eb04d8ee95ec2898187e407e519c118d3d27c"
+ "reference": "7878b9c41edb3afab92b85edf5f0981014a2713a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/da0eb04d8ee95ec2898187e407e519c118d3d27c",
- "reference": "da0eb04d8ee95ec2898187e407e519c118d3d27c",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/7878b9c41edb3afab92b85edf5f0981014a2713a",
+ "reference": "7878b9c41edb3afab92b85edf5f0981014a2713a",
"shasum": ""
},
"require": {
@@ -522,7 +522,7 @@
"mock",
"xunit"
],
- "time": "2014-05-02 07:04:11"
+ "time": "2014-06-12 07:22:15"
},
{
"name": "psr/log",
@@ -564,19 +564,20 @@
},
{
"name": "satooshi/php-coveralls",
- "version": "dev-master",
+ "version": "v0.6.1",
"source": {
"type": "git",
"url": "https://github.com/satooshi/php-coveralls.git",
- "reference": "b7271847c84d160f5b0aae83e45c225e8ffc96f4"
+ "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/b7271847c84d160f5b0aae83e45c225e8ffc96f4",
- "reference": "b7271847c84d160f5b0aae83e45c225e8ffc96f4",
+ "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/dd0df95bd37a7cf5c5c50304dfe260ffe4b50760",
+ "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760",
"shasum": ""
},
"require": {
+ "ext-curl": "*",
"ext-json": "*",
"ext-simplexml": "*",
"guzzle/guzzle": ">=3.0",
@@ -598,22 +599,14 @@
"squizlabs/php_codesniffer": "1.4.*@stable",
"theseer/fdomdocument": "dev-master"
},
- "suggest": {
- "symfony/http-kernel": "Allows Symfony integration"
- },
"bin": [
"composer/bin/coveralls"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "0.7-dev"
- }
- },
"autoload": {
"psr-0": {
- "Satooshi\\Component": "src/",
- "Satooshi\\Bundle": "src/"
+ "Contrib\\Component": "src/",
+ "Contrib\\Bundle": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -635,7 +628,7 @@
"github",
"test"
],
- "time": "2014-05-14 13:09:37"
+ "time": "2013-05-04 08:07:33"
},
{
"name": "sebastian/comparator",
@@ -854,7 +847,8 @@
},
{
"name": "Adam Harvey",
- "email": "aharvey@php.net"
+ "email": "aharvey@php.net",
+ "role": "Lead"
},
{
"name": "Bernhard Schussek",
@@ -906,17 +900,17 @@
},
{
"name": "symfony/config",
- "version": "v2.5.0",
+ "version": "v2.5.2",
"target-dir": "Symfony/Component/Config",
"source": {
"type": "git",
"url": "https://github.com/symfony/Config.git",
- "reference": "9c8caadb38ecc69ac35ab31af4d1996944b5a09f"
+ "reference": "a31aa8029bcc0b5b85578328050aa70d052e177b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Config/zipball/9c8caadb38ecc69ac35ab31af4d1996944b5a09f",
- "reference": "9c8caadb38ecc69ac35ab31af4d1996944b5a09f",
+ "url": "https://api.github.com/repos/symfony/Config/zipball/a31aa8029bcc0b5b85578328050aa70d052e177b",
+ "reference": "a31aa8029bcc0b5b85578328050aa70d052e177b",
"shasum": ""
},
"require": {
@@ -952,21 +946,21 @@
],
"description": "Symfony Config Component",
"homepage": "http://symfony.com",
- "time": "2014-04-22 08:11:23"
+ "time": "2014-07-09 09:05:48"
},
{
"name": "symfony/console",
- "version": "v2.5.0",
+ "version": "v2.5.2",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "ef4ca73b0b3a10cbac653d3ca482d0cdd4502b2c"
+ "reference": "386fa63407805959bd2c5fe540294721ad4224c8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/ef4ca73b0b3a10cbac653d3ca482d0cdd4502b2c",
- "reference": "ef4ca73b0b3a10cbac653d3ca482d0cdd4502b2c",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/386fa63407805959bd2c5fe540294721ad4224c8",
+ "reference": "386fa63407805959bd2c5fe540294721ad4224c8",
"shasum": ""
},
"require": {
@@ -1009,21 +1003,21 @@
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
- "time": "2014-05-22 08:54:24"
+ "time": "2014-07-15 14:15:12"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.5.0",
+ "version": "v2.5.2",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8"
+ "reference": "2215d2ef6fd7ab24d55576a3d924df575c741762"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8",
- "reference": "cb62ec8dd05893fc8e4f0e6e21e326e1fc731fe8",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/2215d2ef6fd7ab24d55576a3d924df575c741762",
+ "reference": "2215d2ef6fd7ab24d55576a3d924df575c741762",
"shasum": ""
},
"require": {
@@ -1068,21 +1062,21 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
- "time": "2014-04-29 10:13:57"
+ "time": "2014-07-09 09:05:48"
},
{
"name": "symfony/filesystem",
- "version": "v2.5.0",
+ "version": "v2.5.2",
"target-dir": "Symfony/Component/Filesystem",
"source": {
"type": "git",
"url": "https://github.com/symfony/Filesystem.git",
- "reference": "98e831eac836a0a5911626ce82684155f21d0e4d"
+ "reference": "c1309b0ee195ad264a4314435bdaecdfacb8ae9c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Filesystem/zipball/98e831eac836a0a5911626ce82684155f21d0e4d",
- "reference": "98e831eac836a0a5911626ce82684155f21d0e4d",
+ "url": "https://api.github.com/repos/symfony/Filesystem/zipball/c1309b0ee195ad264a4314435bdaecdfacb8ae9c",
+ "reference": "c1309b0ee195ad264a4314435bdaecdfacb8ae9c",
"shasum": ""
},
"require": {
@@ -1117,21 +1111,21 @@
],
"description": "Symfony Filesystem Component",
"homepage": "http://symfony.com",
- "time": "2014-04-16 10:36:21"
+ "time": "2014-07-09 09:05:48"
},
{
"name": "symfony/stopwatch",
- "version": "v2.5.0",
+ "version": "v2.5.2",
"target-dir": "Symfony/Component/Stopwatch",
"source": {
"type": "git",
"url": "https://github.com/symfony/Stopwatch.git",
- "reference": "724d73604ebe6c1c9bdf36533b556123bd9075a1"
+ "reference": "13cb004db921ec40d41689f471e3667037a8087e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/724d73604ebe6c1c9bdf36533b556123bd9075a1",
- "reference": "724d73604ebe6c1c9bdf36533b556123bd9075a1",
+ "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/13cb004db921ec40d41689f471e3667037a8087e",
+ "reference": "13cb004db921ec40d41689f471e3667037a8087e",
"shasum": ""
},
"require": {
@@ -1166,21 +1160,21 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "http://symfony.com",
- "time": "2014-04-18 20:40:13"
+ "time": "2014-07-09 09:05:48"
},
{
"name": "symfony/yaml",
- "version": "v2.5.0",
+ "version": "v2.5.2",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "b4b09c68ec2f2727574544ef0173684281a5033c"
+ "reference": "f868ecdbcc0276b6158dfbf08b9e98ce07f014e1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/b4b09c68ec2f2727574544ef0173684281a5033c",
- "reference": "b4b09c68ec2f2727574544ef0173684281a5033c",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/f868ecdbcc0276b6158dfbf08b9e98ce07f014e1",
+ "reference": "f868ecdbcc0276b6158dfbf08b9e98ce07f014e1",
"shasum": ""
},
"require": {
@@ -1215,16 +1209,16 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2014-05-16 14:25:18"
+ "time": "2014-07-09 09:05:48"
}
],
"aliases": [
],
"minimum-stability": "stable",
- "stability-flags": {
- "satooshi/php-coveralls": 20
- },
+ "stability-flags": [
+
+ ],
"platform": {
"php": ">=5.3.2"
},
diff --git a/doc/Extend.md b/doc/Extend.md
--- a/doc/Extend.md
+++ b/doc/Extend.md
@@ -55,6 +55,9 @@ The following class is a possible implementation of the TOTP Class:
public function setLabel($label)
{
+ if ($this->hasSemicolon($label)) {
+ throw new \Exception("Label must not containt a semi-colon.");
+ }
$this->label = $label;
return $this;
}
@@ -66,6 +69,9 @@ The following class is a possible implementation of the TOTP Class:
public function setIssuer($issuer)
{
+ if ($this->hasSemicolon($issuer)) {
+ throw new \Exception("Issuer must not containt a semi-colon.");
+ }
$this->issuer = $issuer;
return $this;
}
@@ -88,6 +94,9 @@ The following class is a possible implementation of the TOTP Class:
public function setDigits($digits)
{
+ if( !is_numeric($digits) || $digits < 1 ) {
+ throw new \Exception("Digits must be at least 1.");
+ }
$this->digits = $digits;
return $this;
}
@@ -99,6 +108,9 @@ The following class is a possible implementation of the TOTP Class:
public function setDigest($digest)
{
+ if( !in_array($digest, array('md5', 'sha1', 'sha256', 'sha512')) ) {
+ throw new \Exception("'$digest' digest is not supported.");
+ }
$this->digest = $digest;
return $this;
}
diff --git a/lib/OTPHP/HOTP.php b/lib/HOTP.php
similarity index 100%
rename from lib/OTPHP/HOTP.php
rename to lib/HOTP.php
diff --git a/lib/OTPHP/HOTPInterface.php b/lib/HOTPInterface.php
similarity index 100%
rename from lib/OTPHP/HOTPInterface.php
rename to lib/HOTPInterface.php
diff --git a/lib/OTPHP/OTP.php b/lib/OTP.php
similarity index 62%
rename from lib/OTPHP/OTP.php
rename to lib/OTP.php
--- a/lib/OTPHP/OTP.php
+++ b/lib/OTP.php
@@ -6,6 +6,49 @@
abstract class OTP implements OTPInterface
{
+ /**
+ * @param integer $input
+ */
+ protected function generateOTP($input)
+ {
+ $hash = hash_hmac($this->getDigest(), $this->intToBytestring($input), $this->getDecodedSecret());
+ $hmac = array();
+ foreach(str_split($hash, 2) as $hex) {
+ $hmac[] = hexdec($hex);
+ }
+ $offset = $hmac[19] & 0xf;
+ $code = ($hmac[$offset+0] & 0x7F) << 24 |
+ ($hmac[$offset + 1] & 0xFF) << 16 |
+ ($hmac[$offset + 2] & 0xFF) << 8 |
+ ($hmac[$offset + 3] & 0xFF);
+ return $code % pow(10, $this->getDigits());
+ }
+
+ /**
+ * @param string $type
+ */
+ protected function generateURI($type, $opt = array())
+ {
+ if( $this->getLabel() === null ) {
+ throw new \Exception("No label defined.");
+ }
+ $opt['algorithm'] = $this->getDigest();
+ $opt['digits'] = $this->getDigits();
+ $opt['secret'] = $this->getSecret();
+ if( $this->getIssuer() !== null && $this->isIssuerIncludedAsParameter() === true ) {
+ $opt['issuer'] = $this->getIssuer();
+ }
+
+ ksort($opt);
+
+ $params = str_replace(
+ array('+', '%7E'),
+ array('%20', '~'),
+ http_build_query($opt)
+ );
+ return "otpauth://$type/".rawurlencode(($this->getIssuer()!==null?$this->getIssuer().':':'').$this->getLabel())."?$params";
+ }
+
/**
* {@inheritdoc}
*/
@@ -27,14 +70,8 @@ public function verify($otp, $counter)
*
* @return boolean
*/
- private function hasSemicolon($value)
+ protected function hasSemicolon($value)
{
- if ($value === null ) {
- return false;
- }
- if (!is_string($value) ) {
- throw new \Exception('The value is not a string');
- }
$semicolons = array(':', '%3A', '%3a');
foreach ($semicolons as $semicolon) {
if (false !== strpos($value, $semicolon)) {
@@ -43,44 +80,6 @@ private function hasSemicolon($value)
}
return false;
}
-
- /**
- * @param integer $input
- */
- protected function generateOTP($input)
- {
- $this->checkOtpData();
-
- $hash = hash_hmac($this->getDigest(), $this->intToBytestring($input), $this->getDecodedSecret());
- $hmac = array();
- foreach(str_split($hash, 2) as $hex) {
- $hmac[] = hexdec($hex);
- }
- $offset = $hmac[19] & 0xf;
- $code = ($hmac[$offset+0] & 0x7F) << 24 |
- ($hmac[$offset + 1] & 0xFF) << 16 |
- ($hmac[$offset + 2] & 0xFF) << 8 |
- ($hmac[$offset + 3] & 0xFF);
- return $code % pow(10, $this->getDigits());
- }
-
- /**
- * @param string $type
- */
- protected function generateURI($type, array $opt = array())
- {
- $this->checkOtpData();
- $this->checkUriData();
-
- $opt['algorithm'] = $this->getDigest();
- $opt['digits'] = $this->getDigits();
- $opt['secret'] = $this->getSecret();
- if( $this->getIssuer() !== null && $this->isIssuerIncludedAsParameter() === true ) {
- $opt['issuer'] = $this->getIssuer();
- }
-
- return $this->buildURI($type, $opt);
- }
/**
* @return string
@@ -107,48 +106,4 @@ private function intToBytestring($int)
}
return str_pad(implode(array_reverse($result)), 8, "\000", STR_PAD_LEFT);
}
-
- private function checkOtpData() {
-
- $digits = $this->getDigits();
- if ( !is_numeric($digits) || $digits <0 ) {
- throw new \Exception("Digits must be at least 1.");
- }
-
- $digest = $this->getDigest();
- if( !in_array($digest, array('md5', 'sha1', 'sha256', 'sha512')) ) {
- throw new \Exception("'$digest' digest is not supported.");
- }
-
- $secret = $this->getSecret();
- if( empty($secret) || Base32::encode(Base32::decode($secret)) !== $secret ) {
- throw new \Exception("The secret is not a valid Base32 encoded string.");
- }
- }
-
- private function checkUriData() {
-
- if ( $this->getLabel() === null ) {
- throw new \Exception("No label defined.");
- }
- if ( $this->hasSemicolon($this->getLabel()) || $this->hasSemicolon($this->getIssuer())) {
- throw new \Exception('The label or the issuer must not contain a semicolon.');
- }
- }
-
- /**
- * @param string $type Type of OTPAuth
- * @param array $opt Options for the OTP generation
- */
- private function buildURI($type, array $opt = array())
- {
- ksort($opt);
-
- $params = str_replace(
- array('+', '%7E'),
- array('%20', '~'),
- http_build_query($opt)
- );
- return "otpauth://$type/".rawurlencode(($this->getIssuer()!==null?$this->getIssuer().':':'').$this->getLabel())."?$params";
- }
}
diff --git a/lib/OTPHP/OTPInterface.php b/lib/OTPInterface.php
similarity index 100%
rename from lib/OTPHP/OTPInterface.php
rename to lib/OTPInterface.php
diff --git a/lib/OTPHP/TOTP.php b/lib/TOTP.php
similarity index 100%
rename from lib/OTPHP/TOTP.php
rename to lib/TOTP.php
diff --git a/lib/OTPHP/TOTPInterface.php b/lib/TOTPInterface.php
similarity index 100%
rename from lib/OTPHP/TOTPInterface.php
rename to lib/TOTPInterface.php
|
diff --git a/tests/OTPTest.php b/tests/OTPTest.php
--- a/tests/OTPTest.php
+++ b/tests/OTPTest.php
@@ -95,6 +95,11 @@ public function testGenerateUriWithValidLabel()
->method('getSecret')
->will($this->returnValue('JDDK4U6G3BJLEZ7Y'));
+ $method = self::getMethod('generateURI');
+
+ $this->assertEquals('otpauth://test/alice%40foo.bar?secret=JDDK4U6G3BJLEZ7Y', $method->invokeArgs($otp,array('test', array())));
+ $this->assertEquals('otpauth://test/alice%40foo.bar?option1=baz&secret=JDDK4U6G3BJLEZ7Y', $method->invokeArgs($otp,array('test', array('option1'=>'baz'))));
+
$otp->expects($this->any())
->method('getIssuer')
->will($this->returnValue('My Project'));
@@ -107,8 +112,6 @@ public function testGenerateUriWithValidLabel()
->method('getDigits')
->will($this->returnValue(8));
- $method = self::getMethod('generateURI');
-
$this->assertEquals('otpauth://test/My%20Project%3Aalice%40foo.bar?algorithm=sha1&digits=8&secret=JDDK4U6G3BJLEZ7Y', $method->invokeArgs($otp,array('test', array())));
$otp->expects($this->any())
|
Made hasSemicolon public to bring it inline with the docs
The documentation linked below has an example implementation which uses hasSemicolon. The hasSemicolon() method is marked as private in OTP.php. I've changed it to public.
https://github.com/Spomky-Labs/otphp/blob/3.0.x/doc/Extend.md
| 2014-07-21T21:07:49
|
php
|
Hard
|
|
laravel/reverb
| 122
|
laravel__reverb-122
|
[
"121"
] |
d1b72f46a0af42ca5e84d5c1d0f97b8013c6dac3
|
diff --git a/src/Protocols/Pusher/Http/Controllers/EventsController.php b/src/Protocols/Pusher/Http/Controllers/EventsController.php
--- a/src/Protocols/Pusher/Http/Controllers/EventsController.php
+++ b/src/Protocols/Pusher/Http/Controllers/EventsController.php
@@ -34,6 +34,9 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
}
$channels = Arr::wrap($payload['channels'] ?? $payload['channel'] ?? []);
+ if ($except = $payload['socket_id'] ?? null) {
+ $except = $this->channels->connections()[$except] ?? null;
+ }
EventDispatcher::dispatch(
$this->application,
@@ -42,7 +45,7 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
'channels' => $channels,
'data' => $payload['data'],
],
- isset($payload['socket_id']) ? $this->channels->connections()[$payload['socket_id']]->connection() : null
+ $except ? $except->connection() : null
);
if (isset($payload['info'])) {
|
diff --git a/tests/Feature/Protocols/Pusher/Reverb/EventsControllerTest.php b/tests/Feature/Protocols/Pusher/Reverb/EventsControllerTest.php
--- a/tests/Feature/Protocols/Pusher/Reverb/EventsControllerTest.php
+++ b/tests/Feature/Protocols/Pusher/Reverb/EventsControllerTest.php
@@ -78,6 +78,28 @@
expect($response->getBody()->getContents())->toBe('{}');
});
+it('does not fail when ignoring an invalid subscriber', function () {
+ $connection = connect();
+ subscribe('test-channel-two', connection: $connection);
+ $response = await($this->signedPostRequest('events', [
+ 'name' => 'NewEvent',
+ 'channels' => ['test-channel-one', 'test-channel-two'],
+ 'data' => json_encode(['some' => 'data']),
+ ]));
+
+ $response = await($this->signedPostRequest('events', [
+ 'name' => 'NewEvent',
+ 'channels' => ['test-channel-one', 'test-channel-two'],
+ 'data' => json_encode(['some' => ['more' => 'data']]),
+ 'socket_id' => 'invalid-socket-id',
+ ]));
+
+ $connection->assertReceived('{"event":"NewEvent","data":"{\"some\":\"data\"}","channel":"test-channel-two"}', 1);
+ $connection->assertReceived('{"event":"NewEvent","data":"{\"some\":{\"more\":\"data\"}}","channel":"test-channel-two"}', 1);
+ expect($response->getStatusCode())->toBe(200);
+ expect($response->getBody()->getContents())->toBe('{}');
+});
+
it('validates invalid data', function ($payload) {
await($this->signedPostRequest('events', $payload));
})
|
Broadcast message toOthers throws ApiException in pusher
### Reverb Version
1.0.0-beta4
### Laravel Version
11.1.0
### PHP Version
8.3.4
### Description
When i try to send broadcast message via my Event like this
`broadcast(new MyEvent())->toOthers()`
I receive an Exception
```
[2024-03-28 16:26:08] local.ERROR: Pusher error: Internal server error.. {"exception":"[object] (Illuminate\\Broadcasting\\BroadcastException(code: 0): Pusher error: Internal server error.. at /home/ss/workspace/chat/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php:164)
[stacktrace]
#0 /home/ss/workspace/chat/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastEvent.php(92): Illuminate\\Broadcasting\\Broadcasters\\PusherBroadcaster->broadcast()
```
In laravel-websockets, which i used before, same method work without errors.
### Steps To Reproduce
`broadcast(new MyEvent())->toOthers()`
receive exception
```
[2024-03-28 16:26:08] local.ERROR: Pusher error: Internal server error.. {"exception":"[object] (Illuminate\\Broadcasting\\BroadcastException(code: 0): Pusher error: Internal server error.. at /home/ss/workspace/chat/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php:164)
[stacktrace]
#0 /home/ss/workspace/chat/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastEvent.php(92): Illuminate\\Broadcasting\\Broadcasters\\PusherBroadcaster->broadcast()
```
When i add in Reverb inside handleRequest method of Laravel\Reverb\Servers\Reverb\Http\Server
` $this->close($connection, 500, $e->getMessage());
`
instead of
` $this->close($connection, 500, 'Internal server error.');
`
Which a give ZERO info about what happening inside this error
I receive some more info
```
message
:
"Pusher error: Undefined array key \"875833828.561499442\"."
```
Maybe problem in line
` isset($payload['socket_id']) ? $this->channels->connections()[$payload['socket_id']]->connection() : null
`
But didn't understand what is wrong. When remove ->toOthers() - all work good
Thank you
| 2024-03-29T15:27:38
|
php
|
Hard
|
|
laravel/reverb
| 167
|
laravel__reverb-167
|
[
"163"
] |
78d8db37d4f7cdad187c0205c1490e1b5df0eb93
|
diff --git a/src/Protocols/Pusher/Http/Controllers/ChannelController.php b/src/Protocols/Pusher/Http/Controllers/ChannelController.php
--- a/src/Protocols/Pusher/Http/Controllers/ChannelController.php
+++ b/src/Protocols/Pusher/Http/Controllers/ChannelController.php
@@ -4,9 +4,9 @@
use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
use Psr\Http\Message\RequestInterface;
use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
class ChannelController extends Controller
{
@@ -20,6 +20,6 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
return app(MetricsHandler::class)->gather($this->application, 'channel', [
'channel' => $channel,
'info' => ($info = $this->query['info']) ? $info.',occupied' : 'occupied',
- ])->then(fn ($channel) => new JsonResponse((object) $channel));
+ ])->then(fn ($channel) => new Response((object) $channel));
}
}
diff --git a/src/Protocols/Pusher/Http/Controllers/ChannelUsersController.php b/src/Protocols/Pusher/Http/Controllers/ChannelUsersController.php
--- a/src/Protocols/Pusher/Http/Controllers/ChannelUsersController.php
+++ b/src/Protocols/Pusher/Http/Controllers/ChannelUsersController.php
@@ -5,10 +5,9 @@
use Laravel\Reverb\Protocols\Pusher\Concerns\InteractsWithChannelInformation;
use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
use Psr\Http\Message\RequestInterface;
use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
class ChannelUsersController extends Controller
{
@@ -24,15 +23,15 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
$channel = $this->channels->find($channel);
if (! $channel) {
- return new JsonResponse((object) [], 404);
+ return new Response((object) [], 404);
}
if (! $this->isPresenceChannel($channel)) {
- return new JsonResponse((object) [], 400);
+ return new Response((object) [], 400);
}
return app(MetricsHandler::class)
->gather($this->application, 'channel_users', ['channel' => $channel->name()])
- ->then(fn ($connections) => new JsonResponse(['users' => $connections]));
+ ->then(fn ($connections) => new Response(['users' => $connections]));
}
}
diff --git a/src/Protocols/Pusher/Http/Controllers/ChannelsController.php b/src/Protocols/Pusher/Http/Controllers/ChannelsController.php
--- a/src/Protocols/Pusher/Http/Controllers/ChannelsController.php
+++ b/src/Protocols/Pusher/Http/Controllers/ChannelsController.php
@@ -4,9 +4,9 @@
use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
use Psr\Http\Message\RequestInterface;
use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
class ChannelsController extends Controller
{
@@ -20,6 +20,6 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
return app(MetricsHandler::class)->gather($this->application, 'channels', [
'filter' => $this->query['filter_by_prefix'] ?? null,
'info' => $this->query['info'] ?? null,
- ])->then(fn ($channels) => new JsonResponse(['channels' => array_map(fn ($item) => (object) $item, $channels)]));
+ ])->then(fn ($channels) => new Response(['channels' => array_map(fn ($item) => (object) $item, $channels)]));
}
}
diff --git a/src/Protocols/Pusher/Http/Controllers/ConnectionsController.php b/src/Protocols/Pusher/Http/Controllers/ConnectionsController.php
--- a/src/Protocols/Pusher/Http/Controllers/ConnectionsController.php
+++ b/src/Protocols/Pusher/Http/Controllers/ConnectionsController.php
@@ -4,9 +4,9 @@
use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
use Psr\Http\Message\RequestInterface;
use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
class ConnectionsController extends Controller
{
@@ -18,6 +18,6 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
$this->verify($request, $connection, $appId);
return app(MetricsHandler::class)->gather($this->application, 'connections')
- ->then(fn ($connections) => new JsonResponse(['connections' => count($connections)]));
+ ->then(fn ($connections) => new Response(['connections' => count($connections)]));
}
}
diff --git a/src/Protocols/Pusher/Http/Controllers/EventsBatchController.php b/src/Protocols/Pusher/Http/Controllers/EventsBatchController.php
--- a/src/Protocols/Pusher/Http/Controllers/EventsBatchController.php
+++ b/src/Protocols/Pusher/Http/Controllers/EventsBatchController.php
@@ -8,10 +8,9 @@
use Laravel\Reverb\Protocols\Pusher\EventDispatcher;
use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
use Psr\Http\Message\RequestInterface;
use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
use function React\Promise\all;
@@ -31,7 +30,7 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
$validator = $this->validator($payload);
if ($validator->fails()) {
- return new JsonResponse($validator->errors(), 422);
+ return new Response($validator->errors(), 422);
}
$items = collect($payload['batch']);
@@ -56,11 +55,11 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
if ($items->contains(fn ($item) => ! empty($item))) {
return all($items)->then(function ($items) {
- return new JsonResponse(['batch' => array_map(fn ($item) => (object) $item, $items)]);
+ return new Response(['batch' => array_map(fn ($item) => (object) $item, $items)]);
});
}
- return new JsonResponse(['batch' => (object) []]);
+ return new Response(['batch' => (object) []]);
}
/**
diff --git a/src/Protocols/Pusher/Http/Controllers/EventsController.php b/src/Protocols/Pusher/Http/Controllers/EventsController.php
--- a/src/Protocols/Pusher/Http/Controllers/EventsController.php
+++ b/src/Protocols/Pusher/Http/Controllers/EventsController.php
@@ -9,10 +9,9 @@
use Laravel\Reverb\Protocols\Pusher\EventDispatcher;
use Laravel\Reverb\Protocols\Pusher\MetricsHandler;
use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
use Psr\Http\Message\RequestInterface;
use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
class EventsController extends Controller
{
@@ -30,7 +29,7 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
$validator = $this->validator($payload);
if ($validator->fails()) {
- return new JsonResponse($validator->errors(), 422);
+ return new Response($validator->errors(), 422);
}
$channels = Arr::wrap($payload['channels'] ?? $payload['channel'] ?? []);
@@ -51,10 +50,10 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
if (isset($payload['info'])) {
return app(MetricsHandler::class)
->gather($this->application, 'channels', ['info' => $payload['info'], 'channels' => $channels])
- ->then(fn ($channels) => new JsonResponse(['channels' => array_map(fn ($channel) => (object) $channel, $channels)]));
+ ->then(fn ($channels) => new Response(['channels' => array_map(fn ($channel) => (object) $channel, $channels)]));
}
- return new JsonResponse((object) []);
+ return new Response((object) []);
}
/**
diff --git a/src/Protocols/Pusher/Http/Controllers/UsersTerminateController.php b/src/Protocols/Pusher/Http/Controllers/UsersTerminateController.php
--- a/src/Protocols/Pusher/Http/Controllers/UsersTerminateController.php
+++ b/src/Protocols/Pusher/Http/Controllers/UsersTerminateController.php
@@ -5,10 +5,9 @@
use Laravel\Reverb\ServerProviderManager;
use Laravel\Reverb\Servers\Reverb\Contracts\PubSubProvider;
use Laravel\Reverb\Servers\Reverb\Http\Connection;
+use Laravel\Reverb\Servers\Reverb\Http\Response;
use Psr\Http\Message\RequestInterface;
use React\Promise\PromiseInterface;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
class UsersTerminateController extends Controller
{
@@ -24,7 +23,7 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
'type' => 'terminate',
'application' => serialize($this->application),
'payload' => ['user_id' => $userId],
- ])->then(fn () => new JsonResponse((object) []));
+ ])->then(fn () => new Response((object) []));
}
$connections = collect($this->channels->connections());
@@ -35,6 +34,6 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
}
});
- return new JsonResponse((object) []);
+ return new Response((object) []);
}
}
diff --git a/src/Servers/Reverb/Http/Response.php b/src/Servers/Reverb/Http/Response.php
new file mode 100644
--- /dev/null
+++ b/src/Servers/Reverb/Http/Response.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Laravel\Reverb\Servers\Reverb\Http;
+
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+class Response extends JsonResponse
+{
+ /**
+ * Create a new Http response instance.
+ */
+ public function __construct(mixed $data = null, int $status = 200, array $headers = [], bool $json = false)
+ {
+ parent::__construct($data, $status, $headers, $json);
+
+ $this->headers->set('Content-Length', strlen($this->content));
+ }
+}
\ No newline at end of file
|
diff --git a/tests/Feature/Protocols/Pusher/Reverb/ChannelControllerTest.php b/tests/Feature/Protocols/Pusher/Reverb/ChannelControllerTest.php
--- a/tests/Feature/Protocols/Pusher/Reverb/ChannelControllerTest.php
+++ b/tests/Feature/Protocols/Pusher/Reverb/ChannelControllerTest.php
@@ -59,6 +59,15 @@
expect($response->getBody()->getContents())->toBe('{"occupied":true,"subscription_count":1}');
});
+it('can send the content-length header', function () {
+ subscribe('test-channel-one');
+ subscribe('test-channel-one');
+
+ $response = await($this->signedRequest('channels/test-channel-one?info=user_count,subscription_count,cache'));
+
+ expect($response->getHeader('Content-Length'))->toBe(['40']);
+});
+
it('can gather data for a single channel', function () {
$this->usingRedis();
@@ -121,3 +130,14 @@
expect($response->getStatusCode())->toBe(200);
expect($response->getBody()->getContents())->toBe('{"occupied":true,"subscription_count":1}');
});
+
+it('can send the content-length header when gathering results', function () {
+ $this->usingRedis();
+
+ subscribe('test-channel-one');
+ subscribe('test-channel-one');
+
+ $response = await($this->signedRequest('channels/test-channel-one?info=user_count,subscription_count,cache'));
+
+ expect($response->getHeader('Content-Length'))->toBe(['40']);
+});
diff --git a/tests/Feature/Protocols/Pusher/Reverb/ChannelUsersControllerTest.php b/tests/Feature/Protocols/Pusher/Reverb/ChannelUsersControllerTest.php
--- a/tests/Feature/Protocols/Pusher/Reverb/ChannelUsersControllerTest.php
+++ b/tests/Feature/Protocols/Pusher/Reverb/ChannelUsersControllerTest.php
@@ -61,6 +61,19 @@
await($this->signedRequest('channels/presence-test-channel/users'));
})->throws(ResponseException::class);
+it('can send the content-length header', function () {
+ $channel = app(ChannelManager::class)
+ ->for(app()->make(ApplicationProvider::class)->findByKey('reverb-key'))
+ ->findOrCreate('presence-test-channel');
+ $channel->subscribe($connection = new FakeConnection('test-connection-one'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 1, 'user_info' => ['name' => 'Taylor']])), $data);
+ $channel->subscribe($connection = new FakeConnection('test-connection-two'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 2, 'user_info' => ['name' => 'Joe']])), $data);
+ $channel->subscribe($connection = new FakeConnection('test-connection-three'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 3, 'user_info' => ['name' => 'Jess']])), $data);
+
+ $response = await($this->signedRequest('channels/presence-test-channel/users'));
+
+ expect($response->getHeader('Content-Length'))->toBe(['38']);
+});
+
it('gathers the user data', function () {
$this->usingRedis();
@@ -92,3 +105,18 @@
expect($response->getStatusCode())->toBe(200);
expect($response->getBody()->getContents())->toBe('{"users":[{"id":2},{"id":3}]}');
});
+
+it('can send the content-length header when gathering results', function () {
+ $this->usingRedis();
+
+ $channel = app(ChannelManager::class)
+ ->for(app()->make(ApplicationProvider::class)->findByKey('reverb-key'))
+ ->findOrCreate('presence-test-channel');
+ $channel->subscribe($connection = new FakeConnection('test-connection-one'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 1, 'user_info' => ['name' => 'Taylor']])), $data);
+ $channel->subscribe($connection = new FakeConnection('test-connection-two'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 2, 'user_info' => ['name' => 'Joe']])), $data);
+ $channel->subscribe($connection = new FakeConnection('test-connection-three'), validAuth($connection->id(), 'presence-test-channel', $data = json_encode(['user_id' => 3, 'user_info' => ['name' => 'Jess']])), $data);
+
+ $response = await($this->signedRequest('channels/presence-test-channel/users'));
+
+ expect($response->getHeader('Content-Length'))->toBe(['38']);
+});
diff --git a/tests/Feature/Protocols/Pusher/Reverb/ChannelsControllerTest.php b/tests/Feature/Protocols/Pusher/Reverb/ChannelsControllerTest.php
--- a/tests/Feature/Protocols/Pusher/Reverb/ChannelsControllerTest.php
+++ b/tests/Feature/Protocols/Pusher/Reverb/ChannelsControllerTest.php
@@ -51,6 +51,15 @@
expect($response->getBody()->getContents())->toBe('{"channels":{"test-channel-two":{}}}');
});
+it('can send the content-length header', function () {
+ subscribe('test-channel-one');
+ subscribe('presence-test-channel-two');
+
+ $response = await($this->signedRequest('channels?info=user_count'));
+
+ expect($response->getHeader('Content-Length'))->toBe(['81']);
+});
+
it('can gather all channel information', function () {
$this->usingRedis();
@@ -102,3 +111,14 @@
expect($response->getStatusCode())->toBe(200);
expect($response->getBody()->getContents())->toBe('{"channels":{"test-channel-two":{}}}');
});
+
+it('can send the content-length header when gathering results', function () {
+ $this->usingRedis();
+
+ subscribe('test-channel-one');
+ subscribe('presence-test-channel-two');
+
+ $response = await($this->signedRequest('channels?info=user_count'));
+
+ expect($response->getHeader('Content-Length'))->toBe(['81']);
+});
diff --git a/tests/Feature/Protocols/Pusher/Reverb/ConnectionsControllerTest.php b/tests/Feature/Protocols/Pusher/Reverb/ConnectionsControllerTest.php
--- a/tests/Feature/Protocols/Pusher/Reverb/ConnectionsControllerTest.php
+++ b/tests/Feature/Protocols/Pusher/Reverb/ConnectionsControllerTest.php
@@ -27,6 +27,15 @@
expect($response->getBody()->getContents())->toBe('{"connections":1}');
});
+it('can send the content-length header', function () {
+ subscribe('test-channel-one');
+ subscribe('presence-test-channel-two');
+
+ $response = await($this->signedRequest('connections'));
+
+ expect($response->getHeader('Content-Length'))->toBe(['17']);
+});
+
it('can gather a connection count', function () {
$this->usingRedis();
@@ -51,3 +60,14 @@
expect($response->getStatusCode())->toBe(200);
expect($response->getBody()->getContents())->toBe('{"connections":1}');
});
+
+it('can send the content-length header when gathering results', function () {
+ $this->usingRedis();
+
+ subscribe('test-channel-one');
+ subscribe('presence-test-channel-two');
+
+ $response = await($this->signedRequest('connections'));
+
+ expect($response->getHeader('Content-Length'))->toBe(['17']);
+});
\ No newline at end of file
diff --git a/tests/Feature/Protocols/Pusher/Reverb/EventsBatchControllerTest.php b/tests/Feature/Protocols/Pusher/Reverb/EventsBatchControllerTest.php
--- a/tests/Feature/Protocols/Pusher/Reverb/EventsBatchControllerTest.php
+++ b/tests/Feature/Protocols/Pusher/Reverb/EventsBatchControllerTest.php
@@ -87,6 +87,18 @@
expect($response->getBody()->getContents())->toBe('{"batch":[{"user_count":1},{}]}');
});
+it('can send the content-length header', function () {
+ $response = await($this->signedPostRequest('batch_events', ['batch' => [
+ [
+ 'name' => 'NewEvent',
+ 'channel' => 'test-channel',
+ 'data' => json_encode(['some' => 'data']),
+ ],
+ ]]));
+
+ expect($response->getHeader('Content-Length'))->toBe(['12']);
+});
+
it('can receive an event batch trigger with multiple events and gather info for each', function () {
$this->usingRedis();
@@ -145,3 +157,17 @@
expect($response->getStatusCode())->toBe(500);
})->throws(ResponseException::class, exceptionCode: 500);
+
+it('can send the content-length header when gathering results', function () {
+ $this->usingRedis();
+
+ $response = await($this->signedPostRequest('batch_events', ['batch' => [
+ [
+ 'name' => 'NewEvent',
+ 'channel' => 'test-channel',
+ 'data' => json_encode(['some' => 'data']),
+ ],
+ ]]));
+
+ expect($response->getHeader('Content-Length'))->toBe(['12']);
+});
diff --git a/tests/Feature/Protocols/Pusher/Reverb/EventsControllerTest.php b/tests/Feature/Protocols/Pusher/Reverb/EventsControllerTest.php
--- a/tests/Feature/Protocols/Pusher/Reverb/EventsControllerTest.php
+++ b/tests/Feature/Protocols/Pusher/Reverb/EventsControllerTest.php
@@ -197,3 +197,13 @@
it('fails when app cannot be found', function () {
await($this->signedPostRequest('events', appId: 'invalid-app-id'));
})->throws(ResponseException::class, exceptionCode: 404);
+
+it('can send the content-length header', function () {
+ $response = await($this->signedPostRequest('events', [
+ 'name' => 'NewEvent',
+ 'channel' => 'test-channel',
+ 'data' => json_encode(['some' => 'data']),
+ ]));
+
+ expect($response->getHeader('Content-Length'))->toBe(['2']);
+});
diff --git a/tests/Feature/Protocols/Pusher/Reverb/UsersTerminateControllerTest.php b/tests/Feature/Protocols/Pusher/Reverb/UsersTerminateControllerTest.php
--- a/tests/Feature/Protocols/Pusher/Reverb/UsersTerminateControllerTest.php
+++ b/tests/Feature/Protocols/Pusher/Reverb/UsersTerminateControllerTest.php
@@ -29,6 +29,7 @@
expect($response->getBody()->getContents())->toBe('{}');
expect(collect(channels()->all())->get('presence-test-channel-one')->connections())->toHaveCount(1);
expect(collect(channels()->all())->get('test-channel-two')->connections())->toHaveCount(1);
+ expect($response->getHeader('Content-Length'))->toBe(['2']);
});
it('unsubscribes from all channels across all servers and terminates a user', function () {
@@ -51,4 +52,5 @@
expect($response->getBody()->getContents())->toBe('{}');
expect(collect(channels()->all())->get('presence-test-channel-one')->connections())->toHaveCount(1);
expect(collect(channels()->all())->get('test-channel-two')->connections())->toHaveCount(1);
+ expect($response->getHeader('Content-Length'))->toBe(['2']);
});
|
Using ssl in valet environment causes error.
### Reverb Version
1.0.0-beta7
### Laravel Version
11.4.0
### PHP Version
8.2.16
### Description
I have struggled to get laravel reverb work locally with valet & ssl & Livewire.
I can get Echo successfully connet to reverb, but when dispatching event, I get error:
[2024-04-19 10:17:12] local.ERROR: cURL error 56: OpenSSL SSL_read: SSL_ERROR_SYSCALL, errno 0
### Steps To Reproduce
I use node version 20.10.
Valet version: 4.6.1
```
composer create-project laravel/laravel reverb-app
cd reverb-app
valet link --secure
composer require laravel/breeze --dev
php artisan breeze:install
-> Livewire (Volt Class API) with Alpine -> No -> phpunit
php artisan install:broadcasting
-> Yes, install reverb...
-> Would you like to install and build the Node dependencies required for broadcasting? Yes.
```
**Change from .env:**
APP_URL=https://reverb-app.test
REVERB_HOST="reverb-app.test"
REVERB_SCHEME=https
**Set reverb.cong tls option to:**
```
'tls' => [
'verify_peer' => false,
'allow_self_signed' => true,
],
```
**Create TestEvent for broadcasting:**
php artisan make:event TestEvent
Edit TestEvet to implement ShouldBroadcast and chane PrivateChannel to Channel
**Start parallel:**
npm run dev
php artisan reverb:start --debug
php artisan queue:work
Check browser connects successfully and reverb debug shows connection.
Dispatch event from tinker:
`App\Events\TestEvent::dispatch();`
See error from logs:
[2024-04-19 10:48:14] local.ERROR: cURL error 56: OpenSSL SSL_read: SSL_ERROR_SYSCALL, errno 0
<details>
<summary>Full trace</summary>
[2024-04-19 10:48:14] local.ERROR: cURL error 56: OpenSSL SSL_read: SSL_ERROR_SYSCALL, errno 0 (see https://curl.haxx.se/libcurl/c/libcurl-errors.html) for https://reverb-app.test:8080/apps/835917/events?auth_key=bkefoajmyavya3ph3lml&auth_timestamp=1713523694&auth_version=1.0&body_md5=290a36791f069f26dc79082e40601c21&auth_signature=ff9d675c3f35a20b31e8dc9d106d3d6dd8f9208749641316f0be6c9aca044b8f {"exception":"[object] (GuzzleHttp\\Exception\\RequestException(code: 0): cURL error 56: OpenSSL SSL_read: SSL_ERROR_SYSCALL, errno 0 (see https://curl.haxx.se/libcurl/c/libcurl-errors.html) for https://reverb-app.test:8080/apps/835917/events?auth_key=bkefoajmyavya3ph3lml&auth_timestamp=1713523694&auth_version=1.0&body_md5=290a36791f069f26dc79082e40601c21&auth_signature=ff9d675c3f35a20b31e8dc9d106d3d6dd8f9208749641316f0be6c9aca044b8f at /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php:211)
[stacktrace]
#0 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php(158): GuzzleHttp\\Handler\\CurlFactory::createRejection(Object(GuzzleHttp\\Handler\\EasyHandle), Array)
#1 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php(110): GuzzleHttp\\Handler\\CurlFactory::finishError(Object(GuzzleHttp\\Handler\\CurlHandler), Object(GuzzleHttp\\Handler\\EasyHandle), Object(GuzzleHttp\\Handler\\CurlFactory))
#2 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php(47): GuzzleHttp\\Handler\\CurlFactory::finish(Object(GuzzleHttp\\Handler\\CurlHandler), Object(GuzzleHttp\\Handler\\EasyHandle), Object(GuzzleHttp\\Handler\\CurlFactory))
#3 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php(28): GuzzleHttp\\Handler\\CurlHandler->__invoke(Object(GuzzleHttp\\Psr7\\Request), Array)
#4 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php(48): GuzzleHttp\\Handler\\Proxy::GuzzleHttp\\Handler\\{closure}(Object(GuzzleHttp\\Psr7\\Request), Array)
#5 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php(64): GuzzleHttp\\Handler\\Proxy::GuzzleHttp\\Handler\\{closure}(Object(GuzzleHttp\\Psr7\\Request), Array)
#6 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/Middleware.php(31): GuzzleHttp\\PrepareBodyMiddleware->__invoke(Object(GuzzleHttp\\Psr7\\Request), Array)
#7 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php(71): GuzzleHttp\\Middleware::GuzzleHttp\\{closure}(Object(GuzzleHttp\\Psr7\\Request), Array)
#8 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/Middleware.php(63): GuzzleHttp\\RedirectMiddleware->__invoke(Object(GuzzleHttp\\Psr7\\Request), Array)
#9 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/HandlerStack.php(75): GuzzleHttp\\Middleware::GuzzleHttp\\{closure}(Object(GuzzleHttp\\Psr7\\Request), Array)
#10 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/Client.php(333): GuzzleHttp\\HandlerStack->__invoke(Object(GuzzleHttp\\Psr7\\Request), Array)
#11 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/Client.php(169): GuzzleHttp\\Client->transfer(Object(GuzzleHttp\\Psr7\\Request), Array)
#12 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/Client.php(189): GuzzleHttp\\Client->requestAsync('POST', Object(GuzzleHttp\\Psr7\\Uri), Array)
#13 /Users/juser/code/reverb-app/vendor/guzzlehttp/guzzle/src/ClientTrait.php(95): GuzzleHttp\\Client->request('POST', 'apps/835917/eve...', Array)
#14 /Users/juser/code/reverb-app/vendor/pusher/pusher-php-server/src/Pusher.php(776): GuzzleHttp\\Client->post('apps/835917/eve...', Array)
#15 /Users/juser/code/reverb-app/vendor/pusher/pusher-php-server/src/Pusher.php(441): Pusher\\Pusher->post('/apps/835917/ev...', '{\"name\":\"App\\\\\\\\E...')
#16 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php(161): Pusher\\Pusher->trigger(Array, 'App\\\\Events\\\\Test...', Array, Array)
#17 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Collections/Traits/EnumeratesValues.php(237): Illuminate\\Broadcasting\\Broadcasters\\PusherBroadcaster->Illuminate\\Broadcasting\\Broadcasters\\{closure}(Object(Illuminate\\Support\\Collection), 0)
#18 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php(160): Illuminate\\Support\\Collection->each(Object(Closure))
#19 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastEvent.php(92): Illuminate\\Broadcasting\\Broadcasters\\PusherBroadcaster->broadcast(Object(Illuminate\\Support\\Collection), 'App\\\\Events\\\\Test...', Array)
#20 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php(36): Illuminate\\Broadcasting\\BroadcastEvent->handle(Object(Illuminate\\Broadcasting\\BroadcastManager))
#21 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Container/Util.php(41): Illuminate\\Container\\BoundMethod::Illuminate\\Container\\{closure}()
#22 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php(93): Illuminate\\Container\\Util::unwrapIfClosure(Object(Closure))
#23 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php(35): Illuminate\\Container\\BoundMethod::callBoundMethod(Object(Illuminate\\Foundation\\Application), Array, Object(Closure))
#24 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Container/Container.php(662): Illuminate\\Container\\BoundMethod::call(Object(Illuminate\\Foundation\\Application), Array, Array, NULL)
#25 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php(128): Illuminate\\Container\\Container->call(Array)
#26 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(144): Illuminate\\Bus\\Dispatcher->Illuminate\\Bus\\{closure}(Object(Illuminate\\Broadcasting\\BroadcastEvent))
#27 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(119): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Broadcasting\\BroadcastEvent))
#28 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Bus/Dispatcher.php(132): Illuminate\\Pipeline\\Pipeline->then(Object(Closure))
#29 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php(124): Illuminate\\Bus\\Dispatcher->dispatchNow(Object(Illuminate\\Broadcasting\\BroadcastEvent), false)
#30 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(144): Illuminate\\Queue\\CallQueuedHandler->Illuminate\\Queue\\{closure}(Object(Illuminate\\Broadcasting\\BroadcastEvent))
#31 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(119): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Broadcasting\\BroadcastEvent))
#32 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php(123): Illuminate\\Pipeline\\Pipeline->then(Object(Closure))
#33 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php(71): Illuminate\\Queue\\CallQueuedHandler->dispatchThroughMiddleware(Object(Illuminate\\Queue\\Jobs\\DatabaseJob), Object(Illuminate\\Broadcasting\\BroadcastEvent))
#34 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php(102): Illuminate\\Queue\\CallQueuedHandler->call(Object(Illuminate\\Queue\\Jobs\\DatabaseJob), Array)
#35 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Queue/Worker.php(439): Illuminate\\Queue\\Jobs\\Job->fire()
#36 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Queue/Worker.php(389): Illuminate\\Queue\\Worker->process('database', Object(Illuminate\\Queue\\Jobs\\DatabaseJob), Object(Illuminate\\Queue\\WorkerOptions))
#37 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Queue/Worker.php(176): Illuminate\\Queue\\Worker->runJob(Object(Illuminate\\Queue\\Jobs\\DatabaseJob), 'database', Object(Illuminate\\Queue\\WorkerOptions))
#38 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php(139): Illuminate\\Queue\\Worker->daemon('database', 'default', Object(Illuminate\\Queue\\WorkerOptions))
#39 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Queue/Console/WorkCommand.php(122): Illuminate\\Queue\\Console\\WorkCommand->runWorker('database', 'default')
#40 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php(36): Illuminate\\Queue\\Console\\WorkCommand->handle()
#41 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Container/Util.php(41): Illuminate\\Container\\BoundMethod::Illuminate\\Container\\{closure}()
#42 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php(93): Illuminate\\Container\\Util::unwrapIfClosure(Object(Closure))
#43 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php(35): Illuminate\\Container\\BoundMethod::callBoundMethod(Object(Illuminate\\Foundation\\Application), Array, Object(Closure))
#44 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Container/Container.php(662): Illuminate\\Container\\BoundMethod::call(Object(Illuminate\\Foundation\\Application), Array, Array, NULL)
#45 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Console/Command.php(212): Illuminate\\Container\\Container->call(Array)
#46 /Users/juser/code/reverb-app/vendor/symfony/console/Command/Command.php(279): Illuminate\\Console\\Command->execute(Object(Symfony\\Component\\Console\\Input\\ArgvInput), Object(Illuminate\\Console\\OutputStyle))
#47 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Console/Command.php(181): Symfony\\Component\\Console\\Command\\Command->run(Object(Symfony\\Component\\Console\\Input\\ArgvInput), Object(Illuminate\\Console\\OutputStyle))
#48 /Users/juser/code/reverb-app/vendor/symfony/console/Application.php(1049): Illuminate\\Console\\Command->run(Object(Symfony\\Component\\Console\\Input\\ArgvInput), Object(Symfony\\Component\\Console\\Output\\ConsoleOutput))
#49 /Users/juser/code/reverb-app/vendor/symfony/console/Application.php(318): Symfony\\Component\\Console\\Application->doRunCommand(Object(Illuminate\\Queue\\Console\\WorkCommand), Object(Symfony\\Component\\Console\\Input\\ArgvInput), Object(Symfony\\Component\\Console\\Output\\ConsoleOutput))
#50 /Users/juser/code/reverb-app/vendor/symfony/console/Application.php(169): Symfony\\Component\\Console\\Application->doRun(Object(Symfony\\Component\\Console\\Input\\ArgvInput), Object(Symfony\\Component\\Console\\Output\\ConsoleOutput))
#51 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php(196): Symfony\\Component\\Console\\Application->run(Object(Symfony\\Component\\Console\\Input\\ArgvInput), Object(Symfony\\Component\\Console\\Output\\ConsoleOutput))
#52 /Users/juser/code/reverb-app/vendor/laravel/framework/src/Illuminate/Foundation/Application.php(1183): Illuminate\\Foundation\\Console\\Kernel->handle(Object(Symfony\\Component\\Console\\Input\\ArgvInput), Object(Symfony\\Component\\Console\\Output\\ConsoleOutput))
#53 /Users/juser/code/reverb-app/artisan(13): Illuminate\\Foundation\\Application->handleCommand(Object(Symfony\\Component\\Console\\Input\\ArgvInput))
#54 {main}
"}
</details>
|
@jksa we pushed a fix for Valet yesterday. Could you maybe try the main branch by requesting `"laravel/reverb":"@dev"` in your composer.json?
You'll need to remove all TLS options from your config to test.
Installed and removed all tls options. Same error.
Reverb version is now:
`composer show -i laravel/reverb`
name : laravel/reverb
descrip. : Laravel Reverb provides a real-time WebSocket communication backend for Laravel applications.
keywords : WebSockets, laravel, real-time, websocket
versions : * dev-main
.
.
.
Hey @jksa I believe this is an issue with Curl on your local machine. If you can supply a repo reproducing the issue, I'm happy to test on my local machine. You can get started with the following command:
```
laravel new bug-report --github="--public"
```
Going to close this issue in the mean time.
https://github.com/jksa/laravel-reverb-ssl-issue
Hi @joedixon , please feel free to test with my repo. Today I updated php & curl versions and still got same issue. Can you please inform me what cURL version you are using?
I tried also with PHP8.3.6 but same error.
Curl has version 8.4.0
Here is my env file:
<details>
<summary>env</summary>
APP_NAME=Laravel
APP_ENV=local
APP_KEY=base64:xphd5PuSjc3qy4M9uqJ0XZUSPvOSEHtNZtx3CcyD7+w=
APP_DEBUG=true
APP_TIMEZONE=UTC
APP_URL=https://laravel-reverb-ssl-issue.test
APP_LOCALE=en
APP_FALLBACK_LOCALE=en
APP_FAKER_LOCALE=en_US
APP_MAINTENANCE_DRIVER=file
APP_MAINTENANCE_STORE=database
BCRYPT_ROUNDS=12
LOG_CHANNEL=stack
LOG_STACK=single
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug
DB_CONNECTION=sqlite
# DB_HOST=127.0.0.1
# DB_PORT=3306
# DB_DATABASE=laravel
# DB_USERNAME=root
# DB_PASSWORD=
SESSION_DRIVER=database
SESSION_LIFETIME=120
SESSION_ENCRYPT=false
SESSION_PATH=/
SESSION_DOMAIN=null
BROADCAST_CONNECTION=reverb
FILESYSTEM_DISK=local
QUEUE_CONNECTION=database
CACHE_STORE=database
CACHE_PREFIX=
MEMCACHED_HOST=127.0.0.1
REDIS_CLIENT=phpredis
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
MAIL_MAILER=log
MAIL_HOST=127.0.0.1
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS="hello@example.com"
MAIL_FROM_NAME="${APP_NAME}"
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
AWS_USE_PATH_STYLE_ENDPOINT=false
VITE_APP_NAME="${APP_NAME}"
REVERB_APP_ID=835917
REVERB_APP_KEY=bkefoajmyavya3ph3lml
REVERB_APP_SECRET=ebsrnbqajrgwfwnaorrz
REVERB_HOST="laravel-reverb-ssl-issue.test"
REVERB_PORT=8080
REVERB_SCHEME=https
VITE_REVERB_APP_KEY="${REVERB_APP_KEY}"
VITE_REVERB_HOST="${REVERB_HOST}"
VITE_REVERB_PORT="${REVERB_PORT}"
VITE_REVERB_SCHEME="${REVERB_SCHEME}"
</details>
**This is how issue can be reproduced:**
1. Checkout repo
2. set valet link
3. set env file
4. composer install
5. php artisan migrate
run reverb & queue worker
execute from tinker:
`App\Events\TestEvent::dispatch();`
Job will fail and you can find error from logs.
I am also having ssl issues. I believe its the same.
https://github.com/bretterer/reverb-ssl-test is my reproduction repo. I am using Laravel Herd instead of straight Valet, but its a secure domain.
I'm using:
Laravel 11.4.0
Laravel Installer 5.7.1
PHP 8.3.6
Herd 1.6.0
Reverb `"laravel/reverb":"@dev"`
Steps I took:
1: `laravel new reverb-ssl` (No starterkit, pest)
2: enable ssl in herd for new site
3: update APP_URL in .env to include `https`
4: start reverb service on port 8080 on Herd
5: `php artisan install:broadcasting`
6: Create a test event `SiteVisited` and update the `PrivateChannel` name to `site-visited`
7: Implement `ShouldBroadcast` in the new event
8: update `routes/channel.php`
```
Broadcast::channel('site-visit', function () {
return true;
});
```
9: edit `web.php` route to include `SiteVisited::broadcast()` (also tried `dispatch`)
10: Add listener to `echo.js` (Docs say I can use `Echo.private` but says `Echo` is undefined, need to use `window.Echo`)
```
window.Echo.private('site-visit')
.listen('SiteVisted', function(e) {
console.log(e);
});
```
10: started `npm run dev`
11: started `php artisan queue:work`
Errors in console:
WebSocket connection to 'wss://localhost:8080/app/e0bgxgxlni4u4wntyj2k?protocol=7&client=js&version=8.4.0-rc2&flash=false' failed: WebSocket is closed before the connection is established.
As a note, I did the same configuration and steps without securing the website and using `https` and it works fine.
@bretterer I think you need to set `REVERB_HOST` and `VITE_REVERB_HOST` to `reverb-ssl.test` (or whatever your Herd secured site name is).
@joedixon, I tried that, and It does not change anything for me
@bretterer I have just tested your repo - you need to update your environment variables as follows:
```diff
REVERB_APP_ID=147395
REVERB_APP_KEY=e0bgxgxlni4u4wntyj2k
REVERB_APP_SECRET=vn7tuvmso5cmmlvz7uwg
- REVERB_HOST="localhost"
+ REVERB_HOST="reverb-ssl-test.test"
REVERB_PORT=8080
- REVERB_SCHEME=http
```
Using the correct hostname and removing the plaintext scheme which will use the `https` default instead should resolve your issue.
@jksa I'm a Herd user so going to take me a little longer to test on Valet.
@jksa can you try updating the `client_options` settings of the `reverb` broadcaster in your `broadcasting.php` configuration file as follows?
You won't want to do this in production so I would recommend making it an environment variable if it solves the issue.
```
'client_options' => [
'verify' => false,
],
```
@joedixon that really sounded promising, but unfortunately did not help.
That did resolve the problem for me. Can you share:
- `broadcasting.php` config file
- `composer.json` file
- All of your `REVERB_`prefixed environment variables
Sure, here you go:
<details>
<summary>broadcasting.php</summary>
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Broadcaster
|--------------------------------------------------------------------------
|
| This option controls the default broadcaster that will be used by the
| framework when an event needs to be broadcast. You may set this to
| any of the connections defined in the "connections" array below.
|
| Supported: "reverb", "pusher", "ably", "redis", "log", "null"
|
*/
'default' => env('BROADCAST_CONNECTION', 'null'),
/*
|--------------------------------------------------------------------------
| Broadcast Connections
|--------------------------------------------------------------------------
|
| Here you may define all of the broadcast connections that will be used
| to broadcast events to other systems or over WebSockets. Samples of
| each available type of connection are provided inside this array.
|
*/
'connections' => [
'reverb' => [
'driver' => 'reverb',
'key' => env('REVERB_APP_KEY'),
'secret' => env('REVERB_APP_SECRET'),
'app_id' => env('REVERB_APP_ID'),
'options' => [
'host' => env('REVERB_HOST'),
'port' => env('REVERB_PORT', 443),
'scheme' => env('REVERB_SCHEME', 'https'),
'useTLS' => env('REVERB_SCHEME', 'https') === 'https',
],
'client_options' => [
'verify' => false,
// Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
],
],
'pusher' => [
'driver' => 'pusher',
'key' => env('PUSHER_APP_KEY'),
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
'cluster' => env('PUSHER_APP_CLUSTER'),
'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
'port' => env('PUSHER_PORT', 443),
'scheme' => env('PUSHER_SCHEME', 'https'),
'encrypted' => true,
'useTLS' => env('PUSHER_SCHEME', 'https') === 'https',
],
'client_options' => [
// Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
],
],
'ably' => [
'driver' => 'ably',
'key' => env('ABLY_KEY'),
],
'log' => [
'driver' => 'log',
],
'null' => [
'driver' => 'null',
],
],
];
</details>
<details>
<summary>composer.json</summary>
{
"name": "laravel/laravel",
"type": "project",
"description": "The skeleton application for the Laravel framework.",
"keywords": ["laravel", "framework"],
"license": "MIT",
"require": {
"php": "^8.2",
"laravel/framework": "^11.0",
"laravel/reverb": "@dev",
"laravel/tinker": "^2.9",
"livewire/livewire": "^3.4",
"livewire/volt": "^1.0"
},
"require-dev": {
"fakerphp/faker": "^1.23",
"laravel/breeze": "^2.0",
"laravel/pint": "^1.13",
"laravel/sail": "^1.26",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^8.0",
"phpunit/phpunit": "^11.0.1",
"spatie/laravel-ignition": "^2.4"
},
"autoload": {
"psr-4": {
"App\\": "app/",
"Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/"
}
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
}
},
"scripts": {
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
],
"post-update-cmd": [
"@php artisan vendor:publish --tag=laravel-assets --ansi --force"
],
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"@php artisan key:generate --ansi",
"@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
"@php artisan migrate --graceful --ansi"
]
},
"extra": {
"laravel": {
"dont-discover": []
}
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true,
"allow-plugins": {
"pestphp/pest-plugin": true,
"php-http/discovery": true
}
},
"minimum-stability": "dev",
"prefer-stable": false
}
</details>
<details>
<summary>env</summary>
APP_NAME=Laravel
APP_ENV=local
APP_KEY=base64:xphd5PuSjc3qy4M9uqJ0XZUSPvOSEHtNZtx3CcyD7+w=
APP_DEBUG=true
APP_TIMEZONE=UTC
APP_URL=https://reverb-app.test
APP_LOCALE=en
APP_FALLBACK_LOCALE=en
APP_FAKER_LOCALE=en_US
APP_MAINTENANCE_DRIVER=file
APP_MAINTENANCE_STORE=database
BCRYPT_ROUNDS=12
LOG_CHANNEL=stack
LOG_STACK=single
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug
DB_CONNECTION=sqlite
# DB_HOST=127.0.0.1
# DB_PORT=3306
# DB_DATABASE=laravel
# DB_USERNAME=root
# DB_PASSWORD=
SESSION_DRIVER=database
SESSION_LIFETIME=120
SESSION_ENCRYPT=false
SESSION_PATH=/
SESSION_DOMAIN=null
BROADCAST_CONNECTION=reverb
FILESYSTEM_DISK=local
QUEUE_CONNECTION=database
CACHE_STORE=database
CACHE_PREFIX=
MEMCACHED_HOST=127.0.0.1
REDIS_CLIENT=phpredis
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
MAIL_MAILER=log
MAIL_HOST=127.0.0.1
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS="hello@example.com"
MAIL_FROM_NAME="${APP_NAME}"
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
AWS_USE_PATH_STYLE_ENDPOINT=false
VITE_APP_NAME="${APP_NAME}"
REVERB_APP_ID=835917
REVERB_APP_KEY=bkefoajmyavya3ph3lml
REVERB_APP_SECRET=ebsrnbqajrgwfwnaorrz
REVERB_HOST="reverb-app.test"
REVERB_PORT=8080
REVERB_SCHEME=https
VITE_REVERB_APP_KEY="${REVERB_APP_KEY}"
VITE_REVERB_HOST="${REVERB_HOST}"
VITE_REVERB_PORT="${REVERB_PORT}"
VITE_REVERB_SCHEME="${REVERB_SCHEME}"
</details>
That all looks good to me.
Can you verify in your composer.lock which version of Reverb is being installed?
@joedixon Sadly, this is still an issue. Getting:
echo.js:6 WebSocket connection to 'wss://reverb-ssl.test:8080/app/e0bgxgxlni4u4wntyj2k?protocol=7&client=js&version=8.4.0-rc2&flash=false' failed: WebSocket is closed before the connection is established.
(locally, i have `reverb-ssl` as the folder in Herd)
I tried somethings around going to https://reverb-ssl.test:8080 as I am using Brave browser and it sounds like chrome has a cert issue, but nothing resolves at that url (i suspected that to be the case)
Would you like me to open a new issue, or do you think this is related? Were you able to get my example repo up and running using Herd and Herd Reverb service?
@bretterer this should be fixed on the `main` branch - can you give that a try?
seems `"laravel/reverb": "dev-main",` is still giving the same error
Here is my `Herd` services
@bretterer the Reverb Herd service is separate and doesn't yet have TLS support.
Are you trying to use that or do you have Reverb installed in your application?
reverb is installed in my application. Let me try `php artisan reverb:start`
@joedixon Seems to be that. `php artisan reverb:start` I no longer see the error in brave.
There are few items I would suggest for docs,
1. Make a note about Herd not being able to handle `secure` yet
2. when setting up a listener, you have to use `window.Echo.` instead of just `Echo`
3. Showing a simple `channels.php` route for this, as I personally am having issues using `PrivateChannel` to test with
```
Broadcast::channel('site-visit', function () {
return true;
});
```
That gives a 403, but thats not for this ticket.
Thank you so much for the help!
> That all looks good to me.
>
> Can you verify in your composer.lock which version of Reverb is being installed?
Here you go!
[composer.lock.zip](https://github.com/laravel/reverb/files/15067220/composer.lock.zip)
| 2024-04-23T12:38:15
|
php
|
Hard
|
laravel/reverb
| 253
|
laravel__reverb-253
|
[
"224"
] |
f412b8db9f241793baa08f35bffdfbb7680a09ec
|
diff --git a/src/Connection.php b/src/Connection.php
--- a/src/Connection.php
+++ b/src/Connection.php
@@ -5,6 +5,7 @@
use Laravel\Reverb\Concerns\GeneratesIdentifiers;
use Laravel\Reverb\Contracts\Connection as ConnectionContract;
use Laravel\Reverb\Events\MessageSent;
+use Ratchet\RFC6455\Messaging\Frame;
class Connection extends ConnectionContract
{
@@ -50,6 +51,14 @@ public function send(string $message): void
MessageSent::dispatch($this, $message);
}
+ /**
+ * Send a control frame to the connection.
+ */
+ public function control(string $type = Frame::OP_PING): void
+ {
+ $this->connection->send(new Frame('', opcode: $type));
+ }
+
/**
* Terminate a connection.
*/
diff --git a/src/Contracts/Connection.php b/src/Contracts/Connection.php
--- a/src/Contracts/Connection.php
+++ b/src/Contracts/Connection.php
@@ -3,6 +3,7 @@
namespace Laravel\Reverb\Contracts;
use Laravel\Reverb\Application;
+use Ratchet\RFC6455\Messaging\Frame;
abstract class Connection
{
@@ -16,6 +17,11 @@ abstract class Connection
*/
protected $hasBeenPinged = false;
+ /**
+ * Indicates if the connection uses control frames.
+ */
+ protected $usesControlFrames = false;
+
/**
* Create a new connection instance.
*/
@@ -39,6 +45,11 @@ abstract public function id(): string;
*/
abstract public function send(string $message): void;
+ /**
+ * Send a control frame to the connection.
+ */
+ abstract public function control(string $type = Frame::OP_PING): void;
+
/**
* Terminate a connection.
*/
@@ -136,4 +147,22 @@ public function isStale(): bool
{
return $this->isInactive() && $this->hasBeenPinged;
}
+
+ /**
+ * Determine whether the connection uses control frames.
+ */
+ public function usesControlFrames(): bool
+ {
+ return $this->usesControlFrames;
+ }
+
+ /**
+ * Mark the connection as using control frames to track activity.
+ */
+ public function setUsesControlFrames(bool $usesControlFrames = true): Connection
+ {
+ $this->usesControlFrames = $usesControlFrames;
+
+ return $this;
+ }
}
diff --git a/src/Protocols/Pusher/EventHandler.php b/src/Protocols/Pusher/EventHandler.php
--- a/src/Protocols/Pusher/EventHandler.php
+++ b/src/Protocols/Pusher/EventHandler.php
@@ -117,7 +117,9 @@ public function pong(Connection $connection): void
*/
public function ping(Connection $connection): void
{
- static::send($connection, 'ping');
+ $connection->usesControlFrames()
+ ? $connection->control()
+ : static::send($connection, 'ping');
$connection->ping();
}
diff --git a/src/Protocols/Pusher/Http/Controllers/PusherController.php b/src/Protocols/Pusher/Http/Controllers/PusherController.php
--- a/src/Protocols/Pusher/Http/Controllers/PusherController.php
+++ b/src/Protocols/Pusher/Http/Controllers/PusherController.php
@@ -8,6 +8,7 @@
use Laravel\Reverb\Protocols\Pusher\Server as PusherServer;
use Laravel\Reverb\Servers\Reverb\Connection;
use Psr\Http\Message\RequestInterface;
+use Ratchet\RFC6455\Messaging\FrameInterface;
class PusherController
{
@@ -34,6 +35,10 @@ public function __invoke(RequestInterface $request, Connection $connection, stri
fn ($message) => $this->server->message($reverbConnection, (string) $message)
);
+ $connection->onControl(
+ fn (FrameInterface $message) => $this->server->control($reverbConnection, $message)
+ );
+
$connection->onClose(
fn () => $this->server->close($reverbConnection)
);
diff --git a/src/Protocols/Pusher/Server.php b/src/Protocols/Pusher/Server.php
--- a/src/Protocols/Pusher/Server.php
+++ b/src/Protocols/Pusher/Server.php
@@ -10,6 +10,8 @@
use Laravel\Reverb\Protocols\Pusher\Contracts\ChannelManager;
use Laravel\Reverb\Protocols\Pusher\Exceptions\InvalidOrigin;
use Laravel\Reverb\Protocols\Pusher\Exceptions\PusherException;
+use Ratchet\RFC6455\Messaging\Frame;
+use Ratchet\RFC6455\Messaging\FrameInterface;
class Server
{
@@ -70,6 +72,21 @@ public function message(Connection $from, string $message): void
}
}
+ /**
+ * Handle a low-level WebSocket control frame.
+ */
+ public function control(Connection $from, FrameInterface $message): void
+ {
+ Log::info('Control Frame Received', $from->id());
+ Log::message($message);
+
+ $from->setUsesControlFrames();
+
+ if (in_array($message->getOpcode(), [Frame::OP_PING, Frame::OP_PONG], strict: true)) {
+ $from->touch();
+ }
+ }
+
/**
* Handle a client disconnection.
*/
diff --git a/src/Servers/Reverb/Connection.php b/src/Servers/Reverb/Connection.php
--- a/src/Servers/Reverb/Connection.php
+++ b/src/Servers/Reverb/Connection.php
@@ -27,6 +27,13 @@ class Connection extends EventEmitter implements WebSocketConnection
*/
protected $onMessage;
+ /**
+ * The control frame handler.
+ *
+ * @var ?callable
+ */
+ protected $onControl;
+
/**
* The connection close handler.
*
@@ -83,6 +90,10 @@ public function send(mixed $message): void
*/
public function control(FrameInterface $message): void
{
+ if ($this->onControl) {
+ ($this->onControl)($message);
+ }
+
match ($message->getOpcode()) {
Frame::OP_PING => $this->send(new Frame($message->getPayload(), opcode: Frame::OP_PONG)),
Frame::OP_PONG => fn () => null,
@@ -98,6 +109,14 @@ public function onMessage(callable $callback): void
$this->onMessage = $callback;
}
+ /**
+ * Set the control frame handler.
+ */
+ public function onControl(callable $callback): void
+ {
+ $this->onControl = $callback;
+ }
+
/**
* Set the close handler.
*/
|
diff --git a/tests/FakeConnection.php b/tests/FakeConnection.php
--- a/tests/FakeConnection.php
+++ b/tests/FakeConnection.php
@@ -7,6 +7,7 @@
use Laravel\Reverb\Concerns\GeneratesIdentifiers;
use Laravel\Reverb\Contracts\ApplicationProvider;
use Laravel\Reverb\Contracts\Connection as BaseConnection;
+use Ratchet\RFC6455\Messaging\Frame;
class FakeConnection extends BaseConnection
{
@@ -97,6 +98,12 @@ public function send(string $message): void
$this->messages[] = $message;
}
+ /**
+ * Send a control frame to the connection.
+ */
+ public function control(string $type = Frame::OP_PING): void { }
+
+
/**
* Terminate a connection.
*/
diff --git a/tests/Feature/Protocols/Pusher/Reverb/ServerTest.php b/tests/Feature/Protocols/Pusher/Reverb/ServerTest.php
--- a/tests/Feature/Protocols/Pusher/Reverb/ServerTest.php
+++ b/tests/Feature/Protocols/Pusher/Reverb/ServerTest.php
@@ -4,6 +4,7 @@
use Laravel\Reverb\Jobs\PingInactiveConnections;
use Laravel\Reverb\Jobs\PruneStaleConnections;
use Laravel\Reverb\Tests\ReverbTestCase;
+use Ratchet\RFC6455\Messaging\Frame;
use React\Promise\Deferred;
use function Ratchet\Client\connect as wsConnect;
@@ -482,3 +483,57 @@
expect($response)->toContain('"ids\":[1]');
expect($response)->toContain('"hash\":{\"1\":{\"name\":\"Test User\"}}');
});
+
+it('can handle a ping control frame', function () {
+ $connection = connect();
+ subscribe('test-channel', connection: $connection);
+ $channels = channels();
+ $managedConnection = Arr::first($channels->connections());
+ $subscribedAt = $managedConnection->lastSeenAt();
+ sleep(1);
+ $connection->send(new Frame('', opcode: Frame::OP_PING));
+
+ $connection->assertPonged();
+ expect($managedConnection->lastSeenAt())->toBeGreaterThan($subscribedAt);
+});
+
+it('can handle a pong control frame', function () {
+ $connection = connect();
+ subscribe('test-channel', connection: $connection);
+ $channels = channels();
+ $managedConnection = Arr::first($channels->connections());
+ $subscribedAt = $managedConnection->lastSeenAt();
+ sleep(1);
+ $connection->send(new Frame('', opcode: Frame::OP_PONG));
+
+ $connection->assertNotPinged();
+ $connection->assertNotPonged();
+ expect($managedConnection->lastSeenAt())->toBeGreaterThan($subscribedAt);
+});
+
+it('uses pusher control messages by default', function () {
+ $connection = connect();
+ subscribe('test-channel', connection: $connection);
+
+ $channels = channels();
+ Arr::first($channels->connections())->setLastSeenAt(time() - 60 * 10);
+
+ (new PingInactiveConnections)->handle($channels);
+
+ $connection->assertReceived('{"event":"pusher:ping"}');
+ $connection->assertNotPinged();
+});
+
+it('uses control frames when the client prefers', function () {
+ $connection = connect();
+ $connection->send(new Frame('', opcode: Frame::OP_PING));
+ subscribe('test-channel', connection: $connection);
+
+ $channels = channels();
+ Arr::first($channels->connections())->setLastSeenAt(time() - 60 * 10);
+
+ (new PingInactiveConnections)->handle($channels);
+
+ $connection->assertPinged();
+ $connection->assertNotReceived('{"event":"pusher:ping"}');
+});
diff --git a/tests/TestConnection.php b/tests/TestConnection.php
--- a/tests/TestConnection.php
+++ b/tests/TestConnection.php
@@ -25,6 +25,10 @@ class TestConnection
*/
public $receivedMessages = [];
+ public $wasPinged = false;
+
+ public $wasPonged = false;
+
/**
* Create a new test connection instance.
*/
@@ -34,6 +38,14 @@ public function __construct(public WebSocket $connection)
$this->receivedMessages[] = (string) $message;
});
+ $connection->on('ping', function () {
+ $this->wasPinged = true;
+ });
+
+ $connection->on('pong', function () {
+ $this->wasPonged = true;
+ });
+
$connection->on('close', function ($code, $message) {
$this->receivedMessages[] = (string) $message;
});
@@ -89,6 +101,58 @@ public function assertReceived(string $message, ?int $count = null): void
expect($this->receivedMessages)->toContain($message);
}
+ /**
+ * Assert that the connection did not receiv the given message.
+ */
+ public function assertNotReceived(string $message): void
+ {
+ if (! in_array($message, $this->receivedMessages)) {
+ $this->await();
+ }
+
+ expect($this->receivedMessages)->not->toContain($message);
+ }
+
+ /**
+ * Assert the connection was pinged during the test.
+ */
+ public function assertPinged(): void
+ {
+ $this->await();
+
+ expect($this->wasPinged)->toBeTrue();
+ }
+
+ /**
+ * Assert the connection was not pinged during the test.
+ */
+ public function assertNotPinged(): void
+ {
+ $this->await();
+
+ expect($this->wasPinged)->toBeFalse();
+ }
+
+ /**
+ * Assert the connection was ponged during the test.
+ */
+ public function assertPonged(): void
+ {
+ $this->await();
+
+ expect($this->wasPonged)->toBeTrue();
+ }
+
+ /**
+ * Assert the connection was not ponged during the test.
+ */
+ public function assertNotPonged(): void
+ {
+ $this->await();
+
+ expect($this->wasPonged)->toBeFalse();
+ }
+
/**
* Proxy method calls to the connection.
*/
|
Potential Issue with Pusher Ping/Pong Messages
### Reverb Version
1.0.0-beta14
### Laravel Version
10.10
### PHP Version
8.1
### Description
If I am understanding the Pusher protocol correctly, then if the WebSocket implementation supports native ping/pong messages, then Pusher will use those, and the `pusher:ping` and `pusher:pong` messages are only used if the client doesn't support websocket protocol ping messages.
[Link to Pusher docs here](https://pusher.com/docs/channels/library_auth_reference/pusher-websockets-protocol/#ping-and-pong-messages)
It seems like Laravel Reverb is ONLY sending `pusher:ping` and not using the websocket native ping messages to determine if a connection is still alive. I found this to be a compatibility issue with the [official dotnet Pusher client](https://github.com/pusher/pusher-websocket-dotnet). If I understand the situation correctly, because the C# implementation of the websocket client handles ping messages at the ws protocol level, they didn't implement any handlers for `pusher:ping` messages, which makes this client incompatible with Reverb.
If my assumptions are correct then this means Reverb should detect the client version and use a different pinging strategy based on the version? Or in my case could I just disable the reverb ping messages entirely and rely on the websocket pings being handled internally to keep the connection alive?
**Edit:** This excerpt from the Pusher docs linked above seems to imply that the C# client's behaviour is fine:
> If the WebSocket draft supports protocol level ping-pong, then on receipt of a ping message, the client MUST respond with a pong message.
>
> If the client does not support protocol level pings and advertises (on connect) that it implements a protocol version >= 5 then the client MUST respond to a pusher:ping event with a pusher.pong event.
It doesn't explicitly state that clients that already support protocol level pings must ALSO respond to pusher:ping events.
### Steps To Reproduce
Set up a minimal Reverb server and minimal Pusher dotnet client (https://github.com/pusher/pusher-websocket-dotnet), wait 1 minute after connection, server drops client connection due to missed ping and client reconnects.
|
So websocket ping/pong is handled here: https://github.com/laravel/reverb/blob/838387607b9223b67eee592a916b36900374bb14/src/Servers/Reverb/Connection.php#L84
Maybe this should call `touch()` on the Pusher connection to reset `lastSeenAt`, and then the `pusher:ping` fallback won't be necessary?
I agree with above approach, probably receiving any control frame should `touch()` the connection the same way any non-control frame does? But to fully meet the spec, sending a `ping()` or `pong()` should also attempt to send the control frame op-code as well?
Lastly, while playing around to check this, I found that `PingInactiveConnections` occurs on a fixed 60 second interval on the `$loop` but my hunch is that this should respect the configured `ping_interval` value? Otherwise it seems possible that active connections may be incorrectly treated at inactive.
https://github.com/laravel/reverb/blob/838387607b9223b67eee592a916b36900374bb14/src/Servers/Reverb/Console/Commands/StartServer.php#L91-L97
I don't think calling `touch()` on receipt of the control frame fully solves the issue since the dotnet client doesn't respond to `pusher:ping` so Reverb will never see a response from the client when pinging inactive connections and ultimately terminate the connection.
I'll take a look to see what's involved in adding support for this.
I notice there are some other similar issues on the repo so wonder if this should be addressed by the client. Doesn't look, at first glance, that there are any checks for the advertised supported pusher protocols.
Yes but by calling `touch()` in response to a control frame event would update the connection's `lastSeenAt` and it wouldn't be included in the next round of `PingInactiveConnections` anyway right? So this _should_ work as long as the client is indeed sending ping events reliably.
What do you think?
> I notice there are some other similar issues on the repo so wonder if this should be addressed by the client. Doesn't look, at first glance, that there are any checks for the advertised supported pusher protocols.
I believe that because the dotnet WebSocket client supports protocol level pings they didn't bother to include support for `pusher:ping` messages, since the spec states you can use either method for detecting inactive connections. This is likely an issue with more client implementations out there. You don't need to check the advertised pusher version to know if ping is supported, you check the `Sec-Websocket-Version` header on conection (I think)
We're seeing the same issue using the https://github.com/pusher/pusher-websocket-swift package where (unlike the Echo / Pusher JS client), it is not sending `pusher:ping` messages and therefore the connections are pruned unexpectedly
Appears most non web based clients don't use `pusher:ping` so most (all?) mobile clients don't work with Reverb.
| 2024-09-25T09:39:40
|
php
|
Hard
|
laravel/reverb
| 94
|
laravel__reverb-94
|
[
"89"
] |
d01860c879afb06813ee02dc81bd15f8daf322a4
|
diff --git a/src/Protocols/Pusher/Channels/Concerns/InteractsWithPrivateChannels.php b/src/Protocols/Pusher/Channels/Concerns/InteractsWithPrivateChannels.php
--- a/src/Protocols/Pusher/Channels/Concerns/InteractsWithPrivateChannels.php
+++ b/src/Protocols/Pusher/Channels/Concerns/InteractsWithPrivateChannels.php
@@ -21,7 +21,7 @@ public function subscribe(Connection $connection, ?string $auth = null, ?string
/**
* Deteremine whether the given authentication token is valid.
*/
- protected function verify(Connection $connection, string $auth, ?string $data = null): bool
+ protected function verify(Connection $connection, ?string $auth = null, ?string $data = null): bool
{
$signature = "{$connection->id()}:{$this->name()}";
|
diff --git a/tests/Feature/Protocols/Pusher/Reverb/ServerTest.php b/tests/Feature/Protocols/Pusher/Reverb/ServerTest.php
--- a/tests/Feature/Protocols/Pusher/Reverb/ServerTest.php
+++ b/tests/Feature/Protocols/Pusher/Reverb/ServerTest.php
@@ -405,3 +405,27 @@
expect(channels()->all())->toHaveCount(0);
});
+
+it('fails to subscribe to private channel with no auth token', function () {
+ $response = send([
+ 'event' => 'pusher:subscribe',
+ 'data' => [
+ 'channel' => 'private-test-channel',
+ 'auth' => null,
+ ],
+ ], connect());
+
+ expect($response)->toBe('{"event":"pusher:error","data":"{\"code\":4009,\"message\":\"Connection is unauthorized\"}"}');
+});
+
+it('fails to subscribe to presence channel with no auth token', function () {
+ $response = send([
+ 'event' => 'pusher:subscribe',
+ 'data' => [
+ 'channel' => 'presence-test-channel',
+ 'auth' => null,
+ ],
+ ], connect());
+
+ expect($response)->toBe('{"event":"pusher:error","data":"{\"code\":4009,\"message\":\"Connection is unauthorized\"}"}');
+});
diff --git a/tests/Unit/Protocols/Pusher/Channels/PrivateChannelTest.php b/tests/Unit/Protocols/Pusher/Channels/PrivateChannelTest.php
--- a/tests/Unit/Protocols/Pusher/Channels/PrivateChannelTest.php
+++ b/tests/Unit/Protocols/Pusher/Channels/PrivateChannelTest.php
@@ -1,5 +1,6 @@
<?php
+use Laravel\Reverb\Protocols\Pusher\Channels\PresenceChannel;
use Laravel\Reverb\Protocols\Pusher\Channels\PrivateChannel;
use Laravel\Reverb\Protocols\Pusher\Contracts\ChannelConnectionManager;
use Laravel\Reverb\Protocols\Pusher\Exceptions\ConnectionUnauthorized;
@@ -54,3 +55,15 @@
$channel->subscribe($this->connection, 'invalid-signature');
})->throws(ConnectionUnauthorized::class);
+
+it('fails to subscribe to a private channel with no auth token', function () {
+ $channel = new PrivateChannel('private-test-channel');
+
+ $channel->subscribe($this->connection, null);
+})->throws(ConnectionUnauthorized::class);
+
+it('fails to subscribe to a presence channel with no auth token', function () {
+ $channel = new PresenceChannel('presence-test-channel');
+
+ $channel->subscribe($this->connection, null);
+})->throws(ConnectionUnauthorized::class);
|
Reverb process crashes if no $auth parameter is provided
### Reverb Version
v1.0.0-beta3
### Laravel Version
v11.0.6
### PHP Version
8.3
### Description
After putting reverb into production and replacing soketi everything worked fine for an hour and then I started receiving these errors which crash the reverb process:
2024-03-15 02:16:37] production.ERROR: Laravel\Reverb\Protocols\Pusher\Channels\PrivateChannel::verify(): Argument #2 ($auth) must be of type string, null given, called in /home/forge/xxxxxx/vendor/laravel/reverb/src/Protocols/Pusher/Channels/Concerns/InteractsWithPrivateChannels.php on line 16 {"exception":"[object] (TypeError(code: 0): Laravel\\Reverb\\Protocols\\Pusher\\Channels\\PrivateChannel::verify():
I have fixed the error temporarily by modifying the signature of the verify method to match the subscribe method however I am unsure if this is the correct way to fix this issue:
protected function verify(Connection $connection, ?string $auth = null, ?string $data = null): bool
### Steps To Reproduce
Pass a null $auth parameter while trying to connect to a private channel
|
Can you put more information?
Hey there, thanks for reporting this issue.
We'll need more info and/or code to debug this further. Can you please create a repository with the command below, commit the code that reproduces the issue *as one separate commit* on the main/master branch and share the repository here?
Please make sure that you have the [latest version of the Laravel installer](https://github.com/laravel/installer) in order to run this command. Please also make sure you have both Git & [the GitHub CLI tool](https://cli.github.com/) properly set up.
laravel new bug-report --github="--public"
Do not amend and create a separate commit with your custom changes. After you've posted the repository, we'll try to reproduce the issue.
Thanks!
Sorry, I have tried to reproduce the issue from within laravel but I am unsure on how to trigger it during local testing. In production I have thousands of clients connecting to the websocket server and I am guessing that under some specific condition the $auth variable is left unasigned and gets set to null because thats the default value. My only solution would be to undo my changes in production and perhaps capture the info from the connecting client, they might be using an outdated installation of Echo or something like that. In any case, feel free to close this issue as I am unable to reproduce it locally.
I am also experiencing the same issue but in local environment.
`[2024-03-17 14:20:13] local.ERROR: Laravel\Reverb\Protocols\Pusher\Channels\PrivateChannel::verify(): Argument #2 ($auth) must be of type string, null given, called in /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/reverb/src/Protocols/Pusher/Channels/Concerns/InteractsWithPrivateChannels.php on line 16 {"exception":"[object] (TypeError(code: 0): Laravel\\Reverb\\Protocols\\Pusher\\Channels\\PrivateChannel::verify(): Argument #2 ($auth) must be of type string, null given, called in /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/reverb/src/Protocols/Pusher/Channels/Concerns/InteractsWithPrivateChannels.php on line 16 at /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/reverb/src/Protocols/Pusher/Channels/Concerns/InteractsWithPrivateChannels.php:24)
[stacktrace]
#0 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/reverb/src/Protocols/Pusher/Channels/Concerns/InteractsWithPrivateChannels.php(16): Laravel\\Reverb\\Protocols\\Pusher\\Channels\\PrivateChannel->verify()
#1 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/reverb/src/Protocols/Pusher/EventHandler.php(62): Laravel\\Reverb\\Protocols\\Pusher\\Channels\\PrivateChannel->subscribe()
#2 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/reverb/src/Protocols/Pusher/EventHandler.php(29): Laravel\\Reverb\\Protocols\\Pusher\\EventHandler->subscribe()
#3 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/reverb/src/Protocols/Pusher/Server.php(56): Laravel\\Reverb\\Protocols\\Pusher\\EventHandler->handle()
#4 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/reverb/src/Protocols/Pusher/Http/Controllers/PusherController.php(34): Laravel\\Reverb\\Protocols\\Pusher\\Server->message()
#5 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/ratchet/rfc6455/src/Messaging/MessageBuffer.php(248): Laravel\\Reverb\\Protocols\\Pusher\\Http\\Controllers\\PusherController->Laravel\\Reverb\\Protocols\\Pusher\\Http\\Controllers\\{closure}()
#6 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/ratchet/rfc6455/src/Messaging/MessageBuffer.php(194): Ratchet\\RFC6455\\Messaging\\MessageBuffer->processData()
#7 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/evenement/evenement/src/EventEmitterTrait.php(143): Ratchet\\RFC6455\\Messaging\\MessageBuffer->onData()
#8 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/react/stream/src/Util.php(71): Evenement\\EventEmitter->emit()
#9 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/evenement/evenement/src/EventEmitterTrait.php(143): React\\Stream\\Util::React\\Stream\\{closure}()
#10 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/react/stream/src/DuplexResourceStream.php(196): Evenement\\EventEmitter->emit()
#11 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/react/event-loop/src/StreamSelectLoop.php(246): React\\Stream\\DuplexResourceStream->handleData()
#12 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/react/event-loop/src/StreamSelectLoop.php(213): React\\EventLoop\\StreamSelectLoop->waitForStreamActivity()
#13 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/reverb/src/Servers/Reverb/Http/Server.php(39): React\\EventLoop\\StreamSelectLoop->run()
#14 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/reverb/src/Servers/Reverb/Console/Commands/StartServer.php(70): Laravel\\Reverb\\Servers\\Reverb\\Http\\Server->start()
#15 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php(36): Laravel\\Reverb\\Servers\\Reverb\\Console\\Commands\\StartServer->handle()
#16 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/framework/src/Illuminate/Container/Util.php(41): Illuminate\\Container\\BoundMethod::Illuminate\\Container\\{closure}()
#17 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php(93): Illuminate\\Container\\Util::unwrapIfClosure()
#18 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/framework/src/Illuminate/Container/BoundMethod.php(35): Illuminate\\Container\\BoundMethod::callBoundMethod()
#19 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/framework/src/Illuminate/Container/Container.php(662): Illuminate\\Container\\BoundMethod::call()
#20 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/framework/src/Illuminate/Console/Command.php(212): Illuminate\\Container\\Container->call()
#21 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/symfony/console/Command/Command.php(279): Illuminate\\Console\\Command->execute()
#22 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/framework/src/Illuminate/Console/Command.php(181): Symfony\\Component\\Console\\Command\\Command->run()
#23 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/symfony/console/Application.php(1049): Illuminate\\Console\\Command->run()
#24 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/symfony/console/Application.php(318): Symfony\\Component\\Console\\Application->doRunCommand()
#25 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/symfony/console/Application.php(169): Symfony\\Component\\Console\\Application->doRun()
#26 /opt/lampp/htdocs/Wingu-2.0-Backend/vendor/laravel/framework/src/Illuminate/Foundation/Console/Kernel.php(196): Symfony\\Component\\Console\\Application->run()
#27 /opt/lampp/htdocs/Wingu-2.0-Backend/artisan(35): Illuminate\\Foundation\\Console\\Kernel->handle()
#28 {main}
"} `
added this to api route file:
`Broadcast::routes(['middleware' => ['auth:sanctum']]);`
the channel :
`Broadcast::channel('mpesa-credentials.{user_id}', function ($user, $id) {
return $user->id === $id; });`
frontend echo configuration:
`import Echo from "laravel-echo";
import axios from '@/lib/axios';
const EchoConfig = () => {
window.Pusher = require('pusher-js');
window.Echo = new Echo({
broadcaster: 'reverb',
key: process.env.NEXT_PUBLIC_REVERB_APP_KEY,
wsHost: window.location.hostname,
wsPort: process.env.NEXT_PUBLIC_REVERB_PORT,
wssPort: process.env.NEXT_PUBLIC_REVERB_PORT,
forceTLS: (process.env.NEXT_PUBLIC_REVERB_SCHEME ?? 'https') === 'https',
enabledTransports: ['ws', 'wss'],
encrypted: false,
authorizer: (channel, options) => {
return {
authorize: (socketId, callback) => {
axios.post('/api/broadcasting/auth', {
socket_id: socketId,
channel_name: channel.name
})
.then(response => {
console.log('success:'+response.data)
callback(false, response.data);
})
.catch(error => {
console.log('error:'+error)
callback(true, error);
});
}
};
},
})}
export default EchoConfig;`
Hey @KirinyetBrian can you share a screenshot of the WebSocket in the network panel expanding the detail of the `pusher:subscribe` event?
| 2024-03-18T13:21:23
|
php
|
Hard
|
laravel/reverb
| 303
|
laravel__reverb-303
|
[
"298"
] |
c3a4961d4cafcf4bc340c1253bc47d590ef17600
|
diff --git a/src/Loggers/CliLogger.php b/src/Loggers/CliLogger.php
--- a/src/Loggers/CliLogger.php
+++ b/src/Loggers/CliLogger.php
@@ -52,7 +52,7 @@ public function message(string $message): void
$message['data'] = json_decode($message['data'], true);
}
- if (isset($message['data']['channel_data'])) {
+ if (isset($message['data']['channel_data']) && is_string($message['data']['channel_data'])) {
$message['data']['channel_data'] = json_decode($message['data']['channel_data'], true);
}
diff --git a/src/Protocols/Pusher/ClientEvent.php b/src/Protocols/Pusher/ClientEvent.php
--- a/src/Protocols/Pusher/ClientEvent.php
+++ b/src/Protocols/Pusher/ClientEvent.php
@@ -2,6 +2,7 @@
namespace Laravel\Reverb\Protocols\Pusher;
+use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Laravel\Reverb\Contracts\Connection;
@@ -12,6 +13,12 @@ class ClientEvent
*/
public static function handle(Connection $connection, array $event): ?ClientEvent
{
+ Validator::make($event, [
+ 'event' => ['required', 'string'],
+ 'channel' => ['required', 'string'],
+ 'data' => ['required', 'array'],
+ ])->validate();
+
if (! Str::startsWith($event['event'], 'client-')) {
return null;
}
diff --git a/src/Protocols/Pusher/EventHandler.php b/src/Protocols/Pusher/EventHandler.php
--- a/src/Protocols/Pusher/EventHandler.php
+++ b/src/Protocols/Pusher/EventHandler.php
@@ -3,6 +3,7 @@
namespace Laravel\Reverb\Protocols\Pusher;
use Exception;
+use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Laravel\Reverb\Contracts\Connection;
use Laravel\Reverb\Protocols\Pusher\Channels\CacheChannel;
@@ -24,7 +25,9 @@ public function __construct(protected ChannelManager $channels)
*/
public function handle(Connection $connection, string $event, array $payload = []): void
{
- match (Str::after($event, 'pusher:')) {
+ $event = Str::after($event, 'pusher:');
+
+ match ($event) {
'connection_established' => $this->acknowledge($connection),
'subscribe' => $this->subscribe(
$connection,
@@ -55,6 +58,16 @@ public function acknowledge(Connection $connection): void
*/
public function subscribe(Connection $connection, string $channel, ?string $auth = null, ?string $data = null): void
{
+ Validator::make([
+ 'channel' => $channel,
+ 'auth' => $auth,
+ 'channel_data' => $data,
+ ], [
+ 'channel' => ['nullable', 'string'],
+ 'auth' => ['nullable', 'string'],
+ 'channel_data' => ['nullable', 'json'],
+ ])->validate();
+
$channel = $this->channels
->for($connection->app())
->findOrCreate($channel);
diff --git a/src/Protocols/Pusher/Server.php b/src/Protocols/Pusher/Server.php
--- a/src/Protocols/Pusher/Server.php
+++ b/src/Protocols/Pusher/Server.php
@@ -3,6 +3,7 @@
namespace Laravel\Reverb\Protocols\Pusher;
use Exception;
+use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Laravel\Reverb\Contracts\Connection;
use Laravel\Reverb\Events\MessageReceived;
@@ -12,6 +13,7 @@
use Laravel\Reverb\Protocols\Pusher\Exceptions\PusherException;
use Ratchet\RFC6455\Messaging\Frame;
use Ratchet\RFC6455\Messaging\FrameInterface;
+use Throwable;
class Server
{
@@ -54,12 +56,13 @@ public function message(Connection $from, string $message): void
try {
$event = json_decode($message, associative: true, flags: JSON_THROW_ON_ERROR);
+ Validator::make($event, ['event' => ['required', 'string']])->validate();
+
match (Str::startsWith($event['event'], 'pusher:')) {
true => $this->handler->handle(
$from,
$event['event'],
empty($event['data']) ? [] : $event['data'],
- $event['channel'] ?? null
),
default => ClientEvent::handle($from, $event)
};
@@ -67,7 +70,7 @@ public function message(Connection $from, string $message): void
Log::info('Message Handled', $from->id());
MessageReceived::dispatch($from, $message);
- } catch (Exception $e) {
+ } catch (Throwable $e) {
$this->error($from, $e);
}
}
@@ -104,7 +107,7 @@ public function close(Connection $connection): void
/**
* Handle an error.
*/
- public function error(Connection $connection, Exception $exception): void
+ public function error(Connection $connection, Throwable $exception): void
{
if ($exception instanceof PusherException) {
$connection->send(json_encode($exception->payload()));
|
diff --git a/tests/Unit/Protocols/Pusher/ServerTest.php b/tests/Unit/Protocols/Pusher/ServerTest.php
--- a/tests/Unit/Protocols/Pusher/ServerTest.php
+++ b/tests/Unit/Protocols/Pusher/ServerTest.php
@@ -329,3 +329,157 @@
['localhost', '*.localhost'],
],
]);
+
+it('sends an error if something fails for event type', function () {
+ $this->server->message(
+ $connection = new FakeConnection,
+ json_encode([
+ 'event' => [],
+ ])
+ );
+
+ $connection->assertReceived([
+ 'event' => 'pusher:error',
+ 'data' => json_encode([
+ 'code' => 4200,
+ 'message' => 'Invalid message format',
+ ]),
+ ]);
+});
+
+it('sends an error if something fails for data type', function () {
+ $this->server->message(
+ $connection = new FakeConnection,
+ json_encode([
+ 'event' => 'pusher:subscribe',
+ 'data' => 'sfsfsfs',
+ ])
+ );
+
+ $connection->assertReceived([
+ 'event' => 'pusher:error',
+ 'data' => json_encode([
+ 'code' => 4200,
+ 'message' => 'Invalid message format',
+ ]),
+ ]);
+});
+
+it('sends an error if something fails for data channel type', function () {
+ $this->server->message(
+ $connection = new FakeConnection,
+ json_encode([
+ 'event' => 'pusher:subscribe',
+ 'data' => [
+ 'channel' => [],
+ ],
+ ])
+ );
+
+ $connection->assertReceived([
+ 'event' => 'pusher:error',
+ 'data' => json_encode([
+ 'code' => 4200,
+ 'message' => 'Invalid message format',
+ ]),
+ ]);
+
+ $this->server->message(
+ $connection = new FakeConnection,
+ json_encode([
+ 'event' => 'pusher:subscribe',
+ 'data' => [
+ 'channel' => null,
+ ],
+ ])
+ );
+
+ $connection->assertReceived([
+ 'event' => 'pusher:error',
+ 'data' => json_encode([
+ 'code' => 4200,
+ 'message' => 'Invalid message format',
+ ]),
+ ]);
+});
+
+it('sends an error if something fails for data auth type', function () {
+ $this->server->message(
+ $connection = new FakeConnection,
+ json_encode([
+ 'event' => 'pusher:subscribe',
+ 'data' => [
+ 'channel' => 'presence-test-channel',
+ 'auth' => [],
+ ],
+ ])
+ );
+
+ $connection->assertReceived([
+ 'event' => 'pusher:error',
+ 'data' => json_encode([
+ 'code' => 4200,
+ 'message' => 'Invalid message format',
+ ]),
+ ]);
+});
+
+it('sends an error if something fails for data channel_data type', function () {
+ $this->server->message(
+ $connection = new FakeConnection,
+ json_encode([
+ 'event' => 'pusher:subscribe',
+ 'data' => [
+ 'channel' => 'presence-test-channel',
+ 'auth' => '',
+ 'channel_data' => [],
+ ],
+ ])
+ );
+
+ $connection->assertReceived([
+ 'event' => 'pusher:error',
+ 'data' => json_encode([
+ 'code' => 4200,
+ 'message' => 'Invalid message format',
+ ]),
+ ]);
+
+ $this->server->message(
+ $connection = new FakeConnection,
+ json_encode([
+ 'event' => 'pusher:subscribe',
+ 'data' => [
+ 'channel' => 'presence-test-channel',
+ 'auth' => '',
+ 'channel_data' => 'Hello',
+ ],
+ ])
+ );
+
+ $connection->assertReceived([
+ 'event' => 'pusher:error',
+ 'data' => json_encode([
+ 'code' => 4200,
+ 'message' => 'Invalid message format',
+ ]),
+ ]);
+});
+
+it('sends an error if something fails for channel type', function () {
+ $this->server->message(
+ $connection = new FakeConnection,
+ json_encode([
+ 'event' => 'client-start-typing',
+ 'channel' => [],
+ ])
+ );
+
+ $connection->assertReceived([
+ 'event' => 'pusher:error',
+ 'data' => json_encode([
+ 'code' => 4200,
+ 'message' => 'Invalid message format',
+ ]),
+ ]);
+});
|
Incorrect condition in `CliLogger::message` method
### Reverb Version
1.4
### Laravel Version
11.36
### PHP Version
8.3
### Description
There is an incorrect condition in the `CliLogger::message` method in the `vendor/laravel/reverb/src/Loggers/CliLogger.php` file. The condition should check if `message['data']['channel_data']` is a string, not `message['data']`.
### Steps To Reproduce
1. Log a message with `channel_data` as a string.
2. Observe that the `channel_data` is not decoded correctly.
|
Can you share a screenshot of the issue you are seeing on the CLI?
> Can you share a screenshot of the issue you are seeing on the CLI?
<img width="1278" alt="Screenshot 1403-10-22 at 14 17 45" src="https://github.com/user-attachments/assets/13d60062-1aa5-4584-991e-82eab7998073" />
As you can see in the image, when the channel is not in string format, the socket drops and restarts. This issue also exists on its main site https://reverb.laravel.com/.
`{"event":"pusher:subscribe","data":{"auth":"","channel":{}}}`
[video](https://www.youtube.com/watch?v=Lu4VA_26wAE)
> Can you share a screenshot of the issue you are seeing on the CLI?
```
[2025-01-09 07:17:24] local.ERROR: json_decode(): Argument #1 ($json) must be of type string, array given {"exception":"[object] (TypeError(code: 0): json_decode(): Argument #1 ($json) must be of type string, array given at /vendor/laravel/reverb/src/Loggers/CliLogger.php:56)
[stacktrace]
```
اول از همه من مجبور شدم برای اینکه مشکل را توضیح بدم اینکار بکنم :)
[php code](https://limewire.com/d/8d16e125-0adc-4579-89a0-20521ab0de76#1MmqMFUt90L9Q6HhwCS8_B_UQHophxxpm1W7CHx3N5s)
[link sample](http://fm.freehost.io/websocketReverb.php?duration=15)
https://reverb.laravel.com/
کافیه کنسول سایت باز کنید و اسکریپت اجرا کنید و متوجه خطا شوید این کد باعث میش سوکت هر ۵ ثانیه سوکت که توسط پکیج reverb بالا میاد بیافته
حالا دوست داره لاراول این مشکل حل کنه یا خیر واقعا من نمیدونم !!
First of all, I had to do this to explain the issue :)
[php code](https://limewire.com/d/8d16e125-0adc-4579-89a0-20521ab0de76#1MmqMFUt90L9Q6HhwCS8_B_UQHophxxpm1W7CHx3N5s)
[link sample](http://fm.freehost.io/websocketReverb.php?duration=15)
https://reverb.laravel.com/
Just open the site console, run the script, and you’ll notice the error. This code causes the socket, which gets raised by the reverb package, to drop every 5 seconds.
Now it’s up to Laravel to decide whether they want to resolve this issue or not; honestly, I don’t know!!
| 2025-01-19T07:48:07
|
php
|
Hard
|
bmitch/churn-php
| 306
|
bmitch__churn-php-306
|
[
"232"
] |
369dd927ec21b60595ca54bcf557bfdb998c49aa
|
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -85,6 +85,11 @@ filesToShow: 10
# Default: 0.1
minScoreToShow: 0
+# The command returns an 1 exit code if the highest score is greater than the threshold.
+# Disabled if null.
+# Default: null
+maxScoreThreshold: 0.9
+
# The number of parallel jobs to use when processing files.
# Default: 10
parallelJobs: 10
@@ -126,12 +131,12 @@ hooks:
# The version control system used for your project.
# Accepted values: fossil, git, mercurial, subversion, none
# Default: git
- vcs: git
+vcs: git
# The path of the cache file. It doesn't need to exist before running churn.
# Disabled if null.
# Default: null
- cachePath: .churn.cache
+cachePath: .churn.cache
```
If a `churn.yml` file is omitted or an individual setting is omitted the default values above will be used.
diff --git a/src/Command/Helper/MaxScoreChecker.php b/src/Command/Helper/MaxScoreChecker.php
new file mode 100644
--- /dev/null
+++ b/src/Command/Helper/MaxScoreChecker.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Command\Helper;
+
+use Churn\Result\ResultAccumulator;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @internal
+ */
+class MaxScoreChecker
+{
+
+ /**
+ * @var float|null
+ */
+ private $maxScoreThreshold;
+
+ /**
+ * @param float|null $maxScoreThreshold The max score threshold.
+ */
+ public function __construct(?float $maxScoreThreshold)
+ {
+ $this->maxScoreThreshold = $maxScoreThreshold;
+ }
+
+ /**
+ * @param InputInterface $input Input.
+ * @param OutputInterface $output Output.
+ * @param ResultAccumulator $report The report containing the scores.
+ */
+ public function isOverThreshold(InputInterface $input, OutputInterface $output, ResultAccumulator $report): bool
+ {
+ $maxScore = $report->getMaxScore();
+
+ if (null === $this->maxScoreThreshold || null === $maxScore || $maxScore <= $this->maxScoreThreshold) {
+ return false;
+ }
+
+ if ('text' === $input->getOption('format') || !empty($input->getOption('output'))) {
+ $output->writeln('<error>Max score is over the threshold</>');
+ }
+
+ return true;
+ }
+}
diff --git a/src/Command/RunCommand.php b/src/Command/RunCommand.php
--- a/src/Command/RunCommand.php
+++ b/src/Command/RunCommand.php
@@ -4,6 +4,7 @@
namespace Churn\Command;
+use Churn\Command\Helper\MaxScoreChecker;
use Churn\Command\Helper\ProgressBarSubscriber;
use Churn\Configuration\Config;
use Churn\Configuration\Loader;
@@ -109,7 +110,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
}
$config = $this->getConfiguration($input);
$broker = new Broker();
- $this->attachHooks($config, $broker);
+ (new HookLoader($config->getDirPath()))->attachHooks($config->getHooks(), $broker);
$this->printLogo($input, $output);
if (true === $input->getOption('progress')) {
$broker->subscribe(new ProgressBarSubscriber($output));
@@ -117,7 +118,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$report = $this->analyze($input, $config, $broker);
$this->writeResult($input, $output, $report);
- return 0;
+ return (int) (new MaxScoreChecker($config->getMaxScoreThreshold()))->isOverThreshold($input, $output, $report);
}
/**
@@ -147,26 +148,6 @@ private function getConfiguration(InputInterface $input): Config
return $config;
}
- /**
- * @param Config $config The configuration object.
- * @param Broker $broker The event broker.
- * @throws InvalidArgumentException If a hook is invalid.
- */
- private function attachHooks(Config $config, Broker $broker): void
- {
- if ([] === $config->getHooks()) {
- return;
- }
-
- $loader = new HookLoader($config->getDirPath());
-
- foreach ($config->getHooks() as $hook) {
- if (!$loader->attach($hook, $broker)) {
- throw new InvalidArgumentException('Invalid hook: ' . $hook);
- }
- }
- }
-
/**
* Run the actual analysis.
*
diff --git a/src/Configuration/Config.php b/src/Configuration/Config.php
--- a/src/Configuration/Config.php
+++ b/src/Configuration/Config.php
@@ -13,6 +13,7 @@ class Config
private const DIRECTORIES_TO_SCAN = [];
private const FILES_TO_SHOW = 10;
private const MINIMUM_SCORE_TO_SHOW = 0.1;
+ private const MAXIMUM_SCORE_THRESHOLD = null;
private const AMOUNT_OF_PARALLEL_JOBS = 10;
private const SHOW_COMMITS_SINCE = '10 years ago';
private const FILES_TO_IGNORE = [];
@@ -112,6 +113,18 @@ public function getMinScoreToShow(): ?float
return self::MINIMUM_SCORE_TO_SHOW;
}
+ /**
+ * Get the maximum score threshold.
+ */
+ public function getMaxScoreThreshold(): ?float
+ {
+ if (\array_key_exists('maxScoreThreshold', $this->configuration)) {
+ return $this->configuration['maxScoreThreshold'];
+ }
+
+ return self::MAXIMUM_SCORE_THRESHOLD;
+ }
+
/**
* Get the number of parallel jobs to use to process the files.
*/
diff --git a/src/Configuration/Validator.php b/src/Configuration/Validator.php
--- a/src/Configuration/Validator.php
+++ b/src/Configuration/Validator.php
@@ -20,6 +20,7 @@ public function validateConfigurationValues(array $configuration): void
$this->validateDirectoriesToScan($configuration);
$this->validateFilesToShow($configuration);
$this->validateMinScoreToShow($configuration);
+ $this->validateMaxScoreThreshold($configuration);
$this->validateParallelJobs($configuration);
$this->validateCommitsSince($configuration);
$this->validateFilesToIgnore($configuration);
@@ -59,13 +60,25 @@ private function validateFilesToShow(array $configuration): void
*/
private function validateMinScoreToShow(array $configuration): void
{
- if (!\array_key_exists('minScoreToShow', $configuration) || null === $configuration['minScoreToShow']) {
+ if (!isset($configuration['minScoreToShow'])) {
return;
}
Assert::numeric($configuration['minScoreToShow'], 'Minimum score to show should be a number');
}
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ private function validateMaxScoreThreshold(array $configuration): void
+ {
+ if (!isset($configuration['maxScoreThreshold'])) {
+ return;
+ }
+
+ Assert::numeric($configuration['maxScoreThreshold'], 'Maximum score threshold should be a number');
+ }
+
/**
* @param array<mixed> $configuration The array containing the configuration values.
*/
diff --git a/src/Event/HookLoader.php b/src/Event/HookLoader.php
--- a/src/Event/HookLoader.php
+++ b/src/Event/HookLoader.php
@@ -11,6 +11,7 @@
use Churn\Event\Subscriber\AfterFileAnalysisHookDecorator;
use Churn\Event\Subscriber\BeforeAnalysisHookDecorator;
use Churn\File\FileHelper;
+use InvalidArgumentException;
/**
* @internal
@@ -41,6 +42,24 @@ public function __construct(string $basePath)
$this->basePath = $basePath;
}
+ /**
+ * @param array<string> $hooks The list of hooks to attach.
+ * @param Broker $broker The event broker.
+ * @throws InvalidArgumentException If a hook is invalid.
+ */
+ public function attachHooks(array $hooks, Broker $broker): void
+ {
+ if ([] === $hooks) {
+ return;
+ }
+
+ foreach ($hooks as $hook) {
+ if (!$this->attach($hook, $broker)) {
+ throw new InvalidArgumentException('Invalid hook: ' . $hook);
+ }
+ }
+ }
+
/**
* @param string $hookPath The class name or the file path of the hook.
* @param Broker $broker The event broker.
|
diff --git a/tests/Integration/Command/RunCommandTest.php b/tests/Integration/Command/RunCommandTest.php
--- a/tests/Integration/Command/RunCommandTest.php
+++ b/tests/Integration/Command/RunCommandTest.php
@@ -224,4 +224,17 @@ public function it_can_suppress_normal_output(): void
$this->assertEquals(0, $exitCode);
$this->assertEquals('Churn: DONE', $display);
}
+
+ /** @test */
+ public function it_can_return_one_as_exit_code(): void
+ {
+ $exitCode = $this->commandTester->execute([
+ 'paths' => [__FILE__],
+ '-c' => __DIR__ . '/config/test-threshold.yml',
+ ]);
+ $display = $this->commandTester->getDisplay();
+
+ $this->assertEquals(1, $exitCode);
+ $this->assertStringContainsString('Max score is over the threshold', $display);
+ }
}
diff --git a/tests/Integration/Command/config/test-threshold.yml b/tests/Integration/Command/config/test-threshold.yml
new file mode 100644
--- /dev/null
+++ b/tests/Integration/Command/config/test-threshold.yml
@@ -0,0 +1 @@
+maxScoreThreshold: 0.9
\ No newline at end of file
diff --git a/tests/Unit/Command/Helper/MaxScoreCheckerTest.php b/tests/Unit/Command/Helper/MaxScoreCheckerTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Unit/Command/Helper/MaxScoreCheckerTest.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Tests\Unit\Command\Helper;
+
+use Churn\Command\Helper\MaxScoreChecker;
+use Churn\Result\ResultAccumulator;
+use Churn\Tests\BaseTestCase;
+use Mockery as m;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class MaxScoreCheckerTest extends BaseTestCase
+{
+
+ /**
+ * @test
+ * @dataProvider provide_arguments
+ */
+ public function it_can_check_the_max_score(
+ bool $expectedResult,
+ ?float $threshold,
+ ?float $maxScore,
+ string $format = 'text',
+ ?string $output = null
+ ): void {
+ $input = m::mock(InputInterface::class);
+ $input->shouldReceive('getOption')->with('format')->andReturn($format);
+ $input->shouldReceive('getOption')->with('output')->andReturn($output);
+
+ $output = m::mock(OutputInterface::class);
+ $output->shouldReceive('writeln');
+
+ $report = m::mock(ResultAccumulator::class);
+ $report->shouldReceive('getMaxScore')->andReturn($maxScore);
+
+ $checker = new MaxScoreChecker($threshold);
+
+ $this->assertEquals(
+ $expectedResult,
+ $checker->isOverThreshold($input, $output, $report)
+ );
+ }
+
+ public function provide_arguments(): iterable
+ {
+ yield [false, null, null];
+ yield [false, 1, null];
+ yield [false, null, 1];
+ yield [false, 1, 0.1];
+ yield [true, 0.1, 1];
+ yield [true, 0.1, 1, 'text', '/tmp'];
+ }
+}
diff --git a/tests/Unit/Configuration/ConfigTest.php b/tests/Unit/Configuration/ConfigTest.php
--- a/tests/Unit/Configuration/ConfigTest.php
+++ b/tests/Unit/Configuration/ConfigTest.php
@@ -52,6 +52,7 @@ public function it_can_return_its_default_values_when_instantiated_without_any_p
$this->assertSame([], $config->getDirectoriesToScan());
$this->assertSame(10, $config->getFilesToShow());
$this->assertSame(0.1, $config->getMinScoreToShow());
+ $this->assertSame(null, $config->getMaxScoreThreshold());
$this->assertSame(10, $config->getParallelJobs());
$this->assertSame('10 years ago', $config->getCommitsSince());
$this->assertSame([], $config->getFilesToIgnore());
@@ -67,6 +68,7 @@ public function it_can_return_its_values_when_instantiated_parameters()
$filesToShow = 13;
$directoriesToScan = ['src', 'tests'];
$minScoreToShow = 5;
+ $maxScoreThreshold = 9.5;
$parallelJobs = 7;
$commitsSince = '4 years ago';
$filesToIgnore = ['foo.php', 'bar.php', 'baz.php'];
@@ -79,6 +81,7 @@ public function it_can_return_its_values_when_instantiated_parameters()
'directoriesToScan' => $directoriesToScan,
'filesToShow' => $filesToShow,
'minScoreToShow' => $minScoreToShow,
+ 'maxScoreThreshold' => $maxScoreThreshold,
'parallelJobs' => $parallelJobs,
'commitsSince' => $commitsSince,
'filesToIgnore' => $filesToIgnore,
@@ -91,6 +94,7 @@ public function it_can_return_its_values_when_instantiated_parameters()
$this->assertSame($directoriesToScan, $config->getDirectoriesToScan());
$this->assertSame($filesToShow, $config->getFilesToShow());
$this->assertEquals($minScoreToShow, $config->getMinScoreToShow());
+ $this->assertSame($maxScoreThreshold, $config->getMaxScoreThreshold());
$this->assertSame($parallelJobs, $config->getParallelJobs());
$this->assertSame($commitsSince, $config->getCommitsSince());
$this->assertSame($filesToIgnore, $config->getFilesToIgnore());
|
Make command fail if score is higher than a configurable threshold
It could be used in a CI pipeline.
| 2021-02-15T20:12:35
|
php
|
Hard
|
|
bmitch/churn-php
| 72
|
bmitch__churn-php-72
|
[
"57"
] |
d08b0ffbf5e9f3635268ba52798597a31a4d0f75
|
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -59,11 +59,13 @@ composer require bmitch/churn-php --dev
## How to Use? ##
```
-vendor/bin/churn run <path to source code>
+vendor/bin/churn run <one or more paths to source code> ...
+vendor/bin/churn run src
+vendor/bin/churn run src tests
```
## How to Configure?
-You may add an optional `churn.yml` file to the root of your project which can be used to configure churn-php. A sample `churm.yml` file looks like:
+You may add an optional `churn.yml` file to the root of your project which can be used to configure churn-php. A sample `churn.yml` file looks like:
```yml
# The maximum number of files to display in the results table.
@@ -86,7 +88,7 @@ filesToIgnore:
- src/Results/ResultsParser.php
```
-If a `churm.yml` file is omitted or an individual setting is omitted the default values above will be used.
+If a `churn.yml` file is omitted or an individual setting is omitted the default values above will be used.
## Similar Packages
* https://github.com/danmayer/churn (Ruby)
diff --git a/src/Commands/ChurnCommand.php b/src/Commands/ChurnCommand.php
--- a/src/Commands/ChurnCommand.php
+++ b/src/Commands/ChurnCommand.php
@@ -90,7 +90,7 @@ public function __construct()
protected function configure()
{
$this->setName('run')
- ->addArgument('path', InputArgument::REQUIRED, 'Path to source to check.')
+ ->addArgument('paths', InputArgument::IS_ARRAY, 'Path to source to check.')
->setDescription('Check files')
->setHelp('Checks the churn on the provided path argument(s).');
}
@@ -104,8 +104,8 @@ protected function configure()
protected function execute(InputInterface $input, OutputInterface $output)
{
$this->startTime = microtime(true);
- $path = $input->getArgument('path');
- $this->filesCollection = $this->fileManager->getPhpFiles($path);
+ $paths = $input->getArgument('paths');
+ $this->filesCollection = $this->fileManager->getPhpFiles($paths);
$this->filesCount = $this->filesCollection->count();
$this->runningProcesses = new Collection;
$this->completedProcessesArray = [];
@@ -155,7 +155,7 @@ protected function displayResults(OutputInterface $output, ResultCollection $res
{
$totalTime = microtime(true) - $this->startTime;
echo "\n
- ___ _ _ __ __ ____ _ _ ____ _ _ ____
+ ___ _ _ __ __ ____ _ _ ____ _ _ ____
/ __)( )_( )( )( )( _ \( \( )___( _ \( )_( )( _ \
( (__ ) _ ( )(__)( ) / ) ((___))___/ ) _ ( )___/
\___)(_) (_)(______)(_)\_)(_)\_) (__) (_) (_)(__) https://github.com/bmitch/churn-php\n\n";
diff --git a/src/Managers/FileManager.php b/src/Managers/FileManager.php
--- a/src/Managers/FileManager.php
+++ b/src/Managers/FileManager.php
@@ -29,24 +29,26 @@ public function __construct(Config $config)
/**
* Recursively finds all files with the .php extension in the provided
* $path and returns list as array.
- * @param string $path Path to look for .php files.
+ * @param array $paths Paths in which to look for .php files.
* @return FileCollection
*/
- public function getPhpFiles(string $path): FileCollection
+ public function getPhpFiles(array $paths): FileCollection
{
- $directoryIterator = new RecursiveDirectoryIterator($path);
$files = new FileCollection;
- foreach (new RecursiveIteratorIterator($directoryIterator) as $file) {
- if ($file->getExtension() !== 'php') {
- continue;
- }
+ foreach ($paths as $path) {
+ $directoryIterator = new RecursiveDirectoryIterator($path);
+ foreach (new RecursiveIteratorIterator($directoryIterator) as $file) {
+ if ($file->getExtension() !== 'php') {
+ continue;
+ }
- if ($this->fileShouldBeIgnored($file)) {
- continue;
- }
+ if ($this->fileShouldBeIgnored($file)) {
+ continue;
+ }
- $files->push(new File(['displayPath' => $file->getPathName(), 'fullPath' => $file->getRealPath()]));
+ $files->push(new File(['displayPath' => $file->getPathName(), 'fullPath' => $file->getRealPath()]));
+ }
}
return $files;
|
diff --git a/tests/Integration/Managers/FileManagerTest.php b/tests/Integration/Managers/FileManagerTest.php
--- a/tests/Integration/Managers/FileManagerTest.php
+++ b/tests/Integration/Managers/FileManagerTest.php
@@ -25,8 +25,8 @@ public function it_can_be_instantiated()
/** @test **/
public function it_can_recursively_get_the_php_files_in_a_path()
{
- $path = __DIR__ . '';
- $results = $this->fileManager->getPhpFiles($path);
+ $paths = [__DIR__ . ''];
+ $results = $this->fileManager->getPhpFiles($paths);
$this->assertInstanceOf(Collection::class, $results);
$this->assertCount(1, $results);
$this->assertInstanceOf(File::class, $results[0]);
@@ -38,4 +38,4 @@ public function setUp()
$this->fileManager = new FileManager(new Config);
}
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Assets2/Foo2.php b/tests/Unit/Assets2/Foo2.php
new file mode 100644
--- /dev/null
+++ b/tests/Unit/Assets2/Foo2.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Acme;
+
+class Foo2
+{
+
+}
diff --git a/tests/Unit/Managers/FileManagerTest.php b/tests/Unit/Managers/FileManagerTest.php
--- a/tests/Unit/Managers/FileManagerTest.php
+++ b/tests/Unit/Managers/FileManagerTest.php
@@ -23,18 +23,24 @@ public function it_can_be_created()
/** @test */
public function it_can_get_the_php_files_in_a_filter()
{
- $this->assertCount(3, $this->fileManager->getPhpFiles(__DIR__ . '/../Assets'));
+ $this->assertCount(3, $this->fileManager->getPhpFiles([__DIR__ . '/../Assets']));
+ }
+
+ /** @test */
+ public function it_can_get_the_php_files_in_multiple_directories()
+ {
+ $this->assertCount(4, $this->fileManager->getPhpFiles([__DIR__ . '/../Assets', __DIR__ . '/../Assets2']));
}
/** @test **/
public function it_ignores_files_specified_to_ignore_in_the_config()
{
$fileManager = new FileManager(new Config(['filesToIgnore' => ['Assets/Baz.php']]));
- $this->assertCount(2, $fileManager->getPhpFiles(__DIR__ . '/../Assets'));
+ $this->assertCount(2, $fileManager->getPhpFiles([__DIR__ . '/../Assets']));
}
public function setup()
{
$this->fileManager = new FileManager(new Config);
}
-}
\ No newline at end of file
+}
|
[Config] Paths of files
Stems from #40
|
Allow user to configure that path (or paths) of the source files it should process.
@bmitch Would you like me to attempt a PR?
@josephzidell You bet! That would be great, thanks.
@bmitch Running on a folder with 1 file, 8 LOC. My CPU is up to 30% and it's been running for over 3 mins, still no results. Windows 10, PHP 7.1.0
Figured it out. `ProcessFactory.php` uses `uniq` which isn't available on Windows systems. This should be documented in the readme.
Seems like this was fixed 2 days ago in commit `181c574415fedc057701d1db9d7fae487fabc5b2`?
@josephzidell That's true, `ProcessFactory.php` does use `uniq`. I've added #70 to make a note of that in the readme. I'll also see if there's a command I could use that would work for both platforms. Thanks for catching that.
As for 181c574415fedc057701d1db9d7fae487fabc5b2, that commit is for ignoring files.
So if you ran the command like `vendor/bin/churn run src` and had this in your churn.yml file:
```yml
filesToIgnore:
- src/Commands/ChurnCommand.php
```
Then that file would be ignored in the processing.
This issue is to allow one (or perhaps many) paths to be configured in the churn.yml file. So for example, say you wanted it to process the files found within your `src` and `tests` folders. Currently, the only way to do this would be to run the command twice, each time on each folder:
`vendor/bin/churn run src`
`vendor/bin/churn run tests`
So I thought it would be nice in the churn.yml file you could configure this like:
```yml
folders:
- src
- tests
```
Then the user would just have to run
`vendor/bin/churn run`
Which would then process the files in those folders.
I thought we wanted to exclude directories, which currently **is** possible. Will do a PR for multiple dirs in the command.
| 2017-08-27T21:12:06
|
php
|
Hard
|
bmitch/churn-php
| 250
|
bmitch__churn-php-250
|
[
"126"
] |
b915a1ba34cdff7fcb7c15ca8e746e07469b345e
|
diff --git a/.gitattributes b/.gitattributes
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,7 @@
.gitignore export-ignore
.scrutinizer.yml export-ignore
.travis.yml export-ignore
+box.json.dist export-ignore
CHANGELOG.md export-ignore
churn.yml export-ignore
codor.xml export-ignore
diff --git a/.github/workflows/build-phar.yml b/.github/workflows/build-phar.yml
new file mode 100644
--- /dev/null
+++ b/.github/workflows/build-phar.yml
@@ -0,0 +1,54 @@
+name: "Phar construction"
+
+on:
+ push:
+ paths-ignore:
+ - '**.md'
+ - 'img/**'
+ pull_request:
+ paths-ignore:
+ - '**.md'
+ - 'img/**'
+
+jobs:
+ build:
+ name: "Build Phar"
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: "Checkout"
+ uses: "actions/checkout@v2"
+
+ - name: "Install PHP"
+ uses: "shivammathur/setup-php@v2"
+ with:
+ coverage: "none"
+ php-version: "7.2"
+ tools: composer:v2
+
+ - name: "Install dependencies"
+ run: |
+ composer config platform.php 7.1.3
+ composer update --no-dev --no-interaction --no-progress --prefer-dist
+ composer config --unset platform.php
+
+ - name: "Download Box"
+ run: |
+ curl -sL https://github.com/box-project/box/releases/download/3.8.5/box.phar -o box.phar
+ chmod +x box.phar
+
+ - name: "Compile"
+ run: ./box.phar compile
+
+ - name: "Test Version"
+ run: diff <(bin/churn -V) <(./churn.phar -V)
+
+ - name: "Test Phar"
+ run: diff <(bin/churn run src) <(./churn.phar run src)
+
+ - name: "Save Phar"
+ uses: actions/upload-artifact@v2
+ with:
+ name: churn.phar
+ path: ./churn.phar
+ if-no-files-found: error
diff --git a/.github/workflows/composer-normalize.yml b/.github/workflows/composer-normalize.yml
--- a/.github/workflows/composer-normalize.yml
+++ b/.github/workflows/composer-normalize.yml
@@ -16,7 +16,7 @@ jobs:
steps:
- name: "Checkout"
- uses: "actions/checkout@v2.0.0"
+ uses: "actions/checkout@v2"
- name: "Run composer normalize"
uses: "docker://ergebnis/composer-normalize-action:latest"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -1,6 +1,6 @@
name: "Continuous Integration"
-on:
+on:
push:
paths-ignore:
- '**.md'
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ composer.lock
docs
vendor
coverage.xml
-.idea
\ No newline at end of file
+*.phar
+.idea
diff --git a/bin/churn b/bin/churn
--- a/bin/churn
+++ b/bin/churn
@@ -3,6 +3,7 @@
require_once(__DIR__ . '/bootstrap.php');
+use Churn\Command\AssessComplexityCommand;
use Churn\Command\RunCommand;
use DI\ContainerBuilder;
use PackageVersions\Versions;
@@ -12,5 +13,6 @@ $container = ContainerBuilder::buildDevContainer();
$version = substr(Versions::getVersion('bmitch/churn-php'), 0, -33);
$application = new Application('churn-php', $version);
+$application->add(new AssessComplexityCommand());
$application->add($container->get(RunCommand::class));
$application->run();
diff --git a/box.json.dist b/box.json.dist
new file mode 100644
--- /dev/null
+++ b/box.json.dist
@@ -0,0 +1,16 @@
+{
+ "dump-autoload": false,
+ "finder": [
+ {
+ "in": "bin"
+ },
+ {
+ "in": "src"
+ },
+ {
+ "name": "*.php",
+ "in": "vendor"
+ }
+ ],
+ "output": "churn.phar"
+}
\ No newline at end of file
diff --git a/src/Command/AssessComplexityCommand.php b/src/Command/AssessComplexityCommand.php
new file mode 100644
--- /dev/null
+++ b/src/Command/AssessComplexityCommand.php
@@ -0,0 +1,37 @@
+<?php declare(strict_types = 1);
+
+namespace Churn\Command;
+
+use Churn\Assessors\CyclomaticComplexity\CyclomaticComplexityAssessor;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class AssessComplexityCommand extends Command
+{
+ /**
+ * Configure the command
+ * @return void
+ */
+ protected function configure(): void
+ {
+ $this->setName('assess-complexity')
+ ->addArgument('file', InputArgument::REQUIRED, 'Path to file to analyze.')
+ ->setDescription('Calculate the Cyclomatic Complexity');
+ }
+
+ /**
+ * Execute the command
+ * @param InputInterface $input Input.
+ * @param OutputInterface $output Output.
+ * @return integer
+ */
+ protected function execute(InputInterface $input, OutputInterface $output): int
+ {
+ $file = $input->getArgument('file');
+ $assessor = new CyclomaticComplexityAssessor();
+ $output->writeln($assessor->assess($file));
+ return 0;
+ }
+}
diff --git a/src/Command/RunCommand.php b/src/Command/RunCommand.php
--- a/src/Command/RunCommand.php
+++ b/src/Command/RunCommand.php
@@ -132,8 +132,11 @@ private function getDirectoriesToScan(InputInterface $input, array $dirsConfigur
* @param ResultAccumulator $accumulator The object accumulating the results.
* @return OnSuccess
*/
- private function getOnSuccessObserver(InputInterface $input, OutputInterface $output, ResultAccumulator $accumulator): OnSuccess
- {
+ private function getOnSuccessObserver(
+ InputInterface $input,
+ OutputInterface $output,
+ ResultAccumulator $accumulator
+ ): OnSuccess {
$observer = new OnSuccessAccumulate($accumulator);
if ((bool)$input->getOption('progress')) {
@@ -171,7 +174,11 @@ private function writeResult(InputInterface $input, OutputInterface $output, Res
$output->writeln("\n");
}
if (!empty($input->getOption('output'))) {
- $output = new StreamOutput(fopen($input->getOption('output'), 'w+'), OutputInterface::VERBOSITY_NORMAL, false);
+ $output = new StreamOutput(
+ fopen($input->getOption('output'), 'w+'),
+ OutputInterface::VERBOSITY_NORMAL,
+ false
+ );
}
$renderer = $this->renderFactory->getRenderer($input->getOption('format'));
diff --git a/src/Process/ProcessFactory.php b/src/Process/ProcessFactory.php
--- a/src/Process/ProcessFactory.php
+++ b/src/Process/ProcessFactory.php
@@ -2,8 +2,12 @@
namespace Churn\Process;
+use function array_merge;
use Churn\File\File;
use function getcwd;
+use function is_callable;
+use Phar;
+use function strlen;
use Symfony\Component\Process\PhpExecutableFinder;
use Symfony\Component\Process\Process;
@@ -47,10 +51,25 @@ public function createGitCommitProcess(File $file): ChurnProcess
*/
public function createCyclomaticComplexityProcess(File $file): ChurnProcess
{
- $php = (new PhpExecutableFinder())->find();
- $script = __DIR__ . '/../../bin/CyclomaticComplexityAssessorRunner';
- $process = new Process([$php, $script, $file->getFullPath()]);
+ $command = array_merge(
+ [(new PhpExecutableFinder())->find()],
+ $this->getAssessorArguments(),
+ [$file->getFullPath()]
+ );
+ $process = new Process($command);
return new ChurnProcess($file, $process, 'CyclomaticComplexityProcess');
}
+
+ /**
+ * @return string[]
+ */
+ private function getAssessorArguments(): array
+ {
+ if (is_callable([Phar::class, 'running']) && strlen(Phar::running(false)) > 0) {
+ return [Phar::running(false), 'assess-complexity'];
+ }
+
+ return [__DIR__ . '/../../bin/CyclomaticComplexityAssessorRunner'];
+ }
}
|
diff --git a/tests/Integration/Command/AssessComplexityCommandTest.php b/tests/Integration/Command/AssessComplexityCommandTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Integration/Command/AssessComplexityCommandTest.php
@@ -0,0 +1,42 @@
+<?php declare(strict_types = 1);
+
+namespace Churn\Tests\Integration\Command;
+
+use Churn\Command\AssessComplexityCommand;
+use Churn\Tests\BaseTestCase;
+use function ctype_digit;
+use DI\ContainerBuilder;
+use function rtrim;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class AssessComplexityCommandTest extends BaseTestCase
+{
+ /** @var CommandTester */
+ private $commandTester;
+
+ protected function setUp()
+ {
+ $container = ContainerBuilder::buildDevContainer();
+ $application = new Application('churn-php', 'test');
+ $application->add($container->get(AssessComplexityCommand::class));
+ $command = $application->find('assess-complexity');
+ $this->commandTester = new CommandTester($command);
+ }
+
+ protected function tearDown()
+ {
+ $this->commandTester = null;
+ }
+
+ /** @test */
+ public function it_returns_the_cyclomatic_complexity()
+ {
+ $exitCode = $this->commandTester->execute(['file' => __FILE__]);
+ $result = rtrim($this->commandTester->getDisplay());
+
+ $this->assertEquals(0, $exitCode);
+ $this->assertTrue(ctype_digit($result), 'The result of the command must be an integer');
+ $this->assertGreaterThan(0, (int) $result);
+ }
+}
|
Build a "binary" for this project
It would be awesome if one could run this tool against a code base without installing it (if said project supports Composer dependencies at all ;)). Sounds like a `.phar` file would be useful. I'll look into what's needed for that and if we can make the build process automated.
|
@matthiasnoback I just `composer global require` install things and then put ~/.config/composer/vendor/bin into my PATH.
@matthewbaggett That's a viable solution, but past experiences have learned me that this can lead to some impossible to solve dependency issues due to incompatible globally installed packages. Hence, for tools like this, I do like to have a .phar handy ;)
| 2020-10-23T11:16:40
|
php
|
Hard
|
bmitch/churn-php
| 357
|
bmitch__churn-php-357
|
[
"356"
] |
6c908c11a15eb00d3ae480f347e1c3b83d8b1bba
|
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -330,4 +330,4 @@ jobs:
run: chmod +x churn.phar
- name: "Run Phar"
- run: ./churn.phar
+ run: ./churn.phar --format=markdown >> $GITHUB_STEP_SUMMARY
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -147,6 +147,7 @@ You can configure `churn` to output the result in different formats. The availab
* `csv`
* `json`
+* `markdown`
* `text` (default)
To use a different format use `--format` option. Example command for `json`:
diff --git a/src/Result/Render/MarkdownResultsRenderer.php b/src/Result/Render/MarkdownResultsRenderer.php
new file mode 100644
--- /dev/null
+++ b/src/Result/Render/MarkdownResultsRenderer.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Result\Render;
+
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @internal
+ */
+final class MarkdownResultsRenderer implements ResultsRendererInterface
+{
+ /**
+ * Renders the results.
+ *
+ * @param OutputInterface $output Output Interface.
+ * @param array<array<float|integer|string>> $results The results.
+ */
+ public function render(OutputInterface $output, array $results): void
+ {
+ $output->writeln('| File | Times Changed | Complexity | Score |');
+ $output->writeln('|------|---------------|------------|-------|');
+
+ foreach ($results as $result) {
+ $output->writeln($this->inline($result));
+ }
+ }
+
+ /**
+ * @param array<float|integer|string> $data The data to inline.
+ */
+ private function inline(array $data): string
+ {
+ $escapedData = \array_map(static function ($item) {
+ return \is_string($item)
+ ? \str_replace('|', '\\|', $item)
+ : $item;
+ }, $data);
+
+ return '| ' . \implode(' | ', $escapedData) . ' |';
+ }
+}
diff --git a/src/Result/ResultsRendererFactory.php b/src/Result/ResultsRendererFactory.php
--- a/src/Result/ResultsRendererFactory.php
+++ b/src/Result/ResultsRendererFactory.php
@@ -7,6 +7,7 @@
use Churn\Result\Render\ConsoleResultsRenderer;
use Churn\Result\Render\CsvResultsRenderer;
use Churn\Result\Render\JsonResultsRenderer;
+use Churn\Result\Render\MarkdownResultsRenderer;
use Churn\Result\Render\ResultsRendererInterface;
use InvalidArgumentException;
@@ -15,8 +16,9 @@
*/
final class ResultsRendererFactory
{
- private const FORMAT_JSON = 'json';
private const FORMAT_CSV = 'csv';
+ private const FORMAT_JSON = 'json';
+ private const FORMAT_MD = 'markdown';
private const FORMAT_TEXT = 'text';
/**
@@ -35,6 +37,10 @@ public function getRenderer(string $format): ResultsRendererInterface
return new JsonResultsRenderer();
}
+ if (self::FORMAT_MD === $format) {
+ return new MarkdownResultsRenderer();
+ }
+
if (self::FORMAT_TEXT === $format) {
return new ConsoleResultsRenderer();
}
|
diff --git a/tests/Unit/Result/Render/CsvResultsRendererTest.php b/tests/Unit/Result/Render/CsvResultsRendererTest.php
--- a/tests/Unit/Result/Render/CsvResultsRendererTest.php
+++ b/tests/Unit/Result/Render/CsvResultsRendererTest.php
@@ -18,7 +18,7 @@ public function it_can_be_instantiated()
}
/** @test */
- public function it_can_render_the_results_as_json()
+ public function it_can_render_the_results_as_csv()
{
$results = [
['filename1.php', 5, 7, 0.625],
diff --git a/tests/Unit/Result/Render/MarkdownResultsRendererTest.php b/tests/Unit/Result/Render/MarkdownResultsRendererTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Unit/Result/Render/MarkdownResultsRendererTest.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Tests\Unit\Result\Render;
+
+use Churn\Result\Render\MarkdownResultsRenderer;
+use Churn\Tests\BaseTestCase;
+use Mockery as m;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class MarkdownResultsRendererTest extends BaseTestCase
+{
+ /** @test */
+ public function it_can_be_instantiated()
+ {
+ $this->assertInstanceOf(MarkdownResultsRenderer::class, new MarkdownResultsRenderer());
+ }
+
+ /** @test */
+ public function it_can_render_the_results_as_markdown()
+ {
+ $results = [
+ ['filename1.php', 5, 7, 0.625],
+ ['path/filename2.php', 3, 4, 0.242],
+ ['pa|th/filename3.php', 1, 5, 0.08],
+ ];
+
+ $output = m::mock(OutputInterface::class);
+ $output->shouldReceive('writeln')->once()->with('| File | Times Changed | Complexity | Score |');
+ $output->shouldReceive('writeln')->once()->with('|------|---------------|------------|-------|');
+ $output->shouldReceive('writeln')->once()->with('| filename1.php | 5 | 7 | 0.625 |');
+ $output->shouldReceive('writeln')->once()->with('| path/filename2.php | 3 | 4 | 0.242 |');
+ $output->shouldReceive('writeln')->once()->with('| pa\\|th/filename3.php | 1 | 5 | 0.08 |');
+
+ (new MarkdownResultsRenderer())->render($output, $results);
+ }
+}
diff --git a/tests/Unit/Result/ResultsRendererFactoryTest.php b/tests/Unit/Result/ResultsRendererFactoryTest.php
--- a/tests/Unit/Result/ResultsRendererFactoryTest.php
+++ b/tests/Unit/Result/ResultsRendererFactoryTest.php
@@ -7,6 +7,7 @@
use Churn\Result\Render\ConsoleResultsRenderer;
use Churn\Result\Render\CsvResultsRenderer;
use Churn\Result\Render\JsonResultsRenderer;
+use Churn\Result\Render\MarkdownResultsRenderer;
use Churn\Result\ResultsRendererFactory;
use Churn\Tests\BaseTestCase;
use InvalidArgumentException;
@@ -36,6 +37,12 @@ public function it_returns_the_csv_renderer_when_provided_csv_format()
$this->assertInstanceOf(CsvResultsRenderer::class, $this->factory->getRenderer('csv'));
}
+ /** @test */
+ public function it_returns_the_markdown_renderer_when_provided_markdown_format()
+ {
+ $this->assertInstanceOf(MarkdownResultsRenderer::class, $this->factory->getRenderer('markdown'));
+ }
+
/** @test */
public function it_returns_the_console_renderer_when_provided_text_format()
{
|
Support markdown format
It would be great to support the markdown format, especially now the GH actions can display it as a job summary:
https://github.blog/2022-05-09-supercharging-github-actions-with-job-summaries/
| 2022-05-10T08:16:09
|
php
|
Hard
|
|
bmitch/churn-php
| 334
|
bmitch__churn-php-334
|
[
"333"
] |
e56b63746d488b5a21332e86d5a9e9dbf7fefa3a
|
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -258,7 +258,7 @@ jobs:
run: diff -u <(bin/churn -V) <(./churn.phar -V)
- name: "Test Phar"
- run: diff -u <(bin/churn run src --format=csv | sort) <(./churn.phar run src --format=csv | sort)
+ run: diff -u <(bin/churn --format=csv | sort) <(./churn.phar --format=csv | sort)
- name: "Save Phar"
uses: actions/upload-artifact@v2
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ If you want to install `churn-php` in Symfony project, your Symfony components v
## How to Install?
Install via Composer:
-```
+```sh
composer require bmitch/churn-php --dev
```
@@ -53,22 +53,25 @@ phive install churn
```
## How to Use?
-```
+```sh
vendor/bin/churn run <one or more paths to source code> ...
vendor/bin/churn run src
vendor/bin/churn run src tests
+
+# the command name can be skipped if directoriesToScan is set in churn.yml
+vendor/bin/churn
```
You can also use `churn-php` via [Docker](https://hub.docker.com/r/dockerizedphp/churn):
-```
+```sh
docker run --rm -ti -v $PWD:/app dockerizedphp/churn run src
```
## How to Configure?
You may add an optional `churn.yml` file which can be used to configure churn-php. The location of the churn.yml file can be customized using these commands:
-```
+```sh
# Default: "churn.yml"
vendor/bin/churn run --configuration=config-dir/ <path>
vendor/bin/churn run --configuration=my-config.yml <path>
diff --git a/bin/churn b/bin/churn
--- a/bin/churn
+++ b/bin/churn
@@ -11,5 +11,6 @@ use Symfony\Component\Console\Application;
$version = substr(Versions::getVersion('bmitch/churn-php'), 0, -33);
$application = new Application('churn-php', $version);
$application->add(new AssessComplexityCommand());
-$application->add(RunCommand::newInstance());
+$application->add($run = RunCommand::newInstance());
+$application->setDefaultCommand($run->getName());
$application->run();
diff --git a/churn.yml b/churn.yml
--- a/churn.yml
+++ b/churn.yml
@@ -1,3 +1,6 @@
# The minimum score a file need to display in the results table.
# Default: 0.1
minScoreToShow: 0
+
+directoriesToScan:
+- src/
|
diff --git a/tests/Integration/Command/RunCommandTest.php b/tests/Integration/Command/RunCommandTest.php
--- a/tests/Integration/Command/RunCommandTest.php
+++ b/tests/Integration/Command/RunCommandTest.php
@@ -131,7 +131,10 @@ public function it_throws_for_invalid_configuration(): void
public function it_throws_when_no_directory(): void
{
$this->expectException(InvalidArgumentException::class);
- $this->commandTester->execute(['paths' => []]);
+ $this->commandTester->execute([
+ 'paths' => [],
+ '-c' => __DIR__ . '/config/empty.yml',
+ ]);
}
/** @test */
diff --git a/tests/Integration/Command/config/empty.yml b/tests/Integration/Command/config/empty.yml
new file mode 100644
|
Make run the default command
See: https://symfony.com/doc/current/components/console/changing_default_command.html
There are currently 2 command: `run` and `assess-complexity`, but only `run` is supposed to be used by our users.
So by making `run` the default command we could run Churn without arguments (with a proper configuration).
| 2022-01-10T16:35:13
|
php
|
Hard
|
|
bmitch/churn-php
| 47
|
bmitch__churn-php-47
|
[
"33"
] |
858698cf28828d3a2f053894c4198a6b054b369e
|
diff --git a/src/Collections/FileCollection.php b/src/Collections/FileCollection.php
new file mode 100644
--- /dev/null
+++ b/src/Collections/FileCollection.php
@@ -0,0 +1,27 @@
+<?php declare(strict_types = 1);
+
+namespace Churn\Collections;
+
+use Illuminate\Support\Collection;
+use Churn\Values\File;
+
+class FileCollection extends Collection
+{
+ /**
+ * Determines if the collection has any files left.
+ * @return boolean
+ */
+ public function hasFiles(): bool
+ {
+ return $this->count() > 0;
+ }
+
+ /**
+ * Pops off the next file from the collection.
+ * @return File
+ */
+ public function getNextFile(): File
+ {
+ return $this->shift();
+ }
+}
diff --git a/src/Commands/ChurnCommand.php b/src/Commands/ChurnCommand.php
--- a/src/Commands/ChurnCommand.php
+++ b/src/Commands/ChurnCommand.php
@@ -32,7 +32,7 @@ class ChurnCommand extends Command
* Collection of files to run the processes on.
* @var Collection
*/
- private $files;
+ private $filesCollection;
/**
* Collection of processes currently running.
@@ -77,11 +77,11 @@ protected function configure()
protected function execute(InputInterface $input, OutputInterface $output)
{
$path = $input->getArgument('path');
- $this->files = $this->fileManager->getPhpFiles($path);
+ $this->filesCollection = $this->fileManager->getPhpFiles($path);
$this->runningProcesses = new Collection;
$this->completedProcessesArray = [];
- while ($this->files->count() || $this->runningProcesses->count()) {
+ while ($this->filesCollection->hasFiles() || $this->runningProcesses->count()) {
$this->getProcessResults();
}
$completedProcesses = new Collection($this->completedProcessesArray);
@@ -96,8 +96,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
*/
private function getProcessResults()
{
- for ($index = $this->runningProcesses->count(); $this->files->count() > 0 && $index < 10; $index++) {
- $file = $this->files->shift();
+ for ($index = $this->runningProcesses->count(); $this->filesCollection->hasFiles() > 0 && $index < 10; $index++) {
+ $file = $this->filesCollection->getNextFile();
$process = new GitCommitCountProcess($file);
$process->start();
diff --git a/src/Managers/FileManager.php b/src/Managers/FileManager.php
--- a/src/Managers/FileManager.php
+++ b/src/Managers/FileManager.php
@@ -2,7 +2,7 @@
namespace Churn\Managers;
-use Illuminate\Support\Collection;
+use Churn\Collections\FileCollection;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use Churn\Values\File;
@@ -13,12 +13,12 @@ class FileManager
* Recursively finds all files with the .php extension in the provided
* $path and returns list as array.
* @param string $path Path to look for .php files.
- * @return Collection
+ * @return FileCollection
*/
- public function getPhpFiles(string $path): Collection
+ public function getPhpFiles(string $path): FileCollection
{
$directoryIterator = new RecursiveDirectoryIterator($path);
- $files = new Collection;
+ $files = new FileCollection;
foreach (new RecursiveIteratorIterator($directoryIterator) as $file) {
if ($file->getExtension() !== 'php') {
continue;
diff --git a/src/Results/ResultsParser.php b/src/Results/ResultsParser.php
--- a/src/Results/ResultsParser.php
+++ b/src/Results/ResultsParser.php
@@ -60,6 +60,9 @@ private function parseCommits(GitCommitCountProcess $process): int
{
$output = $process->getOutput();
preg_match("/([0-9]{1,})/", $output, $matches);
- return (integer) $matches[1] ?? 0;
+ if (! isset($matches[1])) {
+ return 0;
+ }
+ return (integer) $matches[1];
}
}
|
diff --git a/tests/Unit/Collections/FileCollectionTest.php b/tests/Unit/Collections/FileCollectionTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Unit/Collections/FileCollectionTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Churn\Tests\Unit\Collections;
+
+use Churn\Collections\FileCollection;
+use Churn\Values\File;
+
+class FileCollectionTest extends \Churn\Tests\BaseTestCase
+{
+ /** @test **/
+ public function it_can_be_instantiated()
+ {
+ $this->assertInstanceOf(FileCollection::class, new FileCollection());
+ }
+
+ /** @test **/
+ public function it_can_pop_off_the_next_file()
+ {
+ $fileCollection = new FileCollection;
+ $fileCollection->push(new File(['fullPath' => 'foo.php', 'displayPath' => 'foo.php']));
+ $fileCollection->push(new File(['fullPath' => 'bar.php', 'displayPath' => 'bar.php']));
+ $fileCollection->push(new File(['fullPath' => 'baz.php', 'displayPath' => 'baz.php']));
+ $this->assertCount(3, $fileCollection);
+ $poppedFile = $fileCollection->getNextFile();
+ $this->assertCount(2, $fileCollection);
+ }
+
+ /** @test **/
+ public function it_can_determine_if_it_has_files_or_not()
+ {
+ $fileCollection = new FileCollection;
+ $this->assertFalse($fileCollection->hasFiles());
+ $fileCollection->push(new File(['fullPath' => 'foo.php', 'displayPath' => 'foo.php']));
+ $this->assertTrue($fileCollection->hasFiles());
+ }
+
+}
\ No newline at end of file
|
Make FileManager return an object instead of an array?
| 2017-08-19T21:08:19
|
php
|
Hard
|
|
bmitch/churn-php
| 351
|
bmitch__churn-php-351
|
[
"146"
] |
7b0e1483f5b9176698a7a4b3ac2a98fc3e83d196
|
diff --git a/bin/CyclomaticComplexityAssessorRunner b/bin/CyclomaticComplexityAssessorRunner
--- a/bin/CyclomaticComplexityAssessorRunner
+++ b/bin/CyclomaticComplexityAssessorRunner
@@ -1,13 +1,16 @@
#!/usr/bin/env php
<?php
+declare(strict_types=1);
+
require_once __DIR__ . '/bootstrap.php';
use Churn\Assessor\CyclomaticComplexityAssessor;
$file = $argv[1];
$contents = \file_get_contents($file);
-if ($contents === false) {
+
+if (false === $contents) {
echo 0;
return;
}
diff --git a/bin/app.php b/bin/app.php
--- a/bin/app.php
+++ b/bin/app.php
@@ -16,7 +16,7 @@
return $version;
})('bmitch/churn-php'));
-$application->add(new AssessComplexityCommand());
+$application->add(AssessComplexityCommand::newInstance());
$application->add($run = RunCommand::newInstance());
$application->setDefaultCommand($run->getName());
diff --git a/src/Assessor/CyclomaticComplexityAssessor.php b/src/Assessor/CyclomaticComplexityAssessor.php
--- a/src/Assessor/CyclomaticComplexityAssessor.php
+++ b/src/Assessor/CyclomaticComplexityAssessor.php
@@ -10,141 +10,78 @@
class CyclomaticComplexityAssessor
{
/**
- * The total cyclomatic complexity score.
- *
- * @var integer
+ * @var array<int, int>
*/
- private $score = 0;
+ private $tokens = [
+ \T_CLASS => 1,
+ \T_INTERFACE => 1,
+ \T_TRAIT => 1,
+ \T_IF => 1,
+ \T_ELSEIF => 1,
+ \T_FOR => 1,
+ \T_FOREACH => 1,
+ \T_WHILE => 1,
+ \T_CASE => 1,
+ \T_CATCH => 1,
+ \T_BOOLEAN_AND => 1,
+ \T_LOGICAL_AND => 1,
+ \T_BOOLEAN_OR => 1,
+ \T_LOGICAL_OR => 1,
+ \T_COALESCE => 1,
+ ];
/**
- * Asses the files cyclomatic complexity.
- *
- * @param string $contents The contents of a PHP file.
+ * Class constructor.
*/
- public function assess(string $contents): int
+ public function __construct()
{
- $this->score = 0;
- $this->hasAtLeastOneMethod($contents);
- $this->countTheIfStatements($contents);
- $this->countTheElseIfStatements($contents);
- $this->countTheWhileLoops($contents);
- $this->countTheForLoops($contents);
- $this->countTheCaseStatements($contents);
- $this->countTheTernaryOperators($contents);
- $this->countTheLogicalAnds($contents);
- $this->countTheLogicalOrs($contents);
-
- if (0 === $this->score) {
- $this->score = 1;
- }
-
- return $this->score;
+ $this->init();
}
/**
- * Does the class have at least one method?
+ * Assess the files cyclomatic complexity.
*
- * @param string $contents File contents.
+ * @param string $contents The contents of a PHP file.
*/
- private function hasAtLeastOneMethod(string $contents): void
+ public function assess(string $contents): int
{
- \preg_match("/[ ]function[ ]/", $contents, $matches);
-
- if (!isset($matches[0])) {
- return;
+ $score = 0;
+ foreach (\token_get_all($contents) as $token) {
+ $score += $this->getComplexity($token[0]);
}
- $this->score++;
- }
-
- /**
- * Count how many if statements there are.
- *
- * @param string $contents File contents.
- */
- private function countTheIfStatements(string $contents): void
- {
- $this->score += $this->howManyPatternMatches("/[ ]if[ ]{0,}\(/", $contents);
- }
-
- /**
- * Count how many else if statements there are.
- *
- * @param string $contents File contents.
- */
- private function countTheElseIfStatements(string $contents): void
- {
- $this->score += $this->howManyPatternMatches("/else[ ]{0,}if[ ]{0,}\(/", $contents);
+ return \max(1, $score);
}
/**
- * Count how many while loops there are.
- *
- * @param string $contents File contents.
+ * Add missing tokens depending on the PHP version.
*/
- private function countTheWhileLoops(string $contents): void
+ private function init(): void
{
- $this->score += $this->howManyPatternMatches("/while[ ]{0,}\(/", $contents);
- }
-
- /**
- * Count how many for loops there are.
- *
- * @param string $contents File contents.
- */
- private function countTheForLoops(string $contents): void
- {
- $this->score += $this->howManyPatternMatches("/[ ]for(each){0,1}[ ]{0,}\(/", $contents);
- }
-
- /**
- * Count how many case statements there are.
- *
- * @param string $contents File contents.
- */
- private function countTheCaseStatements(string $contents): void
- {
- $this->score += $this->howManyPatternMatches("/[ ]case[ ]{1}(.*)\:/", $contents);
- }
-
- /**
- * Count how many ternary operators there are.
- *
- * @param string $contents File contents.
- */
- private function countTheTernaryOperators(string $contents): void
- {
- $this->score += $this->howManyPatternMatches("/[ ]\?.*:.*;/", $contents);
- }
-
- /**
- * Count how many '&&' there are.
- *
- * @param string $contents File contents.
- */
- private function countTheLogicalAnds(string $contents): void
- {
- $this->score += $this->howManyPatternMatches("/[ ]&&[ ]/", $contents);
+ $tokens = [
+ // Since PHP 7.4
+ 'T_COALESCE_EQUAL',
+ // Since PHP 8.1
+ 'T_ENUM',
+ ];
+ foreach ($tokens as $token) {
+ if (!\defined($token)) {
+ continue;
+ }
+
+ $this->tokens[(int) \constant($token)] = 1;
+ }
}
/**
- * Count how many '||' there are.
- *
- * @param string $contents File contents.
+ * @param integer|string $code Code of a PHP token.
*/
- private function countTheLogicalOrs(string $contents): void
+ private function getComplexity($code): int
{
- $this->score += $this->howManyPatternMatches("/[ ]\|\|[ ]/", $contents);
- }
+ if ('?' === $code) {
+ return 1;
+ }
- /**
- * For the given $pattern on $string, how many matches are returned?
- *
- * @param string $pattern Regex pattern.
- * @param string $string Any string.
- */
- private function howManyPatternMatches(string $pattern, string $string): int
- {
- return (int) \preg_match_all($pattern, $string);
+ return $this->tokens[$code] ?? 0;
}
}
diff --git a/src/Command/AssessComplexityCommand.php b/src/Command/AssessComplexityCommand.php
--- a/src/Command/AssessComplexityCommand.php
+++ b/src/Command/AssessComplexityCommand.php
@@ -15,6 +15,31 @@
*/
class AssessComplexityCommand extends Command
{
+ /**
+ * @var CyclomaticComplexityAssessor
+ */
+ private $assessor;
+
+ /**
+ * Class constructor.
+ *
+ * @param CyclomaticComplexityAssessor $assessor The class calculating the complexity.
+ */
+ public function __construct(CyclomaticComplexityAssessor $assessor)
+ {
+ parent::__construct();
+
+ $this->assessor = $assessor;
+ }
+
+ /**
+ * Returns a new instance of the command.
+ */
+ public static function newInstance(): self
+ {
+ return new self(new CyclomaticComplexityAssessor());
+ }
+
/**
* Configure the command
*/
@@ -44,8 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
return 0;
}
- $assessor = new CyclomaticComplexityAssessor();
- $output->writeln((string) $assessor->assess($contents));
+ $output->writeln((string) $this->assessor->assess($contents));
return 0;
}
|
diff --git a/tests/Integration/Command/AssessComplexityCommandTest.php b/tests/Integration/Command/AssessComplexityCommandTest.php
--- a/tests/Integration/Command/AssessComplexityCommandTest.php
+++ b/tests/Integration/Command/AssessComplexityCommandTest.php
@@ -17,7 +17,7 @@ class AssessComplexityCommandTest extends BaseTestCase
protected function setUp()
{
$application = new Application('churn-php', 'test');
- $application->add(new AssessComplexityCommand());
+ $application->add(AssessComplexityCommand::newInstance());
$command = $application->find('assess-complexity');
$this->commandTester = new CommandTester($command);
}
diff --git a/tests/Unit/Assessor/Assets/ClassWithForLoop.inc b/tests/Unit/Assessor/Assets/ClassWithForLoop.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithForLoop.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-class ClassWithWhileLoop
-{
- public function foobar()
- {
- for ($n = 0; $n < $h; $n++) {
- foobar();
- }
- }
-}
diff --git a/tests/Unit/Assessor/Assets/ClassWithIfElseIf.inc b/tests/Unit/Assessor/Assets/ClassWithIfElseIf.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithIfElseIf.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class ClassWithIfElseIf
-{
- public function foobar()
- {
- if ($true) {
- return true;
- } elseif ($false) {
- return false;
- }
- }
-}
diff --git a/tests/Unit/Assessor/Assets/ClassWithLogicalAnd.inc b/tests/Unit/Assessor/Assets/ClassWithLogicalAnd.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithLogicalAnd.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class ClassWithLogicalAnd
-{
- public function foobar()
- {
- return ($a == $b && $c == $d);
- }
-}
diff --git a/tests/Unit/Assessor/Assets/ClassWithLogicalOr.inc b/tests/Unit/Assessor/Assets/ClassWithLogicalOr.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithLogicalOr.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class ClassWithLogicalOr
-{
- public function foobar()
- {
- return ($a == $b || $c == $d);
- }
-}
diff --git a/tests/Unit/Assessor/Assets/ClassWithManyMethodsAndLotsOfBranches.inc b/tests/Unit/Assessor/Assets/ClassWithManyMethodsAndLotsOfBranches.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithManyMethodsAndLotsOfBranches.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-class ClassWithWhileLoop
-{
- public function foo()
- {
- for ($n = 0; $n < $h; $n++) {
- foobar();
- }
- }
-
- public function bar()
- {
- if ($true) {
- return true;
- } elseif ($false) {
- return false;
- }
-
- if ($true) {
- if ($true) {
- return true;
- }
- }
-
- return false;
- }
-
- public function baz()
- {
- if ($true) {
- return true;
- }
-
- return false;
- }
-
- public function uggh()
- {
- switch ($z) {
- case 1:
- foobar();
- break;
- case 2:
- foobar();
- break;
- case 3:
- foobar();
- break;
- default:
- foobar();
- break;
- }
-
- while ($c == $d) {
- foobar();
- }
- }
-}
-}
diff --git a/tests/Unit/Assessor/Assets/ClassWithNoForLoops.inc b/tests/Unit/Assessor/Assets/ClassWithNoForLoops.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithNoForLoops.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-class ClassWithNoForLoops
-{
- public function forteen()
- {
- // For foreach
- // This does not contain any for or foreach loops
- }
-}
diff --git a/tests/Unit/Assessor/Assets/ClassWithOneEmptyMethod.inc b/tests/Unit/Assessor/Assets/ClassWithOneEmptyMethod.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithOneEmptyMethod.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-class ClassWithOneEmptyMethod
-{
- public function foobar()
- {
- }
-}
diff --git a/tests/Unit/Assessor/Assets/ClassWithOneMethodWithNestedIf.inc b/tests/Unit/Assessor/Assets/ClassWithOneMethodWithNestedIf.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithOneMethodWithNestedIf.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class ClassWithOneMethodWithNestedIf
-{
- public function foobar()
- {
- if ($true) {
- if ($true) {
- return true;
- }
- }
-
- return false;
- }
-}
diff --git a/tests/Unit/Assessor/Assets/ClassWithOneMethodWithOneIf.inc b/tests/Unit/Assessor/Assets/ClassWithOneMethodWithOneIf.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithOneMethodWithOneIf.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class ClassWithOneMethodWithOneIf
-{
- public function foobar()
- {
- if ($true) {
- return true;
- }
-
- return false;
- }
-}
diff --git a/tests/Unit/Assessor/Assets/ClassWithSwitchStatement.inc b/tests/Unit/Assessor/Assets/ClassWithSwitchStatement.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithSwitchStatement.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class ClassWithWhileLoop
-{
- public function foobar()
- {
- switch ($z) {
- case 1:
- foobar();
- break;
- case 2:
- foobar();
- break;
- case 3:
- foobar();
- break;
- default:
- foobar();
- break;
- }
- }
-}
diff --git a/tests/Unit/Assessor/Assets/ClassWithTernary.inc b/tests/Unit/Assessor/Assets/ClassWithTernary.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithTernary.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class ClassWithTernary
-{
- public function foobar()
- {
- $foo == 'bar' ? $baz++ : $zug;
- }
-}
diff --git a/tests/Unit/Assessor/Assets/ClassWithWhileLoop.inc b/tests/Unit/Assessor/Assets/ClassWithWhileLoop.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/ClassWithWhileLoop.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-class ClassWithWhileLoop
-{
- public function foobar()
- {
- while ($c == $d) {
- foobar();
- }
- }
-}
diff --git a/tests/Unit/Assessor/Assets/EmptyClass.inc b/tests/Unit/Assessor/Assets/EmptyClass.inc
deleted file mode 100644
--- a/tests/Unit/Assessor/Assets/EmptyClass.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class EmptyClass
-{
-
-}
diff --git a/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php b/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php
--- a/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php
+++ b/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php
@@ -9,84 +9,287 @@
class CyclomaticComplexityAssessorTest extends BaseTestCase
{
- /** @test */
- public function an_empty_class_should_have_a_complexity_of_one()
+ /**
+ * @dataProvider provide_assess
+ */
+ public function test_assess(int $expectedScore, string $code)
{
- $this->assertEquals(1, $this->assess('tests/Unit/Assessor/Assets/EmptyClass.inc'));
+ $assessor = new CyclomaticComplexityAssessor();
+
+ $this->assertEquals($expectedScore, $assessor->assess($code));
+ }
+
+ public function provide_assess(): iterable
+ {
+ yield 'an empty file' => [
+ 1,
+ ''
+ ];
+
+ yield 'an empty class' => [
+ 1,
+ <<<'EOC'
+<?php
+class EmptyClass
+{
+}
+EOC
+ ];
+
+ yield 'a class with one empty method' => [
+ 1,
+ <<<'EOC'
+<?php
+class ClassWithOneEmptyMethod
+{
+ public function foobar()
+ {
+ }
+}
+EOC
+ ];
+
+ yield 'a class with a method containing one if statement' => [
+ 2,
+ <<<'EOC'
+<?php
+class ClassWithOneMethodWithOneIf
+{
+ public function foobar()
+ {
+ if ($true) {
+ return true;
+ }
+
+ return false;
}
+}
+EOC
+ ];
- /** @test */
- public function a_class_with_one_empty_method_has_a_complexity_of_one()
+ yield 'a class with a method containing a nested if statement' => [
+ 3,
+ <<<'EOC'
+<?php
+class ClassWithOneMethodWithNestedIf
+{
+ public function foobar()
{
- $this->assertEquals(1, $this->assess('tests/Unit/Assessor/Assets/ClassWithOneEmptyMethod.inc'));
+ if ($true) {
+ if ($true) {
+ return true;
+ }
+ }
+
+ return false;
}
+}
+EOC
+ ];
- /** @test */
- public function a_class_with_a_method_containing_one_if_statement_has_a_complexity_of_two()
+ yield 'a class with a method containing an if else if statement' => [
+ 3,
+ <<<'EOC'
+<?php
+class ClassWithIfElseIf
+{
+ public function foobar()
{
- $this->assertEquals(2, $this->assess('tests/Unit/Assessor/Assets/ClassWithOneMethodWithOneIf.inc'));
+ if ($true) {
+ return true;
+ } elseif ($false) {
+ return false;
+ }
}
+}
+EOC
+ ];
- /** @test */
- public function a_class_with_a_method_containing_a_nested_if_statement_has_a_complexity_of_three()
+ yield 'a class with a method containing a while loop' => [
+ 2,
+ <<<'EOC'
+<?php
+class ClassWithWhileLoop
+{
+ public function foobar()
{
- $this->assertEquals(3, $this->assess('tests/Unit/Assessor/Assets/ClassWithOneMethodWithNestedIf.inc'));
+ while ($c == $d) {
+ foobar();
+ }
}
+}
+EOC
+ ];
- /** @test */
- public function a_class_with_a_method_containing_an_if_else_if_statement_has_a_complexity_of_three()
+ yield 'a class with a method containing a for loop' => [
+ 2,
+ <<<'EOC'
+<?php
+class ClassWithForLoop
+{
+ public function foobar()
{
- $this->assertEquals(3, $this->assess('tests/Unit/Assessor/Assets/ClassWithIfElseIf.inc'));
+ for ($n = 0; $n < $h; $n++) {
+ foobar();
+ }
}
+}
+EOC
+ ];
- /** @test */
- public function a_class_with_a_method_containing_a_while_loop_has_a_complexity_of_two()
+ yield 'a class with a method a switch statement with 3 cases' => [
+ 4,
+ <<<'EOC'
+<?php
+class ClassWithSwitch
+{
+ public function foobar()
{
- $this->assertEquals(2, $this->assess('tests/Unit/Assessor/Assets/ClassWithWhileLoop.inc'));
+ switch ($z) {
+ case 1:
+ foobar();
+ break;
+ case 2:
+ foobar();
+ break;
+ case 3:
+ foobar();
+ break;
+ default:
+ foobar();
+ break;
+ }
}
+}
+EOC
+ ];
- /** @test */
- public function a_class_with_a_method_containing_a_for_loop_has_a_complexity_of_two()
+ yield 'this class with many methods and many branches' => [
+ 11,
+ <<<'EOC'
+<?php
+class LongClass
+{
+ public function foo()
{
- $this->assertEquals(2, $this->assess('tests/Unit/Assessor/Assets/ClassWithForLoop.inc'));
- $this->assertEquals(1, $this->assess('tests/Unit/Assessor/Assets/ClassWithNoForLoops.inc'));
+ for ($n = 0; $n < $h; $n++) {
+ foobar();
+ }
}
- /** @test */
- public function a_class_with_a_method_a_switch_statement_with_three_cases_has_a_complexity_of_four()
+ public function bar()
{
- $this->assertEquals(4, $this->assess('tests/Unit/Assessor/Assets/ClassWithSwitchStatement.inc'));
+ if ($true) {
+ return true;
+ } elseif ($false) {
+ return false;
+ }
+
+ if ($true) {
+ if ($true) {
+ return true;
+ }
+ }
+
+ return false;
}
- /** @test */
- public function this_class_with_many_methods_and_many_branches_should_have_a_complexity_of_eleven()
+ public function baz()
{
- $this->assertEquals(11, $this->assess('tests/Unit/Assessor/Assets/ClassWithManyMethodsAndLotsOfBranches.inc'));
+ if ($true) {
+ return true;
+ }
+
+ return false;
}
- /** @test */
- public function a_class_with_a_ternary_opererator_should_return_two()
+ public function uggh()
{
- $this->assertEquals(2, $this->assess('tests/Unit/Assessor/Assets/ClassWithTernary.inc'));
+ switch ($z) {
+ case 1:
+ foobar();
+ break;
+ case 2:
+ foobar();
+ break;
+ case 3:
+ foobar();
+ break;
+ default:
+ foobar();
+ break;
+ }
+
+ while ($c == $d) {
+ foobar();
+ }
}
+}
+EOC
+ ];
- /** @test */
- public function a_class_with_a_logical_and_should_return_two()
+ yield 'a class with a ternary operator' => [
+ 2,
+ <<<'EOC'
+<?php
+class ClassWithTernary
+{
+ public function foobar()
{
- $this->assertEquals(2, $this->assess('tests/Unit/Assessor/Assets/ClassWithLogicalAnd.inc'));
+ $foo == 'bar' ? $baz++ : $zug;
}
+}
+EOC
+ ];
- /** @test */
- public function a_class_with_a_logical_or_should_return_two()
+ yield 'a class with a logical AND' => [
+ 2,
+ <<<'EOC'
+<?php
+class ClassWithLogicalAnd
+{
+ public function foobar()
{
- $this->assertEquals(2, $this->assess('tests/Unit/Assessor/Assets/ClassWithLogicalOr.inc'));
+ return ($a == $b && $c == $d);
}
+}
+EOC
+ ];
- protected function assess($filename)
+ yield 'a class with a logical OR' => [
+ 2,
+ <<<'EOC'
+<?php
+class ClassWithLogicalOr
+{
+ public function foobar()
{
- $contents = \file_get_contents($filename);
- assert($contents !== false);
+ return ($a == $b || $c == $d);
+ }
+}
+EOC
+ ];
- return (new CyclomaticComplexityAssessor())->assess($contents);
+ yield 'syntax error' => [
+ 1,
+ '<?php echo'
+ ];
+
+ yield 'file with commented code' => [
+ 1,
+ '<?php // if (true) {if (true) {if (true) {if (true) {}}}}'
+ ];
+
+ if (version_compare(PHP_VERSION, '7.4.0', '>=')) {
+ yield 'file with coalesce equal operator' => [
+ 3,
+ <<<'EOC'
+<?php
+$a ??= 'a';
+$a ??= 'a';
+$a ??= 'a';
+EOC
+ ];
+ }
}
}
diff --git a/tests/console-application.php b/tests/console-application.php
--- a/tests/console-application.php
+++ b/tests/console-application.php
@@ -13,7 +13,7 @@
use Symfony\Component\Console\Application;
$application = new Application('churn-php', 'test');
-$application->add(new AssessComplexityCommand());
+$application->add(AssessComplexityCommand::newInstance());
$application->add(RunCommand::newInstance());
return $application;
|
CyclomaticComplexityAssessor - Improve by using something like `nikic/PHP-Parser`
The score is calculated by using regular expressions which leads to errors.
Example of a PHP file containing only a comment:
```php
<?php
// if ( if ( if (
```
In this example the score is 3 whereas it should be 1.
This kind of error could be avoided by using [PHP-Parser](https://github.com/nikic/PHP-Parser).
|
Thanks @villfa - please feel free to submit a PR if you like. Otherwise I will get to it when I can.
Perhaps we can use `nikic/PHP-Parser` to analyse the PHP file being assessed and not have to rely on regular expressions? Should be something interesting to work on.
Started a new branch `bmitchell-146` with a new test that has the above code provided by @villfa:
https://github.com/bmitch/churn-php/blob/bmitchell-146/tests/Unit/Assessors/CyclomaticComplexity/CyclomaticComplexityAssessorTest.php#L89-L93
Can use that as a starting point for a new CyclomaticComplexityAssessor that would use `PHP-Parser` or something similar.
I think you should use php-ast instead of php-parser.
@emilv I've never used either package so I don't know the pros and cons of each. Why would you chose `php-ast`?
php-ast uses the native PHP abstract syntax tree. Both are maintained by nikic, a PHP core developer (who also introduced the formal parser into the PHP runtime!).
Nikic have written about the differences here: https://github.com/nikic/php-ast#differences-to-php-parser
But reading that list makes me doubt my own suggestion. Perhaps PHP-Parser is the right choice after all?
Thanks @emilv that link is a huge help. I will take a deeper look as soon as I have time.
I think using PHP-Parser is probably going to be the better choice. PHP-ast is a PHP extension. I think to keep this as accessible as possible it is better to use PHP-Parser because it doesn't require an extension to be installed.
| 2022-03-04T21:27:50
|
php
|
Hard
|
bmitch/churn-php
| 233
|
bmitch__churn-php-233
|
[
"230"
] |
b41c1a95c6f2f8b0d3181974bac2e1281894d7ec
|
diff --git a/src/Commands/ChurnCommand.php b/src/Commands/ChurnCommand.php
--- a/src/Commands/ChurnCommand.php
+++ b/src/Commands/ChurnCommand.php
@@ -4,9 +4,9 @@
use Churn\Factories\ResultsRendererFactory;
use Churn\Logic\ResultsLogic;
-use Churn\Managers\ProcessManager;
use Churn\Factories\ProcessFactory;
use Churn\Managers\FileManager;
+use Churn\Processes\ProcessHandlerFactory;
use function count;
use function file_get_contents;
use Symfony\Component\Console\Command\Command;
@@ -30,10 +30,10 @@ class ChurnCommand extends Command
private $resultsLogic;
/**
- * The process manager.
- * @var ProcessManager
+ * The process handler factory.
+ * @var ProcessHandlerFactory
*/
- private $processManager;
+ private $processHandlerFactory;
/**
* The renderer factory.
@@ -43,18 +43,18 @@ class ChurnCommand extends Command
/**
* ChurnCommand constructor.
- * @param ResultsLogic $resultsLogic The results logic.
- * @param ProcessManager $processManager The process manager.
- * @param ResultsRendererFactory $renderFactory The Results Renderer Factory.
+ * @param ResultsLogic $resultsLogic The results logic.
+ * @param ProcessHandlerFactory $processHandlerFactory The process handler factory.
+ * @param ResultsRendererFactory $renderFactory The Results Renderer Factory.
*/
public function __construct(
ResultsLogic $resultsLogic,
- ProcessManager $processManager,
+ ProcessHandlerFactory $processHandlerFactory,
ResultsRendererFactory $renderFactory
) {
parent::__construct();
$this->resultsLogic = $resultsLogic;
- $this->processManager = $processManager;
+ $this->processHandlerFactory = $processHandlerFactory;
$this->renderFactory = $renderFactory;
}
@@ -85,7 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$filesCollection = (new FileManager($config->getFileExtensions(), $config->getFilesToIgnore()))
->getPhpFiles($this->getDirectoriesToScan($input, $config->getDirectoriesToScan()));
- $completedProcesses = $this->processManager->process(
+ $completedProcesses = $this->processHandlerFactory->getProcessHandler($config)->process(
$filesCollection,
new ProcessFactory($config->getCommitsSince()),
$config->getParallelJobs()
diff --git a/src/Managers/ProcessManager.php b/src/Processes/Handler/ParallelProcessHandler.php
similarity index 72%
rename from src/Managers/ProcessManager.php
rename to src/Processes/Handler/ParallelProcessHandler.php
--- a/src/Managers/ProcessManager.php
+++ b/src/Processes/Handler/ParallelProcessHandler.php
@@ -1,12 +1,12 @@
<?php declare(strict_types = 1);
-namespace Churn\Managers;
+namespace Churn\Processes\Handler;
use Churn\Collections\FileCollection;
use Churn\Factories\ProcessFactory;
use Illuminate\Support\Collection;
-class ProcessManager
+class ParallelProcessHandler implements ProcessHandler
{
/**
* Collection of running processes.
@@ -32,24 +32,37 @@ class ProcessManager
*/
private $processFactory;
+ /**
+ * Number of parallel jobs to run.
+ * @var integer
+ */
+ private $numberOfParallelJobs;
+
+ /**
+ * ProcessManager constructor.
+ * @param int $numberOfParallelJobs Number of parallel jobs to run.
+ */
+ public function __construct(int $numberOfParallelJobs)
+ {
+ $this->numberOfParallelJobs = $numberOfParallelJobs;
+ }
+
/**
* Run the processes to gather information.
- * @param FileCollection $filesCollection Collection of files.
- * @param ProcessFactory $processFactory Process Factory.
- * @param integer $numberOfParallelJobs Number of parallel jobs to run.
+ * @param FileCollection $filesCollection Collection of files.
+ * @param ProcessFactory $processFactory Process Factory.
* @return Collection
*/
public function process(
FileCollection $filesCollection,
- ProcessFactory $processFactory,
- int $numberOfParallelJobs
+ ProcessFactory $processFactory
): Collection {
$this->filesCollection = $filesCollection;
$this->processFactory = $processFactory;
$this->runningProcesses = new Collection;
$this->completedProcessesArray = [];
while ($filesCollection->hasFiles() || $this->runningProcesses->count()) {
- $this->getProcessResults($numberOfParallelJobs);
+ $this->getProcessResults($this->numberOfParallelJobs);
}
return new Collection($this->completedProcessesArray);
}
@@ -62,7 +75,7 @@ public function process(
private function getProcessResults(int $numberOfParallelJobs): void
{
$index = $this->runningProcesses->count();
- for (; $this->filesCollection->hasFiles() > 0 && $index < $numberOfParallelJobs; $index++) {
+ for (; $index < $numberOfParallelJobs && $this->filesCollection->hasFiles() > 0; $index++) {
$file = $this->filesCollection->getNextFile();
$process = $this->processFactory->createGitCommitProcess($file);
$process->start();
diff --git a/src/Processes/Handler/ProcessHandler.php b/src/Processes/Handler/ProcessHandler.php
new file mode 100644
--- /dev/null
+++ b/src/Processes/Handler/ProcessHandler.php
@@ -0,0 +1,21 @@
+<?php declare(strict_types = 1);
+
+namespace Churn\Processes\Handler;
+
+use Churn\Collections\FileCollection;
+use Churn\Factories\ProcessFactory;
+use Illuminate\Support\Collection;
+
+interface ProcessHandler
+{
+ /**
+ * Run the processes to gather information.
+ * @param FileCollection $filesCollection Collection of files.
+ * @param ProcessFactory $processFactory Process Factory.
+ * @return Collection
+ */
+ public function process(
+ FileCollection $filesCollection,
+ ProcessFactory $processFactory
+ ): Collection;
+}
diff --git a/src/Processes/Handler/SequentialProcessHandler.php b/src/Processes/Handler/SequentialProcessHandler.php
new file mode 100644
--- /dev/null
+++ b/src/Processes/Handler/SequentialProcessHandler.php
@@ -0,0 +1,35 @@
+<?php declare(strict_types = 1);
+
+namespace Churn\Processes\Handler;
+
+use Churn\Collections\FileCollection;
+use Churn\Factories\ProcessFactory;
+use Illuminate\Support\Collection;
+
+class SequentialProcessHandler implements ProcessHandler
+{
+ /**
+ * Run the processes sequentially to gather information.
+ * @param FileCollection $filesCollection Collection of files.
+ * @param ProcessFactory $processFactory Process Factory.
+ * @return Collection
+ */
+ public function process(
+ FileCollection $filesCollection,
+ ProcessFactory $processFactory
+ ): Collection {
+ $completedProcessesArray = [];
+ while ($filesCollection->hasFiles()) {
+ $file = $filesCollection->getNextFile();
+ $process = $processFactory->createGitCommitProcess($file);
+ $process->start();
+ while (!$process->isSuccessful());
+ $completedProcessesArray[$process->getFileName()][$process->getType()] = $process;
+ $process = $processFactory->createCyclomaticComplexityProcess($file);
+ $process->start();
+ while (!$process->isSuccessful());
+ $completedProcessesArray[$process->getFileName()][$process->getType()] = $process;
+ }
+ return new Collection($completedProcessesArray);
+ }
+}
diff --git a/src/Processes/ProcessHandlerFactory.php b/src/Processes/ProcessHandlerFactory.php
new file mode 100644
--- /dev/null
+++ b/src/Processes/ProcessHandlerFactory.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace Churn\Processes;
+
+use Churn\Configuration\Config;
+use Churn\Processes\Handler\ParallelProcessHandler;
+use Churn\Processes\Handler\ProcessHandler;
+use Churn\Processes\Handler\SequentialProcessHandler;
+
+class ProcessHandlerFactory
+{
+ /**
+ * Returns a process handler depending on the configuration.
+ * @param Config $config The application configuration.
+ * @return ProcessHandler
+ */
+ public function getProcessHandler(Config $config): ProcessHandler
+ {
+ if ($config->getParallelJobs() > 1) {
+ return new ParallelProcessHandler($config->getParallelJobs());
+ }
+
+ return new SequentialProcessHandler();
+ }
+}
|
diff --git a/tests/Integration/Managers/FileManagerTest.php b/tests/Integration/Managers/FileManagerTest.php
--- a/tests/Integration/Managers/FileManagerTest.php
+++ b/tests/Integration/Managers/FileManagerTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
namespace Churn\Tests\Integration\Managers;
@@ -25,7 +25,7 @@ public function it_can_be_instantiated()
/** @test */
public function it_can_recursively_get_the_php_files_in_a_path()
{
- $paths = [__DIR__ . ''];
+ $paths = [__DIR__];
$results = $this->fileManager->getPhpFiles($paths);
$this->assertInstanceOf(Collection::class, $results);
$this->assertCount(1, $results);
diff --git a/tests/Unit/Processes/ChurnProcessTest.php b/tests/Unit/Processes/ChurnProcessTest.php
--- a/tests/Unit/Processes/ChurnProcessTest.php
+++ b/tests/Unit/Processes/ChurnProcessTest.php
@@ -1,4 +1,6 @@
-<?php
+<?php declare(strict_types = 1);
+
+namespace Churn\Tests\Unit\Processes;
use Mockery as m;
use Churn\Tests\BaseTestCase;
diff --git a/tests/Unit/Managers/ProcessManagerTest.php b/tests/Unit/Processes/Handler/ParallelProcessHandlerTest.php
similarity index 61%
rename from tests/Unit/Managers/ProcessManagerTest.php
rename to tests/Unit/Processes/Handler/ParallelProcessHandlerTest.php
--- a/tests/Unit/Managers/ProcessManagerTest.php
+++ b/tests/Unit/Processes/Handler/ParallelProcessHandlerTest.php
@@ -1,32 +1,31 @@
<?php declare(strict_types = 1);
-namespace Churn\Tests\Unit\Managers;
+namespace Churn\Tests\Unit\Processes\Handler;
use Churn\Collections\FileCollection;
use Churn\Configuration\Config;
use Churn\Factories\ProcessFactory;
-use Churn\Managers\ProcessManager;
+use Churn\Processes\Handler\ParallelProcessHandler;
use Churn\Tests\BaseTestCase;
use Churn\Values\File;
-class ProcessManagerTest extends BaseTestCase
+class ParallelProcessHandlerTest extends BaseTestCase
{
/** @test */
public function it_can_be_instantiated()
{
- $this->assertInstanceOf(ProcessManager::class, new ProcessManager);
+ $this->assertInstanceOf(ParallelProcessHandler::class, new ParallelProcessHandler(2));
}
/** @test */
public function it_returns_empty_collection_when_no_files()
{
- $numParallelJobs = 3;
- $processManager = new ProcessManager();
+ $processHandler = new ParallelProcessHandler(3);
$config = Config::createFromDefaultValues();
$processFactory = new ProcessFactory($config->getCommitsSince());
$fileCollection = new FileCollection();
- $collection = $processManager->process($fileCollection, $processFactory, $numParallelJobs);
+ $collection = $processHandler->process($fileCollection, $processFactory);
$this->assertEquals($collection->count(), 0);
}
}
diff --git a/tests/Unit/Processes/Handler/SequentialProcessHandlerTest.php b/tests/Unit/Processes/Handler/SequentialProcessHandlerTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Unit/Processes/Handler/SequentialProcessHandlerTest.php
@@ -0,0 +1,47 @@
+<?php declare(strict_types = 1);
+
+namespace Churn\Tests\Unit\Processes\Handler;
+
+use Churn\Collections\FileCollection;
+use Churn\Factories\ProcessFactory;
+use Churn\Processes\ChurnProcess;
+use Churn\Processes\Handler\SequentialProcessHandler;
+use Churn\Tests\BaseTestCase;
+use Churn\Values\File;
+use Illuminate\Support\Collection;
+use Mockery as m;
+
+class SequentialProcessHandlerTest extends BaseTestCase
+{
+ /** @test */
+ public function it_can_be_instantiated()
+ {
+ $this->assertInstanceOf(SequentialProcessHandler::class, new SequentialProcessHandler());
+ }
+
+ /** @test */
+ public function it_returns_a_collection_of_results()
+ {
+ $process1 = m::mock(ChurnProcess::class);
+ $process1->shouldReceive('start');
+ $process1->shouldReceive('isSuccessful')->andReturn(true);
+ $process1->shouldReceive('getFileName')->andReturn(__FILE__);
+ $process1->shouldReceive('getType')->andReturn('GitCommitProcess');
+
+ $process2 = m::mock(ChurnProcess::class);
+ $process2->shouldReceive('start');
+ $process2->shouldReceive('isSuccessful')->andReturn(true);
+ $process2->shouldReceive('getFileName')->andReturn(__FILE__);
+ $process2->shouldReceive('getType')->andReturn('CyclomaticComplexityProcess');
+
+ $fileCollection = new FileCollection([new File(['fullPath' => __FILE__, 'displayPath' => __FILE__])]);
+ $processFactory = m::mock(ProcessFactory::class);
+ $processFactory->shouldReceive('createGitCommitProcess')->andReturn($process1);
+ $processFactory->shouldReceive('createCyclomaticComplexityProcess')->andReturn($process2);
+
+ $processHandler = new SequentialProcessHandler();
+ $results = $processHandler->process($fileCollection, $processFactory);
+
+ $this->assertInstanceOf(Collection::class, $results);
+ }
+}
diff --git a/tests/Unit/Processes/ProcessHandlerFactoryTest.php b/tests/Unit/Processes/ProcessHandlerFactoryTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Unit/Processes/ProcessHandlerFactoryTest.php
@@ -0,0 +1,45 @@
+<?php declare(strict_types = 1);
+
+namespace Churn\Tests\Unit\Processes;
+
+use Churn\Configuration\Config;
+use Churn\Processes\Handler\ParallelProcessHandler;
+use Churn\Processes\Handler\SequentialProcessHandler;
+use Churn\Processes\ProcessHandlerFactory;
+use Churn\Tests\BaseTestCase;
+use Mockery as m;
+
+class ProcessHandlerFactoryTest extends BaseTestCase
+{
+ /** @test */
+ public function it_can_be_instantiated()
+ {
+ $this->assertInstanceOf(ProcessHandlerFactory::class, new ProcessHandlerFactory());
+ }
+
+ /**
+ * @test
+ * @dataProvider provideConfigWithCorrespondingProcessHandler
+ */
+ public function it_returns_the_right_process_handler(Config $config, string $expectedClassName)
+ {
+ $factory = new ProcessHandlerFactory();
+ $processHandler = $factory->getProcessHandler($config);
+ $this->assertEquals($expectedClassName, get_class($processHandler));
+ }
+
+ public function provideConfigWithCorrespondingProcessHandler(): iterable
+ {
+ $config = m::mock(Config::class);
+ $config->shouldReceive('getParallelJobs')->andReturn(0);
+ yield [$config, SequentialProcessHandler::class];
+
+ $config = m::mock(Config::class);
+ $config->shouldReceive('getParallelJobs')->andReturn(1);
+ yield [$config, SequentialProcessHandler::class];
+
+ $config = m::mock(Config::class);
+ $config->shouldReceive('getParallelJobs')->andReturn(2);
+ yield [$config, ParallelProcessHandler::class];
+ }
+}
|
Option to disable parallelization
Disabling parallelization will force to better structure the code.
It will also be the occasion to improve how to handle certain values (eg: when `parallelJobs` < 1).
| 2020-10-15T12:16:21
|
php
|
Hard
|
|
bmitch/churn-php
| 365
|
bmitch__churn-php-365
|
[
"364"
] |
316da6ef4dc94643df3883041879b5ce3f26aff1
|
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -183,6 +183,9 @@ jobs:
with:
dependency-versions: "highest"
+ - name: "Check for PSR-4 violations"
+ run: "composer dump-autoload --optimize --strict-psr --no-scripts"
+
- name: "Run PHP Mess Detector"
run: "vendor/bin/phpmd src text phpmd.xml"
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -69,6 +69,7 @@
"test": [
"@composer validate --strict",
"parallel-lint src tests",
+ "@composer dump-autoload --optimize --strict-psr",
"phpmd src text phpmd.xml",
"phploc src",
"phpcpd src",
|
diff --git a/tests/Integration/Command/Assets/hooks.php b/tests/Integration/Command/Assets/hooks
similarity index 100%
rename from tests/Integration/Command/Assets/hooks.php
rename to tests/Integration/Command/Assets/hooks
diff --git a/tests/Integration/Command/config/hook-by-path.yml b/tests/Integration/Command/config/hook-by-path.yml
--- a/tests/Integration/Command/config/hook-by-path.yml
+++ b/tests/Integration/Command/config/hook-by-path.yml
@@ -1,2 +1,2 @@
hooks:
- - ../Assets/hooks.php
\ No newline at end of file
+ - ../Assets/hooks
\ No newline at end of file
diff --git a/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php b/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php
--- a/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php
+++ b/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace Churn\Tests\Unit\Assessors\CyclomaticComplexity;
+namespace Churn\Tests\Unit\Assessor;
use Churn\Tests\BaseTestCase;
use Churn\Assessor\CyclomaticComplexityAssessor;
diff --git a/tests/Unit/Event/Event/AfterAnalysisEventTest.php b/tests/Unit/Event/Event/AfterAnalysisEventTest.php
--- a/tests/Unit/Event/Event/AfterAnalysisEventTest.php
+++ b/tests/Unit/Event/Event/AfterAnalysisEventTest.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace Churn\Tests\Event\Event;
+namespace Churn\Tests\Unit\Event\Event;
use Churn\Event\Event\AfterAnalysisEvent;
use Churn\Result\ResultReporter;
diff --git a/tests/Unit/Event/Event/AfterFileAnalysisEventTest.php b/tests/Unit/Event/Event/AfterFileAnalysisEventTest.php
--- a/tests/Unit/Event/Event/AfterFileAnalysisEventTest.php
+++ b/tests/Unit/Event/Event/AfterFileAnalysisEventTest.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace Churn\Tests\Event\Event;
+namespace Churn\Tests\Unit\Event\Event;
use Churn\Event\Event\AfterFileAnalysisEvent;
use Churn\File\File;
diff --git a/tests/Unit/Result/HighestScoresTest.php b/tests/Unit/Result/HighestScoresTest.php
--- a/tests/Unit/Result/HighestScoresTest.php
+++ b/tests/Unit/Result/HighestScoresTest.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace Churn\Tests\Result;
+namespace Churn\Tests\Unit\Result;
use Churn\Result\ResultInterface;
use Churn\Result\HighestScores;
diff --git a/tests/Unit/Result/ResultAccumulatorTest.php b/tests/Unit/Result/ResultAccumulatorTest.php
--- a/tests/Unit/Result/ResultAccumulatorTest.php
+++ b/tests/Unit/Result/ResultAccumulatorTest.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace Churn\Tests\Result;
+namespace Churn\Tests\Unit\Result;
use Churn\File\File;
use Churn\Result\ResultInterface;
diff --git a/tests/Unit/Result/ResultTest.php b/tests/Unit/Result/ResultTest.php
--- a/tests/Unit/Result/ResultTest.php
+++ b/tests/Unit/Result/ResultTest.php
@@ -2,7 +2,7 @@
declare(strict_types=1);
-namespace Churn\Tests\Result;
+namespace Churn\Tests\Unit\Result;
use Churn\File\File;
use Churn\Result\Result;
|
Fix PSR violations
Since [Composer 2.4.0](https://github.com/composer/composer/releases/tag/2.4.0), a new `--strict-psr` flag has been added to `dump-autoload` to check for PSR violations.
Here the result for churn-php:
```sh
# composer dump-autoload --optimize --strict-psr
Generating optimized autoload files
Class Churn\Tests\Integration\Command\Assets\TestAfterAnalysisHook located in ./tests/Integration/Command/Assets/hooks.php does not comply with psr-4 autoloading standard. Skipping.
Class Churn\Tests\Integration\Command\Assets\TestAfterFileAnalysisHook located in ./tests/Integration/Command/Assets/hooks.php does not comply with psr-4 autoloading standard. Skipping.
Class Churn\Tests\Integration\Command\Assets\TestBeforeAnalysisHook located in ./tests/Integration/Command/Assets/hooks.php does not comply with psr-4 autoloading standard. Skipping.
Class Churn\Tests\Unit\Assessors\CyclomaticComplexity\CyclomaticComplexityAssessorTest located in ./tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php does not comply with psr-4 autoloading standard. Skipping.
Class Churn\Tests\Event\Event\AfterAnalysisEventTest located in ./tests/Unit/Event/Event/AfterAnalysisEventTest.php does not comply with psr-4 autoloading standard. Skipping.
Class Churn\Tests\Event\Event\AfterFileAnalysisEventTest located in ./tests/Unit/Event/Event/AfterFileAnalysisEventTest.php does not comply with psr-4 autoloading standard. Skipping.
Class Churn\Tests\Result\HighestScoresTest located in ./tests/Unit/Result/HighestScoresTest.php does not comply with psr-4 autoloading standard. Skipping.
Class Churn\Tests\Result\ResultAccumulatorTest located in ./tests/Unit/Result/ResultAccumulatorTest.php does not comply with psr-4 autoloading standard. Skipping.
Class Churn\Tests\Result\ResultTest located in ./tests/Unit/Result/ResultTest.php does not comply with psr-4 autoloading standard. Skipping.
```
Once these violations will be fixed, it'd be great to run this command in the CI to prevent new violations to appear.
| 2022-09-21T12:51:38
|
php
|
Hard
|
|
bmitch/churn-php
| 44
|
bmitch__churn-php-44
|
[
"38"
] |
a795aaa6080b9b9568fd38afc4277fcfd4453288
|
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ build
composer.lock
docs
vendor
-coverage.xml
\ No newline at end of file
+coverage.xml
+.idea
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ before_script:
- travis_retry composer install --no-interaction --prefer-source --dev
script:
+ - vendor/bin/parallel-lint src tests
- vendor/bin/phpcs --config-set ignore_warnings_on_exit 1
- vendor/bin/phpcs --standard=psr2 src
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then vendor/bin/phpcs --standard=phpcs.xml src --ignore=tests/Sniffs; fi
@@ -18,6 +19,7 @@ script:
- vendor/bin/phpmd src text codesize,unusedcode,naming
- vendor/bin/phploc src
- vendor/bin/phpcpd src
+ - php churn run src
after_success:
- bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
diff --git a/CyclomaticComplexityAssessorRunner b/CyclomaticComplexityAssessorRunner
new file mode 100644
--- /dev/null
+++ b/CyclomaticComplexityAssessorRunner
@@ -0,0 +1,9 @@
+#!/usr/bin/env php
+<?php
+require_once 'vendor/autoload.php';
+
+use Churn\Assessors\CyclomaticComplexity\CyclomaticComplexityAssessor;
+
+$file = $argv[1];
+$assessor = new CyclomaticComplexityAssessor();
+echo $assessor->assess($file);
\ No newline at end of file
diff --git a/churn b/churn
old mode 100644
new mode 100755
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,8 @@
"require": {
"php": ">=7.0.0",
"symfony/console": "^3.3",
- "tightenco/collect": "^5.4"
+ "tightenco/collect": "^5.4",
+ "symfony/process": "^3.3"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
@@ -51,11 +52,16 @@
"vendor/bin/phpcs --standard=psr2 src -spn",
"vendor/bin/phpcs --standard=phpcs.xml src -spn",
"vendor/bin/phpcs --standard=codor.xml src -spn",
- "vendor/bin/phpunit --debug --coverage-clover=coverage.xml",
"vendor/bin/phpmd src text codesize,unusedcode,naming",
"vendor/bin/phploc src",
"vendor/bin/phpcpd src",
- "vendor/bin/phpunit"
+ "vendor/bin/phpunit --debug --coverage-clover=coverage.xml",
+ "churn run src"
+ ],
+ "fix": [
+ "vendor/bin/phpcbf -n --standard=phpcs.xml src/",
+ "vendor/bin/phpcbf --standard=codor.xml src -spn",
+ "vendor/bin/phpcbf --standard=psr2 src -sp"
]
}
}
diff --git a/src/Assessors/GitCommitCount/GitCommitCountAssessor.php b/src/Assessors/GitCommitCount/GitCommitCountAssessor.php
deleted file mode 100644
--- a/src/Assessors/GitCommitCount/GitCommitCountAssessor.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace Churn\Assessors\GitCommitCount;
-
-use Churn\Services\CommandService;
-
-class GitCommitCountAssessor
-{
- /**
- * The command service.
- * @var CommandService
- */
- protected $commandService;
-
- /**
- * Class constructor.
- * @param CommandService $commandService Command Service.
- */
- public function __construct(CommandService $commandService)
- {
- $this->commandService = $commandService;
- }
-
- /**
- * See how many commits the file at $filePath has.
- * @param string $filePath Path and filename.
- * @return integer
- */
- public function assess(string $filePath): int
- {
- $command = $this->buildCommand($filePath);
-
- $result = $this->commandService->execute($command);
- if (! isset($result[0])) {
- return 0;
- }
- $result = trim($result[0]);
- $explodedResult = explode(' ', $result);
- return (integer) $explodedResult[0];
- }
-
- /**
- * Build the command to get the number of commits for the file at $filePath.
- * @param string $filePath Patha nd filename.
- * @return string
- */
- protected function buildCommand(string $filePath): string
- {
- $commandTemplate = "git log --name-only --pretty=format: %s | sort | uniq -c | sort -nr";
-
- $pos =strrpos($filePath, '/');
- if ($pos) {
- $folder = substr($filePath, 0, $pos);
- $commandTemplate = "cd {$folder} && git log --name-only --pretty=format: %s | sort | uniq -c | sort -nr";
- }
-
- return sprintf($commandTemplate, $filePath, $filePath);
- }
-}
diff --git a/src/Commands/ChurnCommand.php b/src/Commands/ChurnCommand.php
--- a/src/Commands/ChurnCommand.php
+++ b/src/Commands/ChurnCommand.php
@@ -2,30 +2,58 @@
namespace Churn\Commands;
-use Churn\Services\CommandService;
-use Churn\Assessors\GitCommitCount\GitCommitCountAssessor;
-use Churn\Assessors\CyclomaticComplexity\CyclomaticComplexityAssessor;
+use Churn\Processes\CyclomaticComplexityProcess;
+use Churn\Processes\GitCommitCountProcess;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Helper\Table;
-use Churn\Results\ResultsGenerator;
use Churn\Managers\FileManager;
use Churn\Results\ResultCollection;
+use Illuminate\Support\Collection;
+use Churn\Results\ResultsParser;
class ChurnCommand extends Command
{
+ /**
+ * The file manager.
+ * @var FileManager
+ */
+ private $fileManager;
+
+ /**
+ * Th results parser.
+ * @var ResultsParser
+ */
+ private $resultsParser;
+
+ /**
+ * Collection of files to run the processes on.
+ * @var Collection
+ */
+ private $files;
+
+ /**
+ * Collection of processes currently running.
+ * @var Collection
+ */
+ private $runningProcesses;
+
+ /**
+ * Array of completed processes.
+ * @var array
+ */
+ private $completedProcessesArray;
+
/**
* Class constructor.
*/
public function __construct()
{
parent::__construct();
- $commitCountAssessor = new GitCommitCountAssessor(new CommandService);
- $complexityAssessor = new CyclomaticComplexityAssessor();
- $this->resultsGenerator = new ResultsGenerator($commitCountAssessor, $complexityAssessor);
- $this->fileManager = new FileManager;
+ $this->fileManager = new FileManager;
+ $this->resultsParser = new ResultsParser;
}
/**
@@ -48,12 +76,45 @@ protected function configure()
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- $path = $input->getArgument('path');
- $phpFiles = $this->fileManager->getPhpFiles($path);
- $results = $this->resultsGenerator->getResults($phpFiles);
+ $path = $input->getArgument('path');
+ $this->files = $this->fileManager->getPhpFiles($path);
+
+ $this->runningProcesses = new Collection;
+ $this->completedProcessesArray = [];
+ while ($this->files->count() || $this->runningProcesses->count()) {
+ $this->getProcessResults();
+ }
+ $completedProcesses = new Collection($this->completedProcessesArray);
+
+ $results = $this->resultsParser->parse($completedProcesses);
$this->displayResults($output, $results);
}
+ /**
+ * Gets the output from processes and stores them in the completedProcessArray member.
+ * @return void
+ */
+ private function getProcessResults()
+ {
+ for ($index = $this->runningProcesses->count(); $this->files->count() > 0 && $index < 10; $index++) {
+ $file = $this->files->shift();
+
+ $process = new GitCommitCountProcess($file);
+ $process->start();
+ $this->runningProcesses->put($process->getKey(), $process);
+ $process = new CyclomaticComplexityProcess($file);
+ $process->start();
+ $this->runningProcesses->put($process->getKey(), $process);
+ }
+
+ foreach ($this->runningProcesses as $file => $process) {
+ if ($process->isSuccessful()) {
+ $this->runningProcesses->forget($process->getKey());
+ $this->completedProcessesArray[$process->getFileName()][$process->getType()] = $process;
+ }
+ }
+ }
+
/**
* Displays the results in a table.
* @param OutputInterface $output Output.
@@ -62,9 +123,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
*/
protected function displayResults(OutputInterface $output, ResultCollection $results)
{
+ echo "\n
+ ___ _ _ __ __ ____ _ _ ____ _ _ ____
+ / __)( )_( )( )( )( _ \( \( )___( _ \( )_( )( _ \
+( (__ ) _ ( )(__)( ) / ) ((___))___/ ) _ ( )___/
+ \___)(_) (_)(______)(_)\_)(_)\_) (__) (_) (_)(__) https://github.com/bmitch/churn-php
+
+";
$table = new Table($output);
$table->setHeaders(['File', 'Times Changed', 'Complexity', 'Score']);
- foreach ($results->orderByScoreDesc() as $result) {
+
+ foreach ($results->orderByScoreDesc()->take(10) as $result) {
$table->addRow($result->toArray());
}
$table->render();
diff --git a/src/Managers/FileManager.php b/src/Managers/FileManager.php
--- a/src/Managers/FileManager.php
+++ b/src/Managers/FileManager.php
@@ -2,8 +2,10 @@
namespace Churn\Managers;
+use Illuminate\Support\Collection;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
+use Churn\Values\File;
class FileManager
{
@@ -11,19 +13,20 @@ class FileManager
* Recursively finds all files with the .php extension in the provided
* $path and returns list as array.
* @param string $path Path to look for .php files.
- * @return array
+ * @return Collection
*/
- public function getPhpFiles(string $path): array
+ public function getPhpFiles(string $path): Collection
{
$directoryIterator = new RecursiveDirectoryIterator($path);
- $files = [];
+ $files = new Collection;
foreach (new RecursiveIteratorIterator($directoryIterator) as $file) {
if ($file->getExtension() !== 'php') {
continue;
}
- $files[] = ['fullPath' => $file->getRealPath(), 'displayPath' => $file->getPathName()];
+ $files->push(new File(['displayPath' => $file->getPathName(), 'fullPath' => $file->getRealPath()]));
}
+
return $files;
}
}
diff --git a/src/Processes/CyclomaticComplexityProcess.php b/src/Processes/CyclomaticComplexityProcess.php
new file mode 100644
--- /dev/null
+++ b/src/Processes/CyclomaticComplexityProcess.php
@@ -0,0 +1,92 @@
+<?php declare(strict_types = 1);
+
+
+namespace Churn\Processes;
+
+use Churn\Values\File;
+use Symfony\Component\Process\Process;
+
+class CyclomaticComplexityProcess
+{
+ /**
+ * The Symfony Process Component.
+ * @var Process
+ */
+ private $process;
+
+ /**
+ * GitCommitCountProcess constructor.
+ * @param File $file The file the process is being executed on.
+ */
+ public function __construct(File $file)
+ {
+ $this->file = $file;
+ }
+
+ /**
+ * Start the process.
+ * @return void
+ */
+ public function start()
+ {
+ $command = $this->getCommandString();
+ $this->process = new Process($command);
+ $this->process->start();
+ }
+
+ /**
+ * Determines if the process was successful.
+ * @return boolean
+ */
+ public function isSuccessful(): bool
+ {
+ return $this->process->isSuccessful();
+ }
+
+ /**
+ * Gets the output of the process.
+ * @return string
+ */
+ public function getOutput(): string
+ {
+ return $this->process->getOutput();
+ }
+
+ /**
+ * Gets the file name of the file the process
+ * is being executed on.
+ * @return string
+ */
+ public function getFilename(): string
+ {
+ return $this->file->getDisplayPath();
+ }
+
+ /**
+ * Gets a unique key used for storing the process in data structures.
+ * @return string
+ */
+ public function getKey(): string
+ {
+ return 'CyclomaticComplexityProcess' . $this->file->getFullPath();
+ }
+
+ /**
+ * Get the type of this process.
+ * @return string
+ */
+ public function getType(): string
+ {
+ return 'CyclomaticComplexityProcess';
+ }
+
+ /**
+ * The process command.
+ * @return string
+ */
+ private function getCommandString(): string
+ {
+ $rootFolder = __DIR__ . '/../../';
+ return "php {$rootFolder}CyclomaticComplexityAssessorRunner {$this->file->getFullPath()}";
+ }
+}
diff --git a/src/Processes/GitCommitCountProcess.php b/src/Processes/GitCommitCountProcess.php
new file mode 100644
--- /dev/null
+++ b/src/Processes/GitCommitCountProcess.php
@@ -0,0 +1,91 @@
+<?php declare(strict_types = 1);
+
+
+namespace Churn\Processes;
+
+use Churn\Values\File;
+use Symfony\Component\Process\Process;
+
+class GitCommitCountProcess
+{
+ /**
+ * The Symfony Process Component.
+ * @var Process
+ */
+ private $process;
+
+ /**
+ * GitCommitCountProcess constructor.
+ * @param File $file The file the process is being executed on.
+ */
+ public function __construct(File $file)
+ {
+ $this->file = $file;
+ }
+
+ /**
+ * Start the process.
+ * @return void
+ */
+ public function start()
+ {
+ $command = $this->getCommandString();
+ $this->process = new Process($command);
+ $this->process->start();
+ }
+
+ /**
+ * Determines if the process was successful.
+ * @return boolean
+ */
+ public function isSuccessful(): bool
+ {
+ return $this->process->isSuccessful();
+ }
+
+ /**
+ * Gets the output of the process.
+ * @return string
+ */
+ public function getOutput(): string
+ {
+ return $this->process->getOutput();
+ }
+
+ /**
+ * Gets the file name of the file the process
+ * is being executed on.
+ * @return string
+ */
+ public function getFilename(): string
+ {
+ return $this->file->getDisplayPath();
+ }
+
+ /**
+ * Gets a unique key used for storing the process in data structures.
+ * @return string
+ */
+ public function getKey(): string
+ {
+ return 'GitCommitCountProcess' . $this->file->getFullPath();
+ }
+
+ /**
+ * Get the type of this process.
+ * @return string
+ */
+ public function getType(): string
+ {
+ return 'GitCommitCountProcess';
+ }
+
+ /**
+ * The process command.
+ * @return string
+ */
+ private function getCommandString(): string
+ {
+ return 'git -C ' . getcwd() . " log --name-only --pretty=format: " . $this->file->getFullPath(). " | sort | uniq -c | sort -nr";
+ }
+}
diff --git a/src/Results/ResultsGenerator.php b/src/Results/ResultsGenerator.php
deleted file mode 100644
--- a/src/Results/ResultsGenerator.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace Churn\Results;
-
-use Churn\Assessors\GitCommitCount\GitCommitCountAssessor;
-use Churn\Assessors\CyclomaticComplexity\CyclomaticComplexityAssessor;
-
-class ResultsGenerator
-{
-
- /**
- * The commit count assesor.
- * @var GitCommitCountAssessor
- */
- protected $commitCountAssessor;
-
- /**
- * The complexity assesor.
- * @var CyclomaticComplexityAssessor
- */
- protected $complexityAssessor;
-
- /**
- * Class constructor.
- * @param GitCommitCountAssessor $commitCountAssessor Git Commit Count Assessor.
- * @param CyclomaticComplexityAssessor $complexityAssessor Cyclomatic Complexity Assessor.
- */
- public function __construct(GitCommitCountAssessor $commitCountAssessor, CyclomaticComplexityAssessor $complexityAssessor)
- {
- $this->commitCountAssessor = $commitCountAssessor;
- $this->complexityAssessor = $complexityAssessor;
- }
-
- /**
- * Generates a ResultCollection for the provided $fils.
- * @param array $files List of files.
- * @return ResultCollection
- */
- public function getResults(array $files): ResultCollection
- {
- $results = new ResultCollection;
- foreach ($files as $file) {
- $results->push($this->getResultsForFile($file));
- }
- return $results;
- }
-
- /**
- * Returns a Result object for the provided $file.
- * @param array $file FileData.
- * @return Result
- */
- protected function getResultsForFile(array $file): Result
- {
- $commits = $this->commitCountAssessor->assess($file['fullPath']);
- $complexity = $this->complexityAssessor->assess($file['fullPath']);
-
- return new Result([
- 'file' => $file['displayPath'],
- 'commits' => $commits,
- 'complexity' => $complexity,
- ]);
- }
-}
diff --git a/src/Results/ResultsParser.php b/src/Results/ResultsParser.php
new file mode 100644
--- /dev/null
+++ b/src/Results/ResultsParser.php
@@ -0,0 +1,65 @@
+<?php declare(strict_types = 1);
+
+
+namespace Churn\Results;
+
+use Churn\Processes\GitCommitCountProcess;
+use Illuminate\Support\Collection;
+
+class ResultsParser
+{
+ /**
+ * Collection of results.
+ * @var ResultCollection
+ */
+ private $resultsCollection;
+
+ /**
+ * Turns a collection of completed processes into a
+ * collection of parsed result objects.
+ * @param Collection $completedProcesses Collection of completed processes.
+ * @return ResultCollection
+ */
+ public function parse(Collection $completedProcesses): ResultCollection
+ {
+ $this->resultsCollection = new ResultCollection;
+
+ foreach ($completedProcesses as $file => $processes) {
+ $this->parseCompletedProcessesForFile($file, $processes);
+ }
+
+ return $this->resultsCollection;
+ }
+
+ /**
+ * Parse the list of processes for a file.
+ * @param string $file The file the processes were executed on.
+ * @param array $processes The proceses that were executed on the file.
+ * @return void
+ */
+ private function parseCompletedProcessesForFile(string $file, array $processes)
+ {
+ $commits = (integer) $this->parseCommits($processes['GitCommitCountProcess']);
+ $complexity = (integer) $processes['CyclomaticComplexityProcess']->getOutput();
+
+ $result = new Result([
+ 'file' => $file,
+ 'commits' => $commits,
+ 'complexity' => $complexity,
+ ]);
+
+ $this->resultsCollection->push($result);
+ }
+
+ /**
+ * Parse the number of commits on the file from the raw process output.
+ * @param GitCommitCountProcess $process Git Commit Count Process.
+ * @return integer
+ */
+ private function parseCommits(GitCommitCountProcess $process): int
+ {
+ $output = $process->getOutput();
+ preg_match("/([0-9]{1,})/", $output, $matches);
+ return (integer) $matches[1] ?? 0;
+ }
+}
diff --git a/src/Services/CommandService.php b/src/Services/CommandService.php
deleted file mode 100644
--- a/src/Services/CommandService.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace Churn\Services;
-
-class CommandService
-{
- /**
- * Run a command line command and return the result.
- * @param string $command Command to execute.
- * @return array
- */
- public function execute(string $command): array
- {
- exec($command, $output);
- return $output;
- }
-}
diff --git a/src/Values/File.php b/src/Values/File.php
new file mode 100644
--- /dev/null
+++ b/src/Values/File.php
@@ -0,0 +1,46 @@
+<?php declare(strict_types = 1);
+
+namespace Churn\Values;
+
+class File
+{
+ /**
+ * The full path of the file.
+ * @var string
+ */
+ private $fullPath;
+
+ /**
+ * The display path of the file.
+ * @var string
+ */
+ private $displayPath;
+
+ /**
+ * File constructor.
+ * @param array $fileData Raw file data.
+ */
+ public function __construct(array $fileData)
+ {
+ $this->fullPath = $fileData['fullPath'];
+ $this->displayPath = $fileData['displayPath'];
+ }
+
+ /**
+ * Get the full path of the file.
+ * @return string
+ */
+ public function getFullPath(): string
+ {
+ return $this->fullPath;
+ }
+
+ /**
+ * Get the display path of the file.
+ * @return string
+ */
+ public function getDisplayPath(): string
+ {
+ return $this->displayPath;
+ }
+}
|
diff --git a/tests/Integration/Managers/FileManagerTest.php b/tests/Integration/Managers/FileManagerTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Integration/Managers/FileManagerTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Churn\Tests\Integration\Managers;
+
+use Churn\Managers\FileManager;
+use Churn\Tests\BaseTestCase;
+use Churn\Values\File;
+use Illuminate\Support\Collection;
+
+class FileManagerTest extends BaseTestCase
+{
+ /**
+ * The class being tested.
+ * @var FileManager
+ */
+ private $fileManager;
+
+ /** @test **/
+ public function it_can_be_instantiated()
+ {
+ $this->assertInstanceOf(FileManager::class, $this->fileManager);
+ }
+
+ /** @test **/
+ public function it_can_recursively_get_the_php_files_in_a_path()
+ {
+ $path = __DIR__ . '';
+ $results = $this->fileManager->getPhpFiles($path);
+ $this->assertInstanceOf(Collection::class, $results);
+ $this->assertCount(1, $results);
+ $this->assertInstanceOf(File::class, $results[0]);
+ }
+
+ public function setUp()
+ {
+ parent::setup();
+
+ $this->fileManager = new FileManager;
+ }
+}
\ No newline at end of file
diff --git a/tests/Unit/Assessors/GitCommitCountAssessor/GitCommitCountAssessorTest.php b/tests/Unit/Assessors/GitCommitCountAssessor/GitCommitCountAssessorTest.php
deleted file mode 100644
--- a/tests/Unit/Assessors/GitCommitCountAssessor/GitCommitCountAssessorTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace Churn\Tests\Assessors\CyclomaticComplexity;
-
-use Mockery as m;
-use Churn\Tests\BaseTestCase;
-use Churn\Assessors\GitCommitCount\GitCommitCountAssessor;
-use Churn\Services\CommandService;
-use Churn\Exceptions\CommandServiceException;
-
-class GitCommitCountAssessorTest extends BaseTestCase
-{
- /** @test */
- public function when_a_file_has_one_commit_it_returns_one()
- {
- $commandService = m::mock(CommandService::class);
- $commandService->shouldReceive('execute')
- ->once()
- ->with("cd src/Assessors/CyclomaticComplexity && git log --name-only --pretty=format: src/Assessors/CyclomaticComplexity/CyclomaticComplexityAssessor.php | sort | uniq -c | sort -nr")
- ->andReturn([' 1 src/Assessors/CyclomaticComplexity/CyclomaticComplexityAssessor.php']);
-
- $this->assertSame(1, (new GitCommitCountAssessor($commandService))->assess('src/Assessors/CyclomaticComplexity/CyclomaticComplexityAssessor.php'));
- }
-
- /** @test */
- public function when_a_file_has_four_commits_it_returns_four()
- {
- $commandService = m::mock(CommandService::class);
- $commandService->shouldReceive('execute')
- ->once()
- ->with("git log --name-only --pretty=format: README.md | sort | uniq -c | sort -nr")
- ->andReturn([' 4 README.md']);
-
- $this->assertSame(4, (new GitCommitCountAssessor($commandService))->assess('README.md'));
- }
-
- /** @test */
- public function it_handles_the_scenario_when_the_provided_file_does_not_exist_or_has_no_commits()
- {
- $commandService = m::mock(CommandService::class);
- $commandService->shouldReceive('execute')
- ->once()
- ->with("git log --name-only --pretty=format: doesNotExist.md | sort | uniq -c | sort -nr")
- ->andReturn([]);
-
- $this->assertSame(0, (new GitCommitCountAssessor($commandService))->assess('doesNotExist.md'));
- }
-}
\ No newline at end of file
diff --git a/tests/Unit/Results/ResultsGeneratorTest.php b/tests/Unit/Results/ResultsGeneratorTest.php
deleted file mode 100644
--- a/tests/Unit/Results/ResultsGeneratorTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace Churn\Tests\Results;
-
-use Churn\Tests\BaseTestCase;
-use Churn\Results\ResultsGenerator;
-use Churn\Results\ResultCollection;
-use Churn\Services\CommandService;
-use Churn\Assessors\GitCommitCount\GitCommitCountAssessor;
-use Churn\Assessors\CyclomaticComplexity\CyclomaticComplexityAssessor;
-use Mockery as m;
-
-class ResultsGeneratorTest extends BaseTestCase
-{
- /**
- * The object we're testing.
- * @var ResultsGenerator
- */
- protected $resultsGenerator;
-
- /**
- * The results generated by the ResultsGenerator
- * @var Results
- */
- protected $results;
-
- /** @test */
- public function it_can_be_created()
- {
- $this->assertInstanceOf(ResultsGenerator::class, $this->resultsGenerator);
- }
-
- /** @test */
- public function it_generates_a_ResultCollection_object()
- {
- $this->assertInstanceOf(ResultCollection::class, $this->results);
- }
-
- public function setup()
- {
- parent::setup();
- $commandService = m::mock(CommandService::class);
- $commandService->shouldReceive('execute')
- ->once()
- ->with("cd /foo/bar && git log --name-only --pretty=format: /foo/bar/Baz.php | sort | uniq -c | sort -nr")
- ->andReturn([' 5 /foo/bar/Baz.php']);
-
- $commitCountAssessor = new GitCommitCountAssessor($commandService);
- $cyclomaticComplexityAssessor = m::mock(CyclomaticComplexityAssessor::class);
- $cyclomaticComplexityAssessor->shouldReceive('assess')
- ->once()
- ->with('/foo/bar/Baz.php')
- ->andReturn(6);
-
- $this->resultsGenerator = new ResultsGenerator($commitCountAssessor, $cyclomaticComplexityAssessor);
-
- $this->results = $this->resultsGenerator->getResults([
- [
- "fullPath" => "/foo/bar/Baz.php",
- "displayPath" => "src/Assessors/CyclomaticComplexity/CyclomaticComplexityAssessor.php",
- ]
- ]);
- }
-
-}
\ No newline at end of file
diff --git a/tests/Unit/Services/CommandServiceTest.php b/tests/Unit/Services/CommandServiceTest.php
deleted file mode 100644
--- a/tests/Unit/Services/CommandServiceTest.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace Churn\Tests\Results;
-
-use Churn\Tests\BaseTestCase;
-use Churn\Services\CommandService;
-
-class CommandServiceTest extends BaseTestCase
-{
- /** @test */
- public function it_returns_the_output_of_a_command()
- {
- $commandService = new CommandService;
- $result = $commandService->execute("echo hi");
- $this->assertSame(["hi"], $result);
- }
-}
\ No newline at end of file
diff --git a/tests/Unit/Values/FileTest.php b/tests/Unit/Values/FileTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Unit/Values/FileTest.php
@@ -0,0 +1,31 @@
+<?php
+
+
+namespace Churn\Tests\Unit\Values;
+
+
+use Churn\Tests\BaseTestCase;
+use Churn\Values\File;
+
+class FileTest extends BaseTestCase
+{
+ /** @test **/
+ public function it_can_be_instantiated()
+ {
+ $this->assertInstanceOf(File::class, $this->file);
+ }
+
+ /** @test **/
+ public function it_can_return_its_values()
+ {
+ $this->assertSame('foo/bar/baz.php', $this->file->getFullPath());
+ $this->assertSame('bar/baz.php', $this->file->getDisplayPath());
+ }
+
+ public function setUp()
+ {
+ parent::setUp();
+
+ $this->file = new File(['fullPath' => 'foo/bar/baz.php', 'displayPath' => 'bar/baz.php']);
+ }
+}
\ No newline at end of file
|
Run in parallel
With a large number of files the results take a while to come back. Need some way to run the files in parallel.
* http://symfony.com/doc/current/components/process.html
* http://blog.servergrove.com/2014/04/16/symfony2-components-overview-process/
If we used something like the above then we'd need to probably create another command that simple takes the file path and returns the results.
|
* Gather all the files needed for processing. Could be a collection of files.
* While there are files to run:
* Launch a process to get the commit count.
* Store results in a class that contains filename and output.
* This class can go into a collection of CommitCountProcessResults.
* Launch a process to get the cyclomatic complexity.
* Store results in a class that contains filename and output.
* This class can go into a collection of CyclomaticComplexityProcessResults.
* Take the two collections and create the results.
Seems like this can be really slowed down if the repo has lots of commits. Perhaps we just limit it to the last X commits?
| 2017-08-12T19:06:57
|
php
|
Hard
|
bmitch/churn-php
| 59
|
bmitch__churn-php-59
|
[
"42"
] |
c1ea2c1c1c7b2c57bc596ad03e12fe082cc48254
|
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,36 +8,45 @@ Helps discover good candidates for refactoring.
* [Compatibility](#compatibility)
* [How to Install?](#how-to-install)
* [How to Use?](#how-to-use)
+* [How to Configure?](#how-to-configure)
* [Similar Packages](#similar-packages)
* [Contributing](#contributing)
* [License](#license)
## What is it? ##
-`churn-php` is a package that helps you identify files in your project that could be good candidates for refactoring. It examines each PHP file in the path it is provided and:
+`churn-php` is a package that helps you identify php files in your project that could be good candidates for refactoring. It examines each PHP file in the path it is provided and:
* Checks how many commits it has.
* Calculates the cyclomatic complexity.
* Creates a score based on these two values.
The results are displayed in a table:
```
+ ___ _ _ __ __ ____ _ _ ____ _ _ ____
+ / __)( )_( )( )( )( _ \( \( )___( _ \( )_( )( _ \
+ ( (__ ) _ ( )(__)( ) / ) ((___))___/ ) _ ( )___/
+ \___)(_) (_)(______)(_)\_)(_)\_) (__) (_) (_)(__) https://github.com/bmitch/churn-php
+
+---------------------------------------------------------------------+---------------+------------+-------+
| File | Times Changed | Complexity | Score |
+---------------------------------------------------------------------+---------------+------------+-------+
+| src/Managers/FileManager.php | 5 | 4 | 9 |
| src/Assessors/CyclomaticComplexity/CyclomaticComplexityAssessor.php | 4 | 4 | 8 |
-| src/Assessors/GitCommitCount/GitCommitCountAssessor.php | 3 | 4 | 7 |
-| src/Commands/ChurnCommand.php | 3 | 2 | 5 |
-| src/Managers/FileManager.php | 2 | 3 | 5 |
-| src/Results/ResultsGenerator.php | 2 | 2 | 4 |
+| src/Results/ResultsParser.php | 3 | 3 | 6 |
| src/Results/Result.php | 2 | 1 | 3 |
-| src/Services/CommandService.php | 2 | 1 | 3 |
+| src/Factories/ProcessFactory.php | 2 | 1 | 3 |
| src/Results/ResultCollection.php | 1 | 1 | 2 |
+| src/Values/File.php | 1 | 1 | 2 |
+| src/Collections/FileCollection.php | 1 | 1 | 2 |
+| src/Values/Config.php | 1 | 1 | 2 |
+| src/Processes/ChurnProcess.php | 1 | 1 | 2 |
+---------------------------------------------------------------------+---------------+------------+-------+
+ 10 files analysed in 0.24276995658875 seconds using 15 parallel jobs.
```
-A file that changes a lot and has a high complexity might be a higher candidate for refactoring than a file that doesn't change a lot and has a low complexity.
+A file that changes a lot and has a high complexity might be a better candidate for refactoring than a file that doesn't change a lot and has a low complexity.
-`churn-php` only intends to assist the developer identifying files for refactoring. It's best to use the results in addition to your own judgement to decide which files you may want to refactor.
+`churn-php` only assists the developer to identify files for refactoring. It's best to use the results in addition to your own judgment to decide which files you may want to refactor.
## Compatibility ##
* PHP 7+
@@ -53,6 +62,32 @@ composer require bmitch/churn-php --dev
vendor/bin/churn run <path to source code>
```
+## How to Configure?
+You may add an optional `churn.yml` file to the root of your project which can be used to configure churn-php. A sample `churm.yml` file looks like:
+
+```yml
+# The maximum number of files to display in the results table.
+# Default: 10
+filesToShow: 10
+
+# The number of parallel jobs to use when processing files.
+# Default 10:
+parallelJobs: 10
+
+# How far back in the git history to count the number of commits to a file
+# Can be a human readable date like 'One week ago' or a date like '2017-07-12'
+# Default '10 Years ago'
+commitsSince: One year ago
+
+# Files to ignore when processing. The full path to the file relative to the root of your project is required
+# Default: All PHP files in the path provided to churn-php are processed.
+filesToIgnore:
+ - src/Commands/ChurnCommand.php
+ - src/Results/ResultsParser.php
+ ```
+
+If a `churm.yml` file is omitted or an individual setting is omitted the default values above will be used.
+
## Similar Packages
* https://github.com/danmayer/churn (Ruby)
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
"php": ">=7.0.0",
"symfony/console": "~3.2",
"tightenco/collect": "^5.4",
- "symfony/process": "^3.3"
+ "symfony/process": "^3.3",
+ "symfony/yaml": "^3.3"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
diff --git a/src/Commands/ChurnCommand.php b/src/Commands/ChurnCommand.php
--- a/src/Commands/ChurnCommand.php
+++ b/src/Commands/ChurnCommand.php
@@ -3,6 +3,7 @@
namespace Churn\Commands;
use Churn\Factories\ProcessFactory;
+use Churn\Values\Config;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -12,6 +13,7 @@
use Churn\Results\ResultCollection;
use Illuminate\Support\Collection;
use Churn\Results\ResultsParser;
+use Symfony\Component\Yaml\Yaml;
class ChurnCommand extends Command
{
@@ -51,9 +53,10 @@ class ChurnCommand extends Command
public function __construct()
{
parent::__construct();
- $this->fileManager = new FileManager;
+ $this->config = new Config(Yaml::parse(@file_get_contents(getcwd() . '/churn.yml')) ?? []);
+ $this->fileManager = new FileManager($this->config);
+ $this->processFactory = new ProcessFactory($this->config);
$this->resultsParser = new ResultsParser;
- $this->processFactory = new ProcessFactory;
}
/**
@@ -97,7 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
*/
private function getProcessResults()
{
- for ($index = $this->runningProcesses->count(); $this->filesCollection->hasFiles() > 0 && $index < 10; $index++) {
+ for ($index = $this->runningProcesses->count(); $this->filesCollection->hasFiles() > 0 && $index < $this->config->getParallelJobs(); $index++) {
$file = $this->filesCollection->getNextFile();
$process = $this->processFactory->createGitCommitProcess($file);
@@ -135,11 +138,10 @@ protected function displayResults(OutputInterface $output, ResultCollection $res
$table = new Table($output);
$table->setHeaders(['File', 'Times Changed', 'Complexity', 'Score']);
-
- foreach ($results->orderByScoreDesc()->take(10) as $result) {
+ foreach ($results->orderByScoreDesc()->take($this->config->getFilesToShow()) as $result) {
$table->addRow($result->toArray());
}
$table->render();
- echo " " . $this->filesCount . " files analysed in {$totalTime} seconds.\n\n";
+ echo " " . $this->filesCount . " files analysed in {$totalTime} seconds using " . $this->config->getParallelJobs() . " parallel jobs.\n\n";
}
}
diff --git a/src/Factories/ProcessFactory.php b/src/Factories/ProcessFactory.php
--- a/src/Factories/ProcessFactory.php
+++ b/src/Factories/ProcessFactory.php
@@ -3,11 +3,21 @@
namespace Churn\Factories;
use Churn\Processes\ChurnProcess;
+use Churn\Values\Config;
use Churn\Values\File;
use Symfony\Component\Process\Process;
class ProcessFactory
{
+ /**
+ * ProcessFactory constructor.
+ * @param Config $config Configuration Settings.
+ */
+ public function __construct(Config $config)
+ {
+ $this->config = $config;
+ }
+
/**
* Creates a Git Commit Process that will run on $file.
* @param File $file File that the process will execute on.
@@ -16,7 +26,7 @@ class ProcessFactory
public function createGitCommitProcess(File $file): ChurnProcess
{
$process = new Process(
- 'git -C ' . getcwd() . " log --name-only --pretty=format: " . $file->getFullPath(). " | sort | uniq -c | sort -nr"
+ 'git -C ' . getcwd() . " log --since=\"" . $this->config->getCommitsSince() . "\" --name-only --pretty=format: " . $file->getFullPath(). " | sort | uniq -c | sort -nr"
);
return new ChurnProcess($file, $process, 'GitCommitProcess');
diff --git a/src/Managers/FileManager.php b/src/Managers/FileManager.php
--- a/src/Managers/FileManager.php
+++ b/src/Managers/FileManager.php
@@ -3,12 +3,22 @@
namespace Churn\Managers;
use Churn\Collections\FileCollection;
+use Churn\Values\Config;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use Churn\Values\File;
class FileManager
{
+ /**
+ * FileManager constructor.
+ * @param Config $config Configuration Settings.
+ */
+ public function __construct(Config $config)
+ {
+ $this->config = $config;
+ }
+
/**
* Recursively finds all files with the .php extension in the provided
* $path and returns list as array.
@@ -24,6 +34,10 @@ public function getPhpFiles(string $path): FileCollection
continue;
}
+ if (in_array($file->getPathname(), $this->config->getFilesToIgnore())) {
+ continue;
+ }
+
$files->push(new File(['displayPath' => $file->getPathName(), 'fullPath' => $file->getRealPath()]));
}
diff --git a/src/Values/Config.php b/src/Values/Config.php
new file mode 100644
--- /dev/null
+++ b/src/Values/Config.php
@@ -0,0 +1,79 @@
+<?php declare(strict_types = 1);
+
+
+namespace Churn\Values;
+
+class Config
+{
+ /**
+ * The number of files to display in the results table.
+ * @var integer
+ */
+ private $filesToShow;
+
+ /**
+ * The number of parallel jobs to use to process the files.
+ * @var integer
+ */
+ private $parallelJobs;
+
+ /**
+ * How far back in the git history to go to count commits.
+ * @var string
+ */
+ private $commitsSince;
+
+ /**
+ * The paths to files to ignore when processing.
+ * @var array
+ */
+ private $filesToIgnore;
+
+ /**
+ * Config constructor.
+ * @param array $rawData Raw config data.
+ */
+ public function __construct(array $rawData = [])
+ {
+ $this->filesToShow = $rawData['filesToShow'] ?? 10;
+ $this->parallelJobs = $rawData['parallelJobs'] ?? 10;
+ $this->commitsSince = $rawData['commitsSince'] ?? '10 years ago';
+ $this->filesToIgnore = $rawData['filesToIgnore'] ?? [];
+ }
+
+ /**
+ * Get the number of files to display in the results table.
+ * @return integer
+ */
+ public function getFilesToShow(): int
+ {
+ return $this->filesToShow;
+ }
+
+ /**
+ * Get the number of parallel jobs to use to process the files.
+ * @return integer
+ */
+ public function getParallelJobs(): int
+ {
+ return $this->parallelJobs;
+ }
+
+ /**
+ * Get how far back in the git history to go to count commits.
+ * @return string
+ */
+ public function getCommitsSince(): string
+ {
+ return $this->commitsSince;
+ }
+
+ /**
+ * Get the paths to files to ignore when processing.
+ * @return array
+ */
+ public function getFilesToIgnore(): array
+ {
+ return $this->filesToIgnore;
+ }
+}
|
diff --git a/tests/Integration/Managers/FileManagerTest.php b/tests/Integration/Managers/FileManagerTest.php
--- a/tests/Integration/Managers/FileManagerTest.php
+++ b/tests/Integration/Managers/FileManagerTest.php
@@ -4,6 +4,7 @@
use Churn\Managers\FileManager;
use Churn\Tests\BaseTestCase;
+use Churn\Values\Config;
use Churn\Values\File;
use Illuminate\Support\Collection;
@@ -35,6 +36,6 @@ public function setUp()
{
parent::setup();
- $this->fileManager = new FileManager;
+ $this->fileManager = new FileManager(new Config);
}
}
\ No newline at end of file
diff --git a/tests/Unit/Factories/ProcessFactoryTest.php b/tests/Unit/Factories/ProcessFactoryTest.php
--- a/tests/Unit/Factories/ProcessFactoryTest.php
+++ b/tests/Unit/Factories/ProcessFactoryTest.php
@@ -6,6 +6,7 @@
use Churn\Tests\BaseTestCase;
use Churn\Factories\ProcessFactory;
use Churn\Values\File;
+use Churn\Values\Config;
class ProcessFactoryTest extends BaseTestCase
{
@@ -38,6 +39,6 @@ public function it_can_create_a_cyclomatic_complexity_process()
public function setup()
{
- $this->processFactory = new ProcessFactory;
+ $this->processFactory = new ProcessFactory(new Config);
}
}
\ No newline at end of file
diff --git a/tests/Unit/Managers/FileManagerTest.php b/tests/Unit/Managers/FileManagerTest.php
--- a/tests/Unit/Managers/FileManagerTest.php
+++ b/tests/Unit/Managers/FileManagerTest.php
@@ -4,6 +4,7 @@
use Churn\Tests\BaseTestCase;
use Churn\Managers\FileManager;
+use Churn\Values\Config;
class FileManagerTest extends BaseTestCase
{
@@ -27,6 +28,6 @@ public function it_can_get_the_php_files_in_a_filter()
public function setup()
{
- $this->fileManager = new FileManager();
+ $this->fileManager = new FileManager(new Config);
}
}
\ No newline at end of file
diff --git a/tests/Unit/Values/ConfigTest.php b/tests/Unit/Values/ConfigTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Unit/Values/ConfigTest.php
@@ -0,0 +1,49 @@
+<?php
+
+
+namespace Churn\Tests\Unit\Values;
+
+
+use Churn\Tests\BaseTestCase;
+use Churn\Values\Config;
+
+class ConfigTest extends BaseTestCase
+{
+ /** @test **/
+ public function it_can_be_instantiated()
+ {
+ $this->assertInstanceOf(Config::class, new Config([]));
+ }
+
+ /** @test **/
+ public function it_can_be_instantiated_without_any_parameters()
+ {
+ $this->assertInstanceOf(Config::class, new Config);
+ }
+
+ /** @test **/
+ public function it_can_return_its_default_values_when_instantiated_without_any_parameters()
+ {
+ $config = new Config;
+ $this->assertSame(10, $config->getFilesToShow());
+ $this->assertSame(10, $config->getParallelJobs());
+ $this->assertSame('10 years ago', $config->getCommitsSince());
+ $this->assertSame([], $config->getFilesToIgnore());
+ }
+
+ /** @test **/
+ public function it_can_return_its_values_when_instantiated_parameters()
+ {
+ $config = new Config([
+ 'filesToShow' => 13,
+ 'parallelJobs' => 7,
+ 'commitsSince' => '4 years ago',
+ 'filesToIgnore' => ['foo.php', 'bar.php', 'baz.php']
+ ]);
+ $this->assertSame(13, $config->getFilesToShow());
+ $this->assertSame(7, $config->getParallelJobs());
+ $this->assertSame('4 years ago', $config->getCommitsSince());
+ $this->assertSame(['foo.php', 'bar.php', 'baz.php'], $config->getFilesToIgnore());
+ }
+
+}
\ No newline at end of file
|
Add footer with misc data under table?
Could show:
* Files analyzed.
* Time it took to run.
* ???
| 2017-08-23T04:29:13
|
php
|
Hard
|
|
bmitch/churn-php
| 297
|
bmitch__churn-php-297
|
[
"293"
] |
2387fe340523b6a579d3d6ef1e39312c67b3037b
|
diff --git a/src/Command/RunCommand.php b/src/Command/RunCommand.php
--- a/src/Command/RunCommand.php
+++ b/src/Command/RunCommand.php
@@ -23,6 +23,7 @@
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\StreamOutput;
+use Webmozart\Assert\Assert;
/** @SuppressWarnings(PHPMD.CouplingBetweenObjects) */
class RunCommand extends Command
@@ -78,9 +79,10 @@ protected function configure(): void
{
$this->setName('run')
->addArgument('paths', InputArgument::IS_ARRAY, 'Path to source to check.')
- ->addOption('configuration', 'c', InputOption::VALUE_OPTIONAL, 'Path to the configuration file', 'churn.yml') // @codingStandardsIgnoreLine
+ ->addOption('configuration', 'c', InputOption::VALUE_REQUIRED, 'Path to the configuration file', 'churn.yml') // @codingStandardsIgnoreLine
->addOption('format', null, InputOption::VALUE_REQUIRED, 'The output format to use', 'text')
->addOption('output', 'o', InputOption::VALUE_REQUIRED, 'The path where to write the result')
+ ->addOption('parallel', null, InputOption::VALUE_REQUIRED, 'Number of parallel jobs')
->addOption('progress', 'p', InputOption::VALUE_NONE, 'Show progress bar')
->setDescription('Check files')
->setHelp('Checks the churn on the provided path argument(s).');
@@ -95,13 +97,39 @@ protected function configure(): void
protected function execute(InputInterface $input, OutputInterface $output): int
{
$this->displayLogo($input, $output);
- $config = Loader::fromPath((string) $input->getOption('configuration'));
- $accumulator = $this->analyze($input, $output, $config);
+ $accumulator = $this->analyze($input, $output, $this->getConfiguration($input));
$this->writeResult($input, $output, $accumulator);
return 0;
}
+ /**
+ * @param InputInterface $input Input.
+ * @throws InvalidArgumentException If paths argument invalid.
+ */
+ private function getConfiguration(InputInterface $input): Config
+ {
+ $config = Loader::fromPath((string) $input->getOption('configuration'));
+
+ if ([] !== $input->getArgument('paths')) {
+ $config->setDirectoriesToScan($input->getArgument('paths'));
+ }
+
+ if ([] === $config->getDirectoriesToScan()) {
+ throw new InvalidArgumentException(
+ 'Provide the directories you want to scan as arguments, ' .
+ 'or configure them under "directoriesToScan" in your churn.yml file.'
+ );
+ }
+
+ if (null !== $input->getOption('parallel')) {
+ Assert::integerish($input->getOption('parallel'), 'Amount of parallel jobs should be an integer');
+ $config->setParallelJobs((int) $input->getOption('parallel'));
+ }
+
+ return $config;
+ }
+
/**
* Run the actual analysis.
*
@@ -112,7 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
private function analyze(InputInterface $input, OutputInterface $output, Config $config): ResultAccumulator
{
$filesFinder = (new FileFinder($config->getFileExtensions(), $config->getFilesToIgnore()))
- ->getPhpFiles($this->getDirectoriesToScan($input, $config->getDirectoriesToScan()));
+ ->getPhpFiles($config->getDirectoriesToScan());
$accumulator = new ResultAccumulator($config->getFilesToShow(), $config->getMinScoreToShow());
$this->processHandlerFactory->getProcessHandler($config)->process(
$filesFinder,
@@ -123,32 +151,6 @@ private function analyze(InputInterface $input, OutputInterface $output, Config
return $accumulator;
}
- /**
- * Get the directories to scan.
- *
- * @param InputInterface $input Input Interface.
- * @param array<string> $dirsConfigured The directories configured to scan.
- * @throws InvalidArgumentException If paths argument invalid.
- * @return array<string> When no directories to scan found.
- */
- private function getDirectoriesToScan(InputInterface $input, array $dirsConfigured): array
- {
- $dirsProvidedAsArgs = (array) $input->getArgument('paths');
-
- if ([] !== $dirsProvidedAsArgs) {
- return $dirsProvidedAsArgs;
- }
-
- if ([] !== $dirsConfigured) {
- return $dirsConfigured;
- }
-
- throw new InvalidArgumentException(
- 'Provide the directories you want to scan as arguments, ' .
- 'or configure them under "directoriesToScan" in your churn.yml file.'
- );
- }
-
/**
* @param InputInterface $input Input.
* @param OutputInterface $output Output.
diff --git a/src/Configuration/Config.php b/src/Configuration/Config.php
--- a/src/Configuration/Config.php
+++ b/src/Configuration/Config.php
@@ -4,8 +4,6 @@
namespace Churn\Configuration;
-use Webmozart\Assert\Assert;
-
class Config
{
@@ -24,15 +22,12 @@ class Config
private $configuration;
/**
- * Config constructor.
- *
* @param array<mixed> $configuration Raw config data.
- * @throws \InvalidArgumentException If parameters is badly defined.
*/
private function __construct(array $configuration = [])
{
if (!empty($configuration)) {
- $this->validateConfigurationValues($configuration);
+ (new Validator())->validateConfigurationValues($configuration);
}
$this->configuration = $configuration;
@@ -57,7 +52,7 @@ public static function createFromDefaultValues(): Config
}
/**
- * Get the names of directories to scan.
+ * Get the paths of directories to scan.
*
* @return array<string>
*/
@@ -66,6 +61,14 @@ public function getDirectoriesToScan(): array
return $this->configuration['directoriesToScan'] ?? self::DIRECTORIES_TO_SCAN;
}
+ /**
+ * @param array<string> $directories Paths of directories to scan.
+ */
+ public function setDirectoriesToScan(array $directories): void
+ {
+ $this->configuration['directoriesToScan'] = $directories;
+ }
+
/**
* Get the number of files to display in the results table.
*/
@@ -90,6 +93,14 @@ public function getParallelJobs(): int
return $this->configuration['parallelJobs'] ?? self::AMOUNT_OF_PARALLEL_JOBS;
}
+ /**
+ * @param integer $parallelJobs Number of parallel jobs.
+ */
+ public function setParallelJobs(int $parallelJobs): void
+ {
+ $this->configuration['parallelJobs'] = $parallelJobs;
+ }
+
/**
* Get how far back in the git history to go to count commits.
*/
@@ -99,8 +110,6 @@ public function getCommitsSince(): string
}
/**
- * Get the paths to files to ignore when processing.
- *
* @return array<string>
*/
public function getFilesToIgnore(): array
@@ -125,116 +134,4 @@ public function getVCS(): string
{
return $this->configuration['vcs'] ?? self::VCS;
}
-
- /**
- * @param array<mixed> $configuration The array containing the configuration values.
- */
- private function validateConfigurationValues(array $configuration): void
- {
- $this->validateDirectoriesToScan($configuration);
- $this->validateFilesToShow($configuration);
- $this->validateMinScoreToShow($configuration);
- $this->validateParallelJobs($configuration);
- $this->validateCommitsSince($configuration);
- $this->validateFilesToIgnore($configuration);
- $this->validateFileExtensions($configuration);
- $this->validateVCS($configuration);
- }
-
- /**
- * @param array<mixed> $configuration The array containing the configuration values.
- */
- private function validateDirectoriesToScan(array $configuration): void
- {
- if (!\array_key_exists('directoriesToScan', $configuration)) {
- return;
- }
-
- Assert::allString($configuration['directoriesToScan'], 'Directories to scan should be an array of strings');
- }
-
- /**
- * @param array<mixed> $configuration The array containing the configuration values.
- */
- private function validateFilesToShow(array $configuration): void
- {
- if (!\array_key_exists('filesToShow', $configuration)) {
- return;
- }
-
- Assert::integer($configuration['filesToShow'], 'Files to show should be an integer');
- }
-
- /**
- * @param array<mixed> $configuration The array containing the configuration values.
- */
- private function validateMinScoreToShow(array $configuration): void
- {
- if (!\array_key_exists('minScoreToShow', $configuration)) {
- return;
- }
-
- Assert::numeric($configuration['minScoreToShow'], 'Minimum score to show should be a number');
- }
-
- /**
- * @param array<mixed> $configuration The array containing the configuration values.
- */
- private function validateParallelJobs(array $configuration): void
- {
- if (!\array_key_exists('parallelJobs', $configuration)) {
- return;
- }
-
- Assert::integer($configuration['parallelJobs'], 'Amount of parallel jobs should be an integer');
- }
-
- /**
- * @param array<mixed> $configuration The array containing the configuration values.
- * @throws \InvalidArgumentException If date is in a bad format.
- */
- private function validateCommitsSince(array $configuration): void
- {
- if (!\array_key_exists('commitsSince', $configuration)) {
- return;
- }
-
- Assert::string($configuration['commitsSince'], 'Commits since should be a string');
- }
-
- /**
- * @param array<mixed> $configuration The array containing the configuration values.
- */
- private function validateFilesToIgnore(array $configuration): void
- {
- if (!\array_key_exists('filesToIgnore', $configuration)) {
- return;
- }
-
- Assert::isArray($configuration['filesToIgnore'], 'Files to ignore should be an array of strings');
- }
-
- /**
- * @param array<mixed> $configuration The array containing the configuration values.
- */
- private function validateFileExtensions(array $configuration): void
- {
- if (!\array_key_exists('fileExtensions', $configuration)) {
- return;
- }
-
- Assert::isArray($configuration['fileExtensions'], 'File extensions should be an array of strings');
- }
-
- /**
- * @param array<mixed> $configuration The array containing the configuration values.
- */
- private function validateVCS(array $configuration): void
- {
- if (!\array_key_exists('vcs', $configuration)) {
- return;
- }
-
- Assert::string($configuration['vcs'], 'VCS should be a string');
- }
}
diff --git a/src/Configuration/Validator.php b/src/Configuration/Validator.php
new file mode 100644
--- /dev/null
+++ b/src/Configuration/Validator.php
@@ -0,0 +1,122 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Configuration;
+
+use Webmozart\Assert\Assert;
+
+class Validator
+{
+
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ public function validateConfigurationValues(array $configuration): void
+ {
+ $this->validateDirectoriesToScan($configuration);
+ $this->validateFilesToShow($configuration);
+ $this->validateMinScoreToShow($configuration);
+ $this->validateParallelJobs($configuration);
+ $this->validateCommitsSince($configuration);
+ $this->validateFilesToIgnore($configuration);
+ $this->validateFileExtensions($configuration);
+ $this->validateVCS($configuration);
+ }
+
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ private function validateDirectoriesToScan(array $configuration): void
+ {
+ if (!\array_key_exists('directoriesToScan', $configuration)) {
+ return;
+ }
+
+ Assert::allString($configuration['directoriesToScan'], 'Directories to scan should be an array of strings');
+ }
+
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ private function validateFilesToShow(array $configuration): void
+ {
+ if (!\array_key_exists('filesToShow', $configuration)) {
+ return;
+ }
+
+ Assert::integer($configuration['filesToShow'], 'Files to show should be an integer');
+ }
+
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ private function validateMinScoreToShow(array $configuration): void
+ {
+ if (!\array_key_exists('minScoreToShow', $configuration)) {
+ return;
+ }
+
+ Assert::numeric($configuration['minScoreToShow'], 'Minimum score to show should be a number');
+ }
+
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ private function validateParallelJobs(array $configuration): void
+ {
+ if (!\array_key_exists('parallelJobs', $configuration)) {
+ return;
+ }
+
+ Assert::integer($configuration['parallelJobs'], 'Amount of parallel jobs should be an integer');
+ }
+
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ private function validateCommitsSince(array $configuration): void
+ {
+ if (!\array_key_exists('commitsSince', $configuration)) {
+ return;
+ }
+
+ Assert::string($configuration['commitsSince'], 'Commits since should be a string');
+ }
+
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ private function validateFilesToIgnore(array $configuration): void
+ {
+ if (!\array_key_exists('filesToIgnore', $configuration)) {
+ return;
+ }
+
+ Assert::isArray($configuration['filesToIgnore'], 'Files to ignore should be an array of strings');
+ }
+
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ private function validateFileExtensions(array $configuration): void
+ {
+ if (!\array_key_exists('fileExtensions', $configuration)) {
+ return;
+ }
+
+ Assert::isArray($configuration['fileExtensions'], 'File extensions should be an array of strings');
+ }
+
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ private function validateVCS(array $configuration): void
+ {
+ if (!\array_key_exists('vcs', $configuration)) {
+ return;
+ }
+
+ Assert::string($configuration['vcs'], 'VCS should be a string');
+ }
+}
|
diff --git a/tests/Integration/Command/RunCommandTest.php b/tests/Integration/Command/RunCommandTest.php
--- a/tests/Integration/Command/RunCommandTest.php
+++ b/tests/Integration/Command/RunCommandTest.php
@@ -39,7 +39,10 @@ protected function tearDown()
/** @test */
public function it_displays_the_logo_at_the_beginning_by_default()
{
- $exitCode = $this->commandTester->execute(['paths' => [realpath(__DIR__ . '/../..')]]);
+ $exitCode = $this->commandTester->execute([
+ 'paths' => [__DIR__],
+ '--parallel' => '1',
+ ]);
$display = $this->commandTester->getDisplay();
$this->assertEquals(0, $exitCode);
@@ -49,7 +52,7 @@ public function it_displays_the_logo_at_the_beginning_by_default()
/** @test */
public function it_can_return_a_json_report()
{
- $exitCode = $this->commandTester->execute(['paths' => [realpath(__DIR__ . '/../..')], '--format' => 'json']);
+ $exitCode = $this->commandTester->execute(['paths' => [__DIR__], '--format' => 'json']);
$data = \json_decode($this->commandTester->getDisplay(), true);
$this->assertEquals(0, $exitCode);
@@ -61,7 +64,7 @@ public function it_can_write_a_json_report()
{
$this->tmpFile = \tempnam(\sys_get_temp_dir(), 'churn-test-');
$exitCode = $this->commandTester->execute([
- 'paths' => [realpath(__DIR__ . '/../..')],
+ 'paths' => [\realpath(__DIR__ . '/../../')],
'--format' => 'json',
'--output' => $this->tmpFile,
]);
@@ -92,7 +95,7 @@ public function it_throws_for_invalid_configuration(): void
{
$this->expectException(InvalidArgumentException::class);
$this->commandTester->execute([
- 'paths' => [realpath(__DIR__ . '/../..')],
+ 'paths' => [__DIR__],
'--configuration' => 'not a valid configuration file',
]);
}
|
Add a --parallel option
This option would override the `parallelJobs` configuration.
By exposing such option it would be easier to use `churn` in conjunction with `nproc`.
Example:
```sh
./churn run src/ --parallel $(nproc)
```
| 2021-01-31T19:46:57
|
php
|
Hard
|
|
bmitch/churn-php
| 303
|
bmitch__churn-php-303
|
[
"187"
] |
1f8075707ec3ba6d706ab992548f64995efb37b0
|
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -69,9 +69,9 @@ docker run --rm -ti -v $PWD:/app dockerizedphp/churn run src
You may add an optional `churn.yml` file which can be used to configure churn-php. The location of the churn.yml file can be customized using these commands:
```
-Default: "churn.yml"
-vendor/bin/churn run -c <path>
-vendor/bin/churn run --configuration[=CONFIGURATION] <path>
+# Default: "churn.yml"
+vendor/bin/churn run --configuration=config-dir/ <path>
+vendor/bin/churn run --configuration=my-config.yml <path>
```
A sample `churn.yml` file looks like:
@@ -108,10 +108,21 @@ fileExtensions:
- php
- inc
+# This list is used only if there is no argument when running churn.
+# Default: <empty>
+directoriesToScan:
+ - src
+ - tests/
+
# The version control system used for your project.
# Accepted values: fossil, git, mercurial, subversion, none
# Default: git
vcs: git
+
+# The path of the cache file. It doesn't need to exist before running churn.
+# Disabled if null.
+# Default: null
+ cachePath: .churn.cache
```
If a `churn.yml` file is omitted or an individual setting is omitted the default values above will be used.
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,7 @@
"php": ">=7.1.3",
"composer/package-versions-deprecated": "^1.11",
"symfony/console": "^3.4 || ^4.0 || ^5.0",
+ "symfony/filesystem": "^3.4 || ^4.0 || ^5.0",
"symfony/process": "^3.4 || ^4.0 || ^5.0",
"symfony/yaml": "^3.4 || ^4.0 || ^5.0",
"webmozart/assert": "^1.2"
diff --git a/src/Command/RunCommand.php b/src/Command/RunCommand.php
--- a/src/Command/RunCommand.php
+++ b/src/Command/RunCommand.php
@@ -8,10 +8,9 @@
use Churn\Configuration\Loader;
use Churn\File\FileFinder;
use Churn\File\FileHelper;
-use Churn\Process\Observer\OnSuccess;
-use Churn\Process\Observer\OnSuccessAccumulate;
-use Churn\Process\Observer\OnSuccessCollection;
-use Churn\Process\Observer\OnSuccessProgress;
+use Churn\Process\CacheProcessFactory;
+use Churn\Process\ConcreteProcessFactory;
+use Churn\Process\Observer\OnSuccessBuilder;
use Churn\Process\ProcessFactory;
use Churn\Process\ProcessHandlerFactory;
use Churn\Result\ResultAccumulator;
@@ -97,7 +96,7 @@ protected function configure(): void
*/
protected function execute(InputInterface $input, OutputInterface $output): int
{
- $this->displayLogo($input, $output);
+ $this->printLogo($input, $output);
$accumulator = $this->analyze($input, $output, $this->getConfiguration($input));
$this->writeResult($input, $output, $accumulator);
@@ -140,14 +139,20 @@ private function getConfiguration(InputInterface $input): Config
*/
private function analyze(InputInterface $input, OutputInterface $output, Config $config): ResultAccumulator
{
+ $observers = [];
+ if (true === $input->getOption('progress')) {
+ $observers[] = $progressBar = new ProgressBar($output);
+ $progressBar->start();
+ }
$filesFinder = (new FileFinder($config->getFileExtensions(), $config->getFilesToIgnore()))
->getPhpFiles($this->getDirectoriesToScan($input, $config));
- $accumulator = new ResultAccumulator($config->getFilesToShow(), $config->getMinScoreToShow());
- $this->processHandlerFactory->getProcessHandler($config)->process(
- $filesFinder,
- new ProcessFactory($config->getVCS(), $config->getCommitsSince()),
- $this->getOnSuccessObserver($input, $output, $accumulator)
- );
+ $observers[] = $accumulator = new ResultAccumulator($config->getFilesToShow(), $config->getMinScoreToShow());
+ $observers[] = $processFactory = $this->getProcessFactory($config);
+ $observer = (new OnSuccessBuilder())->build($observers);
+ $this->processHandlerFactory->getProcessHandler($config)->process($filesFinder, $processFactory, $observer);
+ if ($processFactory instanceof CacheProcessFactory) {
+ $processFactory->writeCache();
+ }
return $accumulator;
}
@@ -172,31 +177,28 @@ private function getDirectoriesToScan(InputInterface $input, Config $config): ar
}
/**
- * @param InputInterface $input Input.
- * @param OutputInterface $output Output.
- * @param ResultAccumulator $accumulator The object accumulating the results.
+ * @param Config $config The configuration object.
*/
- private function getOnSuccessObserver(
- InputInterface $input,
- OutputInterface $output,
- ResultAccumulator $accumulator
- ): OnSuccess {
- $observer = new OnSuccessAccumulate($accumulator);
-
- if (true === $input->getOption('progress')) {
- $progressBar = new ProgressBar($output);
- $progressBar->start();
- $observer = new OnSuccessCollection($observer, new OnSuccessProgress($progressBar));
+ private function getProcessFactory(Config $config): ProcessFactory
+ {
+ $factory = new ConcreteProcessFactory($config->getVCS(), $config->getCommitsSince());
+
+ if (null !== $config->getCachePath()) {
+ $basePath = $config->getPath()
+ ? \dirname($config->getPath())
+ : \getcwd();
+ $path = $config->getCachePath();
+ $factory = new CacheProcessFactory(FileHelper::toAbsolutePath($path, $basePath), $factory);
}
- return $observer;
+ return $factory;
}
/**
* @param InputInterface $input Input.
* @param OutputInterface $output Output.
*/
- private function displayLogo(InputInterface $input, OutputInterface $output): void
+ private function printLogo(InputInterface $input, OutputInterface $output): void
{
if ('text' !== $input->getOption('format') && empty($input->getOption('output'))) {
return;
diff --git a/src/Configuration/Config.php b/src/Configuration/Config.php
--- a/src/Configuration/Config.php
+++ b/src/Configuration/Config.php
@@ -15,6 +15,7 @@ class Config
private const FILES_TO_IGNORE = [];
private const FILE_EXTENSIONS_TO_PARSE = ['php'];
private const VCS = 'git';
+ private const CACHE_PATH = null;
/**
* @var array<string, mixed>
@@ -154,4 +155,12 @@ public function getVCS(): string
{
return $this->configuration['vcs'] ?? self::VCS;
}
+
+ /**
+ * Get the cache file path.
+ */
+ public function getCachePath(): ?string
+ {
+ return $this->configuration['cachePath'] ?? self::CACHE_PATH;
+ }
}
diff --git a/src/Configuration/Validator.php b/src/Configuration/Validator.php
--- a/src/Configuration/Validator.php
+++ b/src/Configuration/Validator.php
@@ -22,6 +22,7 @@ public function validateConfigurationValues(array $configuration): void
$this->validateFilesToIgnore($configuration);
$this->validateFileExtensions($configuration);
$this->validateVCS($configuration);
+ $this->validateCachePath($configuration);
}
/**
@@ -33,6 +34,7 @@ private function validateDirectoriesToScan(array $configuration): void
return;
}
+ Assert::isArray($configuration['directoriesToScan'], 'Directories to scan should be an array of strings');
Assert::allString($configuration['directoriesToScan'], 'Directories to scan should be an array of strings');
}
@@ -94,6 +96,7 @@ private function validateFilesToIgnore(array $configuration): void
}
Assert::isArray($configuration['filesToIgnore'], 'Files to ignore should be an array of strings');
+ Assert::allString($configuration['filesToIgnore'], 'Files to ignore should be an array of strings');
}
/**
@@ -106,6 +109,7 @@ private function validateFileExtensions(array $configuration): void
}
Assert::isArray($configuration['fileExtensions'], 'File extensions should be an array of strings');
+ Assert::allString($configuration['fileExtensions'], 'File extensions should be an array of strings');
}
/**
@@ -119,4 +123,16 @@ private function validateVCS(array $configuration): void
Assert::string($configuration['vcs'], 'VCS should be a string');
}
+
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ private function validateCachePath(array $configuration): void
+ {
+ if (!isset($configuration['cachePath'])) {
+ return;
+ }
+
+ Assert::string($configuration['cachePath'], 'Cache path should be a string');
+ }
}
diff --git a/src/File/FileHelper.php b/src/File/FileHelper.php
--- a/src/File/FileHelper.php
+++ b/src/File/FileHelper.php
@@ -4,6 +4,9 @@
namespace Churn\File;
+use InvalidArgumentException;
+use Symfony\Component\Filesystem\Filesystem;
+
class FileHelper
{
@@ -14,20 +17,35 @@ class FileHelper
*/
public static function toAbsolutePath(string $path, string $basePath): string
{
- $path = \trim($path);
+ return (new Filesystem())->isAbsolutePath($path)
+ ? $path
+ : $basePath . '/' . $path;
+ }
- if (0 === \strpos($path, '/')) {
- return $path;
+ /**
+ * Check whether the path is writable and create the missing folders if needed.
+ *
+ * @param string $filePath The file path to check.
+ * @throws InvalidArgumentException If the path is invalid.
+ */
+ public static function ensureFileIsWritable(string $filePath): void
+ {
+ if ('' === $filePath) {
+ throw new InvalidArgumentException('Path cannot be empty');
}
- if ('\\' === $path[0] || (\strlen($path) >= 3 && \preg_match('#^[A-Z]\:[/\\\]#i', \substr($path, 0, 3)))) {
- return $path;
+ if (\is_dir($filePath)) {
+ throw new InvalidArgumentException('Path cannot be a folder');
}
- if (false !== \strpos($path, '://')) {
- return $path;
+ if (!\is_file($filePath)) {
+ (new Filesystem())->mkdir(\dirname($filePath));
+
+ return;
}
- return $basePath . '/' . $path;
+ if (!\is_writable($filePath)) {
+ throw new InvalidArgumentException('File is not writable');
+ }
}
}
diff --git a/src/Process/CacheProcessFactory.php b/src/Process/CacheProcessFactory.php
new file mode 100644
--- /dev/null
+++ b/src/Process/CacheProcessFactory.php
@@ -0,0 +1,138 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Process;
+
+use Churn\File\File;
+use Churn\File\FileHelper;
+use Churn\Result\Result;
+use InvalidArgumentException;
+use Throwable;
+
+class CacheProcessFactory implements ProcessFactory
+{
+
+ /**
+ * @var string The cache file path.
+ */
+ private $cachePath;
+
+ /**
+ * @var ProcessFactory Inner process factory.
+ */
+ private $processFactory;
+
+ /**
+ * @var array<string, array<mixed>> The cached data.
+ */
+ private $cache;
+
+ /**
+ * @param string $cachePath The cache file path.
+ * @param ProcessFactory $processFactory Inner process factory.
+ * @throws InvalidArgumentException If the path is invalid.
+ */
+ public function __construct(string $cachePath, ProcessFactory $processFactory)
+ {
+ try {
+ FileHelper::ensureFileIsWritable($cachePath);
+ } catch (Throwable $e) {
+ $message = 'Invalid cache file path: ' . $e->getMessage();
+
+ throw new InvalidArgumentException($message, $e->getCode(), $e);
+ }
+
+ $this->cachePath = $cachePath;
+ $this->processFactory = $processFactory;
+ $this->cache = $this->loadCache($cachePath);
+ }
+
+ /**
+ * @param File $file File that the processes will execute on.
+ * @return iterable<ProcessInterface> The list of processes to execute.
+ */
+ public function createProcesses(File $file): iterable
+ {
+ if (!$this->isCached($file)) {
+ return $this->processFactory->createProcesses($file);
+ }
+
+ $key = $file->getFullPath();
+
+ $countChanges = (int) $this->cache[$key][1];
+ $cyclomaticComplexity = (int) $this->cache[$key][2];
+ $this->cache[$key][3] = true;
+
+ return [new PredefinedProcess($file, $countChanges, $cyclomaticComplexity)];
+ }
+
+ /**
+ * @param Result $result The result to save.
+ */
+ public function addToCache(Result $result): void
+ {
+ $path = $result->getFile()->getFullPath();
+ $this->cache[$path][0] = $this->cache[$path][0] ?? \md5_file($path);
+ $this->cache[$path][1] = $result->getCommits();
+ $this->cache[$path][2] = $result->getComplexity();
+ $this->cache[$path][3] = true;
+ }
+
+ /**
+ * Write the cache in its file.
+ */
+ public function writeCache(): void
+ {
+ $data = [];
+
+ foreach ($this->cache as $path => $values) {
+ if (!$values[3]) {
+ continue;
+ }
+
+ unset($values[3]);
+ $data[] = \implode(',', \array_merge([$path], $values));
+ }
+
+ \file_put_contents($this->cachePath, \implode("\n", $data));
+ }
+
+ /**
+ * @param File $file The file to process.
+ */
+ private function isCached(File $file): bool
+ {
+ $key = $file->getFullPath();
+
+ if (!isset($this->cache[$key])) {
+ return false;
+ }
+
+ $md5 = $this->cache[$key][0];
+ $this->cache[$key][0] = $newMd5 = \md5_file($file->getFullPath());
+
+ return $md5 === $newMd5;
+ }
+
+ /**
+ * @param string $cachePath Cache file path.
+ * @return array<string, array<mixed>>
+ */
+ private function loadCache(string $cachePath): array
+ {
+ if (!\is_file($cachePath)) {
+ return [];
+ }
+
+ $cache = [];
+
+ foreach (\file($cachePath) as $row) {
+ $data = \explode(',', $row);
+ $cache[$data[0]] = \array_slice($data, 1);
+ $cache[$data[0]][3] = false;
+ }
+
+ return $cache;
+ }
+}
diff --git a/src/Process/ChurnProcess.php b/src/Process/ChurnProcess.php
--- a/src/Process/ChurnProcess.php
+++ b/src/Process/ChurnProcess.php
@@ -8,7 +8,7 @@
use Symfony\Component\Process\Exception\ProcessFailedException;
use Symfony\Component\Process\Process;
-abstract class ChurnProcess
+abstract class ChurnProcess implements ProcessInterface
{
/**
diff --git a/src/Process/ConcreteProcessFactory.php b/src/Process/ConcreteProcessFactory.php
new file mode 100644
--- /dev/null
+++ b/src/Process/ConcreteProcessFactory.php
@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Process;
+
+use Churn\File\File;
+use Closure;
+use Phar;
+use Symfony\Component\Process\PhpExecutableFinder;
+use Symfony\Component\Process\Process;
+
+class ConcreteProcessFactory implements ProcessFactory
+{
+
+ /**
+ * Builder of objects implementing ChangesCountInterface.
+ *
+ * @var Closure
+ */
+ private $changesCountProcessBuilder;
+
+ /**
+ * Builder of objects implementing CyclomaticComplexityInterface.
+ *
+ * @var Closure
+ */
+ private $cyclomaticComplexityBuilder;
+
+ /**
+ * Class constructor.
+ *
+ * @param string $vcs Name of the version control system.
+ * @param string $commitsSince String containing the date of when to look at commits since.
+ */
+ public function __construct(string $vcs, string $commitsSince)
+ {
+ $this->changesCountProcessBuilder = $this->getChangesCountProcessBuilder($vcs, $commitsSince);
+ $this->cyclomaticComplexityBuilder = $this->getCyclomaticComplexityProcessBuilder();
+ }
+
+ /**
+ * @param File $file File that the processes will execute on.
+ * @return iterable<ProcessInterface> The list of processes to execute.
+ */
+ public function createProcesses(File $file): iterable
+ {
+ $processes = [];
+ $processes[] = ($this->changesCountProcessBuilder)($file);
+ $processes[] = ($this->cyclomaticComplexityBuilder)($file);
+
+ return $processes;
+ }
+
+ /**
+ * @param string $vcs Name of the version control system.
+ * @param string $commitsSince String containing the date of when to look at commits since.
+ * @throws InvalidArgumentException If VCS is not supported.
+ */
+ private function getChangesCountProcessBuilder(string $vcs, string $commitsSince): Closure
+ {
+ return (new ChangesCountProcessBuilder())->getBuilder($vcs, $commitsSince);
+ }
+
+ /**
+ * Returns a cyclomatic complexity builder.
+ */
+ private function getCyclomaticComplexityProcessBuilder(): Closure
+ {
+ $phpExecutable = (string)(new PhpExecutableFinder())->find();
+ $command = \array_merge([$phpExecutable], $this->getAssessorArguments());
+
+ return static function (File $file) use ($command): CyclomaticComplexityInterface {
+ $command[] = $file->getFullPath();
+ $process = new Process($command);
+
+ return new CyclomaticComplexityProcess($file, $process);
+ };
+ }
+
+ /** @return array<string> */
+ private function getAssessorArguments(): array
+ {
+ if (\is_callable([Phar::class, 'running']) && '' !== Phar::running(false)) {
+ return [Phar::running(false), 'assess-complexity'];
+ }
+
+ return [__DIR__ . '/../../bin/CyclomaticComplexityAssessorRunner'];
+ }
+}
diff --git a/src/Process/Handler/BaseProcessHandler.php b/src/Process/Handler/BaseProcessHandler.php
new file mode 100644
--- /dev/null
+++ b/src/Process/Handler/BaseProcessHandler.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Process\Handler;
+
+use Churn\Process\ChangesCountInterface;
+use Churn\Process\CyclomaticComplexityInterface;
+use Churn\Process\ProcessInterface;
+use Churn\Result\Result;
+
+abstract class BaseProcessHandler implements ProcessHandler
+{
+
+ /**
+ * @param ProcessInterface $process A successful process.
+ * @param Result $result The result object to hydrate.
+ */
+ protected function saveResult(ProcessInterface $process, Result $result): Result
+ {
+ if ($process instanceof ChangesCountInterface) {
+ $result->setCommits($process->countChanges());
+ }
+
+ if ($process instanceof CyclomaticComplexityInterface) {
+ $result->setComplexity($process->getCyclomaticComplexity());
+ }
+
+ return $result;
+ }
+}
diff --git a/src/Process/Handler/ParallelProcessHandler.php b/src/Process/Handler/ParallelProcessHandler.php
--- a/src/Process/Handler/ParallelProcessHandler.php
+++ b/src/Process/Handler/ParallelProcessHandler.php
@@ -5,15 +5,13 @@
namespace Churn\Process\Handler;
use Churn\File\File;
-use Churn\Process\ChangesCountInterface;
-use Churn\Process\CyclomaticComplexityInterface;
use Churn\Process\Observer\OnSuccess;
use Churn\Process\ProcessFactory;
use Churn\Process\ProcessInterface;
use Churn\Result\Result;
use Generator;
-class ParallelProcessHandler implements ProcessHandler
+class ParallelProcessHandler extends BaseProcessHandler
{
/**
@@ -88,12 +86,7 @@ private function checkRunningProcesses(array &$pool, OnSuccess $onSuccess): void
*/
private function addToPool(array &$pool, File $file, ProcessFactory $processFactory): void
{
- $processes = [
- $processFactory->createChangesCountProcess($file),
- $processFactory->createCyclomaticComplexityProcess($file),
- ];
-
- foreach ($processes as $i => $process) {
+ foreach ($processFactory->createProcesses($file) as $i => $process) {
$process->start();
$pool["$i:" . $file->getDisplayPath()] = $process;
}
@@ -107,17 +100,9 @@ private function addToPool(array &$pool, File $file, ProcessFactory $processFact
private function getResult(ProcessInterface $process): Result
{
$key = $process->getFile()->getDisplayPath();
- $result = $this->completedProcesses[$key] = $this->completedProcesses[$key] ?? new Result($key);
-
- if ($process instanceof ChangesCountInterface) {
- $result->setCommits($process->countChanges());
- }
-
- if ($process instanceof CyclomaticComplexityInterface) {
- $result->setComplexity($process->getCyclomaticComplexity());
- }
+ $this->completedProcesses[$key] = $this->completedProcesses[$key] ?? new Result($process->getFile());
- return $result;
+ return $this->saveResult($process, $this->completedProcesses[$key]);
}
/**
@@ -130,7 +115,7 @@ private function sendEventIfComplete(Result $result, OnSuccess $onSuccess): void
return;
}
- unset($this->completedProcesses[$result->getFile()]);
+ unset($this->completedProcesses[$result->getFile()->getDisplayPath()]);
$onSuccess($result);
}
}
diff --git a/src/Process/Handler/SequentialProcessHandler.php b/src/Process/Handler/SequentialProcessHandler.php
--- a/src/Process/Handler/SequentialProcessHandler.php
+++ b/src/Process/Handler/SequentialProcessHandler.php
@@ -4,15 +4,13 @@
namespace Churn\Process\Handler;
-use Churn\Process\ChangesCountInterface;
-use Churn\Process\CyclomaticComplexityInterface;
use Churn\Process\Observer\OnSuccess;
use Churn\Process\ProcessFactory;
use Churn\Process\ProcessInterface;
use Churn\Result\Result;
use Generator;
-class SequentialProcessHandler implements ProcessHandler
+class SequentialProcessHandler extends BaseProcessHandler
{
/**
@@ -25,13 +23,9 @@ class SequentialProcessHandler implements ProcessHandler
public function process(Generator $filesFinder, ProcessFactory $processFactory, OnSuccess $onSuccess): void
{
foreach ($filesFinder as $file) {
- $result = new Result($file->getDisplayPath());
- $processes = [
- $processFactory->createChangesCountProcess($file),
- $processFactory->createCyclomaticComplexityProcess($file),
- ];
+ $result = new Result($file);
- foreach ($processes as $process) {
+ foreach ($processFactory->createProcesses($file) as $process) {
$this->executeProcess($process, $result);
}
@@ -45,20 +39,12 @@ public function process(Generator $filesFinder, ProcessFactory $processFactory,
* @param ProcessInterface $process The process to execute.
* @param Result $result The result to complete.
*/
- private function executeProcess(ProcessInterface $process, Result $result): Result
+ private function executeProcess(ProcessInterface $process, Result $result): void
{
$process->start();
while (!$process->isSuccessful());
- if ($process instanceof ChangesCountInterface) {
- $result->setCommits($process->countChanges());
- }
-
- if ($process instanceof CyclomaticComplexityInterface) {
- $result->setComplexity($process->getCyclomaticComplexity());
- }
-
- return $result;
+ $this->saveResult($process, $result);
}
}
diff --git a/src/Process/Observer/OnSuccessBuilder.php b/src/Process/Observer/OnSuccessBuilder.php
new file mode 100644
--- /dev/null
+++ b/src/Process/Observer/OnSuccessBuilder.php
@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Process\Observer;
+
+use Churn\Process\CacheProcessFactory;
+use Churn\Result\ResultAccumulator;
+use Symfony\Component\Console\Helper\ProgressBar;
+
+class OnSuccessBuilder
+{
+
+ /**
+ * @param array<mixed> $objects Objects who need to observe OnSuccess events.
+ */
+ public function build(array $objects): OnSuccess
+ {
+ $observers = [];
+
+ foreach ($objects as $object) {
+ $this->addOnSuccess($object, $observers);
+ $this->addOnSuccessProgress($object, $observers);
+ $this->addOnSuccessAccumulate($object, $observers);
+ $this->addOnSuccessCache($object, $observers);
+ }
+
+ if (1 === \count($observers)) {
+ return $observers[0];
+ }
+
+ return new OnSuccessCollection(...$observers);
+ }
+
+ /**
+ * @param mixed $object Object who needs to observe OnSuccess events.
+ * @param array<OnSuccess> $observers Collection of observers.
+ */
+ private function addOnSuccess($object, array &$observers): void
+ {
+ if (!$object instanceof OnSuccess) {
+ return;
+ }
+
+ $observers[] = $object;
+ }
+
+ /**
+ * @param mixed $object Object who needs to observe OnSuccess events.
+ * @param array<OnSuccess> $observers Collection of observers.
+ */
+ private function addOnSuccessProgress($object, array &$observers): void
+ {
+ if (!$object instanceof ProgressBar) {
+ return;
+ }
+
+ $observers[] = new OnSuccessProgress($object);
+ }
+
+ /**
+ * @param mixed $object Object who needs to observe OnSuccess events.
+ * @param array<OnSuccess> $observers Collection of observers.
+ */
+ private function addOnSuccessAccumulate($object, array &$observers): void
+ {
+ if (!$object instanceof ResultAccumulator) {
+ return;
+ }
+
+ $observers[] = new OnSuccessAccumulate($object);
+ }
+
+ /**
+ * @param mixed $object Object who needs to observe OnSuccess events.
+ * @param array<OnSuccess> $observers Collection of observers.
+ */
+ private function addOnSuccessCache($object, array &$observers): void
+ {
+ if (!$object instanceof CacheProcessFactory) {
+ return;
+ }
+
+ $observers[] = new OnSuccessCache($object);
+ }
+}
diff --git a/src/Process/Observer/OnSuccessCache.php b/src/Process/Observer/OnSuccessCache.php
new file mode 100644
--- /dev/null
+++ b/src/Process/Observer/OnSuccessCache.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Process\Observer;
+
+use Churn\Process\CacheProcessFactory;
+use Churn\Result\Result;
+
+class OnSuccessCache implements OnSuccess
+{
+
+ /**
+ * @var CacheProcessFactory
+ */
+ private $cacheProcessFactory;
+
+ /**
+ * Class constructor.
+ *
+ * @param CacheProcessFactory $cacheProcessFactory The object writing the cache.
+ */
+ public function __construct(CacheProcessFactory $cacheProcessFactory)
+ {
+ $this->cacheProcessFactory = $cacheProcessFactory;
+ }
+
+ /**
+ * Triggers an event when a file is successfully processed.
+ *
+ * @param Result $result The result for a file.
+ */
+ public function __invoke(Result $result): void
+ {
+ $this->cacheProcessFactory->addToCache($result);
+ }
+}
diff --git a/src/Process/PredefinedProcess.php b/src/Process/PredefinedProcess.php
new file mode 100644
--- /dev/null
+++ b/src/Process/PredefinedProcess.php
@@ -0,0 +1,78 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Process;
+
+use Churn\File\File;
+
+class PredefinedProcess implements ChangesCountInterface, CyclomaticComplexityInterface
+{
+
+ /**
+ * @var File
+ */
+ private $file;
+
+ /**
+ * @var integer
+ */
+ private $countChanges;
+
+ /**
+ * @var integer
+ */
+ private $cyclomaticComplexity;
+
+ /**
+ * @param File $file The file the process is being executed on.
+ * @param integer $countChanges The number of changes of the file.
+ * @param integer $cyclomaticComplexity The complexity of the file.
+ */
+ public function __construct(File $file, int $countChanges, int $cyclomaticComplexity)
+ {
+ $this->file = $file;
+ $this->countChanges = $countChanges;
+ $this->cyclomaticComplexity = $cyclomaticComplexity;
+ }
+
+ /**
+ * Start the process.
+ */
+ public function start(): void
+ {
+ // nothing to do
+ }
+
+ /**
+ * Determines if the process was successful.
+ */
+ public function isSuccessful(): bool
+ {
+ return true;
+ }
+
+ /**
+ * Gets the file the process is being executed on.
+ */
+ public function getFile(): File
+ {
+ return $this->file;
+ }
+
+ /**
+ * Returns the number of changes for a file.
+ */
+ public function countChanges(): int
+ {
+ return $this->countChanges;
+ }
+
+ /**
+ * Returns the cyclomatic complexity of a file.
+ */
+ public function getCyclomaticComplexity(): int
+ {
+ return $this->cyclomaticComplexity;
+ }
+}
diff --git a/src/Process/ProcessFactory.php b/src/Process/ProcessFactory.php
--- a/src/Process/ProcessFactory.php
+++ b/src/Process/ProcessFactory.php
@@ -5,93 +5,13 @@
namespace Churn\Process;
use Churn\File\File;
-use Closure;
-use Phar;
-use Symfony\Component\Process\PhpExecutableFinder;
-use Symfony\Component\Process\Process;
-class ProcessFactory
+interface ProcessFactory
{
/**
- * Builder of objects implementing ChangesCountInterface.
- *
- * @var Closure
+ * @param File $file File that the processes will execute on.
+ * @return iterable<ProcessInterface> The list of processes to execute.
*/
- private $changesCountProcessBuilder;
-
- /**
- * Builder of objects implementing CyclomaticComplexityInterface.
- *
- * @var Closure
- */
- private $cyclomaticComplexityBuilder;
-
- /**
- * Class constructor.
- *
- * @param string $vcs Name of the version control system.
- * @param string $commitsSince String containing the date of when to look at commits since.
- */
- public function __construct(string $vcs, string $commitsSince)
- {
- $this->changesCountProcessBuilder = $this->getChangesCountProcessBuilder($vcs, $commitsSince);
- $this->cyclomaticComplexityBuilder = $this->getCyclomaticComplexityProcessBuilder();
- }
-
- /**
- * Creates a process that will count the number of changes for $file.
- *
- * @param File $file File that the process will execute on.
- */
- public function createChangesCountProcess(File $file): ChangesCountInterface
- {
- return ($this->changesCountProcessBuilder)($file);
- }
-
- /**
- * Creates a Cyclomatic Complexity Process that will run on $file.
- *
- * @param File $file File that the process will execute on.
- */
- public function createCyclomaticComplexityProcess(File $file): CyclomaticComplexityInterface
- {
- return ($this->cyclomaticComplexityBuilder)($file);
- }
-
- /**
- * @param string $vcs Name of the version control system.
- * @param string $commitsSince String containing the date of when to look at commits since.
- * @throws InvalidArgumentException If VCS is not supported.
- */
- private function getChangesCountProcessBuilder(string $vcs, string $commitsSince): Closure
- {
- return (new ChangesCountProcessBuilder())->getBuilder($vcs, $commitsSince);
- }
-
- /**
- * Returns a cyclomatic complexity builder.
- */
- private function getCyclomaticComplexityProcessBuilder(): Closure
- {
- $phpExecutable = (string)(new PhpExecutableFinder())->find();
- $command = \array_merge([$phpExecutable], $this->getAssessorArguments());
-
- return static function (File $file) use ($command): CyclomaticComplexityInterface {
- $command[] = $file->getFullPath();
- $process = new Process($command);
-
- return new CyclomaticComplexityProcess($file, $process);
- };
- }
-
- /** @return array<string> */
- private function getAssessorArguments(): array
- {
- if (\is_callable([Phar::class, 'running']) && '' !== Phar::running(false)) {
- return [Phar::running(false), 'assess-complexity'];
- }
-
- return [__DIR__ . '/../../bin/CyclomaticComplexityAssessorRunner'];
- }
+ public function createProcesses(File $file): iterable;
}
diff --git a/src/Result/Result.php b/src/Result/Result.php
--- a/src/Result/Result.php
+++ b/src/Result/Result.php
@@ -4,6 +4,7 @@
namespace Churn\Result;
+use Churn\File\File;
use Webmozart\Assert\Assert;
class Result
@@ -12,7 +13,7 @@ class Result
/**
* The file property.
*
- * @var string
+ * @var File
*/
private $file;
@@ -31,11 +32,9 @@ class Result
private $complexity;
/**
- * Class constructor.
- *
- * @param string $file The path of the processed file.
+ * @param File $file The processed file.
*/
- public function __construct(string $file)
+ public function __construct(File $file)
{
$this->file = $file;
$this->commits = -1;
@@ -43,9 +42,9 @@ public function __construct(string $file)
}
/**
- * Get the file path.
+ * Return the file.
*/
- public function getFile(): string
+ public function getFile(): File
{
return $this->file;
}
diff --git a/src/Result/ResultAccumulator.php b/src/Result/ResultAccumulator.php
--- a/src/Result/ResultAccumulator.php
+++ b/src/Result/ResultAccumulator.php
@@ -106,7 +106,7 @@ public function toArray(): array
}
$rows[] = [
- $result->getFile(),
+ $result->getFile()->getDisplayPath(),
$result->getCommits(),
$result->getComplexity(),
$score,
|
diff --git a/tests/Integration/Command/RunCommandTest.php b/tests/Integration/Command/RunCommandTest.php
--- a/tests/Integration/Command/RunCommandTest.php
+++ b/tests/Integration/Command/RunCommandTest.php
@@ -12,6 +12,9 @@
class RunCommandTest extends BaseTestCase
{
+
+ private const BAR = '0 [>---------------------------]';
+
/** @var CommandTester */
private $commandTester;
@@ -47,6 +50,24 @@ public function it_displays_the_logo_at_the_beginning_by_default()
$this->assertEquals(0, $exitCode);
$this->assertEquals(RunCommand::LOGO, substr($display, 0, strlen(RunCommand::LOGO)));
+ // there is no progress bar by default
+ $this->assertFalse(strpos($display, self::BAR), 'The progress bar shouldn\'t be displayed');
+ }
+
+ /** @test */
+ public function it_can_show_a_progress_bar()
+ {
+ $exitCode = $this->commandTester->execute([
+ 'paths' => [__DIR__],
+ '--progress' => null,
+ ]);
+ $display = $this->commandTester->getDisplay();
+
+ $this->assertEquals(0, $exitCode);
+ $this->assertEquals(RunCommand::LOGO, substr($display, 0, strlen(RunCommand::LOGO)));
+ // the progress bar must be right after the logo
+ $display = ltrim(substr($display, strlen(RunCommand::LOGO)));
+ $this->assertEquals(self::BAR, substr($display, 0, strlen(self::BAR)));
}
/** @test */
@@ -106,4 +127,38 @@ public function it_throws_when_no_directory(): void
$this->expectException(InvalidArgumentException::class);
$this->commandTester->execute(['paths' => []]);
}
+
+ /** @test */
+ public function it_can_use_cache(): void
+ {
+ // delete cache if any
+ $cachePath = $this->tmpFile = __DIR__ . '/config/.churn.cache';
+ if (is_file($cachePath)) {
+ unlink($cachePath);
+ }
+ $this->assertFalse(file_exists($cachePath), "File $cachePath shouldn't exist");
+
+ // generate cache
+ $exitCode = $this->commandTester->execute([
+ 'paths' => [],
+ '-c' => __DIR__ . '/config/test-cache.yml',
+ ]);
+ $displayBeforeCache = $this->commandTester->getDisplay();
+
+ $this->assertEquals(0, $exitCode);
+ $this->assertTrue(file_exists($cachePath), "File $cachePath should exist");
+ $this->assertGreaterThan(0, filesize($cachePath), 'Cache file is empty');
+
+ // use cache
+ $exitCode = $this->commandTester->execute([
+ 'paths' => [],
+ '-c' => __DIR__ . '/config/test-cache.yml',
+ ]);
+ $displayAfterCache = $this->commandTester->getDisplay();
+
+ $this->assertEquals(0, $exitCode);
+ $this->assertEquals($displayBeforeCache, $displayAfterCache);
+ $this->assertTrue(file_exists($cachePath), "File $cachePath should exist");
+ $this->assertGreaterThan(0, filesize($cachePath), 'Cache file is empty');
+ }
}
diff --git a/tests/Integration/Command/config/.gitignore b/tests/Integration/Command/config/.gitignore
new file mode 100644
--- /dev/null
+++ b/tests/Integration/Command/config/.gitignore
@@ -0,0 +1,5 @@
+# Ignore everything, mostly files generated by tests
+*
+# except this file and the configuration files
+!.gitignore
+!*.yml
\ No newline at end of file
diff --git a/tests/Integration/Command/config/test-cache.yml b/tests/Integration/Command/config/test-cache.yml
new file mode 100644
--- /dev/null
+++ b/tests/Integration/Command/config/test-cache.yml
@@ -0,0 +1,3 @@
+directoriesToScan:
+ - "../"
+cachePath: .churn.cache
\ No newline at end of file
diff --git a/tests/Unit/Configuration/ConfigTest.php b/tests/Unit/Configuration/ConfigTest.php
--- a/tests/Unit/Configuration/ConfigTest.php
+++ b/tests/Unit/Configuration/ConfigTest.php
@@ -10,14 +10,33 @@
class ConfigTest extends BaseTestCase
{
- /** @test */
- public function it_throws_exception_if_badly_instantiated()
+ /**
+ * @test
+ * @dataProvider provide_invalid_values
+ */
+ public function it_throws_exception_if_badly_instantiated(array $config, string $expectedMessage)
{
$this->expectException(InvalidArgumentException::class);
- $this->assertInstanceOf(
- Config::class,
- Config::create(['fileExtensions' => 5])
- );
+ $this->expectExceptionMessage($expectedMessage);
+ Config::create($config);
+ }
+
+ public function provide_invalid_values(): iterable
+ {
+ yield [
+ ['fileExtensions' => 5],
+ 'File extensions should be an array of strings'
+ ];
+
+ yield [
+ ['directoriesToScan' => 'not an array'],
+ 'Directories to scan should be an array of strings'
+ ];
+
+ yield [
+ ['directoriesToScan' => ['/tmp', 42]],
+ 'Directories to scan should be an array of strings'
+ ];
}
/** @test */
@@ -38,6 +57,7 @@ public function it_can_return_its_default_values_when_instantiated_without_any_p
$this->assertSame([], $config->getFilesToIgnore());
$this->assertSame(['php'], $config->getFileExtensions());
$this->assertSame('git', $config->getVCS());
+ $this->assertSame(null, $config->getCachePath());
}
/** @test */
@@ -51,6 +71,7 @@ public function it_can_return_its_values_when_instantiated_parameters()
$filesToIgnore = ['foo.php', 'bar.php', 'baz.php'];
$fileExtensions = ['php', 'inc'];
$vcs = 'none';
+ $cachePath = '/tmp/.churn.cache';
$config = Config::create([
'directoriesToScan' => $directoriesToScan,
@@ -61,6 +82,7 @@ public function it_can_return_its_values_when_instantiated_parameters()
'filesToIgnore' => $filesToIgnore,
'fileExtensions' => $fileExtensions,
'vcs' => $vcs,
+ 'cachePath' => $cachePath,
]);
$this->assertSame($directoriesToScan, $config->getDirectoriesToScan());
@@ -71,6 +93,7 @@ public function it_can_return_its_values_when_instantiated_parameters()
$this->assertSame($filesToIgnore, $config->getFilesToIgnore());
$this->assertSame($fileExtensions, $config->getFileExtensions());
$this->assertSame($vcs, $config->getVCS());
+ $this->assertSame($cachePath, $config->getCachePath());
}
/** @test */
diff --git a/tests/Unit/File/FileHelperTest.php b/tests/Unit/File/FileHelperTest.php
--- a/tests/Unit/File/FileHelperTest.php
+++ b/tests/Unit/File/FileHelperTest.php
@@ -27,6 +27,5 @@ public function provide_paths(): iterable
yield ['d:\\foo', '/path', 'd:\\foo'];
yield ['E:/foo', '/path', 'E:/foo'];
yield ['f:/foo', '/path', 'f:/foo'];
- yield ['://foo', '/path', '://foo'];
}
}
diff --git a/tests/Unit/Process/CacheProcessFactoryTest.php b/tests/Unit/Process/CacheProcessFactoryTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Unit/Process/CacheProcessFactoryTest.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Tests\Unit\Process;
+
+use Churn\Process\CacheProcessFactory;
+use Churn\Process\ProcessFactory;
+use Churn\Tests\BaseTestCase;
+use InvalidArgumentException;
+use Mockery as m;
+
+class CacheProcessFactoryTest extends BaseTestCase
+{
+ /**
+ * @test
+ * @dataProvider provide_invalid_paths
+ */
+ public function it_throws_for_invalid_cache_path(string $cachePath): void
+ {
+ $factory = m::mock(ProcessFactory::class);
+ $this->expectException(InvalidArgumentException::class);
+ new CacheProcessFactory($cachePath, $factory);
+ }
+
+ public function provide_invalid_paths(): iterable
+ {
+ yield [''];
+ yield [__DIR__];
+ }
+}
diff --git a/tests/Unit/Process/ConcreteProcessFactoryTest.php b/tests/Unit/Process/ConcreteProcessFactoryTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Unit/Process/ConcreteProcessFactoryTest.php
@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Churn\Tests\Unit\Process;
+
+use Churn\Configuration\Config;
+use Churn\File\File;
+use Churn\Process\ChangesCountInterface;
+use Churn\Process\CyclomaticComplexityInterface;
+use Churn\Process\ConcreteProcessFactory;
+use Churn\Tests\BaseTestCase;
+use InvalidArgumentException;
+
+class ConcreteProcessFactoryTest extends BaseTestCase
+{
+ /**
+ * @var ConcreteProcessFactory
+ */
+ private $processFactory;
+
+ public function setup()
+ {
+ $config = Config::createFromDefaultValues();
+ $this->processFactory = new ConcreteProcessFactory($config->getVCS(), $config->getCommitsSince());
+ }
+
+ /** @test */
+ public function it_can_be_created()
+ {
+ $this->assertInstanceOf(ConcreteProcessFactory::class, $this->processFactory);
+ }
+
+ private function extractChangesCountProcess(iterable $processes): ?ChangesCountInterface
+ {
+ foreach ($processes as $process) {
+ if ($process instanceof ChangesCountInterface) {
+ return $process;
+ }
+ }
+
+ return null;
+ }
+
+ private function extractCyclomaticComplexityProcess(iterable $processes): ?CyclomaticComplexityInterface
+ {
+ foreach ($processes as $process) {
+ if ($process instanceof CyclomaticComplexityInterface) {
+ return $process;
+ }
+ }
+
+ return null;
+ }
+
+ /** @test */
+ public function it_can_create_a_git_commit_count_process()
+ {
+ $file = new File('foo/bar/baz.php', 'bar/baz.php');
+ $process = $this->extractChangesCountProcess($this->processFactory->createProcesses($file));
+ $this->assertInstanceOf(ChangesCountInterface::class, $process);
+ $this->assertSame($file, $process->getFile());
+ }
+
+ /** @test */
+ public function it_can_create_a_cyclomatic_complexity_process()
+ {
+ $file = new File('foo/bar/baz.php', 'bar/baz.php');
+ $process = $this->extractCyclomaticComplexityProcess($this->processFactory->createProcesses($file));
+ $this->assertInstanceOf(CyclomaticComplexityInterface::class, $process);
+ $this->assertSame($file, $process->getFile());
+ }
+
+ /** @test */
+ public function it_throws_exception_if_VCS_is_not_supported()
+ {
+ $config = Config::createFromDefaultValues();
+ $this->expectException(InvalidArgumentException::class);
+ $this->processFactory = new ConcreteProcessFactory('not a valid VCS', $config->getCommitsSince());
+ }
+
+ /** @test */
+ public function it_always_counts_one_when_there_is_no_VCS()
+ {
+ $file = new File('foo/bar/baz.php', 'bar/baz.php');
+ $this->processFactory = new ConcreteProcessFactory('none', '');
+ $process = $this->extractChangesCountProcess($this->processFactory->createProcesses($file));
+ $this->assertSame($file, $process->getFile());
+ $this->assertEquals(1, $process->countChanges());
+ }
+}
diff --git a/tests/Unit/Process/Handler/ParallelProcessHandlerTest.php b/tests/Unit/Process/Handler/ParallelProcessHandlerTest.php
--- a/tests/Unit/Process/Handler/ParallelProcessHandlerTest.php
+++ b/tests/Unit/Process/Handler/ParallelProcessHandlerTest.php
@@ -10,6 +10,7 @@
use Churn\Process\CyclomaticComplexityProcess;
use Churn\Process\Handler\ParallelProcessHandler;
use Churn\Process\Observer\OnSuccess;
+use Churn\Process\ConcreteProcessFactory;
use Churn\Process\ProcessFactory;
use Churn\Tests\BaseTestCase;
use Generator;
@@ -28,7 +29,7 @@ public function it_doesnt_call_the_observer_when_no_file()
{
$processHandler = new ParallelProcessHandler(3);
$config = Config::createFromDefaultValues();
- $processFactory = new ProcessFactory($config->getVCS(), $config->getCommitsSince());
+ $processFactory = new ConcreteProcessFactory($config->getVCS(), $config->getCommitsSince());
$observer = m::mock(OnSuccess::class);
$observer->shouldReceive('__invoke')->never();
@@ -54,8 +55,7 @@ public function it_calls_the_observer_for_one_file()
$process2->shouldReceive('getCyclomaticComplexity')->andReturn(2);
$processFactory = m::mock(ProcessFactory::class);
- $processFactory->shouldReceive('createChangesCountProcess')->andReturn($process1);
- $processFactory->shouldReceive('createCyclomaticComplexityProcess')->andReturn($process2);
+ $processFactory->shouldReceive('createProcesses')->andReturn([$process1, $process2]);
$observer = m::mock(OnSuccess::class);
$observer->shouldReceive('__invoke')->once();
diff --git a/tests/Unit/Process/Handler/SequentialProcessHandlerTest.php b/tests/Unit/Process/Handler/SequentialProcessHandlerTest.php
--- a/tests/Unit/Process/Handler/SequentialProcessHandlerTest.php
+++ b/tests/Unit/Process/Handler/SequentialProcessHandlerTest.php
@@ -36,8 +36,7 @@ public function it_calls_the_observer_for_one_file()
$process2->shouldReceive('getCyclomaticComplexity')->andReturn(2);
$processFactory = m::mock(ProcessFactory::class);
- $processFactory->shouldReceive('createChangesCountProcess')->andReturn($process1);
- $processFactory->shouldReceive('createCyclomaticComplexityProcess')->andReturn($process2);
+ $processFactory->shouldReceive('createProcesses')->andReturn([$process1, $process2]);
$observer = m::mock(OnSuccess::class);
$observer->shouldReceive('__invoke')->once();
diff --git a/tests/Unit/Process/ProcessFactoryTest.php b/tests/Unit/Process/ProcessFactoryTest.php
deleted file mode 100644
--- a/tests/Unit/Process/ProcessFactoryTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Churn\Tests\Unit\Process;
-
-use Churn\Configuration\Config;
-use Churn\File\File;
-use Churn\Process\ChangesCountInterface;
-use Churn\Process\CyclomaticComplexityInterface;
-use Churn\Process\ProcessFactory;
-use Churn\Tests\BaseTestCase;
-use InvalidArgumentException;
-
-class ProcessFactoryTest extends BaseTestCase
-{
- /**
- * @var ProcessFactory
- */
- private $processFactory;
-
- /** @test */
- public function it_can_be_created()
- {
- $this->assertInstanceOf(ProcessFactory::class, $this->processFactory);
- }
-
- /** @test */
- public function it_can_create_a_git_commit_count_process()
- {
- $file = new File('foo/bar/baz.php', 'bar/baz.php');
- $result = $this->processFactory->createChangesCountProcess($file);
- $this->assertInstanceOf(ChangesCountInterface::class, $result);
- $this->assertSame($file, $result->getFile());
- }
-
- /** @test */
- public function it_can_create_a_cyclomatic_complexity_process()
- {
- $file = new File('foo/bar/baz.php', 'bar/baz.php');
- $result = $this->processFactory->createCyclomaticComplexityProcess($file);
- $this->assertInstanceOf(CyclomaticComplexityInterface::class, $result);
- $this->assertSame($file, $result->getFile());
- }
-
- /** @test */
- public function it_throws_exception_if_VCS_is_not_supported()
- {
- $config = Config::createFromDefaultValues();
- $this->expectException(InvalidArgumentException::class);
- $this->processFactory = new ProcessFactory('not a valid VCS', $config->getCommitsSince());
- }
-
- /** @test */
- public function it_always_counts_one_when_there_is_no_VCS()
- {
- $file = new File('foo/bar/baz.php', 'bar/baz.php');
- $this->processFactory = new ProcessFactory('none', '');
- $result = $this->processFactory->createChangesCountProcess($file);
- $this->assertSame($file, $result->getFile());
- $this->assertEquals(1, $result->countChanges());
- }
-
- public function setup()
- {
- $config = Config::createFromDefaultValues();
- $this->processFactory = new ProcessFactory($config->getVCS(), $config->getCommitsSince());
- }
-}
diff --git a/tests/Unit/Process/ProcessHandlerFactoryTest.php b/tests/Unit/Process/ProcessHandlerFactoryTest.php
--- a/tests/Unit/Process/ProcessHandlerFactoryTest.php
+++ b/tests/Unit/Process/ProcessHandlerFactoryTest.php
@@ -21,7 +21,7 @@ public function it_can_be_instantiated()
/**
* @test
- * @dataProvider provideConfigWithCorrespondingProcessHandler
+ * @dataProvider provide_config_with_process_handler
*/
public function it_returns_the_right_process_handler(Config $config, string $expectedClassName)
{
@@ -30,7 +30,7 @@ public function it_returns_the_right_process_handler(Config $config, string $exp
$this->assertEquals($expectedClassName, get_class($processHandler));
}
- public function provideConfigWithCorrespondingProcessHandler(): iterable
+ public function provide_config_with_process_handler(): iterable
{
$config = m::mock(Config::class);
$config->shouldReceive('getParallelJobs')->andReturn(0);
diff --git a/tests/Unit/Result/ResultAccumulatorTest.php b/tests/Unit/Result/ResultAccumulatorTest.php
--- a/tests/Unit/Result/ResultAccumulatorTest.php
+++ b/tests/Unit/Result/ResultAccumulatorTest.php
@@ -4,6 +4,7 @@
namespace Churn\Tests\Result;
+use Churn\File\File;
use Churn\Result\Result;
use Churn\Result\ResultAccumulator;
use Churn\Tests\BaseTestCase;
@@ -17,7 +18,7 @@ private function mockResult(int $commits, int $complexity, string $file, float $
$result->shouldReceive('getCommits')->andReturn($commits);
$result->shouldReceive('getComplexity')->andReturn($complexity);
$result->shouldReceive('getPriority')->andReturn($commits * $complexity);
- $result->shouldReceive('getFile')->andReturn($file);
+ $result->shouldReceive('getFile')->andReturn(new File("/$file", $file));
$result->shouldReceive('getScore')->andReturn($score);
return $result;
diff --git a/tests/Unit/Result/ResultTest.php b/tests/Unit/Result/ResultTest.php
--- a/tests/Unit/Result/ResultTest.php
+++ b/tests/Unit/Result/ResultTest.php
@@ -4,6 +4,7 @@
namespace Churn\Tests\Result;
+use Churn\File\File;
use Churn\Result\Result;
use Churn\Tests\BaseTestCase;
@@ -15,6 +16,13 @@ class ResultTest extends BaseTestCase
*/
protected $result;
+ public function setup()
+ {
+ $this->result = new Result(new File('/filename.php', 'filename.php'));
+ $this->result->setCommits(5);
+ $this->result->setComplexity(7);
+ }
+
/** @test */
public function it_can_be_created()
{
@@ -24,7 +32,7 @@ public function it_can_be_created()
/** @test */
public function it_can_return_the_file()
{
- $this->assertSame('filename.php', $this->result->getFile());
+ $this->assertSame('filename.php', $this->result->getFile()->getDisplayPath());
}
/** @test */
@@ -53,11 +61,4 @@ public function it_can_calculate_the_score()
$this->assertEquals(0.417, $this->result->getScore($maxCommits, $maxComplexity));
}
-
- public function setup()
- {
- $this->result = new Result('filename.php');
- $this->result->setCommits(5);
- $this->result->setComplexity(7);
- }
}
|
Use a cache to speed up calculations
I just started to use this library. I have not looked into the source yet so Im sorry if I ask a weird question.
Would it be possible to use a cache to speed up execution?
What if the cache contained complexity and changes for every file in my project up until yesterday. Then when I do `churn run src` I will only calculate the change set between yesterday and now.
|
Thank you for the suggestion @Nyholm
It does sound like a good idea but a couple of notes:
* I think most people run this during a CI pipeline which probably would not have access to a cache since every run via the pipeline is essentially fresh. However, if you are running this locally over and over then a cache could be helpful.
* If you are looking for a way to increase the performance you could limit how far back in the git history it looks. See https://github.com/bmitch/churn-php#how-to-configure and the `commitsSince`. Perhaps that will solve your issue?
Are you having poor performance using this tool? If so please feel free to open another issue with details. Thanks!
> which probably would not have access to a cache since every run via the pipeline is essentially fresh
I know both Travis and Gitlab's CI can use caching. I mean we just started to use it here #191.
> If you are looking for a way to increase the performance you could limit how far back in the git history it looks.
I tried that. My project takes about 5 minutes to run on my MacBook Pro 2018. Changing the value of `commitsSince` does not effect the execution time. (Only the result). I tried with 3 years and 1 week.
My project is not enormous. It is about 4.000 files with history from 5 years.
--------
Thank you for your reply.
| 2021-02-11T19:33:50
|
php
|
Hard
|
bmitch/churn-php
| 350
|
bmitch__churn-php-350
|
[
"330"
] |
136c1ade9255448249c0bd1064d167bedeb615dd
|
diff --git a/.gitattributes b/.gitattributes
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,6 +10,7 @@ CHANGELOG.md export-ignore
churn.yml export-ignore
CONTRIBUTING.md export-ignore
img/ export-ignore
+infection.json export-ignore
Makefile export-ignore
manifest.xml export-ignore
phpcs.xml export-ignore
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -128,8 +128,8 @@ jobs:
name: coverage
path: ./coverage-${{ matrix.vcs }}.xml
- analysis:
- name: "Static Analysis"
+ coverage:
+ name: "Code coverage"
runs-on: ubuntu-latest
# Run after "test-vcs" to gather all code coverage reports
needs: [test-vcs]
@@ -144,6 +144,57 @@ jobs:
coverage: "pcov"
ini-values: "error_reporting=-1, display_errors=On, display_startup_errors=On, zend.assertions=1"
php-version: "8.0"
+ tools: composer:v2
+
+ - name: Get composer cache directory
+ id: composercache
+ run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+ - name: Cache composer dependencies
+ uses: actions/cache@v2
+ with:
+ path: ${{ steps.composercache.outputs.dir }}
+ key: composer-${{ runner.os }}-8.0-${{ hashFiles('composer.*') }}
+ restore-keys: |
+ composer-${{ runner.os }}-8.0-
+ composer-${{ runner.os }}-
+ composer-
+
+ - name: "Install dependencies"
+ run: "composer update --no-interaction --no-scripts --no-progress --prefer-dist"
+
+ - name: "Calculate code coverage"
+ run: "vendor/bin/simple-phpunit --colors=always --testdox --testsuite churn-tests --coverage-clover=coverage.xml"
+
+ - name: "Download other code coverage reports"
+ uses: actions/download-artifact@v2
+ with:
+ name: coverage
+ path: ./coverage
+
+ - name: "List all coverage reports"
+ run: echo coverage_reports=./coverage/$(ls -m coverage/ | sed "s/, */,.\/coverage\//g") >> $GITHUB_ENV
+
+ - uses: codecov/codecov-action@v1
+ with:
+ files: ./coverage.xml,${{ env.coverage_reports }}
+ fail_ci_if_error: true
+ verbose: true
+
+ analysis:
+ name: "Static Analysis"
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: "Checkout"
+ uses: "actions/checkout@v2"
+
+ - name: "Install PHP"
+ uses: "shivammathur/setup-php@v2"
+ with:
+ coverage: "none"
+ ini-values: "error_reporting=-1, display_errors=On, display_startup_errors=On, zend.assertions=1"
+ php-version: "8.0"
tools: composer:v2, composer-normalize
- name: Get composer cache directory
@@ -187,29 +238,49 @@ jobs:
- name: "Normalize composer.json"
run: "composer-normalize --dry-run --no-check-lock --no-update-lock"
- - name: "Calculate code coverage"
- run: "vendor/bin/simple-phpunit --colors=always --testdox --testsuite churn-tests --coverage-clover=coverage.xml"
+ mutation:
+ name: "Mutation testing"
+ runs-on: ubuntu-latest
- - name: "Download other code coverage reports"
- uses: actions/download-artifact@v2
+ steps:
+ - name: "Checkout"
+ uses: "actions/checkout@v2"
+
+ - name: "Install PHP"
+ uses: "shivammathur/setup-php@v2"
with:
- name: coverage
- path: ./coverage
+ coverage: "pcov"
+ ini-values: "error_reporting=-1, display_errors=On, display_startup_errors=On, zend.assertions=1"
+ php-version: "8.0"
+ tools: composer:v2, infection
- - name: "List all coverage reports"
- run: echo coverage_reports=./coverage/$(ls -m coverage/ | sed "s/, */,.\/coverage\//g") >> $GITHUB_ENV
+ - name: Get composer cache directory
+ id: composercache
+ run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- - uses: codecov/codecov-action@v1
+ - name: Cache composer dependencies
+ uses: actions/cache@v2
with:
- files: ./coverage.xml,${{ env.coverage_reports }}
- fail_ci_if_error: true
- verbose: true
+ path: ${{ steps.composercache.outputs.dir }}
+ key: composer-${{ runner.os }}-8.0-${{ hashFiles('composer.*') }}
+ restore-keys: |
+ composer-${{ runner.os }}-8.0-
+ composer-${{ runner.os }}-
+ composer-
+
+ - name: "Install dependencies"
+ run: "composer update --no-interaction --no-scripts --no-progress --prefer-dist"
+
+ - name: "Run Infection"
+ run: |
+ git fetch --depth=1 origin $GITHUB_BASE_REF
+ infection -j$(nproc) --logger-github --git-diff-filter=AM --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --min-msi=85 --min-covered-msi=95
build:
name: "Build Phar"
runs-on: ubuntu-latest
# Build when everything else is ok
- needs: [tests, analysis]
+ needs: [tests, analysis, coverage, mutation]
steps:
- name: "Checkout"
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
/composer.lock
/coverage.xml
/docs/
+/infection.log
/phpunit.xml
/vendor/
/vendor-bin/**/vendor
diff --git a/bin/CyclomaticComplexityAssessorRunner b/bin/CyclomaticComplexityAssessorRunner
--- a/bin/CyclomaticComplexityAssessorRunner
+++ b/bin/CyclomaticComplexityAssessorRunner
@@ -6,5 +6,11 @@ require_once __DIR__ . '/bootstrap.php';
use Churn\Assessor\CyclomaticComplexityAssessor;
$file = $argv[1];
+$contents = \file_get_contents($file);
+if ($contents === false) {
+ echo 0;
+ return;
+}
+
$assessor = new CyclomaticComplexityAssessor();
-echo $assessor->assess($file);
+echo $assessor->assess($contents);
diff --git a/bin/app.php b/bin/app.php
--- a/bin/app.php
+++ b/bin/app.php
@@ -7,11 +7,11 @@
use Composer\InstalledVersions;
use Symfony\Component\Console\Application;
-$application = new Application('churn-php', (function (string $package): string {
+$application = new Application('churn-php', (static function (string $package): string {
$version = InstalledVersions::getPrettyVersion($package);
$ref = InstalledVersions::getReference($package);
if ($ref) {
- $version .= '@' . \substr($ref, 0, 7);
+ $version .= '@' . substr($ref, 0, 7);
}
return $version;
diff --git a/bin/bootstrap.php b/bin/bootstrap.php
--- a/bin/bootstrap.php
+++ b/bin/bootstrap.php
@@ -1,16 +1,24 @@
<?php
+declare(strict_types=1);
+
error_reporting(E_ALL);
ini_set('display_errors', 'stderr');
-if (is_file($autoload = __DIR__ . '/../vendor/autoload.php')) {
- require_once($autoload);
-} elseif (is_file($autoload = __DIR__ . '/../../../autoload.php')) {
- require_once($autoload);
-} else {
- fwrite(STDERR,
- 'You must set up the project dependencies first. Run the following command:'.PHP_EOL.
- 'composer install'.PHP_EOL
- );
- exit(1);
+foreach (
+ [
+ __DIR__ . '/../vendor/autoload.php',
+ __DIR__ . '/../../../autoload.php',
+ ] as $autoload
+) {
+ if (is_file($autoload)) {
+ return require_once $autoload;
+ }
}
+
+fwrite(
+ STDERR,
+ 'You must set up the project dependencies first. Run the following command:' . PHP_EOL .
+ 'composer install' . PHP_EOL
+);
+exit(1);
diff --git a/infection.json b/infection.json
new file mode 100644
--- /dev/null
+++ b/infection.json
@@ -0,0 +1,15 @@
+{
+ "$schema": "https://raw.githubusercontent.com/infection/infection/0.26.0/resources/schema.json",
+ "source": {
+ "directories": [
+ "src"
+ ]
+ },
+ "logs": {
+ "text": "infection.log"
+ },
+ "mutators": {
+ "@default": true,
+ "@cast": false
+ }
+}
diff --git a/phpcs.xml b/phpcs.xml
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,6 +7,7 @@
<config name="php_version" value="70103"/>
<file>./src</file>
+ <file>./bin</file>
<rule ref="PSR12"/>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+ xsi:noNamespaceSchemaLocation="vendor/bin/.phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
convertDeprecationsToExceptions="true"
@@ -18,11 +18,11 @@
<directory>tests/Unit</directory>
</testsuite>
</testsuites>
- <filter>
- <whitelist>
+ <coverage>
+ <include>
<directory suffix=".php">src</directory>
- </whitelist>
- </filter>
+ </include>
+ </coverage>
<php>
<env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="1" />
</php>
diff --git a/src/Assessor/CyclomaticComplexityAssessor.php b/src/Assessor/CyclomaticComplexityAssessor.php
--- a/src/Assessor/CyclomaticComplexityAssessor.php
+++ b/src/Assessor/CyclomaticComplexityAssessor.php
@@ -14,28 +14,25 @@ class CyclomaticComplexityAssessor
*
* @var integer
*/
- protected $score = 0;
+ private $score = 0;
/**
* Asses the files cyclomatic complexity.
*
- * @param string $filePath Path and file name.
+ * @param string $contents The contents of a PHP file.
*/
- public function assess(string $filePath): int
+ public function assess(string $contents): int
{
$this->score = 0;
- $contents = $this->getFileContents($filePath);
- if (false !== $contents) {
- $this->hasAtLeastOneMethod($contents);
- $this->countTheIfStatements($contents);
- $this->countTheElseIfStatements($contents);
- $this->countTheWhileLoops($contents);
- $this->countTheForLoops($contents);
- $this->countTheCaseStatements($contents);
- $this->countTheTernaryOperators($contents);
- $this->countTheLogicalAnds($contents);
- $this->countTheLogicalOrs($contents);
- }
+ $this->hasAtLeastOneMethod($contents);
+ $this->countTheIfStatements($contents);
+ $this->countTheElseIfStatements($contents);
+ $this->countTheWhileLoops($contents);
+ $this->countTheForLoops($contents);
+ $this->countTheCaseStatements($contents);
+ $this->countTheTernaryOperators($contents);
+ $this->countTheLogicalAnds($contents);
+ $this->countTheLogicalOrs($contents);
if (0 === $this->score) {
$this->score = 1;
@@ -49,7 +46,7 @@ public function assess(string $filePath): int
*
* @param string $contents File contents.
*/
- protected function hasAtLeastOneMethod(string $contents): void
+ private function hasAtLeastOneMethod(string $contents): void
{
\preg_match("/[ ]function[ ]/", $contents, $matches);
@@ -65,7 +62,7 @@ protected function hasAtLeastOneMethod(string $contents): void
*
* @param string $contents File contents.
*/
- protected function countTheIfStatements(string $contents): void
+ private function countTheIfStatements(string $contents): void
{
$this->score += $this->howManyPatternMatches("/[ ]if[ ]{0,}\(/", $contents);
}
@@ -75,7 +72,7 @@ protected function countTheIfStatements(string $contents): void
*
* @param string $contents File contents.
*/
- protected function countTheElseIfStatements(string $contents): void
+ private function countTheElseIfStatements(string $contents): void
{
$this->score += $this->howManyPatternMatches("/else[ ]{0,}if[ ]{0,}\(/", $contents);
}
@@ -85,7 +82,7 @@ protected function countTheElseIfStatements(string $contents): void
*
* @param string $contents File contents.
*/
- protected function countTheWhileLoops(string $contents): void
+ private function countTheWhileLoops(string $contents): void
{
$this->score += $this->howManyPatternMatches("/while[ ]{0,}\(/", $contents);
}
@@ -95,7 +92,7 @@ protected function countTheWhileLoops(string $contents): void
*
* @param string $contents File contents.
*/
- protected function countTheForLoops(string $contents): void
+ private function countTheForLoops(string $contents): void
{
$this->score += $this->howManyPatternMatches("/[ ]for(each){0,1}[ ]{0,}\(/", $contents);
}
@@ -105,7 +102,7 @@ protected function countTheForLoops(string $contents): void
*
* @param string $contents File contents.
*/
- protected function countTheCaseStatements(string $contents): void
+ private function countTheCaseStatements(string $contents): void
{
$this->score += $this->howManyPatternMatches("/[ ]case[ ]{1}(.*)\:/", $contents);
}
@@ -115,7 +112,7 @@ protected function countTheCaseStatements(string $contents): void
*
* @param string $contents File contents.
*/
- protected function countTheTernaryOperators(string $contents): void
+ private function countTheTernaryOperators(string $contents): void
{
$this->score += $this->howManyPatternMatches("/[ ]\?.*:.*;/", $contents);
}
@@ -125,7 +122,7 @@ protected function countTheTernaryOperators(string $contents): void
*
* @param string $contents File contents.
*/
- protected function countTheLogicalAnds(string $contents): void
+ private function countTheLogicalAnds(string $contents): void
{
$this->score += $this->howManyPatternMatches("/[ ]&&[ ]/", $contents);
}
@@ -135,7 +132,7 @@ protected function countTheLogicalAnds(string $contents): void
*
* @param string $contents File contents.
*/
- protected function countTheLogicalOrs(string $contents): void
+ private function countTheLogicalOrs(string $contents): void
{
$this->score += $this->howManyPatternMatches("/[ ]\|\|[ ]/", $contents);
}
@@ -146,19 +143,8 @@ protected function countTheLogicalOrs(string $contents): void
* @param string $pattern Regex pattern.
* @param string $string Any string.
*/
- protected function howManyPatternMatches(string $pattern, string $string): int
+ private function howManyPatternMatches(string $pattern, string $string): int
{
return (int) \preg_match_all($pattern, $string);
}
-
- /**
- * Return the contents of the provided file at $filePath.
- *
- * @param string $filePath Path and filename.
- * @return string|false The file content.
- */
- protected function getFileContents(string $filePath)
- {
- return \file_get_contents($filePath);
- }
}
diff --git a/src/Command/AssessComplexityCommand.php b/src/Command/AssessComplexityCommand.php
--- a/src/Command/AssessComplexityCommand.php
+++ b/src/Command/AssessComplexityCommand.php
@@ -34,8 +34,18 @@ protected function configure(): void
protected function execute(InputInterface $input, OutputInterface $output): int
{
$file = (string) $input->getArgument('file');
+ $contents = \is_file($file)
+ ? \file_get_contents($file)
+ : false;
+
+ if (false === $contents) {
+ $output->writeln('0');
+
+ return 0;
+ }
+
$assessor = new CyclomaticComplexityAssessor();
- $output->writeln((string) $assessor->assess($file));
+ $output->writeln((string) $assessor->assess($contents));
return 0;
}
|
diff --git a/tests/Integration/Command/AssessComplexityCommandTest.php b/tests/Integration/Command/AssessComplexityCommandTest.php
--- a/tests/Integration/Command/AssessComplexityCommandTest.php
+++ b/tests/Integration/Command/AssessComplexityCommandTest.php
@@ -28,7 +28,7 @@ protected function tearDown()
}
/** @test */
- public function it_returns_the_cyclomatic_complexity()
+ public function it_returns_the_cyclomatic_complexity_greater_than_zero()
{
$exitCode = $this->commandTester->execute(['file' => __FILE__]);
$result = \rtrim($this->commandTester->getDisplay());
@@ -37,4 +37,15 @@ public function it_returns_the_cyclomatic_complexity()
$this->assertTrue(\ctype_digit($result), 'The result of the command must be an integer');
$this->assertGreaterThan(0, (int) $result);
}
+
+ /** @test */
+ public function it_returns_zero_for_non_existing_file()
+ {
+ $exitCode = $this->commandTester->execute(['file' => 'nonexisting-file.php']);
+ $result = \rtrim($this->commandTester->getDisplay());
+
+ $this->assertEquals(0, $exitCode);
+ $this->assertTrue(\ctype_digit($result), 'The result of the command must be an integer');
+ $this->assertEquals(0, (int) $result);
+ }
}
diff --git a/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php b/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php
--- a/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php
+++ b/tests/Unit/Assessor/CyclomaticComplexityAssessorTest.php
@@ -9,12 +9,6 @@
class CyclomaticComplexityAssessorTest extends BaseTestCase
{
- /** @test */
- public function the_class_itself_has_a_complexity_of_four()
- {
- $this->assertEquals(4, $this->assess('src/Assessor/CyclomaticComplexityAssessor.php'));
- }
-
/** @test */
public function an_empty_class_should_have_a_complexity_of_one()
{
@@ -90,6 +84,9 @@ public function a_class_with_a_logical_or_should_return_two()
protected function assess($filename)
{
- return (new CyclomaticComplexityAssessor())->assess($filename);
+ $contents = \file_get_contents($filename);
+ assert($contents !== false);
+
+ return (new CyclomaticComplexityAssessor())->assess($contents);
}
}
|
Add mutation testing
The project has a very good code coverage but we don't have metrics about the quality of the tests.
A tool like [Infection](https://infection.github.io/) could help with that.
| 2022-03-03T11:27:30
|
php
|
Hard
|
|
bmitch/churn-php
| 362
|
bmitch__churn-php-362
|
[
"360"
] |
c67da4b5fd43a14228fed588b6e24d82018b8d3c
|
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -31,4 +31,4 @@ jobs:
- name: "Run Infection"
run: |
git fetch --depth=1 origin $GITHUB_BASE_REF
- infection -j$(nproc) --logger-github --git-diff-filter=AM --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --min-msi=76 --min-covered-msi=82
+ infection -j$(nproc) --logger-github --show-mutations --git-diff-filter=AM --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --min-msi=75 --min-covered-msi=80
diff --git a/bin/bootstrap.php b/bin/bootstrap.php
--- a/bin/bootstrap.php
+++ b/bin/bootstrap.php
@@ -4,6 +4,7 @@
error_reporting(E_ALL);
ini_set('display_errors', 'stderr');
+ini_set('log_errors', 'Off');
foreach (
[
diff --git a/infection.json b/infection.json
--- a/infection.json
+++ b/infection.json
@@ -6,7 +6,7 @@
]
},
"logs": {
- "text": "infection.log"
+ "text": "php://stdout"
},
"mutators": {
"@default": true,
diff --git a/src/Configuration/Validator/CommitsSince.php b/src/Configuration/Validator/CommitsSince.php
--- a/src/Configuration/Validator/CommitsSince.php
+++ b/src/Configuration/Validator/CommitsSince.php
@@ -17,7 +17,23 @@ final class CommitsSince extends BaseValidator
*/
public function __construct()
{
- parent::__construct('commitSince');
+ parent::__construct('commitsSince');
+ }
+
+ /**
+ * @param EditableConfig $config The configuration object.
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ public function validate(EditableConfig $config, array $configuration): void
+ {
+ if (!$this->hasConfigurationKey($configuration)) {
+ return;
+ }
+
+ /** @var mixed $value */
+ $value = $configuration[$this->key];
+
+ $this->validateValue($config, $value);
}
/**
@@ -30,4 +46,27 @@ protected function validateValue(EditableConfig $config, $value): void
$config->setCommitsSince($value);
}
+
+ /**
+ * @param array<mixed> $configuration The array containing the configuration values.
+ */
+ private function hasConfigurationKey(array $configuration): bool
+ {
+ if (\array_key_exists($this->key, $configuration)) {
+ return true;
+ }
+
+ if (\array_key_exists('commitSince', $configuration)) {
+ $this->key = 'commitSince';
+ \trigger_error(
+ 'The "commitSince" configuration key is deprecated and won\'t be supported'
+ . ' in the next major version anymore. Use "commitsSince" instead.',
+ \E_USER_DEPRECATED
+ );
+
+ return true;
+ }
+
+ return false;
+ }
}
|
diff --git a/tests/Integration/Command/config/unrecognized-keys.yml b/tests/Integration/Command/config/unrecognized-keys.yml
--- a/tests/Integration/Command/config/unrecognized-keys.yml
+++ b/tests/Integration/Command/config/unrecognized-keys.yml
@@ -1,2 +1,17 @@
foo: ~
-bar: baz
\ No newline at end of file
+bar: baz
+
+# The following keys must not be reported as unrecognized
+filesToShow: 10
+minScoreToShow: 0.1
+maxScoreThreshold: null
+parallelJobs: 10
+commitsSince: One year ago
+filesToIgnore: []
+fileExtensions:
+ - php
+directoriesToScan:
+ - src
+hooks: []
+vcs: git
+cachePath: null
diff --git a/tests/Unit/Configuration/ValidatorTest.php b/tests/Unit/Configuration/ValidatorTest.php
--- a/tests/Unit/Configuration/ValidatorTest.php
+++ b/tests/Unit/Configuration/ValidatorTest.php
@@ -134,4 +134,34 @@ public function provide_validators_with_invalid_value(): iterable
yield 'Vcs / int' => [new Vcs(), 123, 'VCS should be a string'];
yield 'Vcs / null' => [new Vcs(), null, 'VCS should be a string'];
}
+
+ /**
+ * @test
+ */
+ public function it_emits_a_deprecation_warning_for_commit_since(): void
+ {
+ $deprecationMessage = null;
+ set_error_handler(function ($_, $errstr) use (&$deprecationMessage) {
+ $deprecationMessage = $errstr;
+
+ return true;
+ }, \E_USER_DEPRECATED);
+
+ try {
+ $config = new EditableConfig();
+ $validator = new CommitsSince();
+ $validator->validate($config, ['commitSince' => 'one day ago']);
+
+ $this->assertEquals('one day ago', $config->getCommitsSince());
+ $this->assertEquals('commitSince', $validator->getKey());
+ } finally {
+ restore_error_handler();
+ }
+
+ $this->assertEquals(
+ 'The "commitSince" configuration key is deprecated and won\'t be supported'
+ . ' in the next major version anymore. Use "commitsSince" instead.',
+ $deprecationMessage
+ );
+ }
}
|
"commitsSince" not recognized
When I drop in the example config (modified or verbatim) I get the following warning on launch:
```console
Unrecognized configuration keys: commitsSince
```
Fresh install of `church` as `composer require --dev`, both pulled version `1.7.0`. I don't see any other reports of this so far; I will dig through the config code and bit and see if anything is apparent.
|
It is because the configuration string is actual the singular `commitSince`: https://github.com/bmitch/churn-php/blob/fca48716d5b958a3bd87ed80adefdf87e0e63f27/src/Configuration/Validator/CommitsSince.php#L20
The Validator is actually the plural though as well. Need a maintainer to advise, then I can send a PR one way or another.
Thank you for the report!
The right key is `commitsSince`.
This regression exists since `1.6.0` and has been introduced by [1b59a42](https://github.com/bmitch/churn-php/commit/1b59a427afda35f93ca145f7c5afed010f9cbf6a).
In my opinion we should support the 2 spellings just in case some users already use the singular form.
However the usage of `commitSince` must trigger a deprecation message indicating it won't be supported in the next major version.
| 2022-09-17T22:17:48
|
php
|
Hard
|
pusher/pusher-http-php
| 305
|
pusher__pusher-http-php-305
|
[
"302"
] |
8673f60458ceedb9531fad7a5747eb49de619a8a
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
# Changelog
+## 7.0.0
+
+* [DEPRECATED] `get_channel_info`, `get_channels`, `socket_auth`, `presence_auth` in favour of camelCased versions
+* [DEPRECATED] `get_users_info` in favour of `getPresenceUsers`
+* [DEPRECATED] `ensure_valid_signature` in favour of `verifySignature`
+* [CHANGED] Restrict `$app_id` parameter of the `Pusher()` object to `string` (`int` was possible).
+* [ADDED] Return types.
+* [ADDED] Namespacing, PSR-12 formatting.
+
## 6.1.0
* [ADDED] triggerAsync and triggerBatchAsync using the Guzzle async interface.
@@ -14,7 +23,7 @@
* [CHANGED] internal HTTP client to Guzzle
* [ADDED] optional client parameter to constructor
* [CHANGED] useTLS is true by default
-* [REMOVED] from options
+* [REMOVED] `curl_options` from options
* [REMOVED] customer logger
* [REMOVED] host, port and timeout constructor parameters
* [REMOVED] support for PHP 7.1
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -18,15 +18,15 @@ Or add to `composer.json`:
```json
"require": {
- "pusher/pusher-php-server": "^6.1"
+ "pusher/pusher-php-server": "^7.0"
}
```
-and then run `composer update`.
+then run `composer update`.
## Supported platforms
-* PHP - supports PHP versions 7.2, 7.3, 7.4 and 8.0.
+* PHP - supports PHP versions 7.3, 7.4 and 8.0.
* Laravel - version 8.29 and above has built-in support for Pusher Channels as a [Broadcasting backend](https://laravel.com/docs/master/broadcasting).
* Other PHP frameworks - supported provided you are using a supported version of PHP.
@@ -40,7 +40,7 @@ $app_key = 'YOUR_APP_KEY';
$app_secret = 'YOUR_APP_SECRET';
$app_cluster = 'YOUR_APP_CLUSTER';
-$pusher = new Pusher\Pusher( $app_key, $app_secret, $app_id, array('cluster' => $app_cluster) );
+$pusher = new Pusher\Pusher($app_key, $app_secret, $app_id, ['cluster' => $app_cluster]);
```
The fourth parameter is an `$options` array. The additional options are:
@@ -66,7 +66,7 @@ $options = [
'cluster' => $app_cluster,
'useTLS' => false
];
-$pusher = new Pusher\Pusher( $app_key, $app_secret, $app_id, $options );
+$pusher = new Pusher\Pusher($app_key, $app_secret, $app_id, $options);
```
## Logging configuration
@@ -92,12 +92,11 @@ your own Guzzle instance to the Pusher constructor:
$custom_client = new GuzzleHttp\Client();
$pusher = new Pusher\Pusher(
- $app_key,
- $app_secret,
- $app_id,
- array(),
- $custom_client
- )
+ $app_key,
+ $app_secret,
+ $app_id,
+ [],
+ $custom_client
);
```
@@ -111,13 +110,13 @@ To trigger an event on one or more channels use the `trigger` function.
### A single channel
```php
-$pusher->trigger( 'my-channel', 'my_event', 'hello world' );
+$pusher->trigger('my-channel', 'my_event', 'hello world');
```
### Multiple channels
```php
-$pusher->trigger( [ 'channel-1', 'channel-2' ], 'my_event', 'hello world' );
+$pusher->trigger([ 'channel-1', 'channel-2' ], 'my_event', 'hello world');
```
### Batches
@@ -126,9 +125,9 @@ It's also possible to send multiple events with a single API call (max 10
events per call on multi-tenant clusters):
```php
-$batch = array();
-$batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => array('hello' => 'world'));
-$batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => array('myname' => 'bob'));
+$batch = [];
+$batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => ['hello' => 'world']];
+$batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => ['myname' => 'bob']];
$pusher->triggerBatch($batch);
```
@@ -140,9 +139,9 @@ promises](https://github.com/guzzle/promises) which can be chained
with `->then`:
```php
-$promise = $pusher->triggerAsync( [ 'channel-1', 'channel-2' ], 'my_event', 'hello world' );
+$promise = $pusher->triggerAsync(['channel-1', 'channel-2'], 'my_event', 'hello world');
-$promise->then(function ($result) {
+$promise->then(function($result) {
// do something with $result
return $result;
});
@@ -152,7 +151,7 @@ $final_result = $promise->wait();
### Arrays
-Objects are automatically converted to JSON format:
+Arrays are automatically converted to JSON format:
```php
$array['name'] = 'joe';
@@ -174,13 +173,13 @@ socket id](https://pusher.com/docs/channels/server_api/excluding-event-recipient
while triggering an event:
```php
-$pusher->trigger('my-channel', 'event', 'data', array('socket_id' => $socket_id));
+$pusher->trigger('my-channel', 'event', 'data', ['socket_id' => $socket_id]);
```
```php
-$batch = array();
-$batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => array('hello' => 'world'), array('socket_id' => $socket_id));
-$batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => array('myname' => 'bob'), array('socket_id' => $socket_id);
+$batch = [];
+$batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => ['hello' => 'world'], ['socket_id' => $socket_id]];
+$batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => ['myname' => 'bob'], ['socket_id' => $socket_id]];
$pusher->triggerBatch($batch);
```
@@ -191,23 +190,23 @@ published to with the
[`info` param](https://pusher.com/docs/channels/library_auth_reference/rest-api#request):
```php
-$result = $pusher->trigger('my-channel', 'my_event', 'hello world', array('info' => 'subscription_count'));
+$result = $pusher->trigger('my-channel', 'my_event', 'hello world', ['info' => 'subscription_count']);
$subscription_count = $result->channels['my-channel']->subscription_count;
```
```php
-$batch = array();
-$batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => array('hello' => 'world'), 'info' => 'subscription_count');
-$batch[] = array('channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => array('myname' => 'bob'), 'info' => 'user_count,subscription_count');
+$batch = [];
+$batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => ['hello' => 'world'], 'info' => 'subscription_count'];
+$batch[] = ['channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => ['myname' => 'bob'], 'info' => 'user_count,subscription_count'];
$result = $pusher->triggerBatch($batch);
foreach ($result->batch as $i => $attributes) {
echo "channel: {$batch[$i]['channel']}, name: {$batch[$i]['name']}";
if (isset($attributes->subscription_count)) {
- echo ", subscription_count: {$attributes->subscription_count}";
+ echo ", subscription_count: {$attributes->subscription_count}";
}
if (isset($attributes->user_count)) {
- echo ", user_count: {$attributes->user_count}";
+ echo ", user_count: {$attributes->user_count}";
}
echo PHP_EOL;
}
@@ -219,16 +218,16 @@ If your data is already encoded in JSON format, you can avoid a second encoding
step by setting the sixth argument true, like so:
```php
-$pusher->trigger('my-channel', 'event', 'data', array(), true)
+$pusher->trigger('my-channel', 'event', 'data', [], true);
```
## Authenticating Private channels
To authorise your users to access private channels on Pusher, you can use the
-`socket_auth` function:
+`socketAuth` function:
```php
-$pusher->socket_auth('private-my-channel','socket_id');
+$pusher->socketAuth('private-my-channel','socket_id');
```
## Authenticating Presence channels
@@ -237,7 +236,7 @@ Using presence channels is similar to private channels, but you can specify
extra data to identify that particular user:
```php
-$pusher->presence_auth('presence-my-channel','socket_id', 'user_id', 'user_info');
+$pusher->presenceAuth('presence-my-channel','socket_id', 'user_id', 'user_info');
```
## Webhooks
@@ -252,7 +251,7 @@ exception is thrown instead.
```php
$webhook = $pusher->webhook($request_headers, $request_body);
$number_of_events = count($webhook->get_events());
-$time_recieved = $webhook->get_time_ms();
+$time_received = $webhook->get_time_ms();
```
## End to end encryption
@@ -281,14 +280,14 @@ these steps:
```php
$pusher = new Pusher\Pusher(
- $app_key,
- $app_secret,
- $app_id,
- array(
- 'cluster' => $app_cluster,
- 'encryption_master_key_base64' => "<your base64 encoded master key>"
- )
- );
+ $app_key,
+ $app_secret,
+ $app_id,
+ [
+ 'cluster' => $app_cluster,
+ 'encryption_master_key_base64' => "<your base64 encoded master key>"
+ ]
+ );
```
4. Channels where you wish to use end to end encryption should be prefixed with
@@ -309,7 +308,7 @@ call to `trigger`, e.g.
$data['name'] = 'joe';
$data['message_count'] = 23;
-$pusher->trigger(array('channel-1', 'private-encrypted-channel-2'), 'test_event', $data);
+$pusher->trigger(['channel-1', 'private-encrypted-channel-2'], 'test_event', $data);
```
Rationale: the methods in this library map directly to individual Channels HTTP
@@ -322,29 +321,30 @@ is unencrypted for unencrypted channels.
First set this variable in your JS app:
-```php
-Pusher.channel_auth_endpoint = '/presence_auth.php';
+```js
+Pusher.channel_auth_endpoint = '/presenceAuth.php';
```
-Next, create the following in presence_auth.php:
+Next, create the following in presenceAuth.php:
```php
<?php
+
+header('Content-Type: application/json');
+
if (isset($_SESSION['user_id'])) {
$stmt = $pdo->prepare("SELECT * FROM `users` WHERE id = :id");
$stmt->bindValue(':id', $_SESSION['user_id'], PDO::PARAM_INT);
$stmt->execute();
$user = $stmt->fetch();
} else {
- die('aaargh, no-one is logged in');
+ die(json_encode('no-one is logged in'));
}
-header('Content-Type: application/json');
-
$pusher = new Pusher\Pusher($key, $secret, $app_id);
-$presence_data = array('name' => $user['name']);
+$presence_data = ['name' => $user['name']];
-echo $pusher->presence_auth($_POST['channel_name'], $_POST['socket_id'], $user['id'], $presence_data);
+echo $pusher->presenceAuth($_POST['channel_name'], $_POST['socket_id'], $user['id'], $presence_data);
```
Note: this assumes that you store your users in a table called `users` and that
@@ -356,13 +356,13 @@ mechanism that stores the `user_id` of the logged in user in the session.
### Get information about a channel
```php
-$pusher->get_channel_info( $name );
+$pusher->getChannelInfo($name);
```
It's also possible to get information about a channel from the Channels HTTP API.
```php
-$info = $pusher->get_channel_info('channel-name');
+$info = $pusher->getChannelInfo('channel-name');
$channel_occupied = $info->occupied;
```
@@ -371,7 +371,7 @@ query the number of distinct users currently subscribed to this channel (a
single user may be subscribed many times, but will only count as one):
```php
-$info = $pusher->get_channel_info('presence-channel-name', array('info' => 'user_count'));
+$info = $pusher->getChannelInfo('presence-channel-name', ['info' => 'user_count']);
$user_count = $info->user_count;
```
@@ -380,28 +380,28 @@ of connections currently subscribed to this channel) then you can query this
value as follows:
```php
-$info = $pusher->get_channel_info('presence-channel-name', array('info' => 'subscription_count'));
+$info = $pusher->getChannelInfo('presence-channel-name', ['info' => 'subscription_count']);
$subscription_count = $info->subscription_count;
```
### Get a list of application channels
```php
-$pusher->get_channels()
+$pusher->getChannels();
```
It's also possible to get a list of channels for an application from the
Channels HTTP API.
```php
-$result = $pusher->get_channels();
+$result = $pusher->getChannels();
$channel_count = count($result->channels); // $channels is an Array
```
### Get a filtered list of application channels
```php
-$pusher->get_channels( array( 'filter_by_prefix' => 'some_filter' ) )
+$pusher->getChannels(['filter_by_prefix' => 'some_filter']);
```
It's also possible to get a list of channels based on their name prefix. To do
@@ -410,30 +410,31 @@ example the call will return a list of all channels with a `presence-` prefix.
This is idea for fetching a list of all presence channels.
```php
-$results = $pusher->get_channels( array( 'filter_by_prefix' => 'presence-') );
+$results = $pusher->getChannels(['filter_by_prefix' => 'presence-']);
$channel_count = count($result->channels); // $channels is an Array
```
This can also be achieved using the generic `pusher->get` function:
```php
-$pusher->get( '/channels', array( 'filter_by_prefix' => 'presence-' ) );
+$pusher->get('/channels', ['filter_by_prefix' => 'presence-']);
```
### Get a list of application channels with subscription counts
The HTTP API returning the channel list does not support returning the
subscription count along with each channel. Instead, you can fetch this data by
-iterating over each channel and making another request. But be warned: this
+iterating over each channel and making another request. Be warned: this
approach consumes (number of channels + 1) messages!
```php
<?php
-$subscription_counts = array();
-foreach ($pusher->get_channels()->channels as $channel => $v) {
+$subscription_counts = [];
+foreach ($pusher->getChannels()->channels as $channel => $v) {
$subscription_counts[$channel] =
- $pusher->get_channel_info(
- $channel, array('info' => 'subscription_count'))->subscription_count;
+ $pusher->getChannelInfo(
+ $channel, ['info' => 'subscription_count']
+ )->subscription_count;
}
var_dump($subscription_counts);
```
@@ -441,14 +442,14 @@ var_dump($subscription_counts);
### Get user information from a presence channel
```php
-$results = $pusher->get_users_info( 'presence-channel-name' );
+$results = $pusher->getPresenceUsers('presence-channel-name');
$users_count = count($results->users); // $users is an Array
```
This can also be achieved using the generic `pusher->get` function:
```php
-$response = $pusher->get( '/channels/presence-channel-name/users' )
+$response = $pusher->get('/channels/presence-channel-name/users');
```
The `$response` is in the format:
@@ -471,7 +472,7 @@ Array (
### Generic get function
```php
-$pusher->get( $path, $params );
+$pusher->get($path, $params);
```
Used to make `GET` queries against the Channels HTTP API. Handles authentication.
@@ -482,9 +483,9 @@ property to allow the HTTP status code is always present and a `result`
property will be set if the status code indicates a successful call to the API.
```php
-$response = $pusher->get( '/channels' );
-$http_status_code = $response[ 'status' ];
-$result = $response[ 'result' ];
+$response = $pusher->get('/channels');
+$http_status_code = $response['status'];
+$result = $response['result'];
```
## Running the tests
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -4,14 +4,15 @@
"keywords": ["php-pusher-server", "pusher", "rest", "realtime", "real-time", "real time", "messaging", "push", "trigger", "publish", "events"],
"license": "MIT",
"require": {
- "php": "^7.2.5|^8.0",
+ "php": "^7.3|^8.0",
"ext-curl": "*",
+ "ext-json": "*",
"guzzlehttp/guzzle": "^7.2",
"psr/log": "^1.0",
"paragonie/sodium_compat": "^1.6"
},
"require-dev": {
- "phpunit/phpunit": "^7.2|^8.5|^9.3",
+ "phpunit/phpunit": "^8.5|^9.3",
"overtrue/phplint": "^2.3"
},
"autoload": {
diff --git a/src/ApiErrorException.php b/src/ApiErrorException.php
--- a/src/ApiErrorException.php
+++ b/src/ApiErrorException.php
@@ -14,7 +14,7 @@ class ApiErrorException extends PusherException
*
* @return string
*/
- public function __toString()
+ public function __toString(): string
{
return "(Status {$this->getCode()}) {$this->getMessage()}";
}
diff --git a/src/Pusher.php b/src/Pusher.php
--- a/src/Pusher.php
+++ b/src/Pusher.php
@@ -2,6 +2,8 @@
namespace Pusher;
+use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\GuzzleException;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerAwareTrait;
use Psr\Log\LoggerInterface;
@@ -16,7 +18,7 @@ class Pusher implements LoggerAwareInterface, PusherInterface
/**
* @var string Version
*/
- public static $VERSION = '6.1.0';
+ public static $VERSION = '7.0.0';
/**
* @var null|PusherCrypto
@@ -26,12 +28,12 @@ class Pusher implements LoggerAwareInterface, PusherInterface
/**
* @var array Settings
*/
- private $settings = array(
+ private $settings = [
'scheme' => 'http',
'port' => 80,
'path' => '',
'timeout' => 30,
- );
+ ];
/**
* @var null|resource
@@ -43,8 +45,8 @@ class Pusher implements LoggerAwareInterface, PusherInterface
*
* @param string $auth_key
* @param string $secret
- * @param int $app_id
- * @param array $options [optional]
+ * @param string $app_id
+ * @param array $options [optional]
* Options to configure the Pusher instance.
* scheme - e.g. http or https
* host - the host e.g. api-mt1.pusher.com. No trailing forward slash.
@@ -53,11 +55,11 @@ class Pusher implements LoggerAwareInterface, PusherInterface
* useTLS - quick option to use scheme of https and port 443 (default is true).
* cluster - cluster name to connect to.
* encryption_master_key_base64 - a 32 byte key, encoded as base64. This key, along with the channel name, are used to derive per-channel encryption keys. Per-channel keys are used to encrypt event data on encrypted channels.
- * @param client $resource [optional] - a Guzzle client to use for all HTTP requests
+ * @param ClientInterface|null $client [optional] - a Guzzle client to use for all HTTP requests
*
* @throws PusherException Throws exception if any required dependencies are missing
*/
- public function __construct($auth_key, $secret, $app_id, $options = array(), $client = null)
+ public function __construct(string $auth_key, string $secret, string $app_id, array $options = [], ClientInterface $client = null)
{
$this->check_compatibility();
@@ -83,7 +85,7 @@ public function __construct($auth_key, $secret, $app_id, $options = array(), $cl
$this->settings['auth_key'] = $auth_key;
$this->settings['secret'] = $secret;
$this->settings['app_id'] = $app_id;
- $this->settings['base_path'] = '/apps/'.$this->settings['app_id'];
+ $this->settings['base_path'] = '/apps/' . $this->settings['app_id'];
foreach ($options as $key => $value) {
// only set if valid setting/option
@@ -97,7 +99,7 @@ public function __construct($auth_key, $secret, $app_id, $options = array(), $cl
if (array_key_exists('host', $options)) {
$this->settings['host'] = $options['host'];
} elseif (array_key_exists('cluster', $options)) {
- $this->settings['host'] = 'api-'.$options['cluster'].'.pusher.com';
+ $this->settings['host'] = 'api-' . $options['cluster'] . '.pusher.com';
} else {
$this->settings['host'] = 'api-mt1.pusher.com';
}
@@ -110,7 +112,7 @@ public function __construct($auth_key, $secret, $app_id, $options = array(), $cl
$options['encryption_master_key_base64'] = '';
}
- if ($options['encryption_master_key_base64'] != '') {
+ if ($options['encryption_master_key_base64'] !== '') {
$parsedKey = PusherCrypto::parse_master_key(
$options['encryption_master_key_base64']
);
@@ -123,7 +125,7 @@ public function __construct($auth_key, $secret, $app_id, $options = array(), $cl
*
* @return array
*/
- public function getSettings()
+ public function getSettings(): array
{
return $this->settings;
}
@@ -134,10 +136,8 @@ public function getSettings()
* @param string $msg The message to log
* @param array|\Exception $context [optional] Any extraneous information that does not fit well in a string.
* @param string $level [optional] Importance of log message, highly recommended to use Psr\Log\LogLevel::{level}
- *
- * @return void
*/
- private function log($msg, array $context = array(), $level = LogLevel::DEBUG)
+ private function log(string $msg, array $context = [], string $level = LogLevel::DEBUG): void
{
if (is_null($this->logger)) {
return;
@@ -151,29 +151,27 @@ private function log($msg, array $context = array(), $level = LogLevel::DEBUG)
// Support old style logger (deprecated)
$msg = sprintf('Pusher: %s: %s', strtoupper($level), $msg);
- $replacement = array();
+ $replacement = [];
foreach ($context as $k => $v) {
- $replacement['{'.$k.'}'] = $v;
+ $replacement['{' . $k . '}'] = $v;
}
- $this->logger->log(strtr($msg, $replacement));
+ $this->logger->log($level, strtr($msg, $replacement));
}
/**
* Check if the current PHP setup is sufficient to run this class.
*
* @throws PusherException If any required dependencies are missing
- *
- * @return void
*/
- private function check_compatibility()
+ private function check_compatibility(): void
{
if (!extension_loaded('json')) {
throw new PusherException('The Pusher library requires the PHP JSON module. Please ensure it is installed');
}
- if (!in_array('sha256', hash_algos())) {
+ if (!in_array('sha256', hash_algos(), true)) {
throw new PusherException('SHA256 appears to be unsupported - make sure you have support for it, or upgrade your version of PHP.');
}
}
@@ -184,10 +182,8 @@ private function check_compatibility()
* @param string[] $channels An array of channel names to validate
*
* @throws PusherException If $channels is too big or any channel is invalid
- *
- * @return void
*/
- private function validate_channels($channels)
+ private function validate_channels(array $channels): void
{
if (count($channels) > 100) {
throw new PusherException('An event can be triggered on a maximum of 100 channels in a single call.');
@@ -204,13 +200,11 @@ private function validate_channels($channels)
* @param string $channel The channel name to validate
*
* @throws PusherException If $channel is invalid
- *
- * @return void
*/
- private function validate_channel($channel)
+ private function validate_channel(string $channel): void
{
if (!preg_match('/\A[-a-zA-Z0-9_=@,.;]+\z/', $channel)) {
- throw new PusherException('Invalid channel name '.$channel);
+ throw new PusherException('Invalid channel name ' . $channel);
}
}
@@ -221,33 +215,31 @@ private function validate_channel($channel)
*
* @throws PusherException If $socket_id is invalid
*/
- private function validate_socket_id($socket_id)
+ private function validate_socket_id(string $socket_id): void
{
if ($socket_id !== null && !preg_match('/\A\d+\.\d+\z/', $socket_id)) {
- throw new PusherException('Invalid socket ID '.$socket_id);
+ throw new PusherException('Invalid socket ID ' . $socket_id);
}
}
/**
* Utility function used to generate signing headers
*
- * @param string $path
- * @param string [optional] $request_method
- * @param array [optional] $query_params
+ * @param string $path
+ * @param string $request_method
+ * @param array $query_params [optional]
*
* @return array
*/
- private function sign($path, $request_method = 'GET', $query_params = array())
+ private function sign(string $path, string $request_method = 'GET', array $query_params = []): array
{
- $signed_params = self::build_auth_query_params(
+ return self::build_auth_query_params(
$this->settings['auth_key'],
$this->settings['secret'],
$request_method,
$path,
$query_params
);
-
- return $signed_params;
}
/**
@@ -255,9 +247,9 @@ private function sign($path, $request_method = 'GET', $query_params = array())
*
* @return string
*/
- private function channels_url_prefix()
+ private function channels_url_prefix(): string
{
- return $this->settings['scheme'].'://'.$this->settings['host'].':'.$this->settings['port'].$this->settings['path'];
+ return $this->settings['scheme'] . '://' . $this->settings['host'] . ':' . $this->settings['port'] . $this->settings['path'];
}
/**
@@ -267,22 +259,21 @@ private function channels_url_prefix()
* @param string $auth_secret
* @param string $request_method
* @param string $request_path
- * @param array $query_params [optional]
- * @param string $auth_version [optional]
- * @param string $auth_timestamp [optional]
- *
- * @return string
+ * @param array $query_params [optional]
+ * @param string $auth_version [optional]
+ * @param string|null $auth_timestamp [optional]
+ * @return array
*/
public static function build_auth_query_params(
- $auth_key,
- $auth_secret,
- $request_method,
- $request_path,
- $query_params = array(),
- $auth_version = '1.0',
- $auth_timestamp = null
- ) {
- $params = array();
+ string $auth_key,
+ string $auth_secret,
+ string $request_method,
+ string $request_path,
+ array $query_params = [],
+ string $auth_version = '1.0',
+ string $auth_timestamp = null
+ ): array {
+ $params = [];
$params['auth_key'] = $auth_key;
$params['auth_timestamp'] = (is_null($auth_timestamp) ? time() : $auth_timestamp);
$params['auth_version'] = $auth_version;
@@ -290,7 +281,7 @@ public static function build_auth_query_params(
$params = array_merge($params, $query_params);
ksort($params);
- $string_to_sign = "$request_method\n".$request_path."\n".self::array_implode('=', '&', $params);
+ $string_to_sign = "$request_method\n" . $request_path . "\n" . self::array_implode('=', '&', $params);
$auth_signature = hash_hmac('sha256', $string_to_sign, $auth_secret, false);
@@ -310,13 +301,13 @@ public static function build_auth_query_params(
*
* @return string The imploded array
*/
- public static function array_implode($glue, $separator, $array)
+ public static function array_implode(string $glue, string $separator, $array): string
{
if (!is_array($array)) {
return $array;
}
- $string = array();
+ $string = [];
foreach ($array as $key => $val) {
if (is_array($val)) {
$val = implode(',', $val);
@@ -331,21 +322,19 @@ public static function array_implode($glue, $separator, $array)
* Helper function to prepare trigger request. Takes the same
* parameters as the public trigger functions.
*
- * @param array|string $channels A channel name or an array of channel names to publish the event on.
- * @param string $event
- * @param mixed $data Event data
- * @param array $params [optional]
- * @param bool $already_encoded [optional]
- *
- * @throws PusherException Throws PusherException if $channels is an array of size 101 or above or $socket_id is invalid
- * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
- * @throws GuzzleException
+ * @param array|string $channels A channel name or an array of channel names to publish the event on.
+ * @param string $event
+ * @param mixed $data Event data
+ * @param array $params [optional]
+ * @param bool $already_encoded [optional]
*
+ * @return Request
+ * @throws PusherException Throws PusherException if $channels is an array of size 101 or above or $socket_id is invalid
*/
- public function make_request($channels, $event, $data, $params = array(), $already_encoded = false) : Request
+ public function make_request($channels, string $event, $data, array $params = [], bool $already_encoded = false): Request
{
if (is_string($channels) === true) {
- $channels = array($channels);
+ $channels = [$channels];
}
$this->validate_channels($channels);
@@ -366,31 +355,46 @@ public function make_request($channels, $event, $data, $params = array(), $alrea
// For rationale, see limitations of end-to-end encryption in the README
throw new PusherException('You cannot trigger to multiple channels when using encrypted channels');
} else {
- $data_encoded = $this->crypto->encrypt_payload($channels[0], $already_encoded ? $data : json_encode($data));
+ try {
+ $data_encoded = $this->crypto->encrypt_payload(
+ $channels[0],
+ $already_encoded ? $data : json_encode($data, JSON_THROW_ON_ERROR)
+ );
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
}
} else {
- $data_encoded = $already_encoded ? $data : json_encode($data);
+ try {
+ $data_encoded = $already_encoded ? $data : json_encode($data, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
}
- $query_params = array();
+ $query_params = [];
- $path = $this->settings['base_path'].'/events';
+ $path = $this->settings['base_path'] . '/events';
// json_encode might return false on failure
if (!$data_encoded) {
- $this->log('Failed to perform json_encode on the the provided data: {error}', array(
+ $this->log('Failed to perform json_encode on the the provided data: {error}', [
'error' => print_r($data, true),
- ), LogLevel::ERROR);
+ ], LogLevel::ERROR);
}
- $post_params = array();
+ $post_params = [];
$post_params['name'] = $event;
$post_params['data'] = $data_encoded;
$post_params['channels'] = array_values($channels);
$all_params = array_merge($post_params, $params);
- $post_value = json_encode($all_params);
+ try {
+ $post_value = json_encode($all_params, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
$query_params['body_md5'] = md5($post_value);
@@ -400,33 +404,32 @@ public function make_request($channels, $event, $data, $params = array(), $alrea
$headers = [
'Content-Type' => 'application/json',
- 'X-Pusher-Library' => 'pusher-http-php '.self::$VERSION
+ 'X-Pusher-Library' => 'pusher-http-php ' . self::$VERSION
];
$params = array_merge($signature, $query_params);
$query_string = self::array_implode('=', '&', $params);
- $full_path = $path."?".$query_string;
- $request = new Request('POST', $full_path, $headers, $post_value);
-
- return $request;
+ $full_path = $path . "?" . $query_string;
+ return new Request('POST', $full_path, $headers, $post_value);
}
/**
* Trigger an event by providing event name and payload.
* Optionally provide a socket ID to exclude a client (most likely the sender).
*
- * @param array|string $channels A channel name or an array of channel names to publish the event on.
- * @param string $event
- * @param mixed $data Event data
- * @param array $params [optional]
- * @param bool $already_encoded [optional]
+ * @param array|string $channels A channel name or an array of channel names to publish the event on.
+ * @param string $event
+ * @param mixed $data Event data
+ * @param array $params [optional]
+ * @param bool $already_encoded [optional]
*
- * @throws PusherException Throws PusherException if $channels is an array of size 101 or above or $socket_id is invalid
+ * @return object
* @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
* @throws GuzzleException
- *
+ * @throws PusherException Throws PusherException if $channels is an array of size 101 or above or $socket_id is invalid
*/
- public function trigger($channels, $event, $data, $params = array(), $already_encoded = false) : object {
+ public function trigger($channels, string $event, $data, array $params = [], bool $already_encoded = false): object
+ {
$request = $this->make_request($channels, $event, $data, $params, $already_encoded);
$response = $this->client->send($request, [
@@ -441,7 +444,11 @@ public function trigger($channels, $event, $data, $params = array(), $already_en
throw new ApiErrorException($body, $status);
}
- $result = json_decode($response->getBody());
+ try {
+ $result = json_decode($response->getBody(), false, 512, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
if (property_exists($result, 'channels')) {
$result->channels = get_object_vars($result->channels);
@@ -454,14 +461,16 @@ public function trigger($channels, $event, $data, $params = array(), $already_en
* Asynchronously trigger an event by providing event name and payload.
* Optionally provide a socket ID to exclude a client (most likely the sender).
*
- * @param array|string $channels A channel name or an array of channel names to publish the event on.
- * @param string $event
- * @param mixed $data Event data
- * @param array $params [optional]
- * @param bool $already_encoded [optional]
+ * @param array|string $channels A channel name or an array of channel names to publish the event on.
+ * @param string $event
+ * @param mixed $data Event data
+ * @param array $params [optional]
+ * @param bool $already_encoded [optional]
*
+ * @return PromiseInterface
+ * @throws PusherException
*/
- public function triggerAsync($channels, $event, $data, $params = array(), $already_encoded = false) : PromiseInterface
+ public function triggerAsync($channels, string $event, $data, array $params = [], bool $already_encoded = false): PromiseInterface
{
$request = $this->make_request($channels, $event, $data, $params, $already_encoded);
@@ -476,7 +485,7 @@ public function triggerAsync($channels, $event, $data, $params = array(), $alrea
throw new ApiErrorException($body, $status);
}
- $result = json_decode($response->getBody());
+ $result = json_decode($response->getBody(), null, 512, JSON_THROW_ON_ERROR);
if (property_exists($result, 'channels')) {
$result->channels = get_object_vars($result->channels);
@@ -491,13 +500,13 @@ public function triggerAsync($channels, $event, $data, $params = array(), $alrea
/**
* Helper function to prepare batch trigger request. Takes the same * parameters as the public batch trigger functions.
*
- * @param array $batch [optional] An array of events to send
- * @param bool $already_encoded [optional]
+ * @param array $batch [optional] An array of events to send
+ * @param bool $already_encoded [optional]
*
- * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
- *
- **/
- public function make_batch_request($batch = array(), $already_encoded = false) : Request
+ * @return Request
+ * @throws PusherException
+ */
+ public function make_batch_request(array $batch = [], bool $already_encoded = false): Request
{
foreach ($batch as $key => $event) {
$this->validate_channel($event['channel']);
@@ -507,7 +516,11 @@ public function make_batch_request($batch = array(), $already_encoded = false) :
$data = $event['data'];
if (!is_string($data)) {
- $data = $already_encoded ? $data : json_encode($data);
+ try {
+ $data = $already_encoded ? $data : json_encode($data, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
}
if (PusherCrypto::is_encrypted_channel($event['channel'])) {
@@ -517,13 +530,17 @@ public function make_batch_request($batch = array(), $already_encoded = false) :
}
}
- $post_params = array();
+ $post_params = [];
$post_params['batch'] = $batch;
- $post_value = json_encode($post_params);
+ try {
+ $post_value = json_encode($post_params, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
- $query_params = array();
+ $query_params = [];
$query_params['body_md5'] = md5($post_value);
- $path = $this->settings['base_path'].'/batch_events';
+ $path = $this->settings['base_path'] . '/batch_events';
$signature = $this->sign($path, 'POST', $query_params);
@@ -531,28 +548,27 @@ public function make_batch_request($batch = array(), $already_encoded = false) :
$headers = [
'Content-Type' => 'application/json',
- 'X-Pusher-Library' => 'pusher-http-php '.self::$VERSION
+ 'X-Pusher-Library' => 'pusher-http-php ' . self::$VERSION
];
$params = array_merge($signature, $query_params);
$query_string = self::array_implode('=', '&', $params);
- $full_path = $path."?".$query_string;
- $request = new Request('POST', $full_path, $headers, $post_value);
-
- return $request;
+ $full_path = $path . "?" . $query_string;
+ return new Request('POST', $full_path, $headers, $post_value);
}
/**
* Trigger multiple events at the same time.
*
- * @param array $batch [optional] An array of events to send
- * @param bool $already_encoded [optional]
+ * @param array $batch [optional] An array of events to send
+ * @param bool $already_encoded [optional]
*
+ * @return object
* @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
* @throws GuzzleException
- *
+ * @throws PusherException
*/
- public function triggerBatch($batch = array(), $already_encoded = false) : object
+ public function triggerBatch(array $batch = [], bool $already_encoded = false): object
{
$request = $this->make_batch_request($batch, $already_encoded);
@@ -568,7 +584,11 @@ public function triggerBatch($batch = array(), $already_encoded = false) : objec
throw new ApiErrorException($body, $status);
}
- $result = json_decode($response->getBody());
+ try {
+ $result = json_decode($response->getBody(), false, 512, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
if (property_exists($result, 'channels')) {
$result->channels = get_object_vars($result->channels);
@@ -580,13 +600,13 @@ public function triggerBatch($batch = array(), $already_encoded = false) : objec
/**
* Asynchronously trigger multiple events at the same time.
*
- * @param array $batch [optional] An array of events to send
- * @param bool $already_encoded [optional]
- *
- * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
+ * @param array $batch [optional] An array of events to send
+ * @param bool $already_encoded [optional]
*
+ * @return PromiseInterface
+ * @throws PusherException
*/
- public function triggerBatchAsync($batch = array(), $already_encoded = false) : PromiseInterface
+ public function triggerBatchAsync(array $batch = [], bool $already_encoded = false): PromiseInterface
{
$request = $this->make_batch_request($batch, $already_encoded);
@@ -601,7 +621,7 @@ public function triggerBatchAsync($batch = array(), $already_encoded = false) :
throw new ApiErrorException($body, $status);
}
- $result = json_decode($response->getBody());
+ $result = json_decode($response->getBody(), false, 512, JSON_THROW_ON_ERROR);
if (property_exists($result, 'channels')) {
$result->channels = get_object_vars($result->channels);
@@ -611,7 +631,6 @@ public function triggerBatchAsync($batch = array(), $already_encoded = false) :
});
return $promise;
-
}
/**
@@ -625,11 +644,19 @@ public function triggerBatchAsync($batch = array(), $already_encoded = false) :
* @throws GuzzleException
*
*/
- public function get_channel_info($channel, $params = array()) : object
+ public function getChannelInfo(string $channel, array $params = []): object
{
$this->validate_channel($channel);
- return $this->get('/channels/'.$channel, $params);
+ return $this->get('/channels/' . $channel, $params);
+ }
+
+ /**
+ * @deprecated in favour of getChannelInfo
+ */
+ public function get_channel_info(string $channel, array $params = []): object
+ {
+ return $this->getChannelInfo($channel, $params);
}
/**
@@ -641,7 +668,7 @@ public function get_channel_info($channel, $params = array()) : object
* @throws GuzzleException
*
*/
- public function get_channels($params = array()) : object
+ public function getChannels(array $params = []): object
{
$result = $this->get('/channels', $params);
@@ -650,6 +677,14 @@ public function get_channels($params = array()) : object
return $result;
}
+ /**
+ * @deprecated in favour of getChannels
+ */
+ public function get_channels(array $params = []): object
+ {
+ return $this->getChannels($params);
+ }
+
/**
* Fetch user ids currently subscribed to a presence channel.
*
@@ -659,9 +694,17 @@ public function get_channels($params = array()) : object
* @throws GuzzleException
*
*/
- public function get_users_info($channel) : object
+ public function getPresenceUsers(string $channel): object
+ {
+ return $this->get('/channels/' . $channel . '/users');
+ }
+
+ /**
+ * @deprecated in favour of getPresenceUsers
+ */
+ public function get_users_info(string $channel): object
{
- return $this->get('/channels/'.$channel.'/users');
+ return $this->getPresenceUsers($channel);
}
/**
@@ -674,18 +717,19 @@ public function get_users_info($channel) : object
*
* @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
* @throws GuzzleException
+ * @throws PusherException
*
* @return mixed See Pusher API docs
*/
- public function get($path, $params = array(), $associative = false)
+ public function get(string $path, array $params = [], $associative = false)
{
- $path = $this->settings['base_path'].$path;
+ $path = $this->settings['base_path'] . $path;
$signature = $this->sign($path, 'GET', $params);
$headers = [
'Content-Type' => 'application/json',
- 'X-Pusher-Library' => 'pusher-http-php '.self::$VERSION
+ 'X-Pusher-Library' => 'pusher-http-php ' . self::$VERSION
];
$response = $this->client->get($path, [
@@ -702,7 +746,13 @@ public function get($path, $params = array(), $associative = false)
throw new ApiErrorException($body, $status);
}
- return json_decode($response->getBody(), $associative);
+ try {
+ $body = json_decode($response->getBody(), $associative, 512, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data decoding error.');
+ }
+
+ return $body;
}
/**
@@ -710,24 +760,23 @@ public function get($path, $params = array(), $associative = false)
*
* @param string $channel
* @param string $socket_id
- * @param string $custom_data
- *
- * @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
+ * @param string|null $custom_data
*
* @return string Json encoded authentication string.
+ * @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
*/
- public function socket_auth($channel, $socket_id, $custom_data = null) : string
+ public function socketAuth(string $channel, string $socket_id, string $custom_data = null): string
{
$this->validate_channel($channel);
$this->validate_socket_id($socket_id);
if ($custom_data) {
- $signature = hash_hmac('sha256', $socket_id.':'.$channel.':'.$custom_data, $this->settings['secret'], false);
+ $signature = hash_hmac('sha256', $socket_id . ':' . $channel . ':' . $custom_data, $this->settings['secret'], false);
} else {
- $signature = hash_hmac('sha256', $socket_id.':'.$channel, $this->settings['secret'], false);
+ $signature = hash_hmac('sha256', $socket_id . ':' . $channel, $this->settings['secret'], false);
}
- $signature = array('auth' => $this->settings['auth_key'].':'.$signature);
+ $signature = ['auth' => $this->settings['auth_key'] . ':' . $signature];
// add the custom data if it has been supplied
if ($custom_data) {
$signature['channel_data'] = $custom_data;
@@ -741,7 +790,21 @@ public function socket_auth($channel, $socket_id, $custom_data = null) : string
}
}
- return json_encode($signature, JSON_UNESCAPED_SLASHES);
+ try {
+ $response = json_encode($signature, JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
+
+ return $response;
+ }
+
+ /**
+ * @deprecated in favour of socketAuth
+ */
+ public function socket_auth(string $channel, string $socket_id, string $custom_data = null): string
+ {
+ return $this->socketAuth($channel, $socket_id, $custom_data);
}
/**
@@ -750,19 +813,31 @@ public function socket_auth($channel, $socket_id, $custom_data = null) : string
* @param string $channel
* @param string $socket_id
* @param string $user_id
- * @param mixed $user_info
+ * @param mixed $user_info
*
+ * @return string
* @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
- *
*/
- public function presence_auth($channel, $socket_id, $user_id, $user_info = null) : string
+ public function presenceAuth(string $channel, string $socket_id, string $user_id, $user_info = null): string
{
- $user_data = array('user_id' => $user_id);
+ $user_data = ['user_id' => $user_id];
if ($user_info) {
$user_data['user_info'] = $user_info;
}
- return $this->socket_auth($channel, $socket_id, json_encode($user_data));
+ try {
+ return $this->socket_auth($channel, $socket_id, json_encode($user_data, JSON_THROW_ON_ERROR));
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
+ }
+
+ /**
+ * @deprecated in favour of presenceAuth
+ */
+ public function presence_auth(string $channel, string $socket_id, string $user_id, $user_info = null): string
+ {
+ return $this->presence_auth($channel, $socket_id, $user_id, $user_info);
}
/**
@@ -775,33 +850,37 @@ public function presence_auth($channel, $socket_id, $user_id, $user_info = null)
*
* @return Webhook marshalled object with the properties time_ms (an int) and events (an array of event objects)
*/
- public function webhook($headers, $body) : object
+ public function webhook(array $headers, string $body): object
{
$this->ensure_valid_signature($headers, $body);
- $decoded_events = array();
- $decoded_json = json_decode($body);
+ $decoded_events = [];
+ try {
+ $decoded_json = json_decode($body, false, 512, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ $this->log('Unable to decrypt webhook event payload.', null, LogLevel::WARNING);
+ throw new PusherException('Data encoding error.');
+ }
+
foreach ($decoded_json->events as $key => $event) {
if (PusherCrypto::is_encrypted_channel($event->channel)) {
if (!is_null($this->crypto)) {
$decryptedEvent = $this->crypto->decrypt_event($event);
- if ($decryptedEvent == false) {
+ if ($decryptedEvent === false) {
$this->log('Unable to decrypt webhook event payload. Wrong key? Ignoring.', null, LogLevel::WARNING);
continue;
}
- array_push($decoded_events, $decryptedEvent);
+ $decoded_events[] = $decryptedEvent;
} else {
$this->log('Got an encrypted webhook event payload, but no master key specified. Ignoring.', null, LogLevel::WARNING);
continue;
}
} else {
- array_push($decoded_events, $event);
+ $decoded_events[] = $event;
}
}
- $webhookobj = new Webhook($decoded_json->time_ms, $decoded_json->events);
-
- return $webhookobj;
+ return new Webhook($decoded_json->time_ms, $decoded_events);
}
/**
@@ -810,13 +889,13 @@ public function webhook($headers, $body) : object
* @param array $headers an array of headers from the request (for example, from getallheaders())
* @param string $body the body of the request (for example, from file_get_contents('php://input'))
*
- * @throws PusherException if signature is inccorrect.
+ * @throws PusherException if signature is incorrect.
*/
- public function ensure_valid_signature($headers, $body)
+ public function verifySignature(array $headers, string $body): void
{
$x_pusher_key = $headers['X-Pusher-Key'];
$x_pusher_signature = $headers['X-Pusher-Signature'];
- if ($x_pusher_key == $this->settings['auth_key']) {
+ if ($x_pusher_key === $this->settings['auth_key']) {
$expected = hash_hmac('sha256', $body, $this->settings['secret']);
if ($expected === $x_pusher_signature) {
return;
@@ -825,4 +904,12 @@ public function ensure_valid_signature($headers, $body)
throw new PusherException(sprintf('Received WebHook with invalid signature: got %s.', $x_pusher_signature));
}
+
+ /**
+ * @deprecated in favour of verifySignature
+ */
+ public function ensure_valid_signature(array $headers, string $body): void
+ {
+ $this->verifySignature($headers, $body);
+ }
}
diff --git a/src/PusherCrypto.php b/src/PusherCrypto.php
--- a/src/PusherCrypto.php
+++ b/src/PusherCrypto.php
@@ -4,10 +4,10 @@
class PusherCrypto
{
- private $encryption_master_key = '';
+ private $encryption_master_key;
// The prefix any e2e channel must have
- const ENCRYPTED_PREFIX = 'private-encrypted-';
+ public const ENCRYPTED_PREFIX = 'private-encrypted-';
/**
* Checks if a given channel is an encrypted channel.
@@ -16,24 +16,29 @@ class PusherCrypto
*
* @return bool true if channel is an encrypted channel
*/
- public static function is_encrypted_channel($channel)
+ public static function is_encrypted_channel(string $channel): bool
{
- return substr($channel, 0, strlen(self::ENCRYPTED_PREFIX)) === self::ENCRYPTED_PREFIX;
+ return strpos($channel, self::ENCRYPTED_PREFIX) === 0;
}
- public static function parse_master_key($encryption_master_key_base64)
+ /**
+ * @param $encryption_master_key_base64
+ * @return string
+ * @throws PusherException
+ */
+ public static function parse_master_key($encryption_master_key_base64): string
{
if (!function_exists('sodium_crypto_secretbox')) {
throw new PusherException('To use end to end encryption, you must either be using PHP 7.2 or greater or have installed the libsodium-php extension for php < 7.2.');
}
- if ($encryption_master_key_base64 != '') {
+ if ($encryption_master_key_base64 !== '') {
$decoded_key = base64_decode($encryption_master_key_base64, true);
if ($decoded_key === false) {
throw new PusherException('encryption_master_key_base64 must be a valid base64 string');
}
- if (strlen($decoded_key) != SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
+ if (strlen($decoded_key) !== SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
throw new PusherException('encryption_master_key_base64 must encode a key which is 32 bytes long');
}
@@ -48,7 +53,7 @@ public static function parse_master_key($encryption_master_key_base64)
*
* @param string $encryption_master_key the SECRET_KEY_LENGTH key that will be used for key derivation.
*/
- public function __construct($encryption_master_key)
+ public function __construct(string $encryption_master_key)
{
$this->encryption_master_key = $encryption_master_key;
}
@@ -59,11 +64,12 @@ public function __construct($encryption_master_key)
* @param object $event an object that has an encrypted data property and a channel property.
*
* @return object the event with a decrypted payload, or false if decryption was unsuccessful.
+ * @throws PusherException
*/
- public function decrypt_event($event)
+ public function decrypt_event(object $event): object
{
$parsed_payload = $this->parse_encrypted_message($event->data);
- $shared_secret = $this->generate_shared_secret($event->channel, $this->encryption_master_key);
+ $shared_secret = $this->generate_shared_secret($event->channel);
$decrypted_payload = $this->decrypt_payload($parsed_payload->ciphertext, $parsed_payload->nonce, $shared_secret);
if (!$decrypted_payload) {
throw new PusherException('Decryption of the payload failed. Wrong key?');
@@ -79,46 +85,54 @@ public function decrypt_event($event)
* @param string $channel the name of the channel
*
* @return string a SHA256 hash (encoded as base64) of the channel name appended to the encryption key
+ * @throws PusherException
*/
- public function generate_shared_secret($channel)
+ public function generate_shared_secret(string $channel): string
{
if (!self::is_encrypted_channel($channel)) {
- throw new PusherException('You must specify a channel of the form private-encrypted-* for E2E encryption. Got '.$channel);
+ throw new PusherException('You must specify a channel of the form private-encrypted-* for E2E encryption. Got ' . $channel);
}
- return hash('sha256', $channel.$this->encryption_master_key, true);
+ return hash('sha256', $channel . $this->encryption_master_key, true);
}
/**
* Encrypts a given plaintext for broadcast on a particular channel.
*
- * @param string $channel the name of the channel the payloads event will be broadcast on
+ * @param string $channel the name of the channel the payloads event will be broadcast on
* @param string $plaintext the data to encrypt
*
* @return string a string ready to be sent as the data of an event.
+ * @throws PusherException
+ * @throws \SodiumException
*/
- public function encrypt_payload($channel, $plaintext)
+ public function encrypt_payload(string $channel, string $plaintext): string
{
if (!self::is_encrypted_channel($channel)) {
- throw new PusherException('Cannot encrypt plaintext for a channel that is not of the form private-encrypted-*. Got '.$channel);
+ throw new PusherException('Cannot encrypt plaintext for a channel that is not of the form private-encrypted-*. Got ' . $channel);
}
$nonce = $this->generate_nonce();
$shared_secret = $this->generate_shared_secret($channel);
$cipher_text = sodium_crypto_secretbox($plaintext, $nonce, $shared_secret);
- return $this->format_encrypted_message($nonce, $cipher_text);
+ try {
+ return $this->format_encrypted_message($nonce, $cipher_text);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
}
/**
* Decrypts a given payload using the nonce and shared secret.
*
- * @param string $payload the ciphertext
- * @param string $nonce the nonce used in the encryption
+ * @param string $payload the ciphertext
+ * @param string $nonce the nonce used in the encryption
* @param string $shared_secret the shared_secret used in the encryption
*
* @return string plaintext
+ * @throws \SodiumException
*/
- public function decrypt_payload($payload, $nonce, $shared_secret)
+ public function decrypt_payload(string $payload, string $nonce, string $shared_secret)
{
$plaintext = sodium_crypto_secretbox_open($payload, $nonce, $shared_secret);
if (empty($plaintext)) {
@@ -131,18 +145,19 @@ public function decrypt_payload($payload, $nonce, $shared_secret)
/**
* Formats an encrypted message ready for broadcast.
*
- * @param string $nonce the nonce used in the encryption process (bytes)
+ * @param string $nonce the nonce used in the encryption process (bytes)
* @param string $ciphertext the ciphertext (bytes)
*
* @return string JSON with base64 encoded nonce and ciphertext`
+ * @throws \JsonException
*/
- private function format_encrypted_message($nonce, $ciphertext)
+ private function format_encrypted_message(string $nonce, string $ciphertext): string
{
$encrypted_message = new \stdClass();
$encrypted_message->nonce = base64_encode($nonce);
$encrypted_message->ciphertext = base64_encode($ciphertext);
- return json_encode($encrypted_message);
+ return json_encode($encrypted_message, JSON_THROW_ON_ERROR);
}
/**
@@ -151,14 +166,20 @@ private function format_encrypted_message($nonce, $ciphertext)
*
* @param string $payload the encrypted message payload
*
- * @return string php object with decoded nonce and ciphertext
+ * @return object php object with decoded nonce and ciphertext
+ * @throws PusherException
*/
- private function parse_encrypted_message($payload)
+ private function parse_encrypted_message(string $payload): object
{
- $decoded_payload = json_decode($payload);
+ try {
+ $decoded_payload = json_decode($payload, false, 512, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data decoding error.');
+ }
+
$decoded_payload->nonce = base64_decode($decoded_payload->nonce);
$decoded_payload->ciphertext = base64_decode($decoded_payload->ciphertext);
- if (strlen($decoded_payload->nonce) != SODIUM_CRYPTO_SECRETBOX_NONCEBYTES || $decoded_payload->ciphertext == '') {
+ if ($decoded_payload->ciphertext === '' || strlen($decoded_payload->nonce) !== SODIUM_CRYPTO_SECRETBOX_NONCEBYTES) {
throw new PusherException('Received a payload that cannot be parsed.');
}
@@ -167,8 +188,10 @@ private function parse_encrypted_message($payload)
/**
* Generates a nonce that is SODIUM_CRYPTO_SECRETBOX_NONCEBYTES long.
+ * @return string
+ * @throws \Exception
*/
- private function generate_nonce()
+ private function generate_nonce(): string
{
return random_bytes(
SODIUM_CRYPTO_SECRETBOX_NONCEBYTES
diff --git a/src/PusherInstance.php b/src/PusherInstance.php
--- a/src/PusherInstance.php
+++ b/src/PusherInstance.php
@@ -13,6 +13,7 @@ class PusherInstance
* Get the pusher singleton instance.
*
* @return Pusher
+ * @throws PusherException
*/
public static function get_pusher()
{
diff --git a/src/PusherInterface.php b/src/PusherInterface.php
--- a/src/PusherInterface.php
+++ b/src/PusherInterface.php
@@ -1,6 +1,8 @@
<?php
namespace Pusher;
+
+use GuzzleHttp\Exception\GuzzleException;
use GuzzleHttp\Promise\PromiseInterface;
interface PusherInterface
@@ -19,7 +21,7 @@ public function getSettings();
* @param array|string $channels A channel name or an array of channel names to publish the event on.
* @param string $event
* @param mixed $data Event data
- * @param string|null $socket_id [optional]
+ * @param array $params [optional]
* @param bool $already_encoded [optional]
*
* @throws PusherException Throws exception if $channels is an array of size 101 or above or $socket_id is invalid
@@ -27,23 +29,22 @@ public function getSettings();
* @throws GuzzleException
*
*/
- public function trigger($channels, $event, $data, $socket_id = null, $already_encoded = false) : object;
+ public function trigger($channels, string $event, $data, array $params = [], bool $already_encoded = false): object;
/**
* Asynchronously trigger an event by providing event name and payload.
* Optionally provide a socket ID to exclude a client (most likely the sender).
*
* @param array|string $channels A channel name or an array of channel names to publish the event on.
- * @param string $event
* @param mixed $data Event data
* @param array $params [optional]
* @param bool $already_encoded [optional]
*
*/
- public function triggerAsync($channels, $event, $data, $params = array(), $already_encoded = false) : PromiseInterface;
-
+ public function triggerAsync($channels, string $event, $data, array $params = [], bool $already_encoded = false): PromiseInterface;
+
/**
- *
+ * Trigger multiple events at the same time.
*
* @param array $batch [optional] An array of events to send
* @param bool $already_encoded [optional]
@@ -53,10 +54,10 @@ public function triggerAsync($channels, $event, $data, $params = array(), $alrea
* @throws GuzzleException
*
*/
- public function triggerBatch($batch = array(), $already_encoded = false) : object;
+ public function triggerBatch(array $batch = [], bool $already_encoded = false): object;
/**
- * Trigger multiple events at the same time.
+ * Asynchronously trigger multiple events at the same time.
*
* @param array $batch [optional] An array of events to send
* @param bool $already_encoded [optional]
@@ -65,10 +66,10 @@ public function triggerBatch($batch = array(), $already_encoded = false) : objec
* @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
*
*/
- public function triggerBatchAsync($batch = array(), $already_encoded = false) : PromiseInterface;
+ public function triggerBatchAsync(array $batch = [], bool $already_encoded = false): PromiseInterface;
/**
- * Asynchronously trigger multiple events at the same time.
+ * Get information, such as subscriber and user count, for a channel.
*
* @param string $channel The name of the channel
* @param array $params Additional parameters for the query e.g. $params = array( 'info' => 'connection_count' )
@@ -78,7 +79,7 @@ public function triggerBatchAsync($batch = array(), $already_encoded = false) :
* @throws GuzzleException
*
*/
- public function get_channel_info($channel, $params = array()) : object;
+ public function getChannelInfo(string $channel, array $params = []): object;
/**
* Fetch a list containing all channels.
@@ -90,7 +91,7 @@ public function get_channel_info($channel, $params = array()) : object;
* @throws GuzzleException
*
*/
- public function get_channels($params = array()) : object;
+ public function getChannels(array $params = []): object;
/**
* Fetch user ids currently subscribed to a presence channel.
@@ -102,7 +103,7 @@ public function get_channels($params = array()) : object;
* @throws GuzzleException
*
*/
- public function get_users_info($channel) : object;
+ public function getPresenceUsers(string $channel): object;
/**
* GET arbitrary REST API resource using a synchronous http client.
@@ -118,33 +119,28 @@ public function get_users_info($channel) : object;
*
* @return mixed See Pusher API docs
*/
- public function get($path, $params = array());
+ public function get(string $path, array $params = [], bool $associative = false);
/**
* Creates a socket signature.
*
* @param string $channel
* @param string $socket_id
- * @param string $custom_data
- *
- * @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
- *
+ * @param string|null $custom_data
* @return string Json encoded authentication string.
+ * @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
*/
- public function socket_auth($channel, $socket_id, $custom_data = null) : string;
+ public function socketAuth(string $channel, string $socket_id, string $custom_data = null): string;
/**
* Creates a presence signature (an extension of socket signing).
*
- * @param string $channel
- * @param string $socket_id
- * @param string $user_id
* @param mixed $user_info
*
* @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
*
*/
- public function presence_auth($channel, $socket_id, $user_id, $user_info = null) : string;
+ public function presenceAuth(string $channel, string $socket_id, string $user_id, $user_info = null): string;
/**
* Verify that a webhook actually came from Pusher, decrypts any
@@ -157,15 +153,105 @@ public function presence_auth($channel, $socket_id, $user_id, $user_info = null)
*
* @return Webhook marshalled object with the properties time_ms (an int) and events (an array of event objects)
*/
- public function webhook($headers, $body) : object;
+ public function webhook(array $headers, string $body): object;
+
+ /**
+ * Verify that a given Pusher Signature is valid.
+ *
+ * @param array $headers an array of headers from the request (for example, from getallheaders())
+ * @param string $body the body of the request (for example, from file_get_contents('php://input'))
+ *
+ * @throws PusherException if signature is incorrect.
+ */
+ public function verifySignature(array $headers, string $body);
+
+
+ /*******************************************************************
+ *
+ * DEPRECATION WARNING:
+ *
+ * all the functions below have been deprecated in favour of their
+ * camelCased variants. They will be removed in the next major
+ * update.
+ */
+
+ /**
+ * Get information, such as subscriber and user count, for a channel.
+ *
+ * @deprecated in favour of getChannelInfo
+ *
+ * @param string $channel The name of the channel
+ * @param array $params Additional parameters for the query e.g. $params = array( 'info' => 'connection_count' )
+ *
+ * @throws PusherException If $channel is invalid or if curl wasn't initialized correctly
+ * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
+ * @throws GuzzleException
+ *
+ */
+ public function get_channel_info(string $channel, array $params = []): object;
+
+ /**
+ * Fetch a list containing all channels.
+ *
+ * @deprecated in favour of getChannels
+ *
+ * @param array $params Additional parameters for the query e.g. $params = array( 'info' => 'connection_count' )
+ *
+ * @throws PusherException Throws exception if curl wasn't initialized correctly
+ * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
+ * @throws GuzzleException
+ *
+ */
+ public function get_channels(array $params = []): object;
+
+ /**
+ * Fetch user ids currently subscribed to a presence channel.
+ *
+ * @deprecated in favour of getPresenceUsers
+ *
+ * @param string $channel The name of the channel
+ *
+ * @throws PusherException Throws exception if curl wasn't initialized correctly
+ * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
+ * @throws GuzzleException
+ *
+ */
+ public function get_users_info(string $channel): object;
+
+ /**
+ * Creates a socket signature.
+ *
+ * @deprecated in favour of socketAuth
+ *
+ * @param string $channel
+ * @param string $socket_id
+ * @param string|null $custom_data
+ * @return string Json encoded authentication string.
+ * @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
+ */
+ public function socket_auth(string $channel, string $socket_id, string $custom_data = null): string;
+
+ /**
+ * Creates a presence signature (an extension of socket signing).
+ *
+ * @deprecated in favour of presenceAuth
+ *
+ * @param mixed $user_info
+ *
+ * @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
+ *
+ */
+ public function presence_auth(string $channel, string $socket_id, string $user_id, $user_info = null): string;
/**
* Verify that a given Pusher Signature is valid.
*
+ * @deprecated in favour of verifySignature
+ *
* @param array $headers an array of headers from the request (for example, from getallheaders())
* @param string $body the body of the request (for example, from file_get_contents('php://input'))
*
- * @throws PusherException if signature is inccorrect.
+ * @throws PusherException if signature is incorrect.
*/
- public function ensure_valid_signature($headers, $body);
+ public function ensure_valid_signature(array $headers, string $body);
}
diff --git a/src/Webhook.php b/src/Webhook.php
--- a/src/Webhook.php
+++ b/src/Webhook.php
@@ -4,8 +4,10 @@
class Webhook
{
+ /** @var int $time_ms */
private $time_ms;
- private $events = array();
+ /** @var array $events */
+ private $events;
public function __construct($time_ms, $events)
{
@@ -13,12 +15,12 @@ public function __construct($time_ms, $events)
$this->events = $events;
}
- public function get_events()
+ public function get_events(): array
{
return $this->events;
}
- public function get_time_ms()
+ public function get_time_ms(): int
{
return $this->time_ms;
}
|
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: [7.2, 7.3, 7.4, 8.0]
+ php: [7.3, 7.4, 8.0]
stability: [prefer-lowest, prefer-stable]
name: PHP ${{ matrix.php }} - ${{ matrix.stability }} Test
@@ -42,5 +42,5 @@ jobs:
PUSHERAPP_APPID: ${{ secrets.CI_APP_ID }}
PUSHERAPP_AUTHKEY: ${{ secrets.CI_APP_KEY }}
PUSHERAPP_SECRET: ${{ secrets.CI_APP_SECRET }}
- PUSHERAPP_HOST: http://api-${{ secrets.CI_APP_CLUSTER }}.pusher.com
+ PUSHERAPP_CLUSTER: ${{ secrets.CI_APP_CLUSTER }}
run: composer exec phpunit tests/acceptance
diff --git a/tests/acceptance/ChannelQueryTest.php b/tests/acceptance/ChannelQueryTest.php
--- a/tests/acceptance/ChannelQueryTest.php
+++ b/tests/acceptance/ChannelQueryTest.php
@@ -1,100 +1,119 @@
<?php
-class ChannelQueryTest extends PHPUnit\Framework\TestCase
+namespace acceptance;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+
+class ChannelQueryTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
+ self::markTestSkipped('Please set the
+ PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
+ PUSHERAPP_APPID keys.');
+ } else {
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER]);
+ }
}
- public function testChannelInfo()
+ public function testChannelInfo(): void
{
$result = $this->pusher->get_channel_info('channel-test');
- $this->assertObjectHasAttribute('occupied', $result, 'class has occupied attribute');
+ self::assertObjectHasAttribute('occupied', $result, 'class has occupied attribute');
}
- public function testChannelList()
+ public function testChannelList(): void
{
$result = $this->pusher->get_channels();
$channels = $result->channels;
- $this->assertTrue(is_array($channels), 'channels is an array');
+ self::assertIsArray($channels, 'channels is an array');
}
- public function testFilterByPrefixNoChannels()
+ public function testFilterByPrefixNoChannels(): void
{
- $options = array(
+ $options = [
'filter_by_prefix' => '__fish',
- );
+ ];
$result = $this->pusher->get_channels($options);
$channels = $result->channels;
- $this->assertTrue(is_array($channels), 'channels is an array');
- $this->assertEquals(0, count($channels), 'should be an empty array');
+ self::assertIsArray($channels, 'channels is an array');
+ self::assertCount(0, $channels, 'should be an empty array');
}
- public function testFilterByPrefixOneChannel()
+ public function testFilterByPrefixOneChannel(): void
{
- $options = array(
+ $options = [
'filter_by_prefix' => 'my-',
- );
+ ];
$result = $this->pusher->get_channels($options);
$channels = $result->channels;
- $this->assertEquals(1, count($channels), 'channels have a single test-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
+ $this->assertCount(1, $channels,
+ 'channels have a single test-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
}
- public function testUsersInfo()
+ public function testUsersInfo(): void
{
$result = $this->pusher->get_users_info('presence-channel-test');
$this->assertObjectHasAttribute('users', $result, 'class has users attribute');
}
- public function testProvidingInfoParameterWithPrefixQueryFailsForPublicChannel()
+ public function testProvidingInfoParameterWithPrefixQueryFailsForPublicChannel(): void
{
$this->expectException(\Pusher\ApiErrorException::class);
- $options = array(
+ $options = [
'filter_by_prefix' => 'test_',
'info' => 'user_count',
- );
+ ];
$result = $this->pusher->get_channels($options);
}
- public function testChannelListUsingGenericGet()
+ public function testChannelListUsingGenericGet(): void
{
- $result = $this->pusher->get('/channels', array(), true);
+ $result = $this->pusher->get('/channels', [], true);
$channels = $result['channels'];
- $this->assertEquals(1, count($channels), 'channels have a single my-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
+ self::assertCount(1, $channels,
+ 'channels have a single my-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
$my_channel = $channels['my-channel'];
- $this->assertEquals(0, count($my_channel));
+ self::assertCount(0, $my_channel);
}
- public function testChannelListUsingGenericGetAndPrefixParam()
+ public function testChannelListUsingGenericGetAndPrefixParam(): void
{
- $result = $this->pusher->get('/channels', array('filter_by_prefix' => 'my-'), true);
+ $result = $this->pusher->get('/channels', ['filter_by_prefix' => 'my-'], true);
$channels = $result['channels'];
- $this->assertEquals(1, count($channels), 'channels have a single my-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
+ self::assertCount(1, $channels,
+ 'channels have a single my-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
$my_channel = $channels['my-channel'];
- $this->assertEquals(0, count($my_channel));
+ self::assertCount(0, $my_channel);
}
- public function testSingleChannelInfoUsingGenericGet()
+ public function testSingleChannelInfoUsingGenericGet(): void
{
$result = $this->pusher->get('/channels/channel-test');
- $this->assertObjectHasAttribute('occupied', $result, 'class has occupied attribute');
+ self::assertObjectHasAttribute('occupied', $result, 'class has occupied attribute');
}
}
diff --git a/tests/acceptance/MiddlewareTest.php b/tests/acceptance/MiddlewareTest.php
--- a/tests/acceptance/MiddlewareTest.php
+++ b/tests/acceptance/MiddlewareTest.php
@@ -1,14 +1,24 @@
<?php
+namespace acceptance;
+
+use Closure;
use GuzzleHttp\Client;
use GuzzleHttp\HandlerStack;
use GuzzleHttp\Handler\CurlHandler;
+use PHPUnit\Framework\TestCase;
use Psr\Http\Message\RequestInterface;
+use Pusher\Pusher;
-class MiddlewareTest extends PHPUnit\Framework\TestCase
+class MiddlewareTest extends TestCase
{
private $count = 0;
- function increment()
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
+ public function increment(): Closure
{
return function (callable $handler) {
return function (RequestInterface $request, array $options) use ($handler) {
@@ -21,7 +31,7 @@ function increment()
protected function setUp(): void
{
if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
- $this->markTestSkipped('Please set the
+ self::markTestSkipped('Please set the
PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
PUSHERAPP_APPID keys.');
} else {
@@ -29,14 +39,14 @@ protected function setUp(): void
$stack->setHandler(new CurlHandler());
$stack->push($this->increment());
$client = new Client(['handler' => $stack]);
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST], $client);
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER], $client);
}
}
- public function testStringPush()
+ public function testStringPush(): void
{
- $this->assertEquals(0, $this->count);
+ self::assertEquals(0, $this->count);
$result = $this->pusher->trigger('test_channel', 'my_event', 'Test string');
- $this->assertEquals(1, $this->count);
+ self::assertEquals(1, $this->count);
}
}
diff --git a/tests/acceptance/TriggerAsyncTest.php b/tests/acceptance/TriggerAsyncTest.php
--- a/tests/acceptance/TriggerAsyncTest.php
+++ b/tests/acceptance/TriggerAsyncTest.php
@@ -1,42 +1,53 @@
<?php
-class TriggerAsyncTest extends PHPUnit\Framework\TestCase
+namespace acceptance;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+use stdClass;
+
+class TriggerAsyncTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
- $this->markTestSkipped('Please set the
+ self::markTestSkipped('Please set the
PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
PUSHERAPP_APPID keys.');
} else {
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER]);
}
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ self::assertNotNull($this->pusher, 'Created new \Pusher\Pusher object');
}
- public function testStringPush()
+ public function testStringPush(): void
{
$result = $this->pusher->triggerAsync('test_channel', 'my_event', 'Test string')->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testArrayPush()
+ public function testArrayPush(): void
{
- $result = $this->pusher->triggerAsync('test_channel', 'my_event', array('test' => 1))->wait();
- $this->assertEquals(new stdClass(), $result);
+ $result = $this->pusher->triggerAsync('test_channel', 'my_event', ['test' => 1])->wait();
+ self::assertEquals(new stdClass(), $result);
}
- public function testPushWithSocketId()
+ public function testPushWithSocketId(): void
{
- $result = $this->pusher->triggerAsync('test_channel', 'my_event', array('test' => 1), array('socket_id' => '123.456'))->wait();
- $this->assertEquals(new stdClass(), $result);
+ $result = $this->pusher->triggerAsync('test_channel', 'my_event', ['test' => 1], ['socket_id' => '123.456'])->wait();
+ self::assertEquals(new stdClass(), $result);
}
- public function testPushWithInfo()
+ public function testPushWithInfo(): void
{
$expectedMyChannel = new stdClass();
$expectedMyChannel->subscription_count = 1;
@@ -44,78 +55,78 @@ public function testPushWithInfo()
$expectedPresenceMyChannel->user_count = 0;
$expectedPresenceMyChannel->subscription_count = 0;
$expectedResult = new stdClass();
- $expectedResult->channels = array(
+ $expectedResult->channels = [
"my-channel" => $expectedMyChannel,
"presence-my-channel" => $expectedPresenceMyChannel,
- );
+ ];
- $result = $this->pusher->triggerAsync(['my-channel', 'presence-my-channel'], 'my_event', array('test' => 1), array('info' => 'user_count,subscription_count'))->wait();
- $this->assertEquals($expectedResult, $result);
+ $result = $this->pusher->triggerAsync(['my-channel', 'presence-my-channel'], 'my_event', ['test' => 1], ['info' => 'user_count,subscription_count'])->wait();
+ self::assertEquals($expectedResult, $result);
}
- public function testTLSPush()
+ public function testTLSPush(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $result = $pusher->triggerAsync('test_channel', 'my_event', array('encrypted' => 1))->wait();
- $this->assertEquals(new stdClass(), $result);
+ $result = $pusher->triggerAsync('test_channel', 'my_event', ['encrypted' => 1])->wait();
+ self::assertEquals(new stdClass(), $result);
}
- public function testSendingOver10kBMessageReturns413()
+ public function testSendingOver10kBMessageReturns413(): void
{
$this->expectException(\Pusher\ApiErrorException::class);
$this->expectExceptionCode('413');
$data = str_pad('', 11 * 1024, 'a');
- $this->pusher->triggerAsync('test_channel', 'my_event', $data, array(), true)->wait();
+ $this->pusher->triggerAsync('test_channel', 'my_event', $data, [], true)->wait();
}
- public function testTriggeringEventOnOver100ChannelsThrowsException()
+ public function testTriggeringEventOnOver100ChannelsThrowsException(): void
{
$this->expectException(\Pusher\PusherException::class);
- $channels = array();
+ $channels = [];
while (count($channels) <= 101) {
- $channels[] = ('channel-'.count($channels));
+ $channels[] = ('channel-' . count($channels));
}
- $data = array('event_name' => 'event_data');
+ $data = ['event_name' => 'event_data'];
$this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
}
- public function testTriggeringEventOnMultipleChannels()
+ public function testTriggeringEventOnMultipleChannels(): void
{
- $data = array('event_name' => 'event_data');
- $channels = array('test_channel_1', 'test_channel_2');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['test_channel_1', 'test_channel_2'];
$result = $this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggeringEventOnPrivateEncryptedChannelSuccess()
+ public function testTriggeringEventOnPrivateEncryptedChannelSuccess(): void
{
$options = ['encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- 'host' => PUSHERAPP_HOST];
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER];
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $data = array('event_name' => 'event_data');
- $channels = array('private-encrypted-ceppaio');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['private-encrypted-ceppaio'];
$result = $this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggeringEventOnMultipleChannelsWithEncryptedChannelPresentError()
+ public function testTriggeringEventOnMultipleChannelsWithEncryptedChannelPresentError(): void
{
$this->expectException(\Pusher\PusherException::class);
$options = ['encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- 'host' => PUSHERAPP_HOST];
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER];
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $data = array('event_name' => 'event_data');
- $channels = array('my-chan-ceppaio', 'private-encrypted-ceppaio');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['my-chan-ceppaio', 'private-encrypted-ceppaio'];
$this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
}
}
diff --git a/tests/acceptance/TriggerBatchAsyncTest.php b/tests/acceptance/TriggerBatchAsyncTest.php
--- a/tests/acceptance/TriggerBatchAsyncTest.php
+++ b/tests/acceptance/TriggerBatchAsyncTest.php
@@ -1,7 +1,19 @@
<?php
-class TriggerBatchAsyncTest extends PHPUnit\Framework\TestCase
+namespace acceptance;
+
+use Error;
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+use stdClass;
+
+class TriggerBatchAsyncTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
@@ -9,73 +21,73 @@ protected function setUp(): void
PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
PUSHERAPP_APPID keys.');
} else {
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER]);
}
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ self::assertNotNull($this->pusher, 'Created new \Pusher\Pusher object');
}
- public function testSimplePush()
+ public function testSimplePush(): void
{
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
$result = $this->pusher->triggerBatchAsync($batch)->wait();
$this->assertEquals(new stdClass(), $result);
}
- public function testTLSPush()
+ public function testTLSPush(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchNonEncryptedEventsWithObjectPayloads()
+ public function testTriggerBatchNonEncryptedEventsWithObjectPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'mio_canale', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'mio_canale', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithSingleEvent()
+ public function testTriggerBatchWithSingleEvent(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithInfo()
+ public function testTriggerBatchWithInfo(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
$expectedMyChannel = new stdClass();
$expectedMyChannel->subscription_count = 1;
@@ -84,150 +96,150 @@ public function testTriggerBatchWithInfo()
$expectedPresenceMyChannel->user_count = 0;
$expectedPresenceMyChannel->subscription_count = 0;
$expectedResult = new stdClass();
- $expectedResult->batch = array(
+ $expectedResult->batch = [
$expectedMyChannel,
$expectedMyChannel2,
$expectedPresenceMyChannel
- );
+ ];
- $batch = array();
- $batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'subscription_count');
- $batch[] = array('channel' => 'my-channel-2', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'user_count,subscription_count');
+ $batch = [];
+ $batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'subscription_count'];
+ $batch[] = ['channel' => 'my-channel-2', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'user_count,subscription_count'];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals($expectedResult, $result);
+ self::assertEquals($expectedResult, $result);
}
- public function testTriggerBatchWithMultipleNonEncryptedEventsWithStringPayloads()
+ public function testTriggerBatchWithMultipleNonEncryptedEventsWithStringPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'test_channel2', 'name' => 'my_event2', 'data' => 'test-string2');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'test_channel2', 'name' => 'my_event2', 'data' => 'test-string2'];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleCombinationsofStringAndObjectPayloads()
+ public function testTriggerBatchWithMultipleCombinationsofStringAndObjectPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'test_channel2', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'test_channel2', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithWithEncryptedEventSuccess()
+ public function testTriggerBatchWithWithEncryptedEventSuccess(): void
{
- $options = array(
- 'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ $options = [
+ 'useTLS' => true,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'private-encrypted-test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $batch = [];
+ $batch[] = ['channel' => 'private-encrypted-test_channel', 'name' => 'my_event', 'data' => 'test-string'];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleEncryptedEventsSuccess()
+ public function testTriggerBatchWithMultipleEncryptedEventsSuccess(): void
{
- $options = array(
- 'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ $options = [
+ 'useTLS' => true,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => 'test-string2');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => 'test-string2'];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleCombinationsofStringsAndObjectsWithEncryptedEventSuccess()
+ public function testTriggerBatchWithMultipleCombinationsofStringsAndObjectsWithEncryptedEventSuccess(): void
{
- $options = array(
- 'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ $options = [
+ 'useTLS' => true,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'secret-string');
- $batch[] = array('channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'secret-string'];
+ $batch[] = ['channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchMultipleEventsWithEncryptedEventWithoutEncryptionMasterKeyError()
+ public function testTriggerBatchMultipleEventsWithEncryptedEventWithoutEncryptionMasterKeyError(): void
{
$this->expectException(Error::class);
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'my_test_chan', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => array('my' => 'to_be_encrypted_data_shhhht'));
+ $batch = [];
+ $batch[] = ['channel' => 'my_test_chan', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => ['my' => 'to_be_encrypted_data_shhhht']];
$pc->triggerBatchAsync($batch)->wait();
}
- public function testTriggerBatchWithMultipleEncryptedEventsWithEncryptionMasterKeySuccess()
+ public function testTriggerBatchWithMultipleEncryptedEventsWithEncryptionMasterKeySuccess(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'my_test_chan', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => array('my' => 'to_be_encrypted_data_shhhht'));
+ $batch = [];
+ $batch[] = ['channel' => 'my_test_chan', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => ['my' => 'to_be_encrypted_data_shhhht']];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testSendingOver10kBMessageReturns413()
+ public function testSendingOver10kBMessageReturns413(): void
{
$this->expectException(\Pusher\ApiErrorException::class);
$this->expectExceptionMessage('content of this event');
$this->expectExceptionCode('413');
$data = str_pad('', 11 * 1024, 'a');
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => $data);
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => $data];
$this->pusher->triggerBatchAsync($batch, true)->wait();
}
- public function testSendingOver10messagesReturns400()
+ public function testSendingOver10messagesReturns400(): void
{
$this->expectException(\Pusher\ApiErrorException::class);
$this->expectExceptionMessage('Batch too large');
$this->expectExceptionCode('400');
- $batch = array();
+ $batch = [];
foreach (range(1, 11) as $i) {
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('index' => $i));
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['index' => $i]];
}
$this->pusher->triggerBatchAsync($batch, false)->wait();
}
diff --git a/tests/acceptance/TriggerBatchTest.php b/tests/acceptance/TriggerBatchTest.php
--- a/tests/acceptance/TriggerBatchTest.php
+++ b/tests/acceptance/TriggerBatchTest.php
@@ -1,7 +1,20 @@
<?php
-class TriggerBatchTest extends PHPUnit\Framework\TestCase
+namespace acceptance;
+
+use Error;
+use PHPUnit\Framework\TestCase;
+use Pusher\ApiErrorException;
+use Pusher\Pusher;
+use stdClass;
+
+class TriggerBatchTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
@@ -9,73 +22,73 @@ protected function setUp(): void
PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
PUSHERAPP_APPID keys.');
} else {
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER]);
}
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ self::assertNotNull($this->pusher, 'Created new \Pusher\Pusher object');
}
- public function testSimplePush()
+ public function testSimplePush(): void
{
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
$result = $this->pusher->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTLSPush()
+ public function testTLSPush(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchNonEncryptedEventsWithObjectPayloads()
+ public function testTriggerBatchNonEncryptedEventsWithObjectPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'mio_canale', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'mio_canale', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithSingleEvent()
+ public function testTriggerBatchWithSingleEvent(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
$result = $pc->triggerBatch($batch);
$this->assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithInfo()
+ public function testTriggerBatchWithInfo(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
$expectedMyChannel = new stdClass();
$expectedMyChannel->subscription_count = 1;
@@ -84,150 +97,150 @@ public function testTriggerBatchWithInfo()
$expectedPresenceMyChannel->user_count = 0;
$expectedPresenceMyChannel->subscription_count = 0;
$expectedResult = new stdClass();
- $expectedResult->batch = array(
+ $expectedResult->batch = [
$expectedMyChannel,
$expectedMyChannel2,
$expectedPresenceMyChannel
- );
+ ];
- $batch = array();
- $batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'subscription_count');
- $batch[] = array('channel' => 'my-channel-2', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'user_count,subscription_count');
+ $batch = [];
+ $batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'subscription_count'];
+ $batch[] = ['channel' => 'my-channel-2', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'user_count,subscription_count'];
$result = $pc->triggerBatch($batch);
- $this->assertEquals($expectedResult, $result);
+ self::assertEquals($expectedResult, $result);
}
- public function testTriggerBatchWithMultipleNonEncryptedEventsWithStringPayloads()
+ public function testTriggerBatchWithMultipleNonEncryptedEventsWithStringPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'test_channel2', 'name' => 'my_event2', 'data' => 'test-string2');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'test_channel2', 'name' => 'my_event2', 'data' => 'test-string2'];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleCombinationsofStringAndObjectPayloads()
+ public function testTriggerBatchWithMultipleCombinationsofStringAndObjectPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'test_channel2', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'test_channel2', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithWithEncryptedEventSuccess()
+ public function testTriggerBatchWithWithEncryptedEventSuccess(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'private-encrypted-test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $batch = [];
+ $batch[] = ['channel' => 'private-encrypted-test_channel', 'name' => 'my_event', 'data' => 'test-string'];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleEncryptedEventsSuccess()
+ public function testTriggerBatchWithMultipleEncryptedEventsSuccess(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => 'test-string2');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => 'test-string2'];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleCombinationsofStringsAndObjectsWithEncryptedEventSuccess()
+ public function testTriggerBatchWithMultipleCombinationsofStringsAndObjectsWithEncryptedEventSuccess(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'secret-string');
- $batch[] = array('channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'secret-string'];
+ $batch[] = ['channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchMultipleEventsWithEncryptedEventWithoutEncryptionMasterKeyError()
+ public function testTriggerBatchMultipleEventsWithEncryptedEventWithoutEncryptionMasterKeyError(): void
{
$this->expectException(Error::class);
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'my_test_chan', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => array('my' => 'to_be_encrypted_data_shhhht'));
+ $batch = [];
+ $batch[] = ['channel' => 'my_test_chan', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => ['my' => 'to_be_encrypted_data_shhhht']];
$pc->triggerBatch($batch);
}
- public function testTriggerBatchWithMultipleEncryptedEventsWithEncryptionMasterKeySuccess()
+ public function testTriggerBatchWithMultipleEncryptedEventsWithEncryptionMasterKeySuccess(): void
{
- $options = array(
- 'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ $options = [
+ 'useTLS' => true,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'my_test_chan', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => array('my' => 'to_be_encrypted_data_shhhht'));
+ $batch = [];
+ $batch[] = ['channel' => 'my_test_chan', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => ['my' => 'to_be_encrypted_data_shhhht']];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testSendingOver10kBMessageReturns413()
+ public function testSendingOver10kBMessageReturns413(): void
{
- $this->expectException(\Pusher\ApiErrorException::class);
+ $this->expectException(ApiErrorException::class);
$this->expectExceptionMessage('content of this event');
$this->expectExceptionCode('413');
$data = str_pad('', 11 * 1024, 'a');
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => $data);
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => $data];
$this->pusher->triggerBatch($batch, true);
}
- public function testSendingOver10messagesReturns400()
+ public function testSendingOver10messagesReturns400(): void
{
- $this->expectException(\Pusher\ApiErrorException::class);
+ $this->expectException(ApiErrorException::class);
$this->expectExceptionMessage('Batch too large');
$this->expectExceptionCode('400');
- $batch = array();
+ $batch = [];
foreach (range(1, 11) as $i) {
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('index' => $i));
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['index' => $i]];
}
$this->pusher->triggerBatch($batch, false);
}
diff --git a/tests/acceptance/TriggerTest.php b/tests/acceptance/TriggerTest.php
--- a/tests/acceptance/TriggerTest.php
+++ b/tests/acceptance/TriggerTest.php
@@ -1,42 +1,55 @@
<?php
-class TriggerTest extends PHPUnit\Framework\TestCase
+namespace acceptance;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\ApiErrorException;
+use Pusher\Pusher;
+use Pusher\PusherException;
+use stdClass;
+
+class TriggerTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
- $this->markTestSkipped('Please set the
+ self::markTestSkipped('Please set the
PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
PUSHERAPP_APPID keys.');
} else {
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER]);
}
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ self::assertNotNull($this->pusher, 'Created new \Pusher\Pusher object');
}
- public function testStringPush()
+ public function testStringPush(): void
{
$result = $this->pusher->trigger('test_channel', 'my_event', 'Test string');
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testArrayPush()
+ public function testArrayPush(): void
{
- $result = $this->pusher->trigger('test_channel', 'my_event', array('test' => 1));
- $this->assertEquals(new stdClass(), $result);
+ $result = $this->pusher->trigger('test_channel', 'my_event', ['test' => 1]);
+ self::assertEquals(new stdClass(), $result);
}
- public function testPushWithSocketId()
+ public function testPushWithSocketId(): void
{
- $result = $this->pusher->trigger('test_channel', 'my_event', array('test' => 1), array('socket_id' => '123.456'));
- $this->assertEquals(new stdClass(), $result);
+ $result = $this->pusher->trigger('test_channel', 'my_event', ['test' => 1], ['socket_id' => '123.456']);
+ self::assertEquals(new stdClass(), $result);
}
- public function testPushWithInfo()
+ public function testPushWithInfo(): void
{
$expectedMyChannel = new stdClass();
$expectedMyChannel->subscription_count = 1;
@@ -44,78 +57,78 @@ public function testPushWithInfo()
$expectedPresenceMyChannel->user_count = 0;
$expectedPresenceMyChannel->subscription_count = 0;
$expectedResult = new stdClass();
- $expectedResult->channels = array(
+ $expectedResult->channels = [
"my-channel" => $expectedMyChannel,
"presence-my-channel" => $expectedPresenceMyChannel,
- );
+ ];
- $result = $this->pusher->trigger(['my-channel', 'presence-my-channel'], 'my_event', array('test' => 1), array('info' => 'user_count,subscription_count'));
- $this->assertEquals($expectedResult, $result);
+ $result = $this->pusher->trigger(['my-channel', 'presence-my-channel'], 'my_event', ['test' => 1], ['info' => 'user_count,subscription_count']);
+ self::assertEquals($expectedResult, $result);
}
- public function testTLSPush()
+ public function testTLSPush(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $result = $pusher->trigger('test_channel', 'my_event', array('encrypted' => 1));
- $this->assertEquals(new stdClass(), $result);
+ $result = $pusher->trigger('test_channel', 'my_event', ['encrypted' => 1]);
+ self::assertEquals(new stdClass(), $result);
}
- public function testSendingOver10kBMessageReturns413()
+ public function testSendingOver10kBMessageReturns413(): void
{
- $this->expectException(\Pusher\ApiErrorException::class);
+ $this->expectException(ApiErrorException::class);
$this->expectExceptionCode('413');
$data = str_pad('', 11 * 1024, 'a');
- $this->pusher->trigger('test_channel', 'my_event', $data, array(), true);
+ $this->pusher->trigger('test_channel', 'my_event', $data, [], true);
}
- public function testTriggeringEventOnOver100ChannelsThrowsException()
+ public function testTriggeringEventOnOver100ChannelsThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $channels = array();
+ $channels = [];
while (count($channels) <= 101) {
- $channels[] = ('channel-'.count($channels));
+ $channels[] = ('channel-' . count($channels));
}
- $data = array('event_name' => 'event_data');
+ $data = ['event_name' => 'event_data'];
$this->pusher->trigger($channels, 'my_event', $data);
}
- public function testTriggeringEventOnMultipleChannels()
+ public function testTriggeringEventOnMultipleChannels(): void
{
- $data = array('event_name' => 'event_data');
- $channels = array('test_channel_1', 'test_channel_2');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['test_channel_1', 'test_channel_2'];
$result = $this->pusher->trigger($channels, 'my_event', $data);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggeringEventOnPrivateEncryptedChannelSuccess()
+ public function testTriggeringEventOnPrivateEncryptedChannelSuccess(): void
{
$options = ['encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- 'host' => PUSHERAPP_HOST];
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER];
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $data = array('event_name' => 'event_data');
- $channels = array('private-encrypted-ceppaio');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['private-encrypted-ceppaio'];
$result = $this->pusher->trigger($channels, 'my_event', $data);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggeringEventOnMultipleChannelsWithEncryptedChannelPresentError()
+ public function testTriggeringEventOnMultipleChannelsWithEncryptedChannelPresentError(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$options = ['encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- 'host' => PUSHERAPP_HOST];
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER];
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $data = array('event_name' => 'event_data');
- $channels = array('my-chan-ceppaio', 'private-encrypted-ceppaio');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['my-chan-ceppaio', 'private-encrypted-ceppaio'];
$this->pusher->trigger($channels, 'my_event', $data);
}
}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -2,14 +2,12 @@
error_reporting(E_ALL);
-$dir = dirname(__FILE__);
-$config_path = $dir.'/config.php';
-if (file_exists($config_path) === true) {
- require_once $config_path;
+if (file_exists(__DIR__ . '/config.php') === true) {
+ require 'config.php';
} else {
define('PUSHERAPP_AUTHKEY', getenv('PUSHERAPP_AUTHKEY'));
define('PUSHERAPP_SECRET', getenv('PUSHERAPP_SECRET'));
define('PUSHERAPP_APPID', getenv('PUSHERAPP_APPID'));
- define('PUSHERAPP_HOST', getenv('PUSHERAPP_HOST'));
+ define('PUSHERAPP_CLUSTER', getenv('PUSHERAPP_CLUSTER'));
}
diff --git a/tests/config.example.php b/tests/config.example.php
--- a/tests/config.example.php
+++ b/tests/config.example.php
@@ -1,6 +1,6 @@
<?php
-define('PUSHERAPP_APPID', '');
-define('PUSHERAPP_AUTHKEY', '');
-define('PUSHERAPP_SECRET', '');
-define('PUSHERAPP_HOST', 'http://api.pusherapp.com');
+const PUSHERAPP_APPID = '';
+const PUSHERAPP_AUTHKEY = '';
+const PUSHERAPP_SECRET = '';
+const PUSHERAPP_CLUSTER = 'eu';
diff --git a/tests/unit/AuthQueryStringTest.php b/tests/unit/AuthQueryStringTest.php
--- a/tests/unit/AuthQueryStringTest.php
+++ b/tests/unit/AuthQueryStringTest.php
@@ -1,41 +1,51 @@
<?php
-class AuthQueryStringTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+
+class AuthQueryStringTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
- $this->pusher = new Pusher\Pusher('thisisaauthkey', 'thisisasecret', 1);
+ $this->pusher = new Pusher('thisisaauthkey', 'thisisasecret', 1);
}
- public function testArrayImplode()
+ public function testArrayImplode(): void
{
- $val = array('testKey' => 'testValue');
+ $val = ['testKey' => 'testValue'];
$expected = 'testKey=testValue';
- $actual = Pusher\Pusher::array_implode('=', '&', $val);
+ $actual = Pusher::array_implode('=', '&', $val);
- $this->assertEquals(
+ self::assertEquals(
$expected,
$actual,
'auth signature valid'
);
}
- public function testArrayImplodeWithTwoValues()
+ public function testArrayImplodeWithTwoValues(): void
{
- $val = array('testKey' => 'testValue', 'testKey2' => 'testValue2');
+ $val = ['testKey' => 'testValue', 'testKey2' => 'testValue2'];
$expected = 'testKey=testValue&testKey2=testValue2';
- $actual = Pusher\Pusher::array_implode('=', '&', $val);
+ $actual = Pusher::array_implode('=', '&', $val);
- $this->assertEquals(
+ self::assertEquals(
$expected,
$actual,
'auth signature valid'
);
}
- public function testGenerateSignature()
+ public function testGenerateSignature(): void
{
$time = time();
$auth_version = '1.0';
@@ -43,10 +53,10 @@ public function testGenerateSignature()
$auth_key = 'thisisaauthkey';
$auth_secret = 'thisisasecret';
$request_path = '/channels/test_channel/events';
- $query_params = array(
+ $query_params = [
'name' => 'an_event',
- );
- $auth_query_string = Pusher\Pusher::build_auth_query_params(
+ ];
+ $auth_query_string = Pusher::build_auth_query_params(
$auth_key,
$auth_secret,
$method,
@@ -66,7 +76,7 @@ public function testGenerateSignature()
'name' => 'an_event'
];
- $this->assertEquals(
+ self::assertEquals(
$expected_query_params,
$auth_query_string,
'auth signature valid'
diff --git a/tests/unit/ChannelInfoUnitTest.php b/tests/unit/ChannelInfoUnitTest.php
--- a/tests/unit/ChannelInfoUnitTest.php
+++ b/tests/unit/ChannelInfoUnitTest.php
@@ -1,34 +1,44 @@
<?php
-class ChannelInfoUnitTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+
+class ChannelInfoUnitTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
- $this->pusher = new Pusher\Pusher('thisisaauthkey', 'thisisasecret', 1);
+ $this->pusher = new Pusher('thisisaauthkey', 'thisisasecret', 1);
}
- public function testTrailingColonChannelThrowsException()
+ public function testTrailingColonChannelThrowsException(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->pusher->get_channel_info('test_channel:');
}
- public function testLeadingColonChannelThrowsException()
+ public function testLeadingColonChannelThrowsException(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->pusher->get_channel_info(':test_channel');
}
- public function testLeadingColonNLChannelThrowsException()
+ public function testLeadingColonNLChannelThrowsException(): void
{
$this->expectException(\Pusher\PusherException::class);
-
+
$this->pusher->get_channel_info(':\ntest_channel');
}
- public function testTrailingColonNLChannelThrowsException()
+ public function testTrailingColonNLChannelThrowsException(): void
{
$this->expectException(\Pusher\PusherException::class);
diff --git a/tests/unit/CryptoTest.php b/tests/unit/CryptoTest.php
--- a/tests/unit/CryptoTest.php
+++ b/tests/unit/CryptoTest.php
@@ -1,101 +1,112 @@
<?php
-class CryptoTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\PusherCrypto;
+use stdClass;
+
+class CryptoTest extends TestCase
{
+ /**
+ * @var PusherCrypto
+ */
+ private $crypto;
+
protected function setUp(): void
{
if (function_exists('sodium_crypto_secretbox')) {
- $this->crypto = new Pusher\PusherCrypto('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+ $this->crypto = new PusherCrypto('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
} else {
- $this->markTestSkipped('libSodium is not available, so end to end encryption is not available.');
+ self::markTestSkipped('libSodium is not available, so end to end encryption is not available.');
}
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->crypto, 'Created new Pusher\PusherCrypto object');
+ self::assertNotNull($this->crypto, 'Created new \Pusher\PusherCrypto object');
}
- public function testValidMasterEncryptionKeys()
+ public function testValidMasterEncryptionKeys(): void
{
- $this->assertEquals('this is 32 bytes 123456789012345', Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMiBieXRlcyAxMjM0NTY3ODkwMTIzNDU='));
- $this->assertEquals("this key has nonprintable char \x00", Pusher\PusherCrypto::parse_master_key('dGhpcyBrZXkgaGFzIG5vbnByaW50YWJsZSBjaGFyIAA='));
+ self::assertEquals('this is 32 bytes 123456789012345', PusherCrypto::parse_master_key('dGhpcyBpcyAzMiBieXRlcyAxMjM0NTY3ODkwMTIzNDU='));
+ self::assertEquals("this key has nonprintable char \x00", PusherCrypto::parse_master_key('dGhpcyBrZXkgaGFzIG5vbnByaW50YWJsZSBjaGFyIAA='));
}
- public function testInvalidMasterEncryptionKeyTooShort()
+ public function testInvalidMasterEncryptionKeyTooShort(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->expectExceptionMessage('32 bytes');
- Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNA==');
+ PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNA==');
}
- public function testInvalidMasterEncryptionKeyTooLong()
+ public function testInvalidMasterEncryptionKeyTooLong(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->expectExceptionMessage('32 bytes');
- Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNDU2');
+ PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNDU2');
}
- public function testInvalidMasterEncryptionKeyBase64TooShort()
+ public function testInvalidMasterEncryptionKeyBase64TooShort(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->expectExceptionMessage('32 bytes');
- Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNA==');
+ PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNA==');
}
- public function testInvalidMasterEncryptionKeyBase64TooLong()
+ public function testInvalidMasterEncryptionKeyBase64TooLong(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->expectExceptionMessage('32 bytes');
- Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMyBieXRlcyAxMjM0NTY3ODkwMTIzNDU2');
+ PusherCrypto::parse_master_key('dGhpcyBpcyAzMyBieXRlcyAxMjM0NTY3ODkwMTIzNDU2');
}
- public function testInvalidMasterEncryptionKeyBase64InvalidBase64()
+ public function testInvalidMasterEncryptionKeyBase64InvalidBase64(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->expectExceptionMessage('valid base64');
- Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMyBi!XRlcyAxMjM0NTY3ODkw#TIzNDU2');
+ PusherCrypto::parse_master_key('dGhpcyBpcyAzMyBi!XRlcyAxMjM0NTY3ODkw#TIzNDU2');
}
- public function testGenerateSharedSecret()
+ public function testGenerateSharedSecret(): void
{
$expected = 'Rp+wpkNpL89qhqco1JkIG31AVXyU8PUVJBr1B2MvdoA=';
// Check that the secret generation is generating consistent secrets
- $this->assertEquals($expected, base64_encode($this->crypto->generate_shared_secret('private-encrypted-channel-a')));
+ self::assertEquals($expected, base64_encode($this->crypto->generate_shared_secret('private-encrypted-channel-a')));
// Check that the secret generation is using the channel as a part of the generation
- $this->assertNotEquals($expected, base64_encode($this->crypto->generate_shared_secret('private-encrypted-channel-b')));
+ self::assertNotEquals($expected, base64_encode($this->crypto->generate_shared_secret('private-encrypted-channel-b')));
// Check that specifying a different key results in a different result
- $crypto2 = new Pusher\PusherCrypto('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
- $this->assertNotEquals($expected, base64_encode($crypto2->generate_shared_secret('private-encrypted-channel-a')));
+ $crypto2 = new PusherCrypto('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
+ self::assertNotEquals($expected, base64_encode($crypto2->generate_shared_secret('private-encrypted-channel-a')));
}
- public function testGenerateSharedSecretNoChannel()
+ public function testGenerateSharedSecretNoChannel(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->crypto->generate_shared_secret('');
}
- public function testIsEncryptedChannel()
+ public function testIsEncryptedChannel(): void
{
- $this->assertEquals(true, Pusher\PusherCrypto::is_encrypted_channel('private-encrypted-test'));
- $this->assertEquals(false, Pusher\PusherCrypto::is_encrypted_channel('private-encrypted'));
- $this->assertEquals(false, Pusher\PusherCrypto::is_encrypted_channel('test-private-encrypted'));
+ self::assertEquals(true, PusherCrypto::is_encrypted_channel('private-encrypted-test'));
+ self::assertEquals(false, PusherCrypto::is_encrypted_channel('private-encrypted'));
+ self::assertEquals(false, PusherCrypto::is_encrypted_channel('test-private-encrypted'));
}
- public function testEncryptDecryptEventValid()
+ public function testEncryptDecryptEventValid(): void
{
$channel = 'private-encrypted-bla';
$payload = "now that's what I call a payload!";
$encrypted_payload = $this->crypto->encrypt_payload($channel, $payload);
- $this->assertNotNull($encrypted_payload);
+ self::assertNotNull($encrypted_payload);
// Create a mock Event object
$event = new stdClass();
@@ -103,44 +114,44 @@ public function testEncryptDecryptEventValid()
$event->channel = $channel;
$decrypted_event = $this->crypto->decrypt_event($event);
$decrypted_payload = $decrypted_event->data;
- $this->assertEquals($payload, $decrypted_payload);
+ self::assertEquals($payload, $decrypted_payload);
}
- public function testEncryptPayloadNoChannel()
+ public function testEncryptPayloadNoChannel(): void
{
$this->expectException(\Pusher\PusherException::class);
$channel = '';
$payload = "now that's what I call a payload!";
$encrypted_payload = $this->crypto->encrypt_payload($channel, $payload);
- $this->assertEquals(false, $encrypted_payload);
+ self::assertEquals(false, $encrypted_payload);
}
- public function testEncryptPayloadPublicChannel()
+ public function testEncryptPayloadPublicChannel(): void
{
$this->expectException(\Pusher\PusherException::class);
$channel = 'public-static-void-main';
$payload = "now that's what I call a payload!";
$encrypted_payload = $this->crypto->encrypt_payload($channel, $payload);
- $this->assertEquals(false, $encrypted_payload);
+ self::assertEquals(false, $encrypted_payload);
}
- public function testDecryptPayloadWrongKey()
+ public function testDecryptPayloadWrongKey(): void
{
$this->expectException(\Pusher\PusherException::class);
$channel = 'private-encrypted-bla';
$payload = "now that's what I call a payload!";
$encrypted_payload = $this->crypto->encrypt_payload($channel, $payload);
- $this->assertNotNull($encrypted_payload);
+ self::assertNotNull($encrypted_payload);
// create empty object with no properties
$event = new stdClass();
$event->data = $encrypted_payload;
$event->channel = $channel;
- $crypto2 = new Pusher\PusherCrypto('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
+ $crypto2 = new PusherCrypto('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
$decrypted_event = $crypto2->decrypt_event($event);
- $this->assertEquals(false, $decrypted_event);
+ self::assertEquals(false, $decrypted_event);
}
}
diff --git a/tests/unit/PusherConstructorTest.php b/tests/unit/PusherConstructorTest.php
--- a/tests/unit/PusherConstructorTest.php
+++ b/tests/unit/PusherConstructorTest.php
@@ -1,65 +1,70 @@
<?php
-class PusherConstructorTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+
+class PusherConstructorTest extends TestCase
{
- public function testUseTLSOptionWillSetHostAndPort()
+ public function testUseTLSOptionWillSetHostAndPort(): void
{
- $options = array('useTLS' => true);
- $pusher = new Pusher\Pusher('app_key', 'app_secret', 'app_id', $options);
+ $options = ['useTLS' => true];
+ $pusher = new Pusher('app_key', 'app_secret', 'app_id', $options);
$settings = $pusher->getSettings();
- $this->assertEquals('https', $settings['scheme'], 'https');
- $this->assertEquals('api-mt1.pusher.com', $settings['host']);
- $this->assertEquals('443', $settings['port']);
+ self::assertEquals('https', $settings['scheme'], 'https');
+ self::assertEquals('api-mt1.pusher.com', $settings['host']);
+ self::assertEquals('443', $settings['port']);
}
- public function testUseTLSOptionWillBeOverwrittenByHostAndPortOptionsSetHostAndPort()
+ public function testUseTLSOptionWillBeOverwrittenByHostAndPortOptionsSetHostAndPort(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
'host' => 'test.com',
'port' => '3000',
- );
- $pusher = new Pusher\Pusher('app_key', 'app_secret', 'app_id', $options);
+ ];
+ $pusher = new Pusher('app_key', 'app_secret', 'app_id', $options);
$settings = $pusher->getSettings();
- $this->assertEquals('http', $settings['scheme']);
- $this->assertEquals($options['host'], $settings['host']);
- $this->assertEquals($options['port'], $settings['port']);
+ self::assertEquals('http', $settings['scheme']);
+ self::assertEquals($options['host'], $settings['host']);
+ self::assertEquals($options['port'], $settings['port']);
}
- public function testSchemeIsStrippedAndIgnoredFromHostInOptions()
+ public function testSchemeIsStrippedAndIgnoredFromHostInOptions(): void
{
- $options = array(
+ $options = [
'host' => 'http://test.com',
- );
- $pusher = new Pusher\Pusher('app_key', 'app_secret', 'app_id', $options);
+ ];
+ $pusher = new Pusher('app_key', 'app_secret', 'app_id', $options);
$settings = $pusher->getSettings();
- $this->assertEquals('https', $settings['scheme']);
- $this->assertEquals('test.com', $settings['host']);
+ self::assertEquals('https', $settings['scheme']);
+ self::assertEquals('test.com', $settings['host']);
}
- public function testClusterSetsANewHost()
+ public function testClusterSetsANewHost(): void
{
- $options = array(
+ $options = [
'cluster' => 'eu',
- );
- $pusher = new Pusher\Pusher('app_key', 'app_secret', 'app_id', $options);
+ ];
+ $pusher = new Pusher('app_key', 'app_secret', 'app_id', $options);
$settings = $pusher->getSettings();
- $this->assertEquals('api-eu.pusher.com', $settings['host']);
+ self::assertEquals('api-eu.pusher.com', $settings['host']);
}
- public function testClusterOptionIsOverriddenByHostIfItExists()
+ public function testClusterOptionIsOverriddenByHostIfItExists(): void
{
- $options = array(
+ $options = [
'cluster' => 'eu',
'host' => 'api.staging.pusher.com',
- );
- $pusher = new Pusher\Pusher('app_key', 'app_secret', 'app_id', $options);
+ ];
+ $pusher = new Pusher('app_key', 'app_secret', 'app_id', $options);
$settings = $pusher->getSettings();
- $this->assertEquals('api.staging.pusher.com', $settings['host']);
+ self::assertEquals('api.staging.pusher.com', $settings['host']);
}
}
diff --git a/tests/unit/SocketAuthTest.php b/tests/unit/SocketAuthTest.php
--- a/tests/unit/SocketAuthTest.php
+++ b/tests/unit/SocketAuthTest.php
@@ -1,89 +1,100 @@
<?php
-class SocketAuthTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+use Pusher\PusherException;
+
+class SocketAuthTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
- $this->pusher = new Pusher\Pusher('thisisaauthkey', 'thisisasecret', 1, array());
+ $this->pusher = new Pusher('thisisaauthkey', 'thisisasecret', 1, []);
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ $this->assertNotNull($this->pusher, 'Created new \Pusher\Pusher object');
}
- public function testSocketAuthKey()
+ public function testSocketAuthKey(): void
{
$socket_auth = $this->pusher->socket_auth('testing_pusher-php', '1.1');
- $this->assertEquals(
+ self::assertEquals(
'{"auth":"thisisaauthkey:751ccc12aeaa79d46f7c199bced5fa47527d3480b51fe61a0bd10438241bd52d"}',
$socket_auth,
'Socket auth key valid'
);
}
- public function testComplexSocketAuthKey()
+ public function testComplexSocketAuthKey(): void
{
$socket_auth = $this->pusher->socket_auth('-azAZ9_=@,.;', '45055.28877557');
- $this->assertEquals(
+ self::assertEquals(
'{"auth":"thisisaauthkey:d1c20ad7684c172271f92c108e11b45aef07499b005796ae1ec5beb924f361c4"}',
$socket_auth,
'Socket auth key valid'
);
}
- public function testTrailingColonSocketIDThrowsException()
+ public function testTrailingColonSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('testing_pusher-php', '1.1:');
}
- public function testLeadingColonSocketIDThrowsException()
+ public function testLeadingColonSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('testing_pusher-php', ':1.1');
}
- public function testLeadingColonNLSocketIDThrowsException()
+ public function testLeadingColonNLSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('testing_pusher-php', ':\n1.1');
}
- public function testTrailingColonNLSocketIDThrowsException()
+ public function testTrailingColonNLSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('testing_pusher-php', '1.1\n:');
}
- public function testTrailingColonChannelThrowsException()
+ public function testTrailingColonChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('test_channel:', '1.1');
}
- public function testLeadingColonChannelThrowsException()
+ public function testLeadingColonChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth(':test_channel', '1.1');
}
- public function testLeadingColonNLChannelThrowsException()
+ public function testLeadingColonNLChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth(':\ntest_channel', '1.1');
}
- public function testTrailingColonNLChannelThrowsException()
+ public function testTrailingColonNLChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('test_channel\n:', '1.1');
}
diff --git a/tests/unit/TriggerUnitTest.php b/tests/unit/TriggerUnitTest.php
--- a/tests/unit/TriggerUnitTest.php
+++ b/tests/unit/TriggerUnitTest.php
@@ -1,88 +1,107 @@
<?php
-class TriggerUnitTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+use Pusher\PusherException;
+
+class TriggerUnitTest extends TestCase
{
+ /**
+ * @var array
+ */
+ private $localData;
+ /**
+ * @var string
+ */
+ private $eventName;
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
- $this->pusher = new Pusher\Pusher('thisisaauthkey', 'thisisasecret', 1);
+ $this->pusher = new Pusher('thisisaauthkey', 'thisisasecret', 1);
$this->eventName = 'test_event';
- $this->data = array();
+ $this->localData = [];
}
- public function testTrailingColonChannelThrowsException()
+ public function testTrailingColonChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel:', $this->eventName, $this->data);
+ $this->pusher->trigger('test_channel:', $this->eventName, $this->localData);
}
- public function testLeadingColonChannelThrowsException()
+ public function testLeadingColonChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger(':test_channel', $this->eventName, $this->data);
+ $this->pusher->trigger(':test_channel', $this->eventName, $this->localData);
}
- public function testLeadingColonNLChannelThrowsException()
+ public function testLeadingColonNLChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger(':\ntest_channel', $this->eventName, $this->data);
+ $this->pusher->trigger(':\ntest_channel', $this->eventName, $this->localData);
}
- public function testTrailingColonNLChannelThrowsException()
+ public function testTrailingColonNLChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel\n:', $this->eventName, $this->data);
+ $this->pusher->trigger('test_channel\n:', $this->eventName, $this->localData);
}
- public function testChannelArrayThrowsException()
+ public function testChannelArrayThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger(array('this_one_is_okay', 'test_channel\n:'), $this->eventName, $this->data);
+ $this->pusher->trigger(['this_one_is_okay', 'test_channel\n:'], $this->eventName, $this->localData);
}
- public function testTrailingColonSocketIDThrowsException()
+ public function testTrailingColonSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel:', $this->eventName, $this->data, array('socket_id' => '1.1:'));
+ $this->pusher->trigger('test_channel:', $this->eventName, $this->localData, ['socket_id' => '1.1:']);
}
- public function testLeadingColonSocketIDThrowsException()
+ public function testLeadingColonSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel:', $this->eventName, $this->data, array('socket_id' => ':1.1'));
+ $this->pusher->trigger('test_channel:', $this->eventName, $this->localData, ['socket_id' => ':1.1']);
}
- public function testLeadingColonNLSocketIDThrowsException()
+ public function testLeadingColonNLSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel:', $this->eventName, $this->data, array('socket_id' => ':\n1.1'));
+ $this->pusher->trigger('test_channel:', $this->eventName, $this->localData, ['socket_id' => ':\n1.1']);
}
- public function testTrailingColonNLSocketIDThrowsException()
+ public function testTrailingColonNLSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel:', $this->eventName, $this->data, array('socket_id' => '1.1\n:'));
+ $this->pusher->trigger('test_channel:', $this->eventName, $this->localData, ['socket_id' => '1.1\n:']);
}
- public function testFalseSocketIDThrowsException()
+ public function testFalseSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel', $this->eventName, $this->data, array('socket_id' => false));
+ $this->pusher->trigger('test_channel', $this->eventName, $this->localData, ['socket_id' => false]);
}
- public function testEmptyStrSocketIDThrowsException()
+ public function testEmptyStrSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel', $this->eventName, $this->data, array('socket_id' => ''));
+ $this->pusher->trigger('test_channel', $this->eventName, $this->localData, ['socket_id' => '']);
}
}
diff --git a/tests/unit/WebhookTest.php b/tests/unit/WebhookTest.php
--- a/tests/unit/WebhookTest.php
+++ b/tests/unit/WebhookTest.php
@@ -1,48 +1,63 @@
<?php
-class WebhookTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+use Pusher\PusherException;
+
+class WebhookTest extends TestCase
{
+ /**
+ * @var string
+ */
+ private $auth_key;
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
$this->auth_key = 'thisisaauthkey';
- $this->pusher = new Pusher\Pusher($this->auth_key, 'thisisasecret', 1);
+ $this->pusher = new Pusher($this->auth_key, 'thisisasecret', 1);
}
- public function testValidWebhookSignature()
+ public function testValidWebhookSignature(): void
{
$signature = '40e0ad3b9aa49529322879e84de1aaaf18bde1efe839ca263d540cc865510d25';
$body = '{"hello":"world"}';
- $headers = array(
+ $headers = [
'X-Pusher-Key' => $this->auth_key,
'X-Pusher-Signature' => $signature,
- );
+ ];
$this->pusher->ensure_valid_signature($headers, $body);
- $this->assertTrue(true);
+ self::assertTrue(true);
}
- public function testInvalidWebhookSignature()
+ public function testInvalidWebhookSignature(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$signature = 'potato';
$body = '{"hello":"world"}';
- $headers = array(
+ $headers = [
'X-Pusher-Key' => $this->auth_key,
'X-Pusher-Signature' => $signature,
- );
- $wrong_signature = $this->pusher->ensure_valid_signature($headers, $body);
+ ];
+ $this->pusher->ensure_valid_signature($headers, $body);
}
- public function testDecodeWebhook()
+ public function testDecodeWebhook(): void
{
- $headers_json = '{"X-Pusher-Key":"'.$this->auth_key.'","X-Pusher-Signature":"a19cab2af3ca1029257570395e78d5d675e9e700ca676d18a375a7083178df1c"}';
+ $headers_json = '{"X-Pusher-Key":"' . $this->auth_key . '","X-Pusher-Signature":"a19cab2af3ca1029257570395e78d5d675e9e700ca676d18a375a7083178df1c"}';
$body = '{"time_ms":1530710011901,"events":[{"name":"client_event","channel":"private-my-channel","event":"client-event","data":"Unencrypted","socket_id":"240621.35780774"}]}';
- $headers = json_decode($headers_json, true);
+ $headers = json_decode($headers_json, true, 512, JSON_THROW_ON_ERROR);
$decodedWebhook = $this->pusher->webhook($headers, $body);
- $this->assertEquals(1530710011901, $decodedWebhook->get_time_ms());
- $this->assertEquals(1, count($decodedWebhook->get_events()));
+ self::assertEquals(1530710011901, $decodedWebhook->get_time_ms());
+ self::assertCount(1, $decodedWebhook->get_events());
}
}
|
[6.1] `build_auth_query_params()` returns array instead of string
As title says, this [PHPDoc says the function returns a string](https://github.com/pusher/pusher-http-php/blob/master/src/Pusher.php#L276-L299) while it returns an array.
| 2021-05-10T09:26:56
|
php
|
Hard
|
|
pusher/pusher-http-php
| 304
|
pusher__pusher-http-php-304
|
[
"302"
] |
8673f60458ceedb9531fad7a5747eb49de619a8a
|
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ tests/config.php
vendor
.phpunit.result.cache
.phplint-cache
+.idea
diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## 7.0.0
+* [CHANGED] Possible backwards compatible break in initiating the `$app_id` parameter of the `new Pusher()` object
+ caused by adding types to the code. It was decided to change it from `int` to `string` to match the examples
+ in the documentation.
+* [CHANGED] added return types, namespacing, psr-12 formatting.
+
## 6.1.0
* [ADDED] triggerAsync and triggerBatchAsync using the Guzzle async interface.
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -18,15 +18,15 @@ Or add to `composer.json`:
```json
"require": {
- "pusher/pusher-php-server": "^6.1"
+ "pusher/pusher-php-server": "^6.1"
}
```
-and then run `composer update`.
+then run `composer update`.
## Supported platforms
-* PHP - supports PHP versions 7.2, 7.3, 7.4 and 8.0.
+* PHP - supports PHP versions 7.3, 7.4 and 8.0.
* Laravel - version 8.29 and above has built-in support for Pusher Channels as a [Broadcasting backend](https://laravel.com/docs/master/broadcasting).
* Other PHP frameworks - supported provided you are using a supported version of PHP.
@@ -40,7 +40,7 @@ $app_key = 'YOUR_APP_KEY';
$app_secret = 'YOUR_APP_SECRET';
$app_cluster = 'YOUR_APP_CLUSTER';
-$pusher = new Pusher\Pusher( $app_key, $app_secret, $app_id, array('cluster' => $app_cluster) );
+$pusher = new Pusher\Pusher($app_key, $app_secret, $app_id, ['cluster' => $app_cluster]);
```
The fourth parameter is an `$options` array. The additional options are:
@@ -66,7 +66,7 @@ $options = [
'cluster' => $app_cluster,
'useTLS' => false
];
-$pusher = new Pusher\Pusher( $app_key, $app_secret, $app_id, $options );
+$pusher = new Pusher\Pusher($app_key, $app_secret, $app_id, $options);
```
## Logging configuration
@@ -92,12 +92,11 @@ your own Guzzle instance to the Pusher constructor:
$custom_client = new GuzzleHttp\Client();
$pusher = new Pusher\Pusher(
- $app_key,
- $app_secret,
- $app_id,
- array(),
- $custom_client
- )
+ $app_key,
+ $app_secret,
+ $app_id,
+ [],
+ $custom_client
);
```
@@ -111,13 +110,13 @@ To trigger an event on one or more channels use the `trigger` function.
### A single channel
```php
-$pusher->trigger( 'my-channel', 'my_event', 'hello world' );
+$pusher->trigger('my-channel', 'my_event', 'hello world');
```
### Multiple channels
```php
-$pusher->trigger( [ 'channel-1', 'channel-2' ], 'my_event', 'hello world' );
+$pusher->trigger([ 'channel-1', 'channel-2' ], 'my_event', 'hello world');
```
### Batches
@@ -126,9 +125,9 @@ It's also possible to send multiple events with a single API call (max 10
events per call on multi-tenant clusters):
```php
-$batch = array();
-$batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => array('hello' => 'world'));
-$batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => array('myname' => 'bob'));
+$batch = [];
+$batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => ['hello' => 'world']];
+$batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => ['myname' => 'bob']];
$pusher->triggerBatch($batch);
```
@@ -140,9 +139,9 @@ promises](https://github.com/guzzle/promises) which can be chained
with `->then`:
```php
-$promise = $pusher->triggerAsync( [ 'channel-1', 'channel-2' ], 'my_event', 'hello world' );
+$promise = $pusher->triggerAsync(['channel-1', 'channel-2'], 'my_event', 'hello world');
-$promise->then(function ($result) {
+$promise->then(function($result) {
// do something with $result
return $result;
});
@@ -152,7 +151,7 @@ $final_result = $promise->wait();
### Arrays
-Objects are automatically converted to JSON format:
+Arrays are automatically converted to JSON format:
```php
$array['name'] = 'joe';
@@ -174,13 +173,13 @@ socket id](https://pusher.com/docs/channels/server_api/excluding-event-recipient
while triggering an event:
```php
-$pusher->trigger('my-channel', 'event', 'data', array('socket_id' => $socket_id));
+$pusher->trigger('my-channel', 'event', 'data', ['socket_id' => $socket_id]);
```
```php
-$batch = array();
-$batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => array('hello' => 'world'), array('socket_id' => $socket_id));
-$batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => array('myname' => 'bob'), array('socket_id' => $socket_id);
+$batch = [];
+$batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => ['hello' => 'world'], ['socket_id' => $socket_id]];
+$batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => ['myname' => 'bob'], ['socket_id' => $socket_id]];
$pusher->triggerBatch($batch);
```
@@ -191,23 +190,23 @@ published to with the
[`info` param](https://pusher.com/docs/channels/library_auth_reference/rest-api#request):
```php
-$result = $pusher->trigger('my-channel', 'my_event', 'hello world', array('info' => 'subscription_count'));
+$result = $pusher->trigger('my-channel', 'my_event', 'hello world', ['info' => 'subscription_count']);
$subscription_count = $result->channels['my-channel']->subscription_count;
```
```php
-$batch = array();
-$batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => array('hello' => 'world'), 'info' => 'subscription_count');
-$batch[] = array('channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => array('myname' => 'bob'), 'info' => 'user_count,subscription_count');
+$batch = [];
+$batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => ['hello' => 'world'], 'info' => 'subscription_count'];
+$batch[] = ['channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => ['myname' => 'bob'], 'info' => 'user_count,subscription_count'];
$result = $pusher->triggerBatch($batch);
foreach ($result->batch as $i => $attributes) {
echo "channel: {$batch[$i]['channel']}, name: {$batch[$i]['name']}";
if (isset($attributes->subscription_count)) {
- echo ", subscription_count: {$attributes->subscription_count}";
+ echo ", subscription_count: {$attributes->subscription_count}";
}
if (isset($attributes->user_count)) {
- echo ", user_count: {$attributes->user_count}";
+ echo ", user_count: {$attributes->user_count}";
}
echo PHP_EOL;
}
@@ -219,7 +218,7 @@ If your data is already encoded in JSON format, you can avoid a second encoding
step by setting the sixth argument true, like so:
```php
-$pusher->trigger('my-channel', 'event', 'data', array(), true)
+$pusher->trigger('my-channel', 'event', 'data', [], true);
```
## Authenticating Private channels
@@ -252,7 +251,7 @@ exception is thrown instead.
```php
$webhook = $pusher->webhook($request_headers, $request_body);
$number_of_events = count($webhook->get_events());
-$time_recieved = $webhook->get_time_ms();
+$time_received = $webhook->get_time_ms();
```
## End to end encryption
@@ -281,14 +280,14 @@ these steps:
```php
$pusher = new Pusher\Pusher(
- $app_key,
- $app_secret,
- $app_id,
- array(
- 'cluster' => $app_cluster,
- 'encryption_master_key_base64' => "<your base64 encoded master key>"
- )
- );
+ $app_key,
+ $app_secret,
+ $app_id,
+ [
+ 'cluster' => $app_cluster,
+ 'encryption_master_key_base64' => "<your base64 encoded master key>"
+ ]
+ );
```
4. Channels where you wish to use end to end encryption should be prefixed with
@@ -309,7 +308,7 @@ call to `trigger`, e.g.
$data['name'] = 'joe';
$data['message_count'] = 23;
-$pusher->trigger(array('channel-1', 'private-encrypted-channel-2'), 'test_event', $data);
+$pusher->trigger(['channel-1', 'private-encrypted-channel-2'], 'test_event', $data);
```
Rationale: the methods in this library map directly to individual Channels HTTP
@@ -322,7 +321,7 @@ is unencrypted for unencrypted channels.
First set this variable in your JS app:
-```php
+```js
Pusher.channel_auth_endpoint = '/presence_auth.php';
```
@@ -330,19 +329,20 @@ Next, create the following in presence_auth.php:
```php
<?php
+
+header('Content-Type: application/json');
+
if (isset($_SESSION['user_id'])) {
$stmt = $pdo->prepare("SELECT * FROM `users` WHERE id = :id");
$stmt->bindValue(':id', $_SESSION['user_id'], PDO::PARAM_INT);
$stmt->execute();
$user = $stmt->fetch();
} else {
- die('aaargh, no-one is logged in');
+ die(json_encode('no-one is logged in'));
}
-header('Content-Type: application/json');
-
$pusher = new Pusher\Pusher($key, $secret, $app_id);
-$presence_data = array('name' => $user['name']);
+$presence_data = ['name' => $user['name']];
echo $pusher->presence_auth($_POST['channel_name'], $_POST['socket_id'], $user['id'], $presence_data);
```
@@ -356,7 +356,7 @@ mechanism that stores the `user_id` of the logged in user in the session.
### Get information about a channel
```php
-$pusher->get_channel_info( $name );
+$pusher->get_channel_info($name);
```
It's also possible to get information about a channel from the Channels HTTP API.
@@ -371,7 +371,7 @@ query the number of distinct users currently subscribed to this channel (a
single user may be subscribed many times, but will only count as one):
```php
-$info = $pusher->get_channel_info('presence-channel-name', array('info' => 'user_count'));
+$info = $pusher->get_channel_info('presence-channel-name', ['info' => 'user_count']);
$user_count = $info->user_count;
```
@@ -380,14 +380,14 @@ of connections currently subscribed to this channel) then you can query this
value as follows:
```php
-$info = $pusher->get_channel_info('presence-channel-name', array('info' => 'subscription_count'));
+$info = $pusher->get_channel_info('presence-channel-name', ['info' => 'subscription_count']);
$subscription_count = $info->subscription_count;
```
### Get a list of application channels
```php
-$pusher->get_channels()
+$pusher->get_channels();
```
It's also possible to get a list of channels for an application from the
@@ -401,7 +401,7 @@ $channel_count = count($result->channels); // $channels is an Array
### Get a filtered list of application channels
```php
-$pusher->get_channels( array( 'filter_by_prefix' => 'some_filter' ) )
+$pusher->get_channels(['filter_by_prefix' => 'some_filter']);
```
It's also possible to get a list of channels based on their name prefix. To do
@@ -410,30 +410,31 @@ example the call will return a list of all channels with a `presence-` prefix.
This is idea for fetching a list of all presence channels.
```php
-$results = $pusher->get_channels( array( 'filter_by_prefix' => 'presence-') );
+$results = $pusher->get_channels(['filter_by_prefix' => 'presence-']);
$channel_count = count($result->channels); // $channels is an Array
```
This can also be achieved using the generic `pusher->get` function:
```php
-$pusher->get( '/channels', array( 'filter_by_prefix' => 'presence-' ) );
+$pusher->get('/channels', ['filter_by_prefix' => 'presence-']);
```
### Get a list of application channels with subscription counts
The HTTP API returning the channel list does not support returning the
subscription count along with each channel. Instead, you can fetch this data by
-iterating over each channel and making another request. But be warned: this
+iterating over each channel and making another request. Be warned: this
approach consumes (number of channels + 1) messages!
```php
<?php
-$subscription_counts = array();
+$subscription_counts = [];
foreach ($pusher->get_channels()->channels as $channel => $v) {
$subscription_counts[$channel] =
- $pusher->get_channel_info(
- $channel, array('info' => 'subscription_count'))->subscription_count;
+ $pusher->get_channel_info(
+ $channel, ['info' => 'subscription_count']
+ )->subscription_count;
}
var_dump($subscription_counts);
```
@@ -441,14 +442,14 @@ var_dump($subscription_counts);
### Get user information from a presence channel
```php
-$results = $pusher->get_users_info( 'presence-channel-name' );
+$results = $pusher->get_users_info('presence-channel-name');
$users_count = count($results->users); // $users is an Array
```
This can also be achieved using the generic `pusher->get` function:
```php
-$response = $pusher->get( '/channels/presence-channel-name/users' )
+$response = $pusher->get('/channels/presence-channel-name/users');
```
The `$response` is in the format:
@@ -471,7 +472,7 @@ Array (
### Generic get function
```php
-$pusher->get( $path, $params );
+$pusher->get($path, $params);
```
Used to make `GET` queries against the Channels HTTP API. Handles authentication.
@@ -482,9 +483,9 @@ property to allow the HTTP status code is always present and a `result`
property will be set if the status code indicates a successful call to the API.
```php
-$response = $pusher->get( '/channels' );
-$http_status_code = $response[ 'status' ];
-$result = $response[ 'result' ];
+$response = $pusher->get('/channels');
+$http_status_code = $response['status'];
+$result = $response['result'];
```
## Running the tests
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -4,14 +4,15 @@
"keywords": ["php-pusher-server", "pusher", "rest", "realtime", "real-time", "real time", "messaging", "push", "trigger", "publish", "events"],
"license": "MIT",
"require": {
- "php": "^7.2.5|^8.0",
+ "php": "^7.3|^8.0",
"ext-curl": "*",
+ "ext-json": "*",
"guzzlehttp/guzzle": "^7.2",
"psr/log": "^1.0",
"paragonie/sodium_compat": "^1.6"
},
"require-dev": {
- "phpunit/phpunit": "^7.2|^8.5|^9.3",
+ "phpunit/phpunit": "^8.5|^9.3",
"overtrue/phplint": "^2.3"
},
"autoload": {
diff --git a/src/ApiErrorException.php b/src/ApiErrorException.php
--- a/src/ApiErrorException.php
+++ b/src/ApiErrorException.php
@@ -14,7 +14,7 @@ class ApiErrorException extends PusherException
*
* @return string
*/
- public function __toString()
+ public function __toString(): string
{
return "(Status {$this->getCode()}) {$this->getMessage()}";
}
diff --git a/src/Pusher.php b/src/Pusher.php
--- a/src/Pusher.php
+++ b/src/Pusher.php
@@ -2,6 +2,8 @@
namespace Pusher;
+use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\GuzzleException;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerAwareTrait;
use Psr\Log\LoggerInterface;
@@ -16,7 +18,7 @@ class Pusher implements LoggerAwareInterface, PusherInterface
/**
* @var string Version
*/
- public static $VERSION = '6.1.0';
+ public static $VERSION = '7.0.0';
/**
* @var null|PusherCrypto
@@ -26,12 +28,12 @@ class Pusher implements LoggerAwareInterface, PusherInterface
/**
* @var array Settings
*/
- private $settings = array(
+ private $settings = [
'scheme' => 'http',
'port' => 80,
'path' => '',
'timeout' => 30,
- );
+ ];
/**
* @var null|resource
@@ -43,8 +45,8 @@ class Pusher implements LoggerAwareInterface, PusherInterface
*
* @param string $auth_key
* @param string $secret
- * @param int $app_id
- * @param array $options [optional]
+ * @param string $app_id
+ * @param array $options [optional]
* Options to configure the Pusher instance.
* scheme - e.g. http or https
* host - the host e.g. api-mt1.pusher.com. No trailing forward slash.
@@ -53,11 +55,11 @@ class Pusher implements LoggerAwareInterface, PusherInterface
* useTLS - quick option to use scheme of https and port 443 (default is true).
* cluster - cluster name to connect to.
* encryption_master_key_base64 - a 32 byte key, encoded as base64. This key, along with the channel name, are used to derive per-channel encryption keys. Per-channel keys are used to encrypt event data on encrypted channels.
- * @param client $resource [optional] - a Guzzle client to use for all HTTP requests
+ * @param ClientInterface|null $client [optional] - a Guzzle client to use for all HTTP requests
*
* @throws PusherException Throws exception if any required dependencies are missing
*/
- public function __construct($auth_key, $secret, $app_id, $options = array(), $client = null)
+ public function __construct(string $auth_key, string $secret, string $app_id, array $options = [], ClientInterface $client = null)
{
$this->check_compatibility();
@@ -83,7 +85,7 @@ public function __construct($auth_key, $secret, $app_id, $options = array(), $cl
$this->settings['auth_key'] = $auth_key;
$this->settings['secret'] = $secret;
$this->settings['app_id'] = $app_id;
- $this->settings['base_path'] = '/apps/'.$this->settings['app_id'];
+ $this->settings['base_path'] = '/apps/' . $this->settings['app_id'];
foreach ($options as $key => $value) {
// only set if valid setting/option
@@ -97,7 +99,7 @@ public function __construct($auth_key, $secret, $app_id, $options = array(), $cl
if (array_key_exists('host', $options)) {
$this->settings['host'] = $options['host'];
} elseif (array_key_exists('cluster', $options)) {
- $this->settings['host'] = 'api-'.$options['cluster'].'.pusher.com';
+ $this->settings['host'] = 'api-' . $options['cluster'] . '.pusher.com';
} else {
$this->settings['host'] = 'api-mt1.pusher.com';
}
@@ -110,7 +112,7 @@ public function __construct($auth_key, $secret, $app_id, $options = array(), $cl
$options['encryption_master_key_base64'] = '';
}
- if ($options['encryption_master_key_base64'] != '') {
+ if ($options['encryption_master_key_base64'] !== '') {
$parsedKey = PusherCrypto::parse_master_key(
$options['encryption_master_key_base64']
);
@@ -123,7 +125,7 @@ public function __construct($auth_key, $secret, $app_id, $options = array(), $cl
*
* @return array
*/
- public function getSettings()
+ public function getSettings(): array
{
return $this->settings;
}
@@ -134,10 +136,8 @@ public function getSettings()
* @param string $msg The message to log
* @param array|\Exception $context [optional] Any extraneous information that does not fit well in a string.
* @param string $level [optional] Importance of log message, highly recommended to use Psr\Log\LogLevel::{level}
- *
- * @return void
*/
- private function log($msg, array $context = array(), $level = LogLevel::DEBUG)
+ private function log(string $msg, array $context = [], string $level = LogLevel::DEBUG): void
{
if (is_null($this->logger)) {
return;
@@ -151,29 +151,27 @@ private function log($msg, array $context = array(), $level = LogLevel::DEBUG)
// Support old style logger (deprecated)
$msg = sprintf('Pusher: %s: %s', strtoupper($level), $msg);
- $replacement = array();
+ $replacement = [];
foreach ($context as $k => $v) {
- $replacement['{'.$k.'}'] = $v;
+ $replacement['{' . $k . '}'] = $v;
}
- $this->logger->log(strtr($msg, $replacement));
+ $this->logger->log($level, strtr($msg, $replacement));
}
/**
* Check if the current PHP setup is sufficient to run this class.
*
* @throws PusherException If any required dependencies are missing
- *
- * @return void
*/
- private function check_compatibility()
+ private function check_compatibility(): void
{
if (!extension_loaded('json')) {
throw new PusherException('The Pusher library requires the PHP JSON module. Please ensure it is installed');
}
- if (!in_array('sha256', hash_algos())) {
+ if (!in_array('sha256', hash_algos(), true)) {
throw new PusherException('SHA256 appears to be unsupported - make sure you have support for it, or upgrade your version of PHP.');
}
}
@@ -184,10 +182,8 @@ private function check_compatibility()
* @param string[] $channels An array of channel names to validate
*
* @throws PusherException If $channels is too big or any channel is invalid
- *
- * @return void
*/
- private function validate_channels($channels)
+ private function validate_channels(array $channels): void
{
if (count($channels) > 100) {
throw new PusherException('An event can be triggered on a maximum of 100 channels in a single call.');
@@ -204,13 +200,11 @@ private function validate_channels($channels)
* @param string $channel The channel name to validate
*
* @throws PusherException If $channel is invalid
- *
- * @return void
*/
- private function validate_channel($channel)
+ private function validate_channel(string $channel): void
{
if (!preg_match('/\A[-a-zA-Z0-9_=@,.;]+\z/', $channel)) {
- throw new PusherException('Invalid channel name '.$channel);
+ throw new PusherException('Invalid channel name ' . $channel);
}
}
@@ -221,33 +215,31 @@ private function validate_channel($channel)
*
* @throws PusherException If $socket_id is invalid
*/
- private function validate_socket_id($socket_id)
+ private function validate_socket_id(string $socket_id): void
{
if ($socket_id !== null && !preg_match('/\A\d+\.\d+\z/', $socket_id)) {
- throw new PusherException('Invalid socket ID '.$socket_id);
+ throw new PusherException('Invalid socket ID ' . $socket_id);
}
}
/**
* Utility function used to generate signing headers
*
- * @param string $path
- * @param string [optional] $request_method
- * @param array [optional] $query_params
+ * @param string $path
+ * @param string $request_method
+ * @param array $query_params [optional]
*
* @return array
*/
- private function sign($path, $request_method = 'GET', $query_params = array())
+ private function sign(string $path, string $request_method = 'GET', array $query_params = []): array
{
- $signed_params = self::build_auth_query_params(
+ return self::build_auth_query_params(
$this->settings['auth_key'],
$this->settings['secret'],
$request_method,
$path,
$query_params
);
-
- return $signed_params;
}
/**
@@ -255,9 +247,9 @@ private function sign($path, $request_method = 'GET', $query_params = array())
*
* @return string
*/
- private function channels_url_prefix()
+ private function channels_url_prefix(): string
{
- return $this->settings['scheme'].'://'.$this->settings['host'].':'.$this->settings['port'].$this->settings['path'];
+ return $this->settings['scheme'] . '://' . $this->settings['host'] . ':' . $this->settings['port'] . $this->settings['path'];
}
/**
@@ -267,22 +259,21 @@ private function channels_url_prefix()
* @param string $auth_secret
* @param string $request_method
* @param string $request_path
- * @param array $query_params [optional]
- * @param string $auth_version [optional]
- * @param string $auth_timestamp [optional]
- *
- * @return string
+ * @param array $query_params [optional]
+ * @param string $auth_version [optional]
+ * @param string|null $auth_timestamp [optional]
+ * @return array
*/
public static function build_auth_query_params(
- $auth_key,
- $auth_secret,
- $request_method,
- $request_path,
- $query_params = array(),
- $auth_version = '1.0',
- $auth_timestamp = null
- ) {
- $params = array();
+ string $auth_key,
+ string $auth_secret,
+ string $request_method,
+ string $request_path,
+ array $query_params = [],
+ string $auth_version = '1.0',
+ string $auth_timestamp = null
+ ): array {
+ $params = [];
$params['auth_key'] = $auth_key;
$params['auth_timestamp'] = (is_null($auth_timestamp) ? time() : $auth_timestamp);
$params['auth_version'] = $auth_version;
@@ -290,7 +281,7 @@ public static function build_auth_query_params(
$params = array_merge($params, $query_params);
ksort($params);
- $string_to_sign = "$request_method\n".$request_path."\n".self::array_implode('=', '&', $params);
+ $string_to_sign = "$request_method\n" . $request_path . "\n" . self::array_implode('=', '&', $params);
$auth_signature = hash_hmac('sha256', $string_to_sign, $auth_secret, false);
@@ -310,13 +301,13 @@ public static function build_auth_query_params(
*
* @return string The imploded array
*/
- public static function array_implode($glue, $separator, $array)
+ public static function array_implode(string $glue, string $separator, $array): string
{
if (!is_array($array)) {
return $array;
}
- $string = array();
+ $string = [];
foreach ($array as $key => $val) {
if (is_array($val)) {
$val = implode(',', $val);
@@ -331,21 +322,19 @@ public static function array_implode($glue, $separator, $array)
* Helper function to prepare trigger request. Takes the same
* parameters as the public trigger functions.
*
- * @param array|string $channels A channel name or an array of channel names to publish the event on.
- * @param string $event
- * @param mixed $data Event data
- * @param array $params [optional]
- * @param bool $already_encoded [optional]
- *
- * @throws PusherException Throws PusherException if $channels is an array of size 101 or above or $socket_id is invalid
- * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
- * @throws GuzzleException
+ * @param array|string $channels A channel name or an array of channel names to publish the event on.
+ * @param string $event
+ * @param mixed $data Event data
+ * @param array $params [optional]
+ * @param bool $already_encoded [optional]
*
+ * @return Request
+ * @throws PusherException Throws PusherException if $channels is an array of size 101 or above or $socket_id is invalid
*/
- public function make_request($channels, $event, $data, $params = array(), $already_encoded = false) : Request
+ public function make_request($channels, string $event, $data, array $params = [], bool $already_encoded = false): Request
{
if (is_string($channels) === true) {
- $channels = array($channels);
+ $channels = [$channels];
}
$this->validate_channels($channels);
@@ -366,31 +355,46 @@ public function make_request($channels, $event, $data, $params = array(), $alrea
// For rationale, see limitations of end-to-end encryption in the README
throw new PusherException('You cannot trigger to multiple channels when using encrypted channels');
} else {
- $data_encoded = $this->crypto->encrypt_payload($channels[0], $already_encoded ? $data : json_encode($data));
+ try {
+ $data_encoded = $this->crypto->encrypt_payload(
+ $channels[0],
+ $already_encoded ? $data : json_encode($data, JSON_THROW_ON_ERROR)
+ );
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
}
} else {
- $data_encoded = $already_encoded ? $data : json_encode($data);
+ try {
+ $data_encoded = $already_encoded ? $data : json_encode($data, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
}
- $query_params = array();
+ $query_params = [];
- $path = $this->settings['base_path'].'/events';
+ $path = $this->settings['base_path'] . '/events';
// json_encode might return false on failure
if (!$data_encoded) {
- $this->log('Failed to perform json_encode on the the provided data: {error}', array(
+ $this->log('Failed to perform json_encode on the the provided data: {error}', [
'error' => print_r($data, true),
- ), LogLevel::ERROR);
+ ], LogLevel::ERROR);
}
- $post_params = array();
+ $post_params = [];
$post_params['name'] = $event;
$post_params['data'] = $data_encoded;
$post_params['channels'] = array_values($channels);
$all_params = array_merge($post_params, $params);
- $post_value = json_encode($all_params);
+ try {
+ $post_value = json_encode($all_params, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
$query_params['body_md5'] = md5($post_value);
@@ -400,33 +404,32 @@ public function make_request($channels, $event, $data, $params = array(), $alrea
$headers = [
'Content-Type' => 'application/json',
- 'X-Pusher-Library' => 'pusher-http-php '.self::$VERSION
+ 'X-Pusher-Library' => 'pusher-http-php ' . self::$VERSION
];
$params = array_merge($signature, $query_params);
$query_string = self::array_implode('=', '&', $params);
- $full_path = $path."?".$query_string;
- $request = new Request('POST', $full_path, $headers, $post_value);
-
- return $request;
+ $full_path = $path . "?" . $query_string;
+ return new Request('POST', $full_path, $headers, $post_value);
}
/**
* Trigger an event by providing event name and payload.
* Optionally provide a socket ID to exclude a client (most likely the sender).
*
- * @param array|string $channels A channel name or an array of channel names to publish the event on.
- * @param string $event
- * @param mixed $data Event data
- * @param array $params [optional]
- * @param bool $already_encoded [optional]
+ * @param array|string $channels A channel name or an array of channel names to publish the event on.
+ * @param string $event
+ * @param mixed $data Event data
+ * @param array $params [optional]
+ * @param bool $already_encoded [optional]
*
- * @throws PusherException Throws PusherException if $channels is an array of size 101 or above or $socket_id is invalid
+ * @return object
* @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
* @throws GuzzleException
- *
+ * @throws PusherException Throws PusherException if $channels is an array of size 101 or above or $socket_id is invalid
*/
- public function trigger($channels, $event, $data, $params = array(), $already_encoded = false) : object {
+ public function trigger($channels, string $event, $data, array $params = [], bool $already_encoded = false): object
+ {
$request = $this->make_request($channels, $event, $data, $params, $already_encoded);
$response = $this->client->send($request, [
@@ -441,7 +444,11 @@ public function trigger($channels, $event, $data, $params = array(), $already_en
throw new ApiErrorException($body, $status);
}
- $result = json_decode($response->getBody());
+ try {
+ $result = json_decode($response->getBody(), false, 512, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
if (property_exists($result, 'channels')) {
$result->channels = get_object_vars($result->channels);
@@ -454,14 +461,16 @@ public function trigger($channels, $event, $data, $params = array(), $already_en
* Asynchronously trigger an event by providing event name and payload.
* Optionally provide a socket ID to exclude a client (most likely the sender).
*
- * @param array|string $channels A channel name or an array of channel names to publish the event on.
- * @param string $event
- * @param mixed $data Event data
- * @param array $params [optional]
- * @param bool $already_encoded [optional]
+ * @param array|string $channels A channel name or an array of channel names to publish the event on.
+ * @param string $event
+ * @param mixed $data Event data
+ * @param array $params [optional]
+ * @param bool $already_encoded [optional]
*
+ * @return PromiseInterface
+ * @throws PusherException
*/
- public function triggerAsync($channels, $event, $data, $params = array(), $already_encoded = false) : PromiseInterface
+ public function triggerAsync($channels, string $event, $data, array $params = [], bool $already_encoded = false): PromiseInterface
{
$request = $this->make_request($channels, $event, $data, $params, $already_encoded);
@@ -476,7 +485,7 @@ public function triggerAsync($channels, $event, $data, $params = array(), $alrea
throw new ApiErrorException($body, $status);
}
- $result = json_decode($response->getBody());
+ $result = json_decode($response->getBody(), null, 512, JSON_THROW_ON_ERROR);
if (property_exists($result, 'channels')) {
$result->channels = get_object_vars($result->channels);
@@ -491,13 +500,13 @@ public function triggerAsync($channels, $event, $data, $params = array(), $alrea
/**
* Helper function to prepare batch trigger request. Takes the same * parameters as the public batch trigger functions.
*
- * @param array $batch [optional] An array of events to send
- * @param bool $already_encoded [optional]
- *
- * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
+ * @param array $batch [optional] An array of events to send
+ * @param bool $already_encoded [optional]
*
- **/
- public function make_batch_request($batch = array(), $already_encoded = false) : Request
+ * @return Request
+ * @throws PusherException
+ */
+ public function make_batch_request(array $batch = [], bool $already_encoded = false): Request
{
foreach ($batch as $key => $event) {
$this->validate_channel($event['channel']);
@@ -507,7 +516,11 @@ public function make_batch_request($batch = array(), $already_encoded = false) :
$data = $event['data'];
if (!is_string($data)) {
- $data = $already_encoded ? $data : json_encode($data);
+ try {
+ $data = $already_encoded ? $data : json_encode($data, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
}
if (PusherCrypto::is_encrypted_channel($event['channel'])) {
@@ -517,13 +530,17 @@ public function make_batch_request($batch = array(), $already_encoded = false) :
}
}
- $post_params = array();
+ $post_params = [];
$post_params['batch'] = $batch;
- $post_value = json_encode($post_params);
+ try {
+ $post_value = json_encode($post_params, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
- $query_params = array();
+ $query_params = [];
$query_params['body_md5'] = md5($post_value);
- $path = $this->settings['base_path'].'/batch_events';
+ $path = $this->settings['base_path'] . '/batch_events';
$signature = $this->sign($path, 'POST', $query_params);
@@ -531,28 +548,27 @@ public function make_batch_request($batch = array(), $already_encoded = false) :
$headers = [
'Content-Type' => 'application/json',
- 'X-Pusher-Library' => 'pusher-http-php '.self::$VERSION
+ 'X-Pusher-Library' => 'pusher-http-php ' . self::$VERSION
];
$params = array_merge($signature, $query_params);
$query_string = self::array_implode('=', '&', $params);
- $full_path = $path."?".$query_string;
- $request = new Request('POST', $full_path, $headers, $post_value);
-
- return $request;
+ $full_path = $path . "?" . $query_string;
+ return new Request('POST', $full_path, $headers, $post_value);
}
/**
* Trigger multiple events at the same time.
*
- * @param array $batch [optional] An array of events to send
- * @param bool $already_encoded [optional]
+ * @param array $batch [optional] An array of events to send
+ * @param bool $already_encoded [optional]
*
+ * @return object
* @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
* @throws GuzzleException
- *
+ * @throws PusherException
*/
- public function triggerBatch($batch = array(), $already_encoded = false) : object
+ public function triggerBatch(array $batch = [], bool $already_encoded = false): object
{
$request = $this->make_batch_request($batch, $already_encoded);
@@ -568,7 +584,11 @@ public function triggerBatch($batch = array(), $already_encoded = false) : objec
throw new ApiErrorException($body, $status);
}
- $result = json_decode($response->getBody());
+ try {
+ $result = json_decode($response->getBody(), false, 512, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
if (property_exists($result, 'channels')) {
$result->channels = get_object_vars($result->channels);
@@ -580,13 +600,13 @@ public function triggerBatch($batch = array(), $already_encoded = false) : objec
/**
* Asynchronously trigger multiple events at the same time.
*
- * @param array $batch [optional] An array of events to send
- * @param bool $already_encoded [optional]
- *
- * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
+ * @param array $batch [optional] An array of events to send
+ * @param bool $already_encoded [optional]
*
+ * @return PromiseInterface
+ * @throws PusherException
*/
- public function triggerBatchAsync($batch = array(), $already_encoded = false) : PromiseInterface
+ public function triggerBatchAsync(array $batch = [], bool $already_encoded = false): PromiseInterface
{
$request = $this->make_batch_request($batch, $already_encoded);
@@ -601,7 +621,7 @@ public function triggerBatchAsync($batch = array(), $already_encoded = false) :
throw new ApiErrorException($body, $status);
}
- $result = json_decode($response->getBody());
+ $result = json_decode($response->getBody(), false, 512, JSON_THROW_ON_ERROR);
if (property_exists($result, 'channels')) {
$result->channels = get_object_vars($result->channels);
@@ -611,7 +631,6 @@ public function triggerBatchAsync($batch = array(), $already_encoded = false) :
});
return $promise;
-
}
/**
@@ -625,11 +644,11 @@ public function triggerBatchAsync($batch = array(), $already_encoded = false) :
* @throws GuzzleException
*
*/
- public function get_channel_info($channel, $params = array()) : object
+ public function get_channel_info(string $channel, array $params = []): object
{
$this->validate_channel($channel);
- return $this->get('/channels/'.$channel, $params);
+ return $this->get('/channels/' . $channel, $params);
}
/**
@@ -641,7 +660,7 @@ public function get_channel_info($channel, $params = array()) : object
* @throws GuzzleException
*
*/
- public function get_channels($params = array()) : object
+ public function get_channels(array $params = []): object
{
$result = $this->get('/channels', $params);
@@ -659,9 +678,9 @@ public function get_channels($params = array()) : object
* @throws GuzzleException
*
*/
- public function get_users_info($channel) : object
+ public function get_users_info(string $channel): object
{
- return $this->get('/channels/'.$channel.'/users');
+ return $this->get('/channels/' . $channel . '/users');
}
/**
@@ -674,18 +693,19 @@ public function get_users_info($channel) : object
*
* @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
* @throws GuzzleException
+ * @throws PusherException
*
* @return mixed See Pusher API docs
*/
- public function get($path, $params = array(), $associative = false)
+ public function get(string $path, array $params = [], $associative = false)
{
- $path = $this->settings['base_path'].$path;
+ $path = $this->settings['base_path'] . $path;
$signature = $this->sign($path, 'GET', $params);
$headers = [
'Content-Type' => 'application/json',
- 'X-Pusher-Library' => 'pusher-http-php '.self::$VERSION
+ 'X-Pusher-Library' => 'pusher-http-php ' . self::$VERSION
];
$response = $this->client->get($path, [
@@ -702,7 +722,13 @@ public function get($path, $params = array(), $associative = false)
throw new ApiErrorException($body, $status);
}
- return json_decode($response->getBody(), $associative);
+ try {
+ $body = json_decode($response->getBody(), $associative, 512, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data decoding error.');
+ }
+
+ return $body;
}
/**
@@ -710,24 +736,23 @@ public function get($path, $params = array(), $associative = false)
*
* @param string $channel
* @param string $socket_id
- * @param string $custom_data
- *
- * @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
+ * @param string|null $custom_data
*
* @return string Json encoded authentication string.
+ * @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
*/
- public function socket_auth($channel, $socket_id, $custom_data = null) : string
+ public function socket_auth(string $channel, string $socket_id, string $custom_data = null): string
{
$this->validate_channel($channel);
$this->validate_socket_id($socket_id);
if ($custom_data) {
- $signature = hash_hmac('sha256', $socket_id.':'.$channel.':'.$custom_data, $this->settings['secret'], false);
+ $signature = hash_hmac('sha256', $socket_id . ':' . $channel . ':' . $custom_data, $this->settings['secret'], false);
} else {
- $signature = hash_hmac('sha256', $socket_id.':'.$channel, $this->settings['secret'], false);
+ $signature = hash_hmac('sha256', $socket_id . ':' . $channel, $this->settings['secret'], false);
}
- $signature = array('auth' => $this->settings['auth_key'].':'.$signature);
+ $signature = ['auth' => $this->settings['auth_key'] . ':' . $signature];
// add the custom data if it has been supplied
if ($custom_data) {
$signature['channel_data'] = $custom_data;
@@ -741,7 +766,13 @@ public function socket_auth($channel, $socket_id, $custom_data = null) : string
}
}
- return json_encode($signature, JSON_UNESCAPED_SLASHES);
+ try {
+ $response = json_encode($signature, JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
+
+ return $response;
}
/**
@@ -750,19 +781,23 @@ public function socket_auth($channel, $socket_id, $custom_data = null) : string
* @param string $channel
* @param string $socket_id
* @param string $user_id
- * @param mixed $user_info
+ * @param mixed $user_info
*
+ * @return string
* @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
- *
*/
- public function presence_auth($channel, $socket_id, $user_id, $user_info = null) : string
+ public function presence_auth(string $channel, string $socket_id, string $user_id, $user_info = null): string
{
- $user_data = array('user_id' => $user_id);
+ $user_data = ['user_id' => $user_id];
if ($user_info) {
$user_data['user_info'] = $user_info;
}
- return $this->socket_auth($channel, $socket_id, json_encode($user_data));
+ try {
+ return $this->socket_auth($channel, $socket_id, json_encode($user_data, JSON_THROW_ON_ERROR));
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
}
/**
@@ -775,33 +810,37 @@ public function presence_auth($channel, $socket_id, $user_id, $user_info = null)
*
* @return Webhook marshalled object with the properties time_ms (an int) and events (an array of event objects)
*/
- public function webhook($headers, $body) : object
+ public function webhook(array $headers, string $body): object
{
$this->ensure_valid_signature($headers, $body);
- $decoded_events = array();
- $decoded_json = json_decode($body);
+ $decoded_events = [];
+ try {
+ $decoded_json = json_decode($body, false, 512, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ $this->log('Unable to decrypt webhook event payload.', null, LogLevel::WARNING);
+ throw new PusherException('Data encoding error.');
+ }
+
foreach ($decoded_json->events as $key => $event) {
if (PusherCrypto::is_encrypted_channel($event->channel)) {
if (!is_null($this->crypto)) {
$decryptedEvent = $this->crypto->decrypt_event($event);
- if ($decryptedEvent == false) {
+ if ($decryptedEvent === false) {
$this->log('Unable to decrypt webhook event payload. Wrong key? Ignoring.', null, LogLevel::WARNING);
continue;
}
- array_push($decoded_events, $decryptedEvent);
+ $decoded_events[] = $decryptedEvent;
} else {
$this->log('Got an encrypted webhook event payload, but no master key specified. Ignoring.', null, LogLevel::WARNING);
continue;
}
} else {
- array_push($decoded_events, $event);
+ $decoded_events[] = $event;
}
}
- $webhookobj = new Webhook($decoded_json->time_ms, $decoded_json->events);
-
- return $webhookobj;
+ return new Webhook($decoded_json->time_ms, $decoded_events);
}
/**
@@ -810,13 +849,13 @@ public function webhook($headers, $body) : object
* @param array $headers an array of headers from the request (for example, from getallheaders())
* @param string $body the body of the request (for example, from file_get_contents('php://input'))
*
- * @throws PusherException if signature is inccorrect.
+ * @throws PusherException if signature is incorrect.
*/
- public function ensure_valid_signature($headers, $body)
+ public function ensure_valid_signature(array $headers, string $body): void
{
$x_pusher_key = $headers['X-Pusher-Key'];
$x_pusher_signature = $headers['X-Pusher-Signature'];
- if ($x_pusher_key == $this->settings['auth_key']) {
+ if ($x_pusher_key === $this->settings['auth_key']) {
$expected = hash_hmac('sha256', $body, $this->settings['secret']);
if ($expected === $x_pusher_signature) {
return;
diff --git a/src/PusherCrypto.php b/src/PusherCrypto.php
--- a/src/PusherCrypto.php
+++ b/src/PusherCrypto.php
@@ -4,10 +4,10 @@
class PusherCrypto
{
- private $encryption_master_key = '';
+ private $encryption_master_key;
// The prefix any e2e channel must have
- const ENCRYPTED_PREFIX = 'private-encrypted-';
+ public const ENCRYPTED_PREFIX = 'private-encrypted-';
/**
* Checks if a given channel is an encrypted channel.
@@ -16,24 +16,29 @@ class PusherCrypto
*
* @return bool true if channel is an encrypted channel
*/
- public static function is_encrypted_channel($channel)
+ public static function is_encrypted_channel(string $channel): bool
{
- return substr($channel, 0, strlen(self::ENCRYPTED_PREFIX)) === self::ENCRYPTED_PREFIX;
+ return strpos($channel, self::ENCRYPTED_PREFIX) === 0;
}
- public static function parse_master_key($encryption_master_key_base64)
+ /**
+ * @param $encryption_master_key_base64
+ * @return string
+ * @throws PusherException
+ */
+ public static function parse_master_key($encryption_master_key_base64): string
{
if (!function_exists('sodium_crypto_secretbox')) {
throw new PusherException('To use end to end encryption, you must either be using PHP 7.2 or greater or have installed the libsodium-php extension for php < 7.2.');
}
- if ($encryption_master_key_base64 != '') {
+ if ($encryption_master_key_base64 !== '') {
$decoded_key = base64_decode($encryption_master_key_base64, true);
if ($decoded_key === false) {
throw new PusherException('encryption_master_key_base64 must be a valid base64 string');
}
- if (strlen($decoded_key) != SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
+ if (strlen($decoded_key) !== SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
throw new PusherException('encryption_master_key_base64 must encode a key which is 32 bytes long');
}
@@ -48,7 +53,7 @@ public static function parse_master_key($encryption_master_key_base64)
*
* @param string $encryption_master_key the SECRET_KEY_LENGTH key that will be used for key derivation.
*/
- public function __construct($encryption_master_key)
+ public function __construct(string $encryption_master_key)
{
$this->encryption_master_key = $encryption_master_key;
}
@@ -59,11 +64,12 @@ public function __construct($encryption_master_key)
* @param object $event an object that has an encrypted data property and a channel property.
*
* @return object the event with a decrypted payload, or false if decryption was unsuccessful.
+ * @throws PusherException
*/
- public function decrypt_event($event)
+ public function decrypt_event(object $event): object
{
$parsed_payload = $this->parse_encrypted_message($event->data);
- $shared_secret = $this->generate_shared_secret($event->channel, $this->encryption_master_key);
+ $shared_secret = $this->generate_shared_secret($event->channel);
$decrypted_payload = $this->decrypt_payload($parsed_payload->ciphertext, $parsed_payload->nonce, $shared_secret);
if (!$decrypted_payload) {
throw new PusherException('Decryption of the payload failed. Wrong key?');
@@ -79,46 +85,54 @@ public function decrypt_event($event)
* @param string $channel the name of the channel
*
* @return string a SHA256 hash (encoded as base64) of the channel name appended to the encryption key
+ * @throws PusherException
*/
- public function generate_shared_secret($channel)
+ public function generate_shared_secret(string $channel): string
{
if (!self::is_encrypted_channel($channel)) {
- throw new PusherException('You must specify a channel of the form private-encrypted-* for E2E encryption. Got '.$channel);
+ throw new PusherException('You must specify a channel of the form private-encrypted-* for E2E encryption. Got ' . $channel);
}
- return hash('sha256', $channel.$this->encryption_master_key, true);
+ return hash('sha256', $channel . $this->encryption_master_key, true);
}
/**
* Encrypts a given plaintext for broadcast on a particular channel.
*
- * @param string $channel the name of the channel the payloads event will be broadcast on
+ * @param string $channel the name of the channel the payloads event will be broadcast on
* @param string $plaintext the data to encrypt
*
* @return string a string ready to be sent as the data of an event.
+ * @throws PusherException
+ * @throws \SodiumException
*/
- public function encrypt_payload($channel, $plaintext)
+ public function encrypt_payload(string $channel, string $plaintext): string
{
if (!self::is_encrypted_channel($channel)) {
- throw new PusherException('Cannot encrypt plaintext for a channel that is not of the form private-encrypted-*. Got '.$channel);
+ throw new PusherException('Cannot encrypt plaintext for a channel that is not of the form private-encrypted-*. Got ' . $channel);
}
$nonce = $this->generate_nonce();
$shared_secret = $this->generate_shared_secret($channel);
$cipher_text = sodium_crypto_secretbox($plaintext, $nonce, $shared_secret);
- return $this->format_encrypted_message($nonce, $cipher_text);
+ try {
+ return $this->format_encrypted_message($nonce, $cipher_text);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data encoding error.');
+ }
}
/**
* Decrypts a given payload using the nonce and shared secret.
*
- * @param string $payload the ciphertext
- * @param string $nonce the nonce used in the encryption
+ * @param string $payload the ciphertext
+ * @param string $nonce the nonce used in the encryption
* @param string $shared_secret the shared_secret used in the encryption
*
* @return string plaintext
+ * @throws \SodiumException
*/
- public function decrypt_payload($payload, $nonce, $shared_secret)
+ public function decrypt_payload(string $payload, string $nonce, string $shared_secret)
{
$plaintext = sodium_crypto_secretbox_open($payload, $nonce, $shared_secret);
if (empty($plaintext)) {
@@ -131,18 +145,19 @@ public function decrypt_payload($payload, $nonce, $shared_secret)
/**
* Formats an encrypted message ready for broadcast.
*
- * @param string $nonce the nonce used in the encryption process (bytes)
+ * @param string $nonce the nonce used in the encryption process (bytes)
* @param string $ciphertext the ciphertext (bytes)
*
* @return string JSON with base64 encoded nonce and ciphertext`
+ * @throws \JsonException
*/
- private function format_encrypted_message($nonce, $ciphertext)
+ private function format_encrypted_message(string $nonce, string $ciphertext): string
{
$encrypted_message = new \stdClass();
$encrypted_message->nonce = base64_encode($nonce);
$encrypted_message->ciphertext = base64_encode($ciphertext);
- return json_encode($encrypted_message);
+ return json_encode($encrypted_message, JSON_THROW_ON_ERROR);
}
/**
@@ -151,14 +166,20 @@ private function format_encrypted_message($nonce, $ciphertext)
*
* @param string $payload the encrypted message payload
*
- * @return string php object with decoded nonce and ciphertext
+ * @return object php object with decoded nonce and ciphertext
+ * @throws PusherException
*/
- private function parse_encrypted_message($payload)
+ private function parse_encrypted_message(string $payload): object
{
- $decoded_payload = json_decode($payload);
+ try {
+ $decoded_payload = json_decode($payload, false, 512, JSON_THROW_ON_ERROR);
+ } catch (\JsonException $e) {
+ throw new PusherException('Data decoding error.');
+ }
+
$decoded_payload->nonce = base64_decode($decoded_payload->nonce);
$decoded_payload->ciphertext = base64_decode($decoded_payload->ciphertext);
- if (strlen($decoded_payload->nonce) != SODIUM_CRYPTO_SECRETBOX_NONCEBYTES || $decoded_payload->ciphertext == '') {
+ if ($decoded_payload->ciphertext === '' || strlen($decoded_payload->nonce) !== SODIUM_CRYPTO_SECRETBOX_NONCEBYTES) {
throw new PusherException('Received a payload that cannot be parsed.');
}
@@ -167,8 +188,10 @@ private function parse_encrypted_message($payload)
/**
* Generates a nonce that is SODIUM_CRYPTO_SECRETBOX_NONCEBYTES long.
+ * @return string
+ * @throws \Exception
*/
- private function generate_nonce()
+ private function generate_nonce(): string
{
return random_bytes(
SODIUM_CRYPTO_SECRETBOX_NONCEBYTES
diff --git a/src/PusherInstance.php b/src/PusherInstance.php
--- a/src/PusherInstance.php
+++ b/src/PusherInstance.php
@@ -13,6 +13,7 @@ class PusherInstance
* Get the pusher singleton instance.
*
* @return Pusher
+ * @throws PusherException
*/
public static function get_pusher()
{
diff --git a/src/PusherInterface.php b/src/PusherInterface.php
--- a/src/PusherInterface.php
+++ b/src/PusherInterface.php
@@ -1,6 +1,8 @@
<?php
namespace Pusher;
+
+use GuzzleHttp\Exception\GuzzleException;
use GuzzleHttp\Promise\PromiseInterface;
interface PusherInterface
@@ -19,7 +21,7 @@ public function getSettings();
* @param array|string $channels A channel name or an array of channel names to publish the event on.
* @param string $event
* @param mixed $data Event data
- * @param string|null $socket_id [optional]
+ * @param array $params [optional]
* @param bool $already_encoded [optional]
*
* @throws PusherException Throws exception if $channels is an array of size 101 or above or $socket_id is invalid
@@ -27,23 +29,22 @@ public function getSettings();
* @throws GuzzleException
*
*/
- public function trigger($channels, $event, $data, $socket_id = null, $already_encoded = false) : object;
+ public function trigger($channels, string $event, $data, array $params = [], bool $already_encoded = false): object;
/**
* Asynchronously trigger an event by providing event name and payload.
* Optionally provide a socket ID to exclude a client (most likely the sender).
*
* @param array|string $channels A channel name or an array of channel names to publish the event on.
- * @param string $event
* @param mixed $data Event data
* @param array $params [optional]
* @param bool $already_encoded [optional]
*
*/
- public function triggerAsync($channels, $event, $data, $params = array(), $already_encoded = false) : PromiseInterface;
-
+ public function triggerAsync($channels, string $event, $data, array $params = [], bool $already_encoded = false): PromiseInterface;
+
/**
- *
+ *
*
* @param array $batch [optional] An array of events to send
* @param bool $already_encoded [optional]
@@ -53,7 +54,7 @@ public function triggerAsync($channels, $event, $data, $params = array(), $alrea
* @throws GuzzleException
*
*/
- public function triggerBatch($batch = array(), $already_encoded = false) : object;
+ public function triggerBatch(array $batch = [], bool $already_encoded = false): object;
/**
* Trigger multiple events at the same time.
@@ -65,7 +66,7 @@ public function triggerBatch($batch = array(), $already_encoded = false) : objec
* @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
*
*/
- public function triggerBatchAsync($batch = array(), $already_encoded = false) : PromiseInterface;
+ public function triggerBatchAsync(array $batch = [], bool $already_encoded = false): PromiseInterface;
/**
* Asynchronously trigger multiple events at the same time.
@@ -78,7 +79,7 @@ public function triggerBatchAsync($batch = array(), $already_encoded = false) :
* @throws GuzzleException
*
*/
- public function get_channel_info($channel, $params = array()) : object;
+ public function get_channel_info(string $channel, array $params = []): object;
/**
* Fetch a list containing all channels.
@@ -90,7 +91,7 @@ public function get_channel_info($channel, $params = array()) : object;
* @throws GuzzleException
*
*/
- public function get_channels($params = array()) : object;
+ public function get_channels(array $params = []): object;
/**
* Fetch user ids currently subscribed to a presence channel.
@@ -102,7 +103,7 @@ public function get_channels($params = array()) : object;
* @throws GuzzleException
*
*/
- public function get_users_info($channel) : object;
+ public function get_users_info(string $channel): object;
/**
* GET arbitrary REST API resource using a synchronous http client.
@@ -118,33 +119,28 @@ public function get_users_info($channel) : object;
*
* @return mixed See Pusher API docs
*/
- public function get($path, $params = array());
+ public function get(string $path, array $params = [], bool $associative = false);
/**
* Creates a socket signature.
*
* @param string $channel
* @param string $socket_id
- * @param string $custom_data
- *
- * @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
- *
+ * @param string|null $custom_data
* @return string Json encoded authentication string.
+ * @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
*/
- public function socket_auth($channel, $socket_id, $custom_data = null) : string;
+ public function socket_auth(string $channel, string $socket_id, string $custom_data = null): string;
/**
* Creates a presence signature (an extension of socket signing).
*
- * @param string $channel
- * @param string $socket_id
- * @param string $user_id
* @param mixed $user_info
*
* @throws PusherException Throws exception if $channel is invalid or above or $socket_id is invalid
*
*/
- public function presence_auth($channel, $socket_id, $user_id, $user_info = null) : string;
+ public function presence_auth(string $channel, string $socket_id, string $user_id, $user_info = null): string;
/**
* Verify that a webhook actually came from Pusher, decrypts any
@@ -157,7 +153,7 @@ public function presence_auth($channel, $socket_id, $user_id, $user_info = null)
*
* @return Webhook marshalled object with the properties time_ms (an int) and events (an array of event objects)
*/
- public function webhook($headers, $body) : object;
+ public function webhook(array $headers, string $body): object;
/**
* Verify that a given Pusher Signature is valid.
@@ -167,5 +163,5 @@ public function webhook($headers, $body) : object;
*
* @throws PusherException if signature is inccorrect.
*/
- public function ensure_valid_signature($headers, $body);
+ public function ensure_valid_signature(array $headers, string $body);
}
diff --git a/src/Webhook.php b/src/Webhook.php
--- a/src/Webhook.php
+++ b/src/Webhook.php
@@ -4,8 +4,10 @@
class Webhook
{
+ /** @var int $time_ms */
private $time_ms;
- private $events = array();
+ /** @var array $events */
+ private $events;
public function __construct($time_ms, $events)
{
@@ -13,12 +15,12 @@ public function __construct($time_ms, $events)
$this->events = $events;
}
- public function get_events()
+ public function get_events(): array
{
return $this->events;
}
- public function get_time_ms()
+ public function get_time_ms(): int
{
return $this->time_ms;
}
|
diff --git a/tests/acceptance/ChannelQueryTest.php b/tests/acceptance/ChannelQueryTest.php
--- a/tests/acceptance/ChannelQueryTest.php
+++ b/tests/acceptance/ChannelQueryTest.php
@@ -1,100 +1,119 @@
<?php
-class ChannelQueryTest extends PHPUnit\Framework\TestCase
+namespace acceptance;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+
+class ChannelQueryTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
+ self::markTestSkipped('Please set the
+ PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
+ PUSHERAPP_APPID keys.');
+ } else {
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER]);
+ }
}
- public function testChannelInfo()
+ public function testChannelInfo(): void
{
$result = $this->pusher->get_channel_info('channel-test');
- $this->assertObjectHasAttribute('occupied', $result, 'class has occupied attribute');
+ self::assertObjectHasAttribute('occupied', $result, 'class has occupied attribute');
}
- public function testChannelList()
+ public function testChannelList(): void
{
$result = $this->pusher->get_channels();
$channels = $result->channels;
- $this->assertTrue(is_array($channels), 'channels is an array');
+ self::assertIsArray($channels, 'channels is an array');
}
- public function testFilterByPrefixNoChannels()
+ public function testFilterByPrefixNoChannels(): void
{
- $options = array(
+ $options = [
'filter_by_prefix' => '__fish',
- );
+ ];
$result = $this->pusher->get_channels($options);
$channels = $result->channels;
- $this->assertTrue(is_array($channels), 'channels is an array');
- $this->assertEquals(0, count($channels), 'should be an empty array');
+ self::assertIsArray($channels, 'channels is an array');
+ self::assertCount(0, $channels, 'should be an empty array');
}
- public function testFilterByPrefixOneChannel()
+ public function testFilterByPrefixOneChannel(): void
{
- $options = array(
+ $options = [
'filter_by_prefix' => 'my-',
- );
+ ];
$result = $this->pusher->get_channels($options);
$channels = $result->channels;
- $this->assertEquals(1, count($channels), 'channels have a single test-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
+ $this->assertCount(1, $channels,
+ 'channels have a single test-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
}
- public function testUsersInfo()
+ public function testUsersInfo(): void
{
$result = $this->pusher->get_users_info('presence-channel-test');
$this->assertObjectHasAttribute('users', $result, 'class has users attribute');
}
- public function testProvidingInfoParameterWithPrefixQueryFailsForPublicChannel()
+ public function testProvidingInfoParameterWithPrefixQueryFailsForPublicChannel(): void
{
$this->expectException(\Pusher\ApiErrorException::class);
- $options = array(
+ $options = [
'filter_by_prefix' => 'test_',
'info' => 'user_count',
- );
+ ];
$result = $this->pusher->get_channels($options);
}
- public function testChannelListUsingGenericGet()
+ public function testChannelListUsingGenericGet(): void
{
- $result = $this->pusher->get('/channels', array(), true);
+ $result = $this->pusher->get('/channels', [], true);
$channels = $result['channels'];
- $this->assertEquals(1, count($channels), 'channels have a single my-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
+ self::assertCount(1, $channels,
+ 'channels have a single my-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
$my_channel = $channels['my-channel'];
- $this->assertEquals(0, count($my_channel));
+ self::assertCount(0, $my_channel);
}
- public function testChannelListUsingGenericGetAndPrefixParam()
+ public function testChannelListUsingGenericGetAndPrefixParam(): void
{
- $result = $this->pusher->get('/channels', array('filter_by_prefix' => 'my-'), true);
+ $result = $this->pusher->get('/channels', ['filter_by_prefix' => 'my-'], true);
$channels = $result['channels'];
- $this->assertEquals(1, count($channels), 'channels have a single my-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
+ self::assertCount(1, $channels,
+ 'channels have a single my-channel present. For this test to pass you must have the "Getting Started" page open on the dashboard for the app you are testing against');
$my_channel = $channels['my-channel'];
- $this->assertEquals(0, count($my_channel));
+ self::assertCount(0, $my_channel);
}
- public function testSingleChannelInfoUsingGenericGet()
+ public function testSingleChannelInfoUsingGenericGet(): void
{
$result = $this->pusher->get('/channels/channel-test');
- $this->assertObjectHasAttribute('occupied', $result, 'class has occupied attribute');
+ self::assertObjectHasAttribute('occupied', $result, 'class has occupied attribute');
}
}
diff --git a/tests/acceptance/MiddlewareTest.php b/tests/acceptance/MiddlewareTest.php
--- a/tests/acceptance/MiddlewareTest.php
+++ b/tests/acceptance/MiddlewareTest.php
@@ -1,14 +1,24 @@
<?php
+namespace acceptance;
+
+use Closure;
use GuzzleHttp\Client;
use GuzzleHttp\HandlerStack;
use GuzzleHttp\Handler\CurlHandler;
+use PHPUnit\Framework\TestCase;
use Psr\Http\Message\RequestInterface;
+use Pusher\Pusher;
-class MiddlewareTest extends PHPUnit\Framework\TestCase
+class MiddlewareTest extends TestCase
{
private $count = 0;
- function increment()
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
+ public function increment(): Closure
{
return function (callable $handler) {
return function (RequestInterface $request, array $options) use ($handler) {
@@ -21,7 +31,7 @@ function increment()
protected function setUp(): void
{
if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
- $this->markTestSkipped('Please set the
+ self::markTestSkipped('Please set the
PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
PUSHERAPP_APPID keys.');
} else {
@@ -29,14 +39,14 @@ protected function setUp(): void
$stack->setHandler(new CurlHandler());
$stack->push($this->increment());
$client = new Client(['handler' => $stack]);
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST], $client);
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER], $client);
}
}
- public function testStringPush()
+ public function testStringPush(): void
{
- $this->assertEquals(0, $this->count);
+ self::assertEquals(0, $this->count);
$result = $this->pusher->trigger('test_channel', 'my_event', 'Test string');
- $this->assertEquals(1, $this->count);
+ self::assertEquals(1, $this->count);
}
}
diff --git a/tests/acceptance/TriggerAsyncTest.php b/tests/acceptance/TriggerAsyncTest.php
--- a/tests/acceptance/TriggerAsyncTest.php
+++ b/tests/acceptance/TriggerAsyncTest.php
@@ -1,42 +1,53 @@
<?php
-class TriggerAsyncTest extends PHPUnit\Framework\TestCase
+namespace acceptance;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+use stdClass;
+
+class TriggerAsyncTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
- $this->markTestSkipped('Please set the
+ self::markTestSkipped('Please set the
PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
PUSHERAPP_APPID keys.');
} else {
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER]);
}
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ self::assertNotNull($this->pusher, 'Created new \Pusher\Pusher object');
}
- public function testStringPush()
+ public function testStringPush(): void
{
$result = $this->pusher->triggerAsync('test_channel', 'my_event', 'Test string')->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testArrayPush()
+ public function testArrayPush(): void
{
- $result = $this->pusher->triggerAsync('test_channel', 'my_event', array('test' => 1))->wait();
- $this->assertEquals(new stdClass(), $result);
+ $result = $this->pusher->triggerAsync('test_channel', 'my_event', ['test' => 1])->wait();
+ self::assertEquals(new stdClass(), $result);
}
- public function testPushWithSocketId()
+ public function testPushWithSocketId(): void
{
- $result = $this->pusher->triggerAsync('test_channel', 'my_event', array('test' => 1), array('socket_id' => '123.456'))->wait();
- $this->assertEquals(new stdClass(), $result);
+ $result = $this->pusher->triggerAsync('test_channel', 'my_event', ['test' => 1], ['socket_id' => '123.456'])->wait();
+ self::assertEquals(new stdClass(), $result);
}
- public function testPushWithInfo()
+ public function testPushWithInfo(): void
{
$expectedMyChannel = new stdClass();
$expectedMyChannel->subscription_count = 1;
@@ -44,78 +55,78 @@ public function testPushWithInfo()
$expectedPresenceMyChannel->user_count = 0;
$expectedPresenceMyChannel->subscription_count = 0;
$expectedResult = new stdClass();
- $expectedResult->channels = array(
+ $expectedResult->channels = [
"my-channel" => $expectedMyChannel,
"presence-my-channel" => $expectedPresenceMyChannel,
- );
+ ];
- $result = $this->pusher->triggerAsync(['my-channel', 'presence-my-channel'], 'my_event', array('test' => 1), array('info' => 'user_count,subscription_count'))->wait();
- $this->assertEquals($expectedResult, $result);
+ $result = $this->pusher->triggerAsync(['my-channel', 'presence-my-channel'], 'my_event', ['test' => 1], ['info' => 'user_count,subscription_count'])->wait();
+ self::assertEquals($expectedResult, $result);
}
- public function testTLSPush()
+ public function testTLSPush(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $result = $pusher->triggerAsync('test_channel', 'my_event', array('encrypted' => 1))->wait();
- $this->assertEquals(new stdClass(), $result);
+ $result = $pusher->triggerAsync('test_channel', 'my_event', ['encrypted' => 1])->wait();
+ self::assertEquals(new stdClass(), $result);
}
- public function testSendingOver10kBMessageReturns413()
+ public function testSendingOver10kBMessageReturns413(): void
{
$this->expectException(\Pusher\ApiErrorException::class);
$this->expectExceptionCode('413');
$data = str_pad('', 11 * 1024, 'a');
- $this->pusher->triggerAsync('test_channel', 'my_event', $data, array(), true)->wait();
+ $this->pusher->triggerAsync('test_channel', 'my_event', $data, [], true)->wait();
}
- public function testTriggeringEventOnOver100ChannelsThrowsException()
+ public function testTriggeringEventOnOver100ChannelsThrowsException(): void
{
$this->expectException(\Pusher\PusherException::class);
- $channels = array();
+ $channels = [];
while (count($channels) <= 101) {
- $channels[] = ('channel-'.count($channels));
+ $channels[] = ('channel-' . count($channels));
}
- $data = array('event_name' => 'event_data');
+ $data = ['event_name' => 'event_data'];
$this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
}
- public function testTriggeringEventOnMultipleChannels()
+ public function testTriggeringEventOnMultipleChannels(): void
{
- $data = array('event_name' => 'event_data');
- $channels = array('test_channel_1', 'test_channel_2');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['test_channel_1', 'test_channel_2'];
$result = $this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggeringEventOnPrivateEncryptedChannelSuccess()
+ public function testTriggeringEventOnPrivateEncryptedChannelSuccess(): void
{
$options = ['encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- 'host' => PUSHERAPP_HOST];
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER];
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $data = array('event_name' => 'event_data');
- $channels = array('private-encrypted-ceppaio');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['private-encrypted-ceppaio'];
$result = $this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggeringEventOnMultipleChannelsWithEncryptedChannelPresentError()
+ public function testTriggeringEventOnMultipleChannelsWithEncryptedChannelPresentError(): void
{
$this->expectException(\Pusher\PusherException::class);
$options = ['encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- 'host' => PUSHERAPP_HOST];
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER];
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $data = array('event_name' => 'event_data');
- $channels = array('my-chan-ceppaio', 'private-encrypted-ceppaio');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['my-chan-ceppaio', 'private-encrypted-ceppaio'];
$this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
}
}
diff --git a/tests/acceptance/TriggerBatchAsyncTest.php b/tests/acceptance/TriggerBatchAsyncTest.php
--- a/tests/acceptance/TriggerBatchAsyncTest.php
+++ b/tests/acceptance/TriggerBatchAsyncTest.php
@@ -1,7 +1,19 @@
<?php
-class TriggerBatchAsyncTest extends PHPUnit\Framework\TestCase
+namespace acceptance;
+
+use Error;
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+use stdClass;
+
+class TriggerBatchAsyncTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
@@ -9,73 +21,73 @@ protected function setUp(): void
PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
PUSHERAPP_APPID keys.');
} else {
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER]);
}
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ self::assertNotNull($this->pusher, 'Created new \Pusher\Pusher object');
}
- public function testSimplePush()
+ public function testSimplePush(): void
{
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
$result = $this->pusher->triggerBatchAsync($batch)->wait();
$this->assertEquals(new stdClass(), $result);
}
- public function testTLSPush()
+ public function testTLSPush(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchNonEncryptedEventsWithObjectPayloads()
+ public function testTriggerBatchNonEncryptedEventsWithObjectPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'mio_canale', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'mio_canale', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithSingleEvent()
+ public function testTriggerBatchWithSingleEvent(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithInfo()
+ public function testTriggerBatchWithInfo(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
$expectedMyChannel = new stdClass();
$expectedMyChannel->subscription_count = 1;
@@ -84,150 +96,150 @@ public function testTriggerBatchWithInfo()
$expectedPresenceMyChannel->user_count = 0;
$expectedPresenceMyChannel->subscription_count = 0;
$expectedResult = new stdClass();
- $expectedResult->batch = array(
+ $expectedResult->batch = [
$expectedMyChannel,
$expectedMyChannel2,
$expectedPresenceMyChannel
- );
+ ];
- $batch = array();
- $batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'subscription_count');
- $batch[] = array('channel' => 'my-channel-2', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'user_count,subscription_count');
+ $batch = [];
+ $batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'subscription_count'];
+ $batch[] = ['channel' => 'my-channel-2', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'user_count,subscription_count'];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals($expectedResult, $result);
+ self::assertEquals($expectedResult, $result);
}
- public function testTriggerBatchWithMultipleNonEncryptedEventsWithStringPayloads()
+ public function testTriggerBatchWithMultipleNonEncryptedEventsWithStringPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'test_channel2', 'name' => 'my_event2', 'data' => 'test-string2');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'test_channel2', 'name' => 'my_event2', 'data' => 'test-string2'];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleCombinationsofStringAndObjectPayloads()
+ public function testTriggerBatchWithMultipleCombinationsofStringAndObjectPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'test_channel2', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'test_channel2', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithWithEncryptedEventSuccess()
+ public function testTriggerBatchWithWithEncryptedEventSuccess(): void
{
- $options = array(
- 'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ $options = [
+ 'useTLS' => true,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'private-encrypted-test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $batch = [];
+ $batch[] = ['channel' => 'private-encrypted-test_channel', 'name' => 'my_event', 'data' => 'test-string'];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleEncryptedEventsSuccess()
+ public function testTriggerBatchWithMultipleEncryptedEventsSuccess(): void
{
- $options = array(
- 'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ $options = [
+ 'useTLS' => true,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => 'test-string2');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => 'test-string2'];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleCombinationsofStringsAndObjectsWithEncryptedEventSuccess()
+ public function testTriggerBatchWithMultipleCombinationsofStringsAndObjectsWithEncryptedEventSuccess(): void
{
- $options = array(
- 'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ $options = [
+ 'useTLS' => true,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'secret-string');
- $batch[] = array('channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'secret-string'];
+ $batch[] = ['channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchMultipleEventsWithEncryptedEventWithoutEncryptionMasterKeyError()
+ public function testTriggerBatchMultipleEventsWithEncryptedEventWithoutEncryptionMasterKeyError(): void
{
$this->expectException(Error::class);
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'my_test_chan', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => array('my' => 'to_be_encrypted_data_shhhht'));
+ $batch = [];
+ $batch[] = ['channel' => 'my_test_chan', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => ['my' => 'to_be_encrypted_data_shhhht']];
$pc->triggerBatchAsync($batch)->wait();
}
- public function testTriggerBatchWithMultipleEncryptedEventsWithEncryptionMasterKeySuccess()
+ public function testTriggerBatchWithMultipleEncryptedEventsWithEncryptionMasterKeySuccess(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'my_test_chan', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => array('my' => 'to_be_encrypted_data_shhhht'));
+ $batch = [];
+ $batch[] = ['channel' => 'my_test_chan', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => ['my' => 'to_be_encrypted_data_shhhht']];
$result = $pc->triggerBatchAsync($batch)->wait();
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testSendingOver10kBMessageReturns413()
+ public function testSendingOver10kBMessageReturns413(): void
{
$this->expectException(\Pusher\ApiErrorException::class);
$this->expectExceptionMessage('content of this event');
$this->expectExceptionCode('413');
$data = str_pad('', 11 * 1024, 'a');
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => $data);
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => $data];
$this->pusher->triggerBatchAsync($batch, true)->wait();
}
- public function testSendingOver10messagesReturns400()
+ public function testSendingOver10messagesReturns400(): void
{
$this->expectException(\Pusher\ApiErrorException::class);
$this->expectExceptionMessage('Batch too large');
$this->expectExceptionCode('400');
- $batch = array();
+ $batch = [];
foreach (range(1, 11) as $i) {
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('index' => $i));
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['index' => $i]];
}
$this->pusher->triggerBatchAsync($batch, false)->wait();
}
diff --git a/tests/acceptance/TriggerBatchTest.php b/tests/acceptance/TriggerBatchTest.php
--- a/tests/acceptance/TriggerBatchTest.php
+++ b/tests/acceptance/TriggerBatchTest.php
@@ -1,7 +1,20 @@
<?php
-class TriggerBatchTest extends PHPUnit\Framework\TestCase
+namespace acceptance;
+
+use Error;
+use PHPUnit\Framework\TestCase;
+use Pusher\ApiErrorException;
+use Pusher\Pusher;
+use stdClass;
+
+class TriggerBatchTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
@@ -9,73 +22,73 @@ protected function setUp(): void
PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
PUSHERAPP_APPID keys.');
} else {
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER]);
}
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ self::assertNotNull($this->pusher, 'Created new \Pusher\Pusher object');
}
- public function testSimplePush()
+ public function testSimplePush(): void
{
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
$result = $this->pusher->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTLSPush()
+ public function testTLSPush(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchNonEncryptedEventsWithObjectPayloads()
+ public function testTriggerBatchNonEncryptedEventsWithObjectPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'mio_canale', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'mio_canale', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithSingleEvent()
+ public function testTriggerBatchWithSingleEvent(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
$result = $pc->triggerBatch($batch);
$this->assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithInfo()
+ public function testTriggerBatchWithInfo(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
$expectedMyChannel = new stdClass();
$expectedMyChannel->subscription_count = 1;
@@ -84,150 +97,150 @@ public function testTriggerBatchWithInfo()
$expectedPresenceMyChannel->user_count = 0;
$expectedPresenceMyChannel->subscription_count = 0;
$expectedResult = new stdClass();
- $expectedResult->batch = array(
+ $expectedResult->batch = [
$expectedMyChannel,
$expectedMyChannel2,
$expectedPresenceMyChannel
- );
+ ];
- $batch = array();
- $batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'subscription_count');
- $batch[] = array('channel' => 'my-channel-2', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'user_count,subscription_count');
+ $batch = [];
+ $batch[] = ['channel' => 'my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'subscription_count'];
+ $batch[] = ['channel' => 'my-channel-2', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'user_count,subscription_count'];
$result = $pc->triggerBatch($batch);
- $this->assertEquals($expectedResult, $result);
+ self::assertEquals($expectedResult, $result);
}
- public function testTriggerBatchWithMultipleNonEncryptedEventsWithStringPayloads()
+ public function testTriggerBatchWithMultipleNonEncryptedEventsWithStringPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'test_channel2', 'name' => 'my_event2', 'data' => 'test-string2');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'test_channel2', 'name' => 'my_event2', 'data' => 'test-string2'];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleCombinationsofStringAndObjectPayloads()
+ public function testTriggerBatchWithMultipleCombinationsofStringAndObjectPayloads(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'test_channel2', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'test_channel2', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithWithEncryptedEventSuccess()
+ public function testTriggerBatchWithWithEncryptedEventSuccess(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'private-encrypted-test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $batch = [];
+ $batch[] = ['channel' => 'private-encrypted-test_channel', 'name' => 'my_event', 'data' => 'test-string'];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleEncryptedEventsSuccess()
+ public function testTriggerBatchWithMultipleEncryptedEventsSuccess(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
- $batch[] = array('channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => 'test-string2');
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string'];
+ $batch[] = ['channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => 'test-string2'];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchWithMultipleCombinationsofStringsAndObjectsWithEncryptedEventSuccess()
+ public function testTriggerBatchWithMultipleCombinationsofStringsAndObjectsWithEncryptedEventSuccess(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'secret-string');
- $batch[] = array('channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => 'secret-string'];
+ $batch[] = ['channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => ['my' => 'data2']];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggerBatchMultipleEventsWithEncryptedEventWithoutEncryptionMasterKeyError()
+ public function testTriggerBatchMultipleEventsWithEncryptedEventWithoutEncryptionMasterKeyError(): void
{
$this->expectException(Error::class);
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'my_test_chan', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => array('my' => 'to_be_encrypted_data_shhhht'));
+ $batch = [];
+ $batch[] = ['channel' => 'my_test_chan', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => ['my' => 'to_be_encrypted_data_shhhht']];
$pc->triggerBatch($batch);
}
- public function testTriggerBatchWithMultipleEncryptedEventsWithEncryptionMasterKeySuccess()
+ public function testTriggerBatchWithMultipleEncryptedEventsWithEncryptionMasterKeySuccess(): void
{
- $options = array(
- 'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
+ $options = [
+ 'useTLS' => true,
+ 'cluster' => PUSHERAPP_CLUSTER,
'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- );
- $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ ];
+ $pc = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $batch = array();
- $batch[] = array('channel' => 'my_test_chan', 'name' => 'my_event', 'data' => array('my' => 'data'));
- $batch[] = array('channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => array('my' => 'to_be_encrypted_data_shhhht'));
+ $batch = [];
+ $batch[] = ['channel' => 'my_test_chan', 'name' => 'my_event', 'data' => ['my' => 'data']];
+ $batch[] = ['channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => ['my' => 'to_be_encrypted_data_shhhht']];
$result = $pc->triggerBatch($batch);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testSendingOver10kBMessageReturns413()
+ public function testSendingOver10kBMessageReturns413(): void
{
- $this->expectException(\Pusher\ApiErrorException::class);
+ $this->expectException(ApiErrorException::class);
$this->expectExceptionMessage('content of this event');
$this->expectExceptionCode('413');
$data = str_pad('', 11 * 1024, 'a');
- $batch = array();
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => $data);
+ $batch = [];
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => $data];
$this->pusher->triggerBatch($batch, true);
}
- public function testSendingOver10messagesReturns400()
+ public function testSendingOver10messagesReturns400(): void
{
- $this->expectException(\Pusher\ApiErrorException::class);
+ $this->expectException(ApiErrorException::class);
$this->expectExceptionMessage('Batch too large');
$this->expectExceptionCode('400');
- $batch = array();
+ $batch = [];
foreach (range(1, 11) as $i) {
- $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('index' => $i));
+ $batch[] = ['channel' => 'test_channel', 'name' => 'my_event', 'data' => ['index' => $i]];
}
$this->pusher->triggerBatch($batch, false);
}
diff --git a/tests/acceptance/TriggerTest.php b/tests/acceptance/TriggerTest.php
--- a/tests/acceptance/TriggerTest.php
+++ b/tests/acceptance/TriggerTest.php
@@ -1,42 +1,55 @@
<?php
-class TriggerTest extends PHPUnit\Framework\TestCase
+namespace acceptance;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\ApiErrorException;
+use Pusher\Pusher;
+use Pusher\PusherException;
+use stdClass;
+
+class TriggerTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
- $this->markTestSkipped('Please set the
+ self::markTestSkipped('Please set the
PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
PUSHERAPP_APPID keys.');
} else {
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['cluster' => PUSHERAPP_CLUSTER]);
}
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ self::assertNotNull($this->pusher, 'Created new \Pusher\Pusher object');
}
- public function testStringPush()
+ public function testStringPush(): void
{
$result = $this->pusher->trigger('test_channel', 'my_event', 'Test string');
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testArrayPush()
+ public function testArrayPush(): void
{
- $result = $this->pusher->trigger('test_channel', 'my_event', array('test' => 1));
- $this->assertEquals(new stdClass(), $result);
+ $result = $this->pusher->trigger('test_channel', 'my_event', ['test' => 1]);
+ self::assertEquals(new stdClass(), $result);
}
- public function testPushWithSocketId()
+ public function testPushWithSocketId(): void
{
- $result = $this->pusher->trigger('test_channel', 'my_event', array('test' => 1), array('socket_id' => '123.456'));
- $this->assertEquals(new stdClass(), $result);
+ $result = $this->pusher->trigger('test_channel', 'my_event', ['test' => 1], ['socket_id' => '123.456']);
+ self::assertEquals(new stdClass(), $result);
}
- public function testPushWithInfo()
+ public function testPushWithInfo(): void
{
$expectedMyChannel = new stdClass();
$expectedMyChannel->subscription_count = 1;
@@ -44,78 +57,78 @@ public function testPushWithInfo()
$expectedPresenceMyChannel->user_count = 0;
$expectedPresenceMyChannel->subscription_count = 0;
$expectedResult = new stdClass();
- $expectedResult->channels = array(
+ $expectedResult->channels = [
"my-channel" => $expectedMyChannel,
"presence-my-channel" => $expectedPresenceMyChannel,
- );
+ ];
- $result = $this->pusher->trigger(['my-channel', 'presence-my-channel'], 'my_event', array('test' => 1), array('info' => 'user_count,subscription_count'));
- $this->assertEquals($expectedResult, $result);
+ $result = $this->pusher->trigger(['my-channel', 'presence-my-channel'], 'my_event', ['test' => 1], ['info' => 'user_count,subscription_count']);
+ self::assertEquals($expectedResult, $result);
}
- public function testTLSPush()
+ public function testTLSPush(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
- 'host' => PUSHERAPP_HOST,
- );
- $pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER,
+ ];
+ $pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $result = $pusher->trigger('test_channel', 'my_event', array('encrypted' => 1));
- $this->assertEquals(new stdClass(), $result);
+ $result = $pusher->trigger('test_channel', 'my_event', ['encrypted' => 1]);
+ self::assertEquals(new stdClass(), $result);
}
- public function testSendingOver10kBMessageReturns413()
+ public function testSendingOver10kBMessageReturns413(): void
{
- $this->expectException(\Pusher\ApiErrorException::class);
+ $this->expectException(ApiErrorException::class);
$this->expectExceptionCode('413');
$data = str_pad('', 11 * 1024, 'a');
- $this->pusher->trigger('test_channel', 'my_event', $data, array(), true);
+ $this->pusher->trigger('test_channel', 'my_event', $data, [], true);
}
- public function testTriggeringEventOnOver100ChannelsThrowsException()
+ public function testTriggeringEventOnOver100ChannelsThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $channels = array();
+ $channels = [];
while (count($channels) <= 101) {
- $channels[] = ('channel-'.count($channels));
+ $channels[] = ('channel-' . count($channels));
}
- $data = array('event_name' => 'event_data');
+ $data = ['event_name' => 'event_data'];
$this->pusher->trigger($channels, 'my_event', $data);
}
- public function testTriggeringEventOnMultipleChannels()
+ public function testTriggeringEventOnMultipleChannels(): void
{
- $data = array('event_name' => 'event_data');
- $channels = array('test_channel_1', 'test_channel_2');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['test_channel_1', 'test_channel_2'];
$result = $this->pusher->trigger($channels, 'my_event', $data);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggeringEventOnPrivateEncryptedChannelSuccess()
+ public function testTriggeringEventOnPrivateEncryptedChannelSuccess(): void
{
$options = ['encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- 'host' => PUSHERAPP_HOST];
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER];
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $data = array('event_name' => 'event_data');
- $channels = array('private-encrypted-ceppaio');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['private-encrypted-ceppaio'];
$result = $this->pusher->trigger($channels, 'my_event', $data);
- $this->assertEquals(new stdClass(), $result);
+ self::assertEquals(new stdClass(), $result);
}
- public function testTriggeringEventOnMultipleChannelsWithEncryptedChannelPresentError()
+ public function testTriggeringEventOnMultipleChannelsWithEncryptedChannelPresentError(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$options = ['encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
- 'host' => PUSHERAPP_HOST];
- $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ 'cluster' => PUSHERAPP_CLUSTER];
+ $this->pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $data = array('event_name' => 'event_data');
- $channels = array('my-chan-ceppaio', 'private-encrypted-ceppaio');
+ $data = ['event_name' => 'event_data'];
+ $channels = ['my-chan-ceppaio', 'private-encrypted-ceppaio'];
$this->pusher->trigger($channels, 'my_event', $data);
}
}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -2,14 +2,12 @@
error_reporting(E_ALL);
-$dir = dirname(__FILE__);
-$config_path = $dir.'/config.php';
-if (file_exists($config_path) === true) {
- require_once $config_path;
+if (file_exists(__DIR__ . '/config.php') === true) {
+ require 'config.php';
} else {
define('PUSHERAPP_AUTHKEY', getenv('PUSHERAPP_AUTHKEY'));
define('PUSHERAPP_SECRET', getenv('PUSHERAPP_SECRET'));
define('PUSHERAPP_APPID', getenv('PUSHERAPP_APPID'));
- define('PUSHERAPP_HOST', getenv('PUSHERAPP_HOST'));
+ define('PUSHERAPP_CLUSTER', getenv('PUSHERAPP_CLUSTER'));
}
diff --git a/tests/config.example.php b/tests/config.example.php
--- a/tests/config.example.php
+++ b/tests/config.example.php
@@ -1,6 +1,6 @@
<?php
-define('PUSHERAPP_APPID', '');
-define('PUSHERAPP_AUTHKEY', '');
-define('PUSHERAPP_SECRET', '');
-define('PUSHERAPP_HOST', 'http://api.pusherapp.com');
+const PUSHERAPP_APPID = '';
+const PUSHERAPP_AUTHKEY = '';
+const PUSHERAPP_SECRET = '';
+const PUSHERAPP_CLUSTER = 'eu';
diff --git a/tests/unit/AuthQueryStringTest.php b/tests/unit/AuthQueryStringTest.php
--- a/tests/unit/AuthQueryStringTest.php
+++ b/tests/unit/AuthQueryStringTest.php
@@ -1,41 +1,51 @@
<?php
-class AuthQueryStringTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+
+class AuthQueryStringTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
- $this->pusher = new Pusher\Pusher('thisisaauthkey', 'thisisasecret', 1);
+ $this->pusher = new Pusher('thisisaauthkey', 'thisisasecret', 1);
}
- public function testArrayImplode()
+ public function testArrayImplode(): void
{
- $val = array('testKey' => 'testValue');
+ $val = ['testKey' => 'testValue'];
$expected = 'testKey=testValue';
- $actual = Pusher\Pusher::array_implode('=', '&', $val);
+ $actual = Pusher::array_implode('=', '&', $val);
- $this->assertEquals(
+ self::assertEquals(
$expected,
$actual,
'auth signature valid'
);
}
- public function testArrayImplodeWithTwoValues()
+ public function testArrayImplodeWithTwoValues(): void
{
- $val = array('testKey' => 'testValue', 'testKey2' => 'testValue2');
+ $val = ['testKey' => 'testValue', 'testKey2' => 'testValue2'];
$expected = 'testKey=testValue&testKey2=testValue2';
- $actual = Pusher\Pusher::array_implode('=', '&', $val);
+ $actual = Pusher::array_implode('=', '&', $val);
- $this->assertEquals(
+ self::assertEquals(
$expected,
$actual,
'auth signature valid'
);
}
- public function testGenerateSignature()
+ public function testGenerateSignature(): void
{
$time = time();
$auth_version = '1.0';
@@ -43,10 +53,10 @@ public function testGenerateSignature()
$auth_key = 'thisisaauthkey';
$auth_secret = 'thisisasecret';
$request_path = '/channels/test_channel/events';
- $query_params = array(
+ $query_params = [
'name' => 'an_event',
- );
- $auth_query_string = Pusher\Pusher::build_auth_query_params(
+ ];
+ $auth_query_string = Pusher::build_auth_query_params(
$auth_key,
$auth_secret,
$method,
@@ -66,7 +76,7 @@ public function testGenerateSignature()
'name' => 'an_event'
];
- $this->assertEquals(
+ self::assertEquals(
$expected_query_params,
$auth_query_string,
'auth signature valid'
diff --git a/tests/unit/ChannelInfoUnitTest.php b/tests/unit/ChannelInfoUnitTest.php
--- a/tests/unit/ChannelInfoUnitTest.php
+++ b/tests/unit/ChannelInfoUnitTest.php
@@ -1,34 +1,44 @@
<?php
-class ChannelInfoUnitTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+
+class ChannelInfoUnitTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
- $this->pusher = new Pusher\Pusher('thisisaauthkey', 'thisisasecret', 1);
+ $this->pusher = new Pusher('thisisaauthkey', 'thisisasecret', 1);
}
- public function testTrailingColonChannelThrowsException()
+ public function testTrailingColonChannelThrowsException(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->pusher->get_channel_info('test_channel:');
}
- public function testLeadingColonChannelThrowsException()
+ public function testLeadingColonChannelThrowsException(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->pusher->get_channel_info(':test_channel');
}
- public function testLeadingColonNLChannelThrowsException()
+ public function testLeadingColonNLChannelThrowsException(): void
{
$this->expectException(\Pusher\PusherException::class);
-
+
$this->pusher->get_channel_info(':\ntest_channel');
}
- public function testTrailingColonNLChannelThrowsException()
+ public function testTrailingColonNLChannelThrowsException(): void
{
$this->expectException(\Pusher\PusherException::class);
diff --git a/tests/unit/CryptoTest.php b/tests/unit/CryptoTest.php
--- a/tests/unit/CryptoTest.php
+++ b/tests/unit/CryptoTest.php
@@ -1,101 +1,112 @@
<?php
-class CryptoTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\PusherCrypto;
+use stdClass;
+
+class CryptoTest extends TestCase
{
+ /**
+ * @var PusherCrypto
+ */
+ private $crypto;
+
protected function setUp(): void
{
if (function_exists('sodium_crypto_secretbox')) {
- $this->crypto = new Pusher\PusherCrypto('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+ $this->crypto = new PusherCrypto('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
} else {
- $this->markTestSkipped('libSodium is not available, so end to end encryption is not available.');
+ self::markTestSkipped('libSodium is not available, so end to end encryption is not available.');
}
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->crypto, 'Created new Pusher\PusherCrypto object');
+ self::assertNotNull($this->crypto, 'Created new \Pusher\PusherCrypto object');
}
- public function testValidMasterEncryptionKeys()
+ public function testValidMasterEncryptionKeys(): void
{
- $this->assertEquals('this is 32 bytes 123456789012345', Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMiBieXRlcyAxMjM0NTY3ODkwMTIzNDU='));
- $this->assertEquals("this key has nonprintable char \x00", Pusher\PusherCrypto::parse_master_key('dGhpcyBrZXkgaGFzIG5vbnByaW50YWJsZSBjaGFyIAA='));
+ self::assertEquals('this is 32 bytes 123456789012345', PusherCrypto::parse_master_key('dGhpcyBpcyAzMiBieXRlcyAxMjM0NTY3ODkwMTIzNDU='));
+ self::assertEquals("this key has nonprintable char \x00", PusherCrypto::parse_master_key('dGhpcyBrZXkgaGFzIG5vbnByaW50YWJsZSBjaGFyIAA='));
}
- public function testInvalidMasterEncryptionKeyTooShort()
+ public function testInvalidMasterEncryptionKeyTooShort(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->expectExceptionMessage('32 bytes');
- Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNA==');
+ PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNA==');
}
- public function testInvalidMasterEncryptionKeyTooLong()
+ public function testInvalidMasterEncryptionKeyTooLong(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->expectExceptionMessage('32 bytes');
- Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNDU2');
+ PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNDU2');
}
- public function testInvalidMasterEncryptionKeyBase64TooShort()
+ public function testInvalidMasterEncryptionKeyBase64TooShort(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->expectExceptionMessage('32 bytes');
- Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNA==');
+ PusherCrypto::parse_master_key('dGhpcyBpcyAzMSBieXRlcyAxMjM0NTY3ODkwMTIzNA==');
}
- public function testInvalidMasterEncryptionKeyBase64TooLong()
+ public function testInvalidMasterEncryptionKeyBase64TooLong(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->expectExceptionMessage('32 bytes');
- Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMyBieXRlcyAxMjM0NTY3ODkwMTIzNDU2');
+ PusherCrypto::parse_master_key('dGhpcyBpcyAzMyBieXRlcyAxMjM0NTY3ODkwMTIzNDU2');
}
- public function testInvalidMasterEncryptionKeyBase64InvalidBase64()
+ public function testInvalidMasterEncryptionKeyBase64InvalidBase64(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->expectExceptionMessage('valid base64');
- Pusher\PusherCrypto::parse_master_key('dGhpcyBpcyAzMyBi!XRlcyAxMjM0NTY3ODkw#TIzNDU2');
+ PusherCrypto::parse_master_key('dGhpcyBpcyAzMyBi!XRlcyAxMjM0NTY3ODkw#TIzNDU2');
}
- public function testGenerateSharedSecret()
+ public function testGenerateSharedSecret(): void
{
$expected = 'Rp+wpkNpL89qhqco1JkIG31AVXyU8PUVJBr1B2MvdoA=';
// Check that the secret generation is generating consistent secrets
- $this->assertEquals($expected, base64_encode($this->crypto->generate_shared_secret('private-encrypted-channel-a')));
+ self::assertEquals($expected, base64_encode($this->crypto->generate_shared_secret('private-encrypted-channel-a')));
// Check that the secret generation is using the channel as a part of the generation
- $this->assertNotEquals($expected, base64_encode($this->crypto->generate_shared_secret('private-encrypted-channel-b')));
+ self::assertNotEquals($expected, base64_encode($this->crypto->generate_shared_secret('private-encrypted-channel-b')));
// Check that specifying a different key results in a different result
- $crypto2 = new Pusher\PusherCrypto('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
- $this->assertNotEquals($expected, base64_encode($crypto2->generate_shared_secret('private-encrypted-channel-a')));
+ $crypto2 = new PusherCrypto('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
+ self::assertNotEquals($expected, base64_encode($crypto2->generate_shared_secret('private-encrypted-channel-a')));
}
- public function testGenerateSharedSecretNoChannel()
+ public function testGenerateSharedSecretNoChannel(): void
{
$this->expectException(\Pusher\PusherException::class);
$this->crypto->generate_shared_secret('');
}
- public function testIsEncryptedChannel()
+ public function testIsEncryptedChannel(): void
{
- $this->assertEquals(true, Pusher\PusherCrypto::is_encrypted_channel('private-encrypted-test'));
- $this->assertEquals(false, Pusher\PusherCrypto::is_encrypted_channel('private-encrypted'));
- $this->assertEquals(false, Pusher\PusherCrypto::is_encrypted_channel('test-private-encrypted'));
+ self::assertEquals(true, PusherCrypto::is_encrypted_channel('private-encrypted-test'));
+ self::assertEquals(false, PusherCrypto::is_encrypted_channel('private-encrypted'));
+ self::assertEquals(false, PusherCrypto::is_encrypted_channel('test-private-encrypted'));
}
- public function testEncryptDecryptEventValid()
+ public function testEncryptDecryptEventValid(): void
{
$channel = 'private-encrypted-bla';
$payload = "now that's what I call a payload!";
$encrypted_payload = $this->crypto->encrypt_payload($channel, $payload);
- $this->assertNotNull($encrypted_payload);
+ self::assertNotNull($encrypted_payload);
// Create a mock Event object
$event = new stdClass();
@@ -103,44 +114,44 @@ public function testEncryptDecryptEventValid()
$event->channel = $channel;
$decrypted_event = $this->crypto->decrypt_event($event);
$decrypted_payload = $decrypted_event->data;
- $this->assertEquals($payload, $decrypted_payload);
+ self::assertEquals($payload, $decrypted_payload);
}
- public function testEncryptPayloadNoChannel()
+ public function testEncryptPayloadNoChannel(): void
{
$this->expectException(\Pusher\PusherException::class);
$channel = '';
$payload = "now that's what I call a payload!";
$encrypted_payload = $this->crypto->encrypt_payload($channel, $payload);
- $this->assertEquals(false, $encrypted_payload);
+ self::assertEquals(false, $encrypted_payload);
}
- public function testEncryptPayloadPublicChannel()
+ public function testEncryptPayloadPublicChannel(): void
{
$this->expectException(\Pusher\PusherException::class);
$channel = 'public-static-void-main';
$payload = "now that's what I call a payload!";
$encrypted_payload = $this->crypto->encrypt_payload($channel, $payload);
- $this->assertEquals(false, $encrypted_payload);
+ self::assertEquals(false, $encrypted_payload);
}
- public function testDecryptPayloadWrongKey()
+ public function testDecryptPayloadWrongKey(): void
{
$this->expectException(\Pusher\PusherException::class);
$channel = 'private-encrypted-bla';
$payload = "now that's what I call a payload!";
$encrypted_payload = $this->crypto->encrypt_payload($channel, $payload);
- $this->assertNotNull($encrypted_payload);
+ self::assertNotNull($encrypted_payload);
// create empty object with no properties
$event = new stdClass();
$event->data = $encrypted_payload;
$event->channel = $channel;
- $crypto2 = new Pusher\PusherCrypto('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
+ $crypto2 = new PusherCrypto('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
$decrypted_event = $crypto2->decrypt_event($event);
- $this->assertEquals(false, $decrypted_event);
+ self::assertEquals(false, $decrypted_event);
}
}
diff --git a/tests/unit/PusherConstructorTest.php b/tests/unit/PusherConstructorTest.php
--- a/tests/unit/PusherConstructorTest.php
+++ b/tests/unit/PusherConstructorTest.php
@@ -1,65 +1,70 @@
<?php
-class PusherConstructorTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+
+class PusherConstructorTest extends TestCase
{
- public function testUseTLSOptionWillSetHostAndPort()
+ public function testUseTLSOptionWillSetHostAndPort(): void
{
- $options = array('useTLS' => true);
- $pusher = new Pusher\Pusher('app_key', 'app_secret', 'app_id', $options);
+ $options = ['useTLS' => true];
+ $pusher = new Pusher('app_key', 'app_secret', 'app_id', $options);
$settings = $pusher->getSettings();
- $this->assertEquals('https', $settings['scheme'], 'https');
- $this->assertEquals('api-mt1.pusher.com', $settings['host']);
- $this->assertEquals('443', $settings['port']);
+ self::assertEquals('https', $settings['scheme'], 'https');
+ self::assertEquals('api-mt1.pusher.com', $settings['host']);
+ self::assertEquals('443', $settings['port']);
}
- public function testUseTLSOptionWillBeOverwrittenByHostAndPortOptionsSetHostAndPort()
+ public function testUseTLSOptionWillBeOverwrittenByHostAndPortOptionsSetHostAndPort(): void
{
- $options = array(
+ $options = [
'useTLS' => true,
'host' => 'test.com',
'port' => '3000',
- );
- $pusher = new Pusher\Pusher('app_key', 'app_secret', 'app_id', $options);
+ ];
+ $pusher = new Pusher('app_key', 'app_secret', 'app_id', $options);
$settings = $pusher->getSettings();
- $this->assertEquals('http', $settings['scheme']);
- $this->assertEquals($options['host'], $settings['host']);
- $this->assertEquals($options['port'], $settings['port']);
+ self::assertEquals('http', $settings['scheme']);
+ self::assertEquals($options['host'], $settings['host']);
+ self::assertEquals($options['port'], $settings['port']);
}
- public function testSchemeIsStrippedAndIgnoredFromHostInOptions()
+ public function testSchemeIsStrippedAndIgnoredFromHostInOptions(): void
{
- $options = array(
+ $options = [
'host' => 'http://test.com',
- );
- $pusher = new Pusher\Pusher('app_key', 'app_secret', 'app_id', $options);
+ ];
+ $pusher = new Pusher('app_key', 'app_secret', 'app_id', $options);
$settings = $pusher->getSettings();
- $this->assertEquals('https', $settings['scheme']);
- $this->assertEquals('test.com', $settings['host']);
+ self::assertEquals('https', $settings['scheme']);
+ self::assertEquals('test.com', $settings['host']);
}
- public function testClusterSetsANewHost()
+ public function testClusterSetsANewHost(): void
{
- $options = array(
+ $options = [
'cluster' => 'eu',
- );
- $pusher = new Pusher\Pusher('app_key', 'app_secret', 'app_id', $options);
+ ];
+ $pusher = new Pusher('app_key', 'app_secret', 'app_id', $options);
$settings = $pusher->getSettings();
- $this->assertEquals('api-eu.pusher.com', $settings['host']);
+ self::assertEquals('api-eu.pusher.com', $settings['host']);
}
- public function testClusterOptionIsOverriddenByHostIfItExists()
+ public function testClusterOptionIsOverriddenByHostIfItExists(): void
{
- $options = array(
+ $options = [
'cluster' => 'eu',
'host' => 'api.staging.pusher.com',
- );
- $pusher = new Pusher\Pusher('app_key', 'app_secret', 'app_id', $options);
+ ];
+ $pusher = new Pusher('app_key', 'app_secret', 'app_id', $options);
$settings = $pusher->getSettings();
- $this->assertEquals('api.staging.pusher.com', $settings['host']);
+ self::assertEquals('api.staging.pusher.com', $settings['host']);
}
}
diff --git a/tests/unit/SocketAuthTest.php b/tests/unit/SocketAuthTest.php
--- a/tests/unit/SocketAuthTest.php
+++ b/tests/unit/SocketAuthTest.php
@@ -1,89 +1,100 @@
<?php
-class SocketAuthTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+use Pusher\PusherException;
+
+class SocketAuthTest extends TestCase
{
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
- $this->pusher = new Pusher\Pusher('thisisaauthkey', 'thisisasecret', 1, array());
+ $this->pusher = new Pusher('thisisaauthkey', 'thisisasecret', 1, []);
}
- public function testObjectConstruct()
+ public function testObjectConstruct(): void
{
- $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ $this->assertNotNull($this->pusher, 'Created new \Pusher\Pusher object');
}
- public function testSocketAuthKey()
+ public function testSocketAuthKey(): void
{
$socket_auth = $this->pusher->socket_auth('testing_pusher-php', '1.1');
- $this->assertEquals(
+ self::assertEquals(
'{"auth":"thisisaauthkey:751ccc12aeaa79d46f7c199bced5fa47527d3480b51fe61a0bd10438241bd52d"}',
$socket_auth,
'Socket auth key valid'
);
}
- public function testComplexSocketAuthKey()
+ public function testComplexSocketAuthKey(): void
{
$socket_auth = $this->pusher->socket_auth('-azAZ9_=@,.;', '45055.28877557');
- $this->assertEquals(
+ self::assertEquals(
'{"auth":"thisisaauthkey:d1c20ad7684c172271f92c108e11b45aef07499b005796ae1ec5beb924f361c4"}',
$socket_auth,
'Socket auth key valid'
);
}
- public function testTrailingColonSocketIDThrowsException()
+ public function testTrailingColonSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('testing_pusher-php', '1.1:');
}
- public function testLeadingColonSocketIDThrowsException()
+ public function testLeadingColonSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('testing_pusher-php', ':1.1');
}
- public function testLeadingColonNLSocketIDThrowsException()
+ public function testLeadingColonNLSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('testing_pusher-php', ':\n1.1');
}
- public function testTrailingColonNLSocketIDThrowsException()
+ public function testTrailingColonNLSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('testing_pusher-php', '1.1\n:');
}
- public function testTrailingColonChannelThrowsException()
+ public function testTrailingColonChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('test_channel:', '1.1');
}
- public function testLeadingColonChannelThrowsException()
+ public function testLeadingColonChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth(':test_channel', '1.1');
}
- public function testLeadingColonNLChannelThrowsException()
+ public function testLeadingColonNLChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth(':\ntest_channel', '1.1');
}
- public function testTrailingColonNLChannelThrowsException()
+ public function testTrailingColonNLChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$this->pusher->socket_auth('test_channel\n:', '1.1');
}
diff --git a/tests/unit/TriggerUnitTest.php b/tests/unit/TriggerUnitTest.php
--- a/tests/unit/TriggerUnitTest.php
+++ b/tests/unit/TriggerUnitTest.php
@@ -1,88 +1,107 @@
<?php
-class TriggerUnitTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+use Pusher\PusherException;
+
+class TriggerUnitTest extends TestCase
{
+ /**
+ * @var array
+ */
+ private $localData;
+ /**
+ * @var string
+ */
+ private $eventName;
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
- $this->pusher = new Pusher\Pusher('thisisaauthkey', 'thisisasecret', 1);
+ $this->pusher = new Pusher('thisisaauthkey', 'thisisasecret', 1);
$this->eventName = 'test_event';
- $this->data = array();
+ $this->localData = [];
}
- public function testTrailingColonChannelThrowsException()
+ public function testTrailingColonChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel:', $this->eventName, $this->data);
+ $this->pusher->trigger('test_channel:', $this->eventName, $this->localData);
}
- public function testLeadingColonChannelThrowsException()
+ public function testLeadingColonChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger(':test_channel', $this->eventName, $this->data);
+ $this->pusher->trigger(':test_channel', $this->eventName, $this->localData);
}
- public function testLeadingColonNLChannelThrowsException()
+ public function testLeadingColonNLChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger(':\ntest_channel', $this->eventName, $this->data);
+ $this->pusher->trigger(':\ntest_channel', $this->eventName, $this->localData);
}
- public function testTrailingColonNLChannelThrowsException()
+ public function testTrailingColonNLChannelThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel\n:', $this->eventName, $this->data);
+ $this->pusher->trigger('test_channel\n:', $this->eventName, $this->localData);
}
- public function testChannelArrayThrowsException()
+ public function testChannelArrayThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger(array('this_one_is_okay', 'test_channel\n:'), $this->eventName, $this->data);
+ $this->pusher->trigger(['this_one_is_okay', 'test_channel\n:'], $this->eventName, $this->localData);
}
- public function testTrailingColonSocketIDThrowsException()
+ public function testTrailingColonSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel:', $this->eventName, $this->data, array('socket_id' => '1.1:'));
+ $this->pusher->trigger('test_channel:', $this->eventName, $this->localData, ['socket_id' => '1.1:']);
}
- public function testLeadingColonSocketIDThrowsException()
+ public function testLeadingColonSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel:', $this->eventName, $this->data, array('socket_id' => ':1.1'));
+ $this->pusher->trigger('test_channel:', $this->eventName, $this->localData, ['socket_id' => ':1.1']);
}
- public function testLeadingColonNLSocketIDThrowsException()
+ public function testLeadingColonNLSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel:', $this->eventName, $this->data, array('socket_id' => ':\n1.1'));
+ $this->pusher->trigger('test_channel:', $this->eventName, $this->localData, ['socket_id' => ':\n1.1']);
}
- public function testTrailingColonNLSocketIDThrowsException()
+ public function testTrailingColonNLSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel:', $this->eventName, $this->data, array('socket_id' => '1.1\n:'));
+ $this->pusher->trigger('test_channel:', $this->eventName, $this->localData, ['socket_id' => '1.1\n:']);
}
- public function testFalseSocketIDThrowsException()
+ public function testFalseSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel', $this->eventName, $this->data, array('socket_id' => false));
+ $this->pusher->trigger('test_channel', $this->eventName, $this->localData, ['socket_id' => false]);
}
- public function testEmptyStrSocketIDThrowsException()
+ public function testEmptyStrSocketIDThrowsException(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
- $this->pusher->trigger('test_channel', $this->eventName, $this->data, array('socket_id' => ''));
+ $this->pusher->trigger('test_channel', $this->eventName, $this->localData, ['socket_id' => '']);
}
}
diff --git a/tests/unit/WebhookTest.php b/tests/unit/WebhookTest.php
--- a/tests/unit/WebhookTest.php
+++ b/tests/unit/WebhookTest.php
@@ -1,48 +1,63 @@
<?php
-class WebhookTest extends PHPUnit\Framework\TestCase
+namespace unit;
+
+use PHPUnit\Framework\TestCase;
+use Pusher\Pusher;
+use Pusher\PusherException;
+
+class WebhookTest extends TestCase
{
+ /**
+ * @var string
+ */
+ private $auth_key;
+ /**
+ * @var Pusher
+ */
+ private $pusher;
+
protected function setUp(): void
{
$this->auth_key = 'thisisaauthkey';
- $this->pusher = new Pusher\Pusher($this->auth_key, 'thisisasecret', 1);
+ $this->pusher = new Pusher($this->auth_key, 'thisisasecret', 1);
}
- public function testValidWebhookSignature()
+ public function testValidWebhookSignature(): void
{
$signature = '40e0ad3b9aa49529322879e84de1aaaf18bde1efe839ca263d540cc865510d25';
$body = '{"hello":"world"}';
- $headers = array(
+ $headers = [
'X-Pusher-Key' => $this->auth_key,
'X-Pusher-Signature' => $signature,
- );
+ ];
$this->pusher->ensure_valid_signature($headers, $body);
- $this->assertTrue(true);
+ self::assertTrue(true);
}
- public function testInvalidWebhookSignature()
+ public function testInvalidWebhookSignature(): void
{
- $this->expectException(\Pusher\PusherException::class);
+ $this->expectException(PusherException::class);
$signature = 'potato';
$body = '{"hello":"world"}';
- $headers = array(
+ $headers = [
'X-Pusher-Key' => $this->auth_key,
'X-Pusher-Signature' => $signature,
- );
- $wrong_signature = $this->pusher->ensure_valid_signature($headers, $body);
+ ];
+ $this->pusher->ensure_valid_signature($headers, $body);
}
- public function testDecodeWebhook()
+ public function testDecodeWebhook(): void
{
- $headers_json = '{"X-Pusher-Key":"'.$this->auth_key.'","X-Pusher-Signature":"a19cab2af3ca1029257570395e78d5d675e9e700ca676d18a375a7083178df1c"}';
+ $headers_json = '{"X-Pusher-Key":"' . $this->auth_key . '","X-Pusher-Signature":"a19cab2af3ca1029257570395e78d5d675e9e700ca676d18a375a7083178df1c"}';
$body = '{"time_ms":1530710011901,"events":[{"name":"client_event","channel":"private-my-channel","event":"client-event","data":"Unencrypted","socket_id":"240621.35780774"}]}';
- $headers = json_decode($headers_json, true);
+ $headers = json_decode($headers_json, true, 512, JSON_THROW_ON_ERROR);
$decodedWebhook = $this->pusher->webhook($headers, $body);
- $this->assertEquals(1530710011901, $decodedWebhook->get_time_ms());
- $this->assertEquals(1, count($decodedWebhook->get_events()));
+ self::assertEquals(1530710011901, $decodedWebhook->get_time_ms());
+ self::assertCount(1, $decodedWebhook->get_events());
}
}
|
[6.1] `build_auth_query_params()` returns array instead of string
As title says, this [PHPDoc says the function returns a string](https://github.com/pusher/pusher-http-php/blob/master/src/Pusher.php#L276-L299) while it returns an array.
| 2021-05-01T13:05:17
|
php
|
Hard
|
|
pusher/pusher-http-php
| 298
|
pusher__pusher-http-php-298
|
[
"22"
] |
e402b838ea316ed0d80d894cb5ac8b41410809d0
|
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -63,7 +63,8 @@ jobs:
- name: Prepare README
run: |
export MAJOR=$(echo "${{ env.VERSION }}" | cut -d'.' -f1)
- sed -i "s|\"pusher/pusher-php-server\": \"^[0-9]*\.0\"|\"pusher/pusher-php-server\": \"^${MAJOR}.0\"|" README.md
+ export MINOR=$(echo "${{ env.VERSION }}" | cut -d'.' -f2)
+ sed -i "s|\"pusher/pusher-php-server\": \"^[0-9]*\.[0-9]*\"|\"pusher/pusher-php-server\": \"^${MAJOR}.${MINOR}\"|" README.md
- name: Prepare Pusher.php
run: |
sed -i "s|public static \$VERSION = '[^']*'|public static \$VERSION = '${{ env.VERSION }}'|" src/Pusher.php
diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## 6.1.0
+
+* [ADDED] triggerAsync and triggerBatchAsync using the Guzzle async interface.
+
## 6.0.1
* [CHANGED] Use type hints where possible (mixed type not available in PHP7).
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Or add to `composer.json`:
```json
"require": {
- "pusher/pusher-php-server": "^6.0"
+ "pusher/pusher-php-server": "^6.1"
}
```
@@ -132,6 +132,24 @@ $batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => arra
$pusher->triggerBatch($batch);
```
+### Asynchronous interface
+
+Both `trigger` and `triggerBatch` have asynchronous counterparts in
+`triggerAsync` and `triggerBatchAsync`. These functions return [Guzzle
+promises](https://github.com/guzzle/promises) which can be chained
+with `->then`:
+
+```php
+$promise = $pusher->triggerAsync( [ 'channel-1', 'channel-2' ], 'my_event', 'hello world' );
+
+$promise->then(function ($result) {
+ // do something with $result
+ return $result;
+});
+
+$final_result = $promise->wait();
+```
+
### Arrays
Objects are automatically converted to JSON format:
diff --git a/src/Pusher.php b/src/Pusher.php
--- a/src/Pusher.php
+++ b/src/Pusher.php
@@ -6,6 +6,8 @@
use Psr\Log\LoggerAwareTrait;
use Psr\Log\LoggerInterface;
use Psr\Log\LogLevel;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Promise\PromiseInterface;
class Pusher implements LoggerAwareInterface, PusherInterface
{
@@ -14,7 +16,7 @@ class Pusher implements LoggerAwareInterface, PusherInterface
/**
* @var string Version
*/
- public static $VERSION = '6.0.1';
+ public static $VERSION = '6.1.0';
/**
* @var null|PusherCrypto
@@ -326,8 +328,8 @@ public static function array_implode($glue, $separator, $array)
}
/**
- * Trigger an event by providing event name and payload.
- * Optionally provide a socket ID to exclude a client (most likely the sender).
+ * Helper function to prepare trigger request. Takes the same
+ * parameters as the public trigger functions.
*
* @param array|string $channels A channel name or an array of channel names to publish the event on.
* @param string $event
@@ -340,7 +342,7 @@ public static function array_implode($glue, $separator, $array)
* @throws GuzzleException
*
*/
- public function trigger($channels, $event, $data, $params = array(), $already_encoded = false) : object
+ public function make_request($channels, $event, $data, $params = array(), $already_encoded = false) : Request
{
if (is_string($channels) === true) {
$channels = array($channels);
@@ -355,6 +357,7 @@ public function trigger($channels, $event, $data, $params = array(), $already_en
foreach ($channels as $chan) {
if (PusherCrypto::is_encrypted_channel($chan)) {
$has_encrypted_channel = true;
+ break;
}
}
@@ -400,10 +403,33 @@ public function trigger($channels, $event, $data, $params = array(), $already_en
'X-Pusher-Library' => 'pusher-http-php '.self::$VERSION
];
- $response = $this->client->post($path, [
- 'query' => array_merge($signature, $query_params),
- 'headers' => $headers,
- 'body' => $post_value,
+ $params = array_merge($signature, $query_params);
+ $query_string = self::array_implode('=', '&', $params);
+ $full_path = $path."?".$query_string;
+ $request = new Request('POST', $full_path, $headers, $post_value);
+
+ return $request;
+ }
+
+ /**
+ * Trigger an event by providing event name and payload.
+ * Optionally provide a socket ID to exclude a client (most likely the sender).
+ *
+ * @param array|string $channels A channel name or an array of channel names to publish the event on.
+ * @param string $event
+ * @param mixed $data Event data
+ * @param array $params [optional]
+ * @param bool $already_encoded [optional]
+ *
+ * @throws PusherException Throws PusherException if $channels is an array of size 101 or above or $socket_id is invalid
+ * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
+ * @throws GuzzleException
+ *
+ */
+ public function trigger($channels, $event, $data, $params = array(), $already_encoded = false) : object {
+ $request = $this->make_request($channels, $event, $data, $params, $already_encoded);
+
+ $response = $this->client->send($request, [
'http_errors' => false,
'base_uri' => $this->channels_url_prefix()
]);
@@ -425,16 +451,53 @@ public function trigger($channels, $event, $data, $params = array(), $already_en
}
/**
- * Trigger multiple events at the same time.
+ * Asynchronously trigger an event by providing event name and payload.
+ * Optionally provide a socket ID to exclude a client (most likely the sender).
+ *
+ * @param array|string $channels A channel name or an array of channel names to publish the event on.
+ * @param string $event
+ * @param mixed $data Event data
+ * @param array $params [optional]
+ * @param bool $already_encoded [optional]
+ *
+ */
+ public function triggerAsync($channels, $event, $data, $params = array(), $already_encoded = false) : PromiseInterface
+ {
+ $request = $this->make_request($channels, $event, $data, $params, $already_encoded);
+
+ $promise = $this->client->sendAsync($request, [
+ 'http_errors' => false,
+ 'base_uri' => $this->channels_url_prefix()
+ ])->then(function ($response) {
+ $status = $response->getStatusCode();
+
+ if ($status !== 200) {
+ $body = (string) $response->getBody();
+ throw new ApiErrorException($body, $status);
+ }
+
+ $result = json_decode($response->getBody());
+
+ if (property_exists($result, 'channels')) {
+ $result->channels = get_object_vars($result->channels);
+ }
+
+ return $result;
+ });
+
+ return $promise;
+ }
+
+ /**
+ * Helper function to prepare batch trigger request. Takes the same * parameters as the public batch trigger functions.
*
* @param array $batch [optional] An array of events to send
* @param bool $already_encoded [optional]
*
* @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
- * @throws GuzzleException
*
- */
- public function triggerBatch($batch = array(), $already_encoded = false) : object
+ **/
+ public function make_batch_request($batch = array(), $already_encoded = false) : Request
{
foreach ($batch as $key => $event) {
$this->validate_channel($event['channel']);
@@ -471,10 +534,29 @@ public function triggerBatch($batch = array(), $already_encoded = false) : objec
'X-Pusher-Library' => 'pusher-http-php '.self::$VERSION
];
- $response = $this->client->post($path, [
- 'query' => array_merge($query_params, $signature),
- 'body' => $post_value,
- 'headers' => $headers,
+ $params = array_merge($signature, $query_params);
+ $query_string = self::array_implode('=', '&', $params);
+ $full_path = $path."?".$query_string;
+ $request = new Request('POST', $full_path, $headers, $post_value);
+
+ return $request;
+ }
+
+ /**
+ * Trigger multiple events at the same time.
+ *
+ * @param array $batch [optional] An array of events to send
+ * @param bool $already_encoded [optional]
+ *
+ * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
+ * @throws GuzzleException
+ *
+ */
+ public function triggerBatch($batch = array(), $already_encoded = false) : object
+ {
+ $request = $this->make_batch_request($batch, $already_encoded);
+
+ $response = $this->client->send($request, [
'http_errors' => false,
'base_uri' => $this->channels_url_prefix()
]);
@@ -486,7 +568,50 @@ public function triggerBatch($batch = array(), $already_encoded = false) : objec
throw new ApiErrorException($body, $status);
}
- return json_decode($response->getBody());
+ $result = json_decode($response->getBody());
+
+ if (property_exists($result, 'channels')) {
+ $result->channels = get_object_vars($result->channels);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Asynchronously trigger multiple events at the same time.
+ *
+ * @param array $batch [optional] An array of events to send
+ * @param bool $already_encoded [optional]
+ *
+ * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
+ *
+ */
+ public function triggerBatchAsync($batch = array(), $already_encoded = false) : PromiseInterface
+ {
+ $request = $this->make_batch_request($batch, $already_encoded);
+
+ $promise = $this->client->sendAsync($request, [
+ 'http_errors' => false,
+ 'base_uri' => $this->channels_url_prefix()
+ ])->then(function ($response) {
+ $status = $response->getStatusCode();
+
+ if ($status !== 200) {
+ $body = (string) $response->getBody();
+ throw new ApiErrorException($body, $status);
+ }
+
+ $result = json_decode($response->getBody());
+
+ if (property_exists($result, 'channels')) {
+ $result->channels = get_object_vars($result->channels);
+ }
+
+ return $result;
+ });
+
+ return $promise;
+
}
/**
diff --git a/src/PusherInterface.php b/src/PusherInterface.php
--- a/src/PusherInterface.php
+++ b/src/PusherInterface.php
@@ -1,6 +1,7 @@
<?php
namespace Pusher;
+use GuzzleHttp\Promise\PromiseInterface;
interface PusherInterface
{
@@ -29,7 +30,20 @@ public function getSettings();
public function trigger($channels, $event, $data, $socket_id = null, $already_encoded = false) : object;
/**
- * Trigger multiple events at the same time.
+ * Asynchronously trigger an event by providing event name and payload.
+ * Optionally provide a socket ID to exclude a client (most likely the sender).
+ *
+ * @param array|string $channels A channel name or an array of channel names to publish the event on.
+ * @param string $event
+ * @param mixed $data Event data
+ * @param array $params [optional]
+ * @param bool $already_encoded [optional]
+ *
+ */
+ public function triggerAsync($channels, $event, $data, $params = array(), $already_encoded = false) : PromiseInterface;
+
+ /**
+ *
*
* @param array $batch [optional] An array of events to send
* @param bool $already_encoded [optional]
@@ -42,7 +56,19 @@ public function trigger($channels, $event, $data, $socket_id = null, $already_en
public function triggerBatch($batch = array(), $already_encoded = false) : object;
/**
- * Fetch channel information for a specific channel.
+ * Trigger multiple events at the same time.
+ *
+ * @param array $batch [optional] An array of events to send
+ * @param bool $already_encoded [optional]
+ *
+ * @throws PusherException Throws exception if curl wasn't initialized correctly
+ * @throws ApiErrorException Throws ApiErrorException if the Channels HTTP API responds with an error
+ *
+ */
+ public function triggerBatchAsync($batch = array(), $already_encoded = false) : PromiseInterface;
+
+ /**
+ * Asynchronously trigger multiple events at the same time.
*
* @param string $channel The name of the channel
* @param array $params Additional parameters for the query e.g. $params = array( 'info' => 'connection_count' )
|
diff --git a/tests/acceptance/TriggerAsyncTest.php b/tests/acceptance/TriggerAsyncTest.php
new file mode 100644
--- /dev/null
+++ b/tests/acceptance/TriggerAsyncTest.php
@@ -0,0 +1,121 @@
+<?php
+
+class TriggerAsyncTest extends PHPUnit\Framework\TestCase
+{
+ protected function setUp(): void
+ {
+ if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
+ $this->markTestSkipped('Please set the
+ PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
+ PUSHERAPP_APPID keys.');
+ } else {
+ $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ }
+ }
+
+ public function testObjectConstruct()
+ {
+ $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ }
+
+ public function testStringPush()
+ {
+ $result = $this->pusher->triggerAsync('test_channel', 'my_event', 'Test string')->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testArrayPush()
+ {
+ $result = $this->pusher->triggerAsync('test_channel', 'my_event', array('test' => 1))->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testPushWithSocketId()
+ {
+ $result = $this->pusher->triggerAsync('test_channel', 'my_event', array('test' => 1), array('socket_id' => '123.456'))->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testPushWithInfo()
+ {
+ $expectedMyChannel = new stdClass();
+ $expectedMyChannel->subscription_count = 1;
+ $expectedPresenceMyChannel = new stdClass();
+ $expectedPresenceMyChannel->user_count = 0;
+ $expectedPresenceMyChannel->subscription_count = 0;
+ $expectedResult = new stdClass();
+ $expectedResult->channels = array(
+ "my-channel" => $expectedMyChannel,
+ "presence-my-channel" => $expectedPresenceMyChannel,
+ );
+
+ $result = $this->pusher->triggerAsync(['my-channel', 'presence-my-channel'], 'my_event', array('test' => 1), array('info' => 'user_count,subscription_count'))->wait();
+ $this->assertEquals($expectedResult, $result);
+ }
+
+ public function testTLSPush()
+ {
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ );
+ $pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $result = $pusher->triggerAsync('test_channel', 'my_event', array('encrypted' => 1))->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testSendingOver10kBMessageReturns413()
+ {
+ $this->expectException(\Pusher\ApiErrorException::class);
+ $this->expectExceptionCode('413');
+
+ $data = str_pad('', 11 * 1024, 'a');
+ $this->pusher->triggerAsync('test_channel', 'my_event', $data, array(), true)->wait();
+ }
+
+ public function testTriggeringEventOnOver100ChannelsThrowsException()
+ {
+ $this->expectException(\Pusher\PusherException::class);
+
+ $channels = array();
+ while (count($channels) <= 101) {
+ $channels[] = ('channel-'.count($channels));
+ }
+ $data = array('event_name' => 'event_data');
+ $this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
+ }
+
+ public function testTriggeringEventOnMultipleChannels()
+ {
+ $data = array('event_name' => 'event_data');
+ $channels = array('test_channel_1', 'test_channel_2');
+ $result = $this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testTriggeringEventOnPrivateEncryptedChannelSuccess()
+ {
+ $options = ['encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
+ 'host' => PUSHERAPP_HOST];
+ $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $data = array('event_name' => 'event_data');
+ $channels = array('private-encrypted-ceppaio');
+ $result = $this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testTriggeringEventOnMultipleChannelsWithEncryptedChannelPresentError()
+ {
+ $this->expectException(\Pusher\PusherException::class);
+
+ $options = ['encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
+ 'host' => PUSHERAPP_HOST];
+ $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $data = array('event_name' => 'event_data');
+ $channels = array('my-chan-ceppaio', 'private-encrypted-ceppaio');
+ $this->pusher->triggerAsync($channels, 'my_event', $data)->wait();
+ }
+}
diff --git a/tests/acceptance/TriggerBatchAsyncTest.php b/tests/acceptance/TriggerBatchAsyncTest.php
new file mode 100644
--- /dev/null
+++ b/tests/acceptance/TriggerBatchAsyncTest.php
@@ -0,0 +1,234 @@
+<?php
+
+class TriggerBatchAsyncTest extends PHPUnit\Framework\TestCase
+{
+ protected function setUp(): void
+ {
+ if (PUSHERAPP_AUTHKEY === '' || PUSHERAPP_SECRET === '' || PUSHERAPP_APPID === '') {
+ $this->markTestSkipped('Please set the
+ PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET and
+ PUSHERAPP_APPID keys.');
+ } else {
+ $this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, ['host' => PUSHERAPP_HOST]);
+ }
+ }
+
+ public function testObjectConstruct()
+ {
+ $this->assertNotNull($this->pusher, 'Created new Pusher\Pusher object');
+ }
+
+ public function testSimplePush()
+ {
+ $batch = array();
+ $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $result = $this->pusher->triggerBatchAsync($batch)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testTLSPush()
+ {
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ );
+ $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $batch = array();
+ $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $result = $pc->triggerBatchAsync($batch)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testTriggerBatchNonEncryptedEventsWithObjectPayloads()
+ {
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ );
+ $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $batch = array();
+ $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $batch[] = array('channel' => 'mio_canale', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $result = $pc->triggerBatchAsync($batch)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testTriggerBatchWithSingleEvent()
+ {
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ );
+ $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $batch = array();
+ $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $result = $pc->triggerBatchAsync($batch)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testTriggerBatchWithInfo()
+ {
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ );
+ $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $expectedMyChannel = new stdClass();
+ $expectedMyChannel->subscription_count = 1;
+ $expectedMyChannel2 = new stdClass();
+ $expectedPresenceMyChannel = new stdClass();
+ $expectedPresenceMyChannel->user_count = 0;
+ $expectedPresenceMyChannel->subscription_count = 0;
+ $expectedResult = new stdClass();
+ $expectedResult->batch = array(
+ $expectedMyChannel,
+ $expectedMyChannel2,
+ $expectedPresenceMyChannel
+ );
+
+ $batch = array();
+ $batch[] = array('channel' => 'my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'subscription_count');
+ $batch[] = array('channel' => 'my-channel-2', 'name' => 'my_event', 'data' => 'test-string');
+ $batch[] = array('channel' => 'presence-my-channel', 'name' => 'my_event', 'data' => 'test-string', 'info' => 'user_count,subscription_count');
+ $result = $pc->triggerBatchAsync($batch)->wait();
+ $this->assertEquals($expectedResult, $result);
+ }
+
+ public function testTriggerBatchWithMultipleNonEncryptedEventsWithStringPayloads()
+ {
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ );
+ $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $batch = array();
+ $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $batch[] = array('channel' => 'test_channel2', 'name' => 'my_event2', 'data' => 'test-string2');
+ $result = $pc->triggerBatchAsync($batch)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testTriggerBatchWithMultipleCombinationsofStringAndObjectPayloads()
+ {
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ );
+ $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $batch = array();
+ $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $batch[] = array('channel' => 'test_channel2', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $result = $pc->triggerBatchAsync($batch)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testTriggerBatchWithWithEncryptedEventSuccess()
+ {
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ 'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
+ );
+ $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $batch = array();
+ $batch[] = array('channel' => 'private-encrypted-test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $result = $pc->triggerBatchAsync($batch)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testTriggerBatchWithMultipleEncryptedEventsSuccess()
+ {
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ 'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
+ );
+ $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $batch = array();
+ $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'test-string');
+ $batch[] = array('channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => 'test-string2');
+ $result = $pc->triggerBatchAsync($batch)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testTriggerBatchWithMultipleCombinationsofStringsAndObjectsWithEncryptedEventSuccess()
+ {
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ 'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
+ );
+ $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $batch = array();
+ $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => 'secret-string');
+ $batch[] = array('channel' => 'private-encrypted-test_channel2', 'name' => 'my_event2', 'data' => array('my' => 'data2'));
+ $result = $pc->triggerBatchAsync($batch)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testTriggerBatchMultipleEventsWithEncryptedEventWithoutEncryptionMasterKeyError()
+ {
+ $this->expectException(Error::class);
+
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ );
+ $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $batch = array();
+ $batch[] = array('channel' => 'my_test_chan', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $batch[] = array('channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => array('my' => 'to_be_encrypted_data_shhhht'));
+ $pc->triggerBatchAsync($batch)->wait();
+ }
+
+ public function testTriggerBatchWithMultipleEncryptedEventsWithEncryptionMasterKeySuccess()
+ {
+ $options = array(
+ 'useTLS' => true,
+ 'host' => PUSHERAPP_HOST,
+ 'encryption_master_key_base64' => 'Y0F6UkgzVzlGWk0zaVhxU05JR3RLenR3TnVDejl4TVY=',
+ );
+ $pc = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+
+ $batch = array();
+ $batch[] = array('channel' => 'my_test_chan', 'name' => 'my_event', 'data' => array('my' => 'data'));
+ $batch[] = array('channel' => 'private-encrypted-ceppaio', 'name' => 'my_private_encrypted_event', 'data' => array('my' => 'to_be_encrypted_data_shhhht'));
+ $result = $pc->triggerBatchAsync($batch)->wait();
+ $this->assertEquals(new stdClass(), $result);
+ }
+
+ public function testSendingOver10kBMessageReturns413()
+ {
+ $this->expectException(\Pusher\ApiErrorException::class);
+ $this->expectExceptionMessage('content of this event');
+ $this->expectExceptionCode('413');
+
+ $data = str_pad('', 11 * 1024, 'a');
+ $batch = array();
+ $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => $data);
+ $this->pusher->triggerBatchAsync($batch, true)->wait();
+ }
+
+ public function testSendingOver10messagesReturns400()
+ {
+ $this->expectException(\Pusher\ApiErrorException::class);
+ $this->expectExceptionMessage('Batch too large');
+ $this->expectExceptionCode('400');
+
+ $batch = array();
+ foreach (range(1, 11) as $i) {
+ $batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('index' => $i));
+ }
+ $this->pusher->triggerBatchAsync($batch, false)->wait();
+ }
+}
|
Provide a way to asynchronously trigger events
This is an issue to keep track of the demand for triggering event asynchronously.
There are a couple of pull requests to add this functionality but neither provide any tests. See #4 and #11.
We're looking at sorting out a number of libraries so I'm cleaning out some older issues.
|
This would be super useful, as triggering events inline presents a serious scaling issue.
Has anyone come up with a successful implementation of a trigger_async method for the php client library, or is there a reason this was not possible?
Would be preferable to start using Guzzle here, as proposed in #95
Note: the Guzzle client to be used should be passable via the constructor as optional argument, so everyone can keep using their Guzzle middleware.
This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. If you'd like this issue to stay open please leave a comment indicating how this issue is affecting you. Thank you.
Pinning this to keep stalebot from closing it. This can now be implemented easily with Guzzle.
| 2021-03-17T13:57:24
|
php
|
Hard
|
pusher/pusher-http-php
| 160
|
pusher__pusher-http-php-160
|
[
"157"
] |
d88d26918a551623928cc15e45b2535c7962ce05
|
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -345,12 +345,23 @@ $pusher->notify(array("test"), $data);
## Debugging & Logging
-The best way to debug your applications interaction with server is to set a logger
-for the library so you can see the internal workings within the library and interactions
-with the Pusher service.
+The best way to debug your applications interaction with server is to set a logger for the library so you can see the internal workings within the library and interactions with the Pusher service.
-You set up logging by passing an object with a `log` function to the `pusher->set_logger`
-function:
+### PSR-3 Support
+
+The recommended approach of logging is to use a [PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md) compliant logger implementing `Psr\Log\LoggerInterface`. The `Pusher` object implements `Psr\Log\LoggerAwareInterface`, meaning you call `setLogger(LoggerInterface $logger)` to set the logger instance.
+
+```php
+// where $logger implements `LoggerInterface`
+
+$pusher->setLogger($logger);
+```
+
+### Custom Logger (deprecated)
+
+> **Warning**: Using `Pusher::set_logger()` and a custom object implementing `log()` is now deprecated and will be removed in the future. Please use a PSR-3 compliant logger.
+
+You set up logging by passing an object with a `log` function to the `pusher->set_logger` function:
```php
class MyLogger {
@@ -362,9 +373,7 @@ class MyLogger {
$pusher->set_logger( new MyLogger() );
```
-If you use the above example in code executed from the console/terminal the debug
-information will be output there. If you use this within a web app then the output
-will appear within the generated app output e.g. HTML.
+If you use the above example in code executed from the console/terminal the debug information will be output there. If you use this within a web app then the output will appear within the generated app output e.g. HTML.
## Running the tests
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,8 @@
"license": "MIT",
"require": {
"php": "^5.4 || ^7.0",
- "ext-curl": "*"
+ "ext-curl": "*",
+ "psr/log": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8 || ^5.7"
diff --git a/src/Pusher.php b/src/Pusher.php
--- a/src/Pusher.php
+++ b/src/Pusher.php
@@ -2,8 +2,15 @@
namespace Pusher;
-class Pusher
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+
+class Pusher implements LoggerAwareInterface
{
+ use LoggerAwareTrait;
+
public static $VERSION = '3.0.0';
private $settings = array(
@@ -13,7 +20,6 @@ class Pusher
'debug' => false,
'curl_options' => array(),
);
- private $logger = null;
private $ch = null; // Curl handler
/**
@@ -62,8 +68,10 @@ public function __construct($auth_key, $secret, $app_id, $options = array(), $ho
$this->settings['host'] = $host;
- $this->log('INFO: Legacy $host parameter provided: '.
- $this->settings['scheme'].' host: '.$this->settings['host']);
+ $this->log('Legacy $host parameter provided: {scheme} host: {host}', array(
+ 'scheme' => $this->settings['scheme'],
+ 'host' => $this->settings['host'],
+ ));
}
if (!is_null($port)) {
@@ -141,6 +149,8 @@ public function getSettings()
/**
* Set a logger to be informed of internal log messages.
*
+ * @deprecated Use the PSR-3 compliant Pusher::setLogger() instead. This method will be removed in the next breaking release.
+ *
* @return void
*/
public function set_logger($logger)
@@ -155,11 +165,27 @@ public function set_logger($logger)
*
* @return void
*/
- private function log($msg)
+ private function log($msg, array $context = array(), $level = LogLevel::INFO)
{
- if (is_null($this->logger) === false) {
- $this->logger->log('Pusher: '.$msg);
+ if (is_null($this->logger)) {
+ return;
+ }
+
+ if ($this->logger instanceof LoggerInterface) {
+ $this->logger->log($level, $msg, $context);
+
+ return;
}
+
+ // Support old style logger (deprecated)
+ $msg = sprintf('Pusher: %s: %s', strtoupper($level), $msg);
+ $replacement = array();
+
+ foreach ($context as $k => $v) {
+ $replacement['{'.$k.'}'] = $v;
+ }
+
+ $this->logger->log(strtr($msg, $replacement));
}
/**
@@ -250,7 +276,7 @@ private function create_curl($domain, $s_url, $request_method = 'GET', $query_pa
$full_url = $domain.$s_url.'?'.$signed_query;
- $this->log('INFO: create_curl( '.$full_url.' )');
+ $this->log('create_curl( {full_url} )', array('full_url' => $full_url));
// Create or reuse existing curl handle
if (null === $this->ch) {
@@ -304,10 +330,10 @@ private function exec_curl($ch)
$response['status'] = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if ($response['body'] === false || $response['status'] < 200 || 400 <= $response['status']) {
- $this->log('ERROR: exec_curl error: '.curl_error($ch));
+ $this->log('exec_curl error: {error}', array('error' => curl_error($ch)), LogLevel::ERROR);
}
- $this->log('INFO: exec_curl response: '.print_r($response, true));
+ $this->log('exec_curl response: {response}', array('response' => print_r($response, true)));
return $response;
}
@@ -425,7 +451,9 @@ public function trigger($channels, $event, $data, $socket_id = null, $debug = fa
// json_encode might return false on failure
if (!$data_encoded) {
- $this->Log('ERROR: Failed to perform json_encode on the the provided data: '.print_r($data, true));
+ $this->log('Failed to perform json_encode on the the provided data: {error}', array(
+ 'error' => print_r($data, true),
+ ), LogLevel::ERROR);
}
$post_params = array();
@@ -443,7 +471,7 @@ public function trigger($channels, $event, $data, $socket_id = null, $debug = fa
$ch = $this->create_curl($this->ddn_domain(), $s_url, 'POST', $query_params);
- $this->log('INFO: trigger POST: '.$post_value);
+ $this->log('trigger POST: {post_value}', compact('post_value'));
curl_setopt($ch, CURLOPT_POSTFIELDS, $post_value);
@@ -490,7 +518,7 @@ public function triggerBatch($batch = array(), $debug = false, $already_encoded
$ch = $this->create_curl($this->ddn_domain(), $s_url, 'POST', $query_params);
- $this->log('INFO: trigger POST: '.$post_value);
+ $this->log('trigger POST: {post_value}', compact('post_value'));
curl_setopt($ch, CURLOPT_POSTFIELDS, $post_value);
@@ -636,7 +664,7 @@ public function notify($interests, $data = array(), $debug = false)
$query_params = array();
if (is_string($interests)) {
- $this->log('INFO: ->notify received string interests "'.$interests.'". Converting to array.');
+ $this->log('->notify received string interests "{interests}" Converting to array.', compact('interests'));
$interests = array($interests);
}
@@ -653,7 +681,7 @@ public function notify($interests, $data = array(), $debug = false)
$notification_path = '/server_api/v1'.$this->settings['base_path'].'/notifications';
$ch = $this->create_curl($this->notification_domain(), $notification_path, 'POST', $query_params);
- $this->log('INFO: trigger POST (Native notifications): '.$post_value);
+ $this->log('trigger POST (Native notifications): {post_value}', compact('post_value'));
curl_setopt($ch, CURLOPT_POSTFIELDS, $post_value);
|
diff --git a/tests/TestLogger.php b/tests/TestLogger.php
--- a/tests/TestLogger.php
+++ b/tests/TestLogger.php
@@ -1,9 +1,21 @@
<?php
-class TestLogger
+use Psr\Log\AbstractLogger;
+
+class TestLogger extends AbstractLogger
{
- public function log($msg)
+ /**
+ * {@inheritdoc}
+ */
+ public function log($level, $message, array $context = array())
{
- print_r("\n".$msg);
+ $msg = sprintf('Pusher: %s: %s', strtoupper($level), $msg);
+ $replacement = array();
+
+ foreach ($context as $k => $v) {
+ $replacement['{'.$k.'}'] = $v;
+ }
+
+ print_r("\n".strtr($msg, $replacement));
}
}
diff --git a/tests/acceptance/channelQueryTest.php b/tests/acceptance/channelQueryTest.php
--- a/tests/acceptance/channelQueryTest.php
+++ b/tests/acceptance/channelQueryTest.php
@@ -5,7 +5,7 @@ class PusherChannelQueryTest extends PHPUnit_Framework_TestCase
protected function setUp()
{
$this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, true, PUSHERAPP_HOST);
- $this->pusher->set_logger(new TestLogger());
+ $this->pusher->setLogger(new TestLogger());
}
public function testChannelInfo()
diff --git a/tests/acceptance/triggerBatchTest.php b/tests/acceptance/triggerBatchTest.php
--- a/tests/acceptance/triggerBatchTest.php
+++ b/tests/acceptance/triggerBatchTest.php
@@ -10,7 +10,7 @@ protected function setUp()
PUSHERAPP_APPID keys.');
} else {
$this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, true, PUSHERAPP_HOST);
- $this->pusher->set_logger(new TestLogger());
+ $this->pusher->setLogger(new TestLogger());
}
}
@@ -34,7 +34,7 @@ public function testEncryptedPush()
'host' => PUSHERAPP_HOST,
);
$pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $pusher->set_logger(new TestLogger());
+ $pusher->setLogger(new TestLogger());
$batch = array();
$batch[] = array('channel' => 'test_channel', 'name' => 'my_event', 'data' => array('my' => 'data'));
diff --git a/tests/acceptance/triggerTest.php b/tests/acceptance/triggerTest.php
--- a/tests/acceptance/triggerTest.php
+++ b/tests/acceptance/triggerTest.php
@@ -10,7 +10,7 @@ protected function setUp()
PUSHERAPP_APPID keys.');
} else {
$this->pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, true, PUSHERAPP_HOST);
- $this->pusher->set_logger(new TestLogger());
+ $this->pusher->setLogger(new TestLogger());
}
}
@@ -38,7 +38,7 @@ public function testEncryptedPush()
'host' => PUSHERAPP_HOST,
);
$pusher = new Pusher\Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
- $pusher->set_logger(new TestLogger());
+ $pusher->setLogger(new TestLogger());
$structure_trigger = $pusher->trigger('test_channel', 'my_event', array('encrypted' => 1));
$this->assertTrue($structure_trigger, 'Trigger with over encrypted connection');
|
Log Level is not defined with Monolog
We use Monolog for my Logger implementation in my app. When I set the logger in Pusher client we obtain this error:
"Exception: Level "Pusher: INFO: create_curl( https://api-eu.pusher.com:443/apps/*****************&auth_version=1.0&body_md5=************* )" is not defined, use one of: 100, 200, 250, 300, 400, 500, 550, 600 [] []"
Monolog implements Psr `LoggerInterface` [1] with next `log` method:
```php
/**
* Logs with an arbitrary level.
*
* @param mixed $level
* @param string $message
* @param array $context
*
* @return void
*/
public function log($level, $message, array $context = array());
```
[1] https://github.com/php-fig/log/blob/master/Psr/Log/LoggerInterface.php
But Pusher client use incorrectly `log` method, without `$level` parameter.
```php
/**
* Set a logger to be informed of internal log messages.
*
* @return void
*/
public function set_logger($logger)
{
$this->logger = $logger;
}
/**
* Log a string.
*
* @param string $msg The message to log
*
* @return void
*/
private function log($msg)
{
if (is_null($this->logger) === false) {
$this->logger->log('Pusher: '.$msg);
}
}
```
|
A quick and shitty solution is write a wrapper for encapsulate the `Psr\Log\LoggerInterface`.
```php
use Psr\Log\LoggerInterface;
class PsrToPusherLogger {
protected $defaultLevel;
protected $logger;
public function __construct(LoggerInterface $logger, $defaultLevel = 100) {
$this->logger = $logger;
$this->defaultLevel = $defaultLevel;
}
public function log($message) {
$this->logger->log($this->defaultLevel, $message);
}
}
```
For use this solution:
```php
use Monolog\Logger;
// ...
$pusher->set_logger(new PsrToPusherLogger($logger, Logger::INFO));
```
We don't implement the logger in this fashion initially, however now that PSR-3-logger entered into the accepted state, it is probably time that we did. I'll look into modifying this library to officially support this logging interface. Thanks for the report!
| 2018-04-04T18:29:09
|
php
|
Hard
|
pusher/pusher-http-php
| 24
|
pusher__pusher-http-php-24
|
[
"23"
] |
d5b4e8bec7fc5e53651c879495a74e96b1bc2cea
|
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,19 @@
+# see http://about.travis-ci.org/docs/user/languages/php/ for more hints
+language: php
+
+# list any PHP version you want to test against
+php:
+ # using major version aliases
+
+ # aliased to 5.3.29
+ - 5.3
+ # aliased to a recent 5.4.x version
+ - 5.4
+ # aliased to a recent 5.5.x version
+ - 5.5
+ # aliased to a recent 5.6.x version
+ - 5.6
+
+before_script: composer install
+
+script: phpunit --testsuite unit
diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## 2.2.0 (2015-01-20)
+
+[CHANGED] `new Pusher($app_key, $app_secret, $app_id, $options)` - The `$options` parameter
+has been added as the forth parameter to the constructor and other additional
+parameters are now deprecated.
+
## 2.1.3 (2012-12-22)
[NEW] `$pusher->trigger` can now take an `array` of channel names as a first parameter to allow the same event to be published on multiple channels.
@@ -32,4 +38,4 @@
[CHANGED] `get_channels()` now returns an object which has a `channels` property. This must be accessed to get the Array of channels in an application.
-[CHANGED] `get_presence_channels()` now returns an object which has a `channels` property. This must be accessed to get the Array of channels in an application.
\ No newline at end of file
+[CHANGED] `get_presence_channels()` now returns an object which has a `channels` property. This must be accessed to get the Array of channels in an application.
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
# Pusher PHP Library
-This is a PHP library for interacting with the Pusher REST API.
+[](https://travis-ci.org/pusher/pusher-php-server)
-Register at <http://pusher.com> and use the application credentials within your app as shown below.
+PHP library for interacting with the Pusher HTTP API.
+
+Register at <https://pusher.com> and use the application credentials within your app as shown below.
## Installation
@@ -17,174 +19,209 @@ Or you can clone or download the library files.
Use the credentials from your Pusher application to create a new `Pusher` instance.
- $app_id = 'YOUR_APP_ID';
- $app_key = 'YOUR_APP_KEY';
- $app_secret = 'YOUR_APP_SECRET';
+```php
+$app_id = 'YOUR_APP_ID';
+$app_key = 'YOUR_APP_KEY';
+$app_secret = 'YOUR_APP_SECRET';
- $pusher = new Pusher( $app_key, $app_secret, $app_id );
+$pusher = new Pusher( $app_key, $app_secret, $app_id );
+```
+
+A forth parameter `$options` parameter can also be passed. The available options are:
-By default calls will be made over a non-encrypted connection. To change this to make calls over HTTPS:
+* `scheme` - e.g. http or https
+* `host` - the host e.g. api.pusherapp.com. No trailing forward slash.
+* `port` - the http port
+* `timeout` - the HTTP timeout
+* `encrypted` - quick option to use scheme of https and port 443.
- $pusher = new Pusher( $app_key, $app_secret, $app_id, false, 'https://api.pusherapp.com', 443 );
+For example, by default calls will be made over a non-encrypted connection. To change this to make calls over HTTPS use:
+
+```php
+$pusher = new Pusher( $app_key, $app_secret, $app_id, array( 'encrypted' => true ) );
+```
+
+*Note: The `$options` parameter was introduced in version 2.2.0 of the library.
+Previously additional parameters could be passed for each option, but this was
+becoming unwieldy. However, backwards compatibility has been maintained.*
## Publishing/Triggering events
To trigger an event on one or more channels use the `trigger` function.
### A single channel
-
- $pusher->trigger( 'my-channel', 'my_event', 'hello world' );
+
+```php
+$pusher->trigger( 'my-channel', 'my_event', 'hello world' );
+```
### Multiple channels
- $pusher->trigger( [ 'channel-1', 'channel-2' ], 'my_event', 'hello world' );
+```php
+$pusher->trigger( [ 'channel-1', 'channel-2' ], 'my_event', 'hello world' );
+```
### Arrays
Objects are automatically converted to JSON format:
- $array['name'] = 'joe';
- $array['message_count'] = 23;
+```php
+$array['name'] = 'joe';
+$array['message_count'] = 23;
- $pusher->trigger('my_channel', 'my_event', $array);
+$pusher->trigger('my_channel', 'my_event', $array);
+```
The output of this will be:
- "{'name': 'joe', 'message_count': 23}"
+```json
+"{'name': 'joe', 'message_count': 23}"
+```
### Socket id
In order to avoid duplicates you can optionally specify the sender's socket id while triggering an event ([http://pusherapp.com/docs/duplicates](http://pusherapp.com/docs/duplicates)):
- $pusher->trigger('my-channel','event','data','socket_id');
-
-### Debugging
-
-You can either turn on debugging by setting the fifth argument to true, like so:
-
- $pusher->trigger('my-channel', 'event', 'data', null, true)
-
-or with all requests:
-
- $pusher = new Pusher($key, $secret, $app_id, true);
-
-On failed requests, this will return the server's response, instead of false.
-
-### Logging
-
-You can pass an object with a `log` function to the `pusher->set_logger` function so that you can log information from the library.
-
- class MyLogger {
- public function log( $msg ) {
- print_r( $msg . "\n" );
- }
- }
+```php
+$pusher->trigger('my-channel','event','data','socket_id');
+```
- $pusher->set_logger( new MyLogger() );
-
### JSON format
-
+
If your data is already encoded in JSON format, you can avoid a second encoding step by setting the sixth argument true, like so:
- $pusher->trigger('my-channel', 'event', 'data', null, false, true)
+```php
+$pusher->trigger('my-channel', 'event', 'data', null, false, true)
+```
## Authenticating Private channels
To authorise your users to access private channels on Pusher, you can use the socket_auth function:
- $pusher->socket_auth('my-channel','socket_id');
+```php
+$pusher->socket_auth('my-channel','socket_id');
+```
## Authenticating Presence channels
Using presence channels is similar to private channels, but you can specify extra data to identify that particular user:
- $pusher->presence_auth('my-channel','socket_id', 'user_id', 'user_info');
+```php
+$pusher->presence_auth('my-channel','socket_id', 'user_id', 'user_info');
+```
### Presence example
First set this variable in your JS app:
- Pusher.channel_auth_endpoint = '/presence_auth.php';
+```php
+Pusher.channel_auth_endpoint = '/presence_auth.php';
+```
Next, create the following in presence_auth.php:
- <?php
- header('Content-Type: application/json');
- if ($_SESSION['user_id']){
- $sql = "SELECT * FROM `users` WHERE id='$_SESSION[user_id]'";
- $result = mysql_query($sql,$mysql);
- $user = mysql_fetch_assoc($result);
- } else {
- die('aaargh, no-one is logged in')
- }
-
- $pusher = new Pusher($key, $secret, $app_id);
- $presence_data = array('name' => $user['name']);
- echo $pusher->presence_auth($_POST['channel_name'], $_POST['socket_id'], $user['id'], $presence_data);
- ?>
+```php
+<?php
+header('Content-Type: application/json');
+if ($_SESSION['user_id']){
+ $sql = "SELECT * FROM `users` WHERE id='$_SESSION[user_id]'";
+ $result = mysql_query($sql,$mysql);
+ $user = mysql_fetch_assoc($result);
+} else {
+ die('aaargh, no-one is logged in')
+}
+
+$pusher = new Pusher($key, $secret, $app_id);
+$presence_data = array('name' => $user['name']);
+echo $pusher->presence_auth($_POST['channel_name'], $_POST['socket_id'], $user['id'], $presence_data);
+```
Note: this assumes that you store your users in a table called `users` and that those users have a `name` column. It also assumes that you have a login mechanism that stores the `user_id` of the logged in user in the session.
## Application State Queries
-## Generic get function
+### Generic get function
- pusher->get( $path, $params )
+```php
+$pusher->get( $path, $params );
+```
Used to make `GET` queries against the Pusher REST API. Handles authentication.
Response is an associative array with a `result` index. The contents of this index is dependent on the REST method that was called. However, a `status` property to allow the HTTP status code is always present and a `result` property will be set if the status code indicates a successful call to the API.
- $response = $pusher->get( '/channels' );
- $http_status_code = $response[ 'status' ];
- $result = $response[ 'result' ];
+```php
+$response = $pusher->get( '/channels' );
+$http_status_code = $response[ 'status' ];
+$result = $response[ 'result' ];
+```
### Get information about a channel
- get_channel_info( $name )
+```php
+$pusher->get_channel_info( $name );
+```
It's also possible to get information about a channel from the Pusher REST API.
- $info = $pusher->get_channel_info('channel-name');
- $channel_occupied = $info->occupied;
+```php
+$info = $pusher->get_channel_info('channel-name');
+$channel_occupied = $info->occupied;
+```
This can also be achieved using the generic `pusher->get` function:
- pusher->get( '/channels/channel-name' );
+```php
+$pusher->get( '/channels/channel-name' );
+```
### Get a list of application channels
- get_channels()
+```php
+$pusher->get_channels()
+```
It's also possible to get a list of channels for an application from the Pusher REST API.
- $result = $pusher->get_channels();
- $channel_count = count($result->channels); // $channels is an Array
+```php
+$result = $pusher->get_channels();
+$channel_count = count($result->channels); // $channels is an Array
+```
This can also be achieved using the generic `pusher->get` function:
- pusher->get( '/channels' );
+```php
+$pusher->get( '/channels' );
+```
### Get a filtered list of application channels
- get_channels( array( 'filter_by_prefix' => 'some_filter' ) )
+```php
+$pusher->get_channels( array( 'filter_by_prefix' => 'some_filter' ) )
+```
It's also possible to get a list of channels based on their name prefix. To do this you need to supply an $options parameter to the call. In the following example the call will return a list of all channels with a 'presence-' prefix. This is idea for fetching a list of all presence channels.
- $results = $pusher->get_channels( array( 'filter_by_prefix' => 'presence-') );
- $channel_count = count($result->channels); // $channels is an Array
+```php
+$results = $pusher->get_channels( array( 'filter_by_prefix' => 'presence-') );
+$channel_count = count($result->channels); // $channels is an Array
+```
This can also be achieved using the generic `pusher->get` function:
- $pusher->get( '/channels', array( 'filter_by_prefix' => 'presence-' ) );
+```php
+$pusher->get( '/channels', array( 'filter_by_prefix' => 'presence-' ) );
+```
### Get user information from a presence channel
- $response = $pusher->get( '/channels/presence-channel-name/users' )
+```php
+$response = $pusher->get( '/channels/presence-channel-name/users' )
+```
The `$response` is in the format:
-```
+```php
Array
(
[body] => {"users":[{"id":"a_user_id"}]}
@@ -202,6 +239,29 @@ Array
)
)
```
+
+## Debugging & Logging
+
+The best way to debug your applications interaction with server is to set a logger
+for the library so you can see the internal workings within the library and interactions
+with the Pusher service.
+
+You set up logging by passing an object with a `log` function to the `pusher->set_logger`
+function:
+
+```php
+class MyLogger {
+ public function log( $msg ) {
+ print_r( $msg . "\n" );
+ }
+}
+
+$pusher->set_logger( new MyLogger() );
+```
+
+If you use the above example in code executed from the console/terminal the debug
+information will be output there. If you use this within a web app then the output
+will appear within the generated app output e.g. HTML.
## Running the tests
@@ -213,5 +273,8 @@ Requires [phpunit](https://github.com/sebastianbergmann/phpunit/).
## License
-Copyright 2010, Squeeks. Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
+Copyright 2014, Pusher. Licensed under the MIT license:
+http://www.opensource.org/licenses/mit-license.php
+Copyright 2010, Squeeks. Licensed under the MIT license:
+http://www.opensource.org/licenses/mit-license.php
diff --git a/lib/Pusher.php b/lib/Pusher.php
--- a/lib/Pusher.php
+++ b/lib/Pusher.php
@@ -50,44 +50,110 @@ public static function get_pusher()
class Pusher
{
- public static $VERSION = '2.0.0';
-
- private $settings = array ();
+ public static $VERSION = '2.2.0';
+
+ private $settings = array(
+ 'scheme' => 'http',
+ 'host' => 'api.pusherapp.com',
+ 'port' => 80,
+ 'timeout' => 30,
+ 'debug' => false
+ );
private $logger = null;
/**
- * PHP5 Constructor.
- *
- * Initializes a new Pusher instance with key, secret , app ID and channel.
- * You can optionally turn on debugging for all requests by setting debug to true.
- *
- * @param string $auth_key
- * @param string $secret
- * @param int $app_id
- * @param bool $debug [optional]
- * @param string $host [optional]
- * @param int $port [optional]
- * @param int $timeout [optional]
- */
- public function __construct( $auth_key, $secret, $app_id, $debug = false, $host = 'http://api.pusherapp.com', $port = '80', $timeout = 30 )
+ * PHP5 Constructor.
+ *
+ * Initializes a new Pusher instance with key, secret , app ID and channel.
+ * You can optionally turn on debugging for all requests by setting debug to true.
+ *
+ * @param string $auth_key
+ * @param string $secret
+ * @param int $app_id
+ * @param bool $options [optional]
+ * Options to configure the Pusher instance.
+ * Was previously a debug flag. Legacy support for this exists if a boolean is passed.
+ * scheme - e.g. http or https
+ * host - the host e.g. api.pusherapp.com. No trailing forward slash.
+ * port - the http port
+ * timeout - the http timeout
+ * encrypted - quick option to use scheme of https and port 443.
+ * @param string $host [optional] - deprecated
+ * @param int $port [optional] - deprecated
+ * @param int $timeout [optional] - deprecated
+ */
+ public function __construct( $auth_key, $secret, $app_id, $options = array(), $host = null, $port = null, $timeout = null )
{
- // Check compatibility, disable for speed improvement
$this->check_compatibility();
- // Setup defaults
- $this->settings['server'] = $host;
- $this->settings['port'] = $port;
- $this->settings['auth_key'] = $auth_key;
- $this->settings['secret'] = $secret;
- $this->settings['app_id'] = $app_id;
- $this->settings['url'] = '/apps/' . $this->settings['app_id'];
- $this->settings['debug'] = $debug;
- $this->settings['timeout'] = $timeout;
+ /** Start backward compatibility with old constructor **/
+ if( is_bool( $options ) === true ) {
+ $options = array(
+ 'debug' => $options
+ );
+ }
+
+ if( !is_null( $host ) ) {
+ $match = null;
+ preg_match("/(http[s]?)\:\/\/(.*)/", $host, $match);
+
+ if( count( $match ) === 3 ) {
+ $this->settings[ 'scheme' ] = $match[ 1 ];
+ $host = $match[ 2 ];
+ }
+
+ $this->settings[ 'host' ] = $host;
+
+ $this->log( 'Legacy $host parameter provided: ' .
+ $this->settings[ 'scheme' ] + ' host: ' + $this->settings[ 'host' ] );
+ }
+
+ if( !is_null( $port ) ) {
+ $options[ 'port' ] = $port;
+ }
+
+ if( !is_null( $timeout ) ) {
+ $options[ 'timeout' ] = $timeout;
+ }
+
+ /** End backward compatibility with old constructor **/
+
+ if( isset( $options[ 'encrypted' ] ) &&
+ $options[ 'encrypted' ] === true &&
+ !isset( $options[ 'scheme' ] ) &&
+ !isset( $options[ 'port' ] ) ) {
+
+ $options[ 'scheme' ] = 'https';
+ $options[ 'port' ] = 443;
+ }
+
+ $this->settings['auth_key'] = $auth_key;
+ $this->settings['secret'] = $secret;
+ $this->settings['app_id'] = $app_id;
+ $this->settings['base_path'] = '/apps/' . $this->settings['app_id'];
+
+ foreach( $options as $key => $value ) {
+ // only set if valid setting/option
+ if( isset( $this->settings[ $key ] ) ) {
+ $this->settings[ $key ] = $value;
+ }
+ }
+
+ // ensure host doesn't have a scheme prefix
+ $this->settings[ 'host' ] =
+ preg_replace( '/http[s]?\:\/\//', '', $this->settings[ 'host' ], 1 );
+ }
+ /**
+ * Fetch the settings.
+ * @return array
+ */
+ public function getSettings() {
+ return $this->settings;
}
/**
- * Set a logger to be informed of interal log messages.
+ * Set a logger to be informed of internal log messages.
*/
public function set_logger( $logger ) {
$this->logger = $logger;
@@ -132,7 +198,9 @@ private function create_curl($s_url, $request_method = 'GET', $query_params = ar
$s_url,
$query_params);
- $full_url = $this->settings['server'] . ':' . $this->settings['port'] . $s_url . '?' . $signed_query;
+ $full_url = $this->settings['scheme'] . '://' .
+ $this->settings['host'] . ':' .
+ $this->settings['port'] . $s_url . '?' . $signed_query;
$this->log( 'curl_init( ' . $full_url . ' )' );
@@ -161,6 +229,10 @@ private function exec_curl( $ch ) {
$response[ 'status' ] = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$this->log( 'exec_curl response: ' . print_r( $response, true ) );
+
+ if( $response[ 'body' ] === false ) {
+ $this->log( 'exec_curl error: ' . curl_error( $ch ) );
+ }
curl_close( $ch );
@@ -168,15 +240,16 @@ private function exec_curl( $ch ) {
}
/**
- * Build the required HMAC'd auth string
+ * Build the required HMAC'd auth string
*
- * @param string $auth_key
- * @param string $auth_secret
- * @param string $request_path
- * @param array $query_params
- * @param string $auth_version [optional]
- * @param string $auth_timestamp [optional]
- * @return string
+ * @param string $auth_key
+ * @param string $auth_secret
+ * @param string $request_method
+ * @param string $request_path
+ * @param array $query_params
+ * @param string $auth_version [optional]
+ * @param string $auth_timestamp [optional]
+ * @return string
*/
public static function build_auth_query_string($auth_key, $auth_secret, $request_method, $request_path,
$query_params = array(), $auth_version = '1.0', $auth_timestamp = null)
@@ -223,16 +296,16 @@ public static function array_implode( $glue, $separator, $array ) {
}
/**
- * Trigger an event by providing event name and payload.
- * Optionally provide a socket ID to exclude a client (most likely the sender).
- *
- * @param array $channel An array of channel names to publish the event on.
- * @param string $event
- * @param mixed $data Event data
- * @param int $socket_id [optional]
- * @param bool $debug [optional]
- * @return bool|string
- */
+ * Trigger an event by providing event name and payload.
+ * Optionally provide a socket ID to exclude a client (most likely the sender).
+ *
+ * @param array $channels An array of channel names to publish the event on.
+ * @param string $event
+ * @param mixed $data Event data
+ * @param int $socket_id [optional]
+ * @param bool $debug [optional]
+ * @return bool|string
+ */
public function trigger( $channels, $event, $data, $socket_id = null, $debug = false, $already_encoded = false )
{
if( is_string( $channels ) === true ) {
@@ -246,7 +319,7 @@ public function trigger( $channels, $event, $data, $socket_id = null, $debug = f
$query_params = array();
- $s_url = $this->settings['url'] . '/events';
+ $s_url = $this->settings['base_path'] . '/events';
$data_encoded = $already_encoded ? $data : json_encode( $data );
@@ -289,12 +362,12 @@ public function trigger( $channels, $event, $data, $socket_id = null, $debug = f
}
/**
- * Fetch channel information for a specific channel.
- *
- * @param string $channel The name of the channel
- * @param array $params Additional parameters for the query e.g. $params = array( 'info' => 'connection_count' )
- * @return object
- */
+ * Fetch channel information for a specific channel.
+ *
+ * @param string $channel The name of the channel
+ * @param array $params Additional parameters for the query e.g. $params = array( 'info' => 'connection_count' )
+ * @return object
+ */
public function get_channel_info($channel, $params = array() )
{
$response = $this->get( '/channels/' . $channel, $params );
@@ -337,15 +410,15 @@ public function get_channels($params = array())
/**
* GET arbitrary REST API resource using a synchronous http client.
- * All request signing is handled automatically.
- *
- * @param string path Path excluding /apps/APP_ID
- * @param params array API params (see http://pusher.com/docs/rest_api)
- *
- * @return See Pusher API docs
+ * All request signing is handled automatically.
+ *
+ * @param string path Path excluding /apps/APP_ID
+ * @param params array API params (see http://pusher.com/docs/rest_api)
+ *
+ * @return See Pusher API docs
*/
public function get( $path, $params = array() ) {
- $s_url = $this->settings['url'] . $path;
+ $s_url = $this->settings['base_path'] . $path;
$ch = $this->create_curl( $s_url, 'GET', $params );
@@ -364,12 +437,12 @@ public function get( $path, $params = array() ) {
}
/**
- * Creates a socket signature
- *
- * @param int $socket_id
- * @param string $custom_data
- * @return string
- */
+ * Creates a socket signature
+ *
+ * @param int $socket_id
+ * @param string $custom_data
+ * @return string
+ */
public function socket_auth( $channel, $socket_id, $custom_data = false )
{
if($custom_data == true)
@@ -391,13 +464,13 @@ public function socket_auth( $channel, $socket_id, $custom_data = false )
}
/**
- * Creates a presence signature (an extension of socket signing)
- *
- * @param int $socket_id
- * @param string $user_id
- * @param mixed $user_info
- * @return string
- */
+ * Creates a presence signature (an extension of socket signing)
+ *
+ * @param int $socket_id
+ * @param string $user_id
+ * @param mixed $user_info
+ * @return string
+ */
public function presence_auth( $channel, $socket_id, $user_id, $user_info = false )
{
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+ backupStaticAttributes="false"
+ bootstrap="./test/test_includes.php"
+ colors="true"
+ convertErrorsToExceptions="true"
+ convertNoticesToExceptions="true"
+ convertWarningsToExceptions="true"
+ processIsolation="false"
+ stopOnFailure="false"
+ syntaxCheck="false"
+ >
+ <testsuites>
+ <testsuite name="all">
+ <directory>./test/</directory>
+ </testsuite>
+
+ <testsuite name="unit">
+ <directory>./test/unit/</directory>
+ </testsuite>
+
+ <testsuite name="acceptance">
+ <directory>./test/acceptance/</directory>
+ </testsuite>
+ </testsuites>
+</phpunit>
|
diff --git a/test/acceptance/channelQueryTest.php b/test/acceptance/channelQueryTest.php
--- a/test/acceptance/channelQueryTest.php
+++ b/test/acceptance/channelQueryTest.php
@@ -1,6 +1,4 @@
<?php
-
- require_once( dirname(__FILE__) . '/../test_includes.php' );
class PusherChannelQueryTest extends PHPUnit_Framework_TestCase
{
diff --git a/test/acceptance/triggerTest.php b/test/acceptance/triggerTest.php
--- a/test/acceptance/triggerTest.php
+++ b/test/acceptance/triggerTest.php
@@ -1,7 +1,5 @@
<?php
- require_once( dirname(__FILE__) . '/../test_includes.php' );
-
class PusherPushTest extends PHPUnit_Framework_TestCase
{
@@ -24,18 +22,31 @@ public function testObjectConstruct()
{
$this->assertNotNull($this->pusher, 'Created new Pusher object');
}
-
+
public function testStringPush()
{
$string_trigger = $this->pusher->trigger('test_channel', 'my_event', 'Test string');
$this->assertTrue($string_trigger, 'Trigger with string payload');
}
-
+
public function testArrayPush()
{
$structure_trigger = $this->pusher->trigger('test_channel', 'my_event', array( 'test' => 1 ));
$this->assertTrue($structure_trigger, 'Trigger with structured payload');
}
+
+ public function testEncryptedPush()
+ {
+ $options = array(
+ 'encrypted' => true,
+ 'host' => PUSHERAPP_HOST
+ );
+ $pusher = new Pusher(PUSHERAPP_AUTHKEY, PUSHERAPP_SECRET, PUSHERAPP_APPID, $options);
+ $pusher->set_logger( new TestLogger() );
+
+ $structure_trigger = $pusher->trigger('test_channel', 'my_event', array( 'encrypted' => 1 ));
+ $this->assertTrue($structure_trigger, 'Trigger with over encrypted connection');
+ }
public function testSendingOver10kBMessageReturns413() {
$data = str_pad( '' , 11 * 1024, 'a' );
@@ -43,7 +54,7 @@ public function testSendingOver10kBMessageReturns413() {
$response = $this->pusher->trigger('test_channel', 'my_event', $data, null, true );
$this->assertEquals( 413, $response[ 'status' ] , '413 HTTP status response expected');
}
-
+
/**
* @expectedException PusherException
*/
@@ -55,12 +66,12 @@ public function test_triggering_event_on_over_100_channels_throws_exception() {
$data = array( 'event_name' => 'event_data' );
$response = $this->pusher->trigger( $channels, 'my_event', $data );
}
-
+
public function test_triggering_event_on_multiple_channels() {
$data = array( 'event_name' => 'event_data' );
$channels = array( 'test_channel_1', 'test_channel_2' );
$response = $this->pusher->trigger( $channels, 'my_event', $data );
-
+
$this->assertTrue( $response );
}
}
diff --git a/test/test_includes.php b/test/test_includes.php
--- a/test/test_includes.php
+++ b/test/test_includes.php
@@ -16,4 +16,4 @@
require_once($dir . '/../lib/Pusher.php');
-require_once( $dir . '/TestLogger.php' );
\ No newline at end of file
+require_once( $dir . '/TestLogger.php' );
diff --git a/test/unit/authQueryStringTest.php b/test/unit/authQueryStringTest.php
--- a/test/unit/authQueryStringTest.php
+++ b/test/unit/authQueryStringTest.php
@@ -1,6 +1,4 @@
<?php
-
- require_once( dirname(__FILE__) . '/../test_includes.php' );
class PusherAuthQueryString extends PHPUnit_Framework_TestCase
{
diff --git a/test/unit/pusherConstructorTest.php b/test/unit/pusherConstructorTest.php
new file mode 100644
--- /dev/null
+++ b/test/unit/pusherConstructorTest.php
@@ -0,0 +1,99 @@
+<?php
+
+ class PusherConstructorTest extends PHPUnit_Framework_TestCase
+ {
+
+ protected function setUp()
+ {
+ }
+
+ public function testDebugCanBeSetViaLegacyParameter() {
+ $pusher = new Pusher( 'app_key', 'app_secret', 'app_id', true );
+
+ $settings = $pusher->getSettings();
+ $this->assertEquals( true, $settings[ 'debug' ] );
+ }
+
+ public function testHostAndSchemeCanBeSetViaLegacyParameter() {
+ $scheme = 'http';
+ $host = 'test.com';
+ $legacy_host = "$scheme://$host";
+ $pusher = new Pusher( 'app_key', 'app_secret', 'app_id', false, $legacy_host );
+
+ $settings = $pusher->getSettings();
+ $this->assertEquals( $scheme, $settings[ 'scheme' ] );
+ $this->assertEquals( $host, $settings[ 'host' ] );
+ }
+
+ public function testLegacyHostParamWithNoSchemeCanBeUsedResultsInHostBeingUsedWithDefaultScheme() {
+ $host = 'test.com';
+ $pusher = new Pusher( 'app_key', 'app_secret', 'app_id', false, $host );
+
+ $settings = $pusher->getSettings();
+ $this->assertEquals( $host, $settings[ 'host' ] );
+ }
+
+ public function testSchemeIsSetViaLegacyParameter() {
+ $host = 'https://test.com';
+ $port = 90;
+ $pusher = new Pusher( 'app_key', 'app_secret', 'app_id', false, $host, $port );
+
+ $settings = $pusher->getSettings();
+ $this->assertEquals( 'https', $settings[ 'scheme' ] );
+ }
+
+ public function testPortCanBeSetViaLegacyParameter() {
+ $host = 'https://test.com';
+ $port = 90;
+ $pusher = new Pusher( 'app_key', 'app_secret', 'app_id', false, $host, $port );
+
+ $settings = $pusher->getSettings();
+ $this->assertEquals( $port, $settings[ 'port' ] );
+ }
+
+ public function testTimeoutCanBeSetViaLegacyParameter() {
+ $host = 'http://test.com';
+ $port = 90;
+ $timeout = 90;
+ $pusher = new Pusher( 'app_key', 'app_secret', 'app_id', false, $host, $port, $timeout );
+
+ $settings = $pusher->getSettings();
+ $this->assertEquals( $timeout, $settings[ 'timeout' ] );
+ }
+
+ public function testEncryptedOptionWillSetHostAndPort() {
+ $options = array( 'encrypted' => true );
+ $pusher = new Pusher( 'app_key', 'app_secret', 'app_id', $options );
+
+ $settings = $pusher->getSettings();
+ $this->assertEquals( 'https', $settings[ 'scheme' ], 'https' );
+ $this->assertEquals( 'api.pusherapp.com', $settings[ 'host' ] );
+ $this->assertEquals( '443', $settings[ 'port' ] );
+ }
+
+ public function testEncryptedOptionWillBeOverwrittenByHostAndPortOptionsSetHostAndPort() {
+ $options = array(
+ 'encrytped' => true,
+ 'host' => 'test.com',
+ 'port' => '3000'
+ );
+ $pusher = new Pusher( 'app_key', 'app_secret', 'app_id', $options );
+
+ $settings = $pusher->getSettings();
+ $this->assertEquals( 'http', $settings[ 'scheme' ] );
+ $this->assertEquals( $options[ 'host' ], $settings[ 'host' ] );
+ $this->assertEquals( $options[ 'port' ], $settings[ 'port' ] );
+ }
+
+ public function testSchemeIsStrippedAndIgnoredFromHostInOptions() {
+ $options = array(
+ 'host' => 'https://test.com'
+ );
+ $pusher = new Pusher( 'app_key', 'app_secret', 'app_id', $options );
+
+ $settings = $pusher->getSettings();
+ $this->assertEquals( 'http', $settings[ 'scheme' ] );
+ $this->assertEquals( 'test.com', $settings[ 'host' ] );
+ }
+
+ }
diff --git a/test/unit/socketAuthTest.php b/test/unit/socketAuthTest.php
--- a/test/unit/socketAuthTest.php
+++ b/test/unit/socketAuthTest.php
@@ -1,6 +1,4 @@
<?php
-
- require_once( dirname(__FILE__) . '/../test_includes.php' );
class PusherSocketAuthTest extends PHPUnit_Framework_TestCase
{
|
Provide more feedback when cURL execution returns 0
See: http://php.net/manual/en/function.curl-error.php
Right now the status code is set to 0 and the body blank. More information should be supplied to make it easier to debug what's going on with the library.
| 2015-01-20T17:34:44
|
php
|
Hard
|
|
sdsykes/fastimage
| 52
|
sdsykes__fastimage-52
|
[
"51"
] |
88355932a9ca83c176c5fdb492c10c313bdc1d40
|
diff --git a/README.textile b/README.textile
--- a/README.textile
+++ b/README.textile
@@ -51,6 +51,8 @@ FastImage.size("http://upload.wikimedia.org/wikipedia/commons/b/b4/Mardin_135066
=> FastImage::ImageFetchFailure: FastImage::ImageFetchFailure
FastImage.size("http://upload.wikimedia.org/wikipedia/commons/b/b4/Mardin_1350660_1350692_33_images.jpg", :raise_on_failure=>true, :timeout=>2.0)
=> [9545, 6623]
+FastImage.new("http://stephensykes.com/images/pngimage").content_length
+=> 432
</code></pre>
h2. Installation
diff --git a/lib/fastimage.rb b/lib/fastimage.rb
--- a/lib/fastimage.rb
+++ b/lib/fastimage.rb
@@ -48,7 +48,7 @@
require 'zlib'
class FastImage
- attr_reader :size, :type
+ attr_reader :size, :type, :content_length
attr_reader :bytes_read
@@ -252,6 +252,8 @@ def fetch_using_http_from_parsed_uri
end
end
+ @content_length = res.content_length
+
parse_packets FiberStream.new(read_fiber)
break # needed to actively quit out of the fetch
|
diff --git a/test/test.rb b/test/test.rb
--- a/test/test.rb
+++ b/test/test.rb
@@ -297,4 +297,18 @@ def test_cant_access_shell
ensure
%x{rm -f shell_test}
end
+
+ def test_content_length
+ url = "#{TestUrl}with_content_length.gif"
+ FakeWeb.register_uri(:get, url, :body => File.join(FixturePath, "test.jpg"), :content_length => 52)
+
+ assert_equal 52, FastImage.new(url).content_length
+ end
+
+ def test_content_length_not_provided
+ url = "#{TestUrl}without_content_length.gif"
+ FakeWeb.register_uri(:get, url, :body => File.join(FixturePath, "test.jpg"))
+
+ assert_equal nil, FastImage.new(url).content_length
+ end
end
|
Can it return file size too?
I am planning to develop a PR, but want to know what you think of it.
I use Fastimage to validate remote image fetching. It is good for determining both the size and also the type of image. However I often need to validate file size as well. I am guessing this can be done during when Fastimage does the request too. So I won't need to do my own request in order to find it out. Thoughts?
| 2015-05-11T12:08:03
|
ruby
|
Hard
|
|
yippee-fun/phlex
| 545
|
yippee-fun__phlex-545
|
[
"544"
] |
8ee184bf42621ae00dd87858b76ad10232e32b3b
|
diff --git a/lib/phlex/elements.rb b/lib/phlex/elements.rb
--- a/lib/phlex/elements.rb
+++ b/lib/phlex/elements.rb
@@ -28,6 +28,7 @@ def registered_elements
# Register a custom element. This macro defines an element method for the current class and descendents only. There is no global element registry.
# @param method_name [Symbol]
# @param tag [String] the name of the tag, otherwise this will be the method name with underscores replaced with dashes.
+ # @return [Symbol] the name of the method created
# @note The methods defined by this macro depend on other methods from {SGML} so they should always be mixed into an {HTML} or {SVG} component.
# @example Register the custom element `<trix-editor>`
# register_element :trix_editor
diff --git a/lib/phlex/html.rb b/lib/phlex/html.rb
--- a/lib/phlex/html.rb
+++ b/lib/phlex/html.rb
@@ -30,12 +30,6 @@ def doctype
nil
end
- # @deprecated use {#plain} instead.
- def text(...)
- warn "DEPRECATED: The `text` method has been deprecated in favour of `plain`. Please use `plain` instead. The `text` method will be removed in a future version of Phlex. Called from: #{caller.first}"
- plain(...)
- end
-
# Outputs an `<svg>` tag
# @return [nil]
# @see https://developer.mozilla.org/docs/Web/SVG/Element/svg
diff --git a/lib/phlex/sgml.rb b/lib/phlex/sgml.rb
--- a/lib/phlex/sgml.rb
+++ b/lib/phlex/sgml.rb
@@ -127,21 +127,12 @@ def __final_call__(buffer = +"", context: Phlex::Context.new, view_context: nil,
end
# Output text content. The text will be HTML-escaped.
+ # @param content [String, Symbol, Integer, void] the content to be output on the buffer. Strings, Symbols, and Integers are handled by `plain` directly, but any object can be handled by overriding `format_object`
# @return [nil]
+ # @see #format_object
def plain(content)
- case content
- when String
- @_context.target << ERB::Escape.html_escape(content)
- when Symbol
- @_context.target << ERB::Escape.html_escape(content.name)
- when Integer
- @_context.target << ERB::Escape.html_escape(content.to_s)
- when nil
- nil
- else
- if (formatted_object = format_object(content))
- @_context.target << ERB::Escape.html_escape(formatted_object)
- end
+ unless __text__(content)
+ raise ArgumentError, "You've passed an object to plain that is not handled by format_object. See https://rubydoc.info/gems/phlex/Phlex/SGML#format_object-instance_method for more information"
end
nil
@@ -250,7 +241,7 @@ def __vanish__(*args)
nil
end
- # Determines if the component should render. By default, it returns <code>true</code>.
+ # Determines if the component should render. By default, it returns `true`.
# @abstract Override to define your own predicate to prevent rendering.
# @return [Boolean]
def render?
@@ -258,6 +249,7 @@ def render?
end
# Format the object for output
+ # @abstract Override to define your own format handling for different object types. Please remember to call `super` in the case that the passed object doesn't match, so that object formatting can be added at different layers of the inheritance tree.
# @return [String]
def format_object(object)
case object
@@ -266,7 +258,7 @@ def format_object(object)
end
end
- # @abstract Override this method to hook in around a template render. You can do things before and after calling <code>super</code> to render the template. You should always call <code>super</code> so that callbacks can be added at different layers of the inheritance tree.
+ # @abstract Override this method to hook in around a template render. You can do things before and after calling `super` to render the template. You should always call `super` so that callbacks can be added at different layers of the inheritance tree.
# @return [nil]
def around_template
before_template
@@ -276,13 +268,13 @@ def around_template
nil
end
- # @abstract Override this method to hook in right before a template is rendered. Please remember to call <code>super</code> so that callbacks can be added at different layers of the inheritance tree.
+ # @abstract Override this method to hook in right before a template is rendered. Please remember to call `super` so that callbacks can be added at different layers of the inheritance tree.
# @return [nil]
def before_template
nil
end
- # @abstract Override this method to hook in right after a template is rendered. Please remember to call <code>super</code> so that callbacks can be added at different layers of the inheritance tree.
+ # @abstract Override this method to hook in right after a template is rendered. Please remember to call `super` so that callbacks can be added at different layers of the inheritance tree.
# @return [nil]
def after_template
nil
@@ -298,7 +290,7 @@ def yield_content
original_length = target.length
content = yield(self)
- plain(content) if original_length == target.length
+ __text__(content) if original_length == target.length
nil
end
@@ -312,7 +304,7 @@ def yield_content_with_no_args
original_length = target.length
content = yield
- plain(content) if original_length == target.length
+ __text__(content) if original_length == target.length
nil
end
@@ -327,11 +319,34 @@ def yield_content_with_args(*args)
original_length = target.length
content = yield(*args)
- plain(content) if original_length == target.length
+ __text__(content) if original_length == target.length
nil
end
+ # Performs the same task as the public method #plain, but does not raise an error if an unformattable object is passed
+ # @api private
+ def __text__(content)
+ case content
+ when String
+ @_context.target << ERB::Escape.html_escape(content)
+ when Symbol
+ @_context.target << ERB::Escape.html_escape(content.name)
+ when Integer
+ @_context.target << ERB::Escape.html_escape(content.to_s)
+ when nil
+ nil
+ else
+ if (formatted_object = format_object(content))
+ @_context.target << ERB::Escape.html_escape(formatted_object)
+ else
+ return false
+ end
+ end
+
+ true
+ end
+
# @api private
def __attributes__(**attributes)
__final_attributes__(**attributes).tap do |buffer|
|
diff --git a/test/phlex/view/text.rb b/test/phlex/view/plain.rb
similarity index 59%
rename from test/phlex/view/text.rb
rename to test/phlex/view/plain.rb
--- a/test/phlex/view/text.rb
+++ b/test/phlex/view/plain.rb
@@ -39,16 +39,15 @@ def template
end
end
- with "deprecated text method" do
+ with "an object that has no special format_object handling" do
view do
def template
- text "Depreacted"
+ plain Object.new
end
end
- it "renders content and prints deprecation warning" do
- expect(example).to receive(:warn).with("DEPRECATED: The `text` method has been deprecated in favour of `plain`. Please use `plain` instead. The `text` method will be removed in a future version of Phlex. Called from: test/phlex/view/text.rb:45:in `template'")
- expect(output).to be == "Depreacted"
+ it "raises an ArgumentError" do
+ expect { output }.to raise_exception(ArgumentError)
end
end
end
|
Raise an error when `plain` is called with an object that can’t be formatted
We should extract a specialised private `__text__` method for `yield_content` that doesn’t raise.
| 2023-03-27T18:30:37
|
ruby
|
Hard
|
|
yippee-fun/phlex
| 377
|
yippee-fun__phlex-377
|
[
"365"
] |
3d8180837afa58ebd7baa969fb8d6785f4063896
|
diff --git a/Gemfile b/Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -5,11 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
gemspec
-gem "benchmark-ips"
-gem "benchmark-memory"
-gem "capybara"
gem "rubocop"
-gem "solargraph"
gem "sus"
gem "syntax_suggest"
gem "zeitwerk"
|
diff --git a/lib/phlex/testing/capybara.rb b/lib/phlex/testing/capybara.rb
deleted file mode 100644
--- a/lib/phlex/testing/capybara.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "capybara"
-require_relative "view_helper"
-
-module Phlex::Testing
- module Capybara
- module ViewHelper
- include Phlex::Testing::ViewHelper
-
- def self.included(klass)
- if defined?(Minitest::Test) && klass < Minitest::Test
- require "capybara/minitest"
- include ::Capybara::Minitest::Assertions
- end
- end
-
- attr_accessor :page
-
- def render(view, &block)
- @page = ::Capybara::Node::Simple.new(super)
- end
- end
- end
-end
diff --git a/lib/phlex/testing/nokogiri.rb b/lib/phlex/testing/nokogiri.rb
deleted file mode 100644
--- a/lib/phlex/testing/nokogiri.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require "nokogiri"
-require_relative "view_helper"
-
-module Phlex::Testing
- module Nokogiri
- module DocumentHelper
- include Phlex::Testing::ViewHelper
-
- def render(view, &block)
- ::Nokogiri::HTML5(super)
- end
- end
-
- module FragmentHelper
- include Phlex::Testing::ViewHelper
-
- def render(view, &block)
- ::Nokogiri::HTML5.fragment(super)
- end
- end
- end
-end
diff --git a/lib/phlex/testing/rails.rb b/lib/phlex/testing/rails.rb
deleted file mode 100644
--- a/lib/phlex/testing/rails.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "view_helper"
-
-module Phlex::Testing
- module Rails
- module ViewHelper
- include Phlex::Testing::ViewHelper
-
- def view_context
- controller.view_context
- end
-
- def controller
- @controller ||= ActionView::TestCase::TestController.new
- end
- end
- end
-end
diff --git a/test/phlex/testing/capybara/view_helper.rb b/test/phlex/testing/capybara/view_helper.rb
deleted file mode 100644
--- a/test/phlex/testing/capybara/view_helper.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require "phlex/testing/capybara"
-
-class Example < Phlex::HTML
- def template
- h1 { "👋" }
- end
-end
-
-describe Phlex::Testing::Capybara::ViewHelper do
- include Phlex::Testing::Capybara::ViewHelper
-
- describe "#render" do
- it "sets the page" do
- render Example.new
-
- expect(page.all("h1").first.text).to be == "👋"
- end
- end
-end
diff --git a/test/phlex/testing/nokogiri/document_helper.rb b/test/phlex/testing/nokogiri/document_helper.rb
deleted file mode 100644
--- a/test/phlex/testing/nokogiri/document_helper.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require "phlex/testing/nokogiri"
-
-class Example < Phlex::HTML
- def template
- h1 { "👋" }
- end
-end
-
-describe Phlex::Testing::Nokogiri::DocumentHelper do
- include Phlex::Testing::Nokogiri::DocumentHelper
-
- describe "#render" do
- it "returns a Nokogiri fragment" do
- output = render Example.new
-
- expect(output).to be_a Nokogiri::HTML5::Document
- expect(output.css("h1").text).to be == "👋"
- end
- end
-end
diff --git a/test/phlex/testing/nokogiri/fragment_helper.rb b/test/phlex/testing/nokogiri/fragment_helper.rb
deleted file mode 100644
--- a/test/phlex/testing/nokogiri/fragment_helper.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require "phlex/testing/nokogiri"
-
-class Example < Phlex::HTML
- def template
- h1 { "👋" }
- end
-end
-
-describe Phlex::Testing::Nokogiri::FragmentHelper do
- include Phlex::Testing::Nokogiri::FragmentHelper
-
- describe "#render" do
- it "returns a Nokogiri fragment" do
- output = render Example.new
-
- expect(output).to be_a Nokogiri::HTML5::DocumentFragment
- expect(output.css("h1").text).to be == "👋"
- end
- end
-end
|
Extract nokogiri and capybara testing extensions
| 2022-11-22T21:33:18
|
ruby
|
Hard
|
|
JEG2/highline
| 110
|
JEG2__highline-110
|
[
"108"
] |
7373e52321c3c1e749199e12f0b503a014329dcb
|
diff --git a/lib/highline.rb b/lib/highline.rb
--- a/lib/highline.rb
+++ b/lib/highline.rb
@@ -617,13 +617,15 @@ def say( statement )
statement = format_statement(statement)
return unless statement.length > 0
- # Don't add a newline if statement ends with whitespace, OR
+ out = (indentation+statement).encode(@output.external_encoding, { :undef => :replace } )
+
+ # Don't add a newline if statement ends with whitespace, OR
# if statement ends with whitespace before a color escape code.
if /[ \t](\e\[\d+(;\d+)*m)?\Z/ =~ statement
- @output.print(indentation+statement)
+ @output.print(out)
@output.flush
else
- @output.puts(indentation+statement)
+ @output.puts(out)
end
end
@@ -711,10 +713,6 @@ def format_statement statement
statement = (statement || "").dup.to_str
return statement unless statement.length > 0
- # Allow non-ascii menu prompts in ruby > 1.9.2. ERB eval the menu statement
- # with the environment's default encoding(usually utf8)
- statement.force_encoding(Encoding.default_external) if defined?(Encoding) && Encoding.default_external
-
template = ERB.new(statement, nil, "%")
statement = template.result(binding)
|
diff --git a/test/tc_menu.rb b/test/tc_menu.rb
--- a/test/tc_menu.rb
+++ b/test/tc_menu.rb
@@ -75,7 +75,7 @@ def test_unicode_flow
# Default: menu.flow = :rows
menu.choice "Unicode right single quotation mark: ’"
end
- assert_equal("1. Unicode right single quotation mark: ’\n? ", @output.string)
+ assert_equal("1. Unicode right single quotation mark: ’\n? ".encode(@output.external_encoding, { :undef => :replace }), @output.string)
end
def test_help
|
test_unicode_flow(TestMenu) test error
I observe the following error:
```
Error: test_unicode_flow(TestMenu)
ArgumentError: invalid byte sequence in US-ASCII
/builddir/build/BUILD/rubygem-highline-1.6.21/usr/share/gems/gems/highline-1.6.21/lib/highline.rb:724:in `gsub'
/builddir/build/BUILD/rubygem-highline-1.6.21/usr/share/gems/gems/highline-1.6.21/lib/highline.rb:724:in `format_statement'
/builddir/build/BUILD/rubygem-highline-1.6.21/usr/share/gems/gems/highline-1.6.21/lib/highline.rb:617:in `say'
/builddir/build/BUILD/rubygem-highline-1.6.21/usr/share/gems/gems/highline-1.6.21/lib/highline.rb:257:in `ask'
/builddir/build/BUILD/rubygem-highline-1.6.21/usr/share/gems/gems/highline-1.6.21/lib/highline.rb:361:in `choose'
/builddir/build/BUILD/rubygem-highline-1.6.21/usr/share/gems/gems/highline-1.6.21/test/tc_menu.rb:74:in `test_unicode_flow'
```
And it can be reproduced when the test suite is executed with `LANG=C`. This issue was apparently introduced by e206fb6c5da5bdbc6daefcbd which makes some strange unjustified assumptions about terminal encoding.
|
Thanks for sharing the problem and hunting down the cause!
| 2014-07-09T17:56:11
|
ruby
|
Hard
|
yippee-fun/phlex
| 917
|
yippee-fun__phlex-917
|
[
"919"
] |
4921cbe0ffb8dbb6f13a1ec1c689a12ee62aa587
|
diff --git a/.rubocop-https---www-goodcop-style-base-yml b/.rubocop-https---www-goodcop-style-base-yml
--- a/.rubocop-https---www-goodcop-style-base-yml
+++ b/.rubocop-https---www-goodcop-style-base-yml
@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://www.rubyschema.org/rubocop.json
---
AllCops:
DisabledByDefault: true
@@ -821,10 +822,6 @@ Style/QuotedSymbols:
Enabled: true
EnforcedStyle: same_as_string_literals
-Style/RaiseArgs:
- Enabled: true
- EnforcedStyle: compact
-
Style/RandomWithOffset:
Enabled: true
diff --git a/lib/phlex/compiler.rb b/lib/phlex/compiler.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "prism"
+
+module Phlex::Compiler
+ def self.compile(component)
+ path, line = Object.const_source_location(component.name)
+ return unless File.exist?(path)
+ source = File.read(path)
+ tree = Prism.parse(source).value
+ Compilation.new(component, path, line, source, tree).compile
+ end
+end
diff --git a/lib/phlex/compiler/class_compiler.rb b/lib/phlex/compiler/class_compiler.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/class_compiler.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class Phlex::Compiler::ClassCompiler < Prism::Visitor
+ def initialize(compiler)
+ @compiler = compiler
+ end
+
+ def compile(node)
+ visit_all(node.child_nodes)
+ end
+
+ def visit_def_node(node)
+ return if node.name == :initialize
+
+ compiled_source = Phlex::Compiler::MethodCompiler.new(@compiler.component).compile(node)
+
+ if compiled_source
+ puts compiled_source
+ @compiler.redefine_method(compiled_source, node.location.start_line)
+ end
+ end
+
+ def visit_class_node(node)
+ nil
+ end
+
+ def visit_module_node(node)
+ nil
+ end
+
+ def visit_block_node(node)
+ nil
+ end
+end
diff --git a/lib/phlex/compiler/compilation.rb b/lib/phlex/compiler/compilation.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/compilation.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler
+ class Compilation
+ def initialize(component, path, line, source, tree)
+ @component = component
+ @path = path
+ @line = line
+ @source = source
+ @tree = tree
+ freeze
+ end
+
+ attr_reader :component, :line, :source, :path
+
+ def compile
+ FileCompiler.new(self).compile(@tree)
+ end
+
+ def redefine_method(source, line)
+ @component.class_eval("# frozen_string_literal: true\n#{source}", @path, line - 1)
+ end
+ end
+end
diff --git a/lib/phlex/compiler/file_compiler.rb b/lib/phlex/compiler/file_compiler.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/file_compiler.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class Phlex::Compiler::FileCompiler < Prism::Visitor
+ def initialize(compiler)
+ @compiler = compiler
+ end
+
+ def compile(node)
+ visit(node)
+ end
+
+ def visit_class_node(node)
+ if @compiler.line == node.location.start_line
+ Phlex::Compiler::ClassCompiler.new(@compiler).compile(node)
+ end
+ end
+
+ # def visit_module_node(node)
+ # super
+ # end
+
+ def visit_def_node(node)
+ nil
+ end
+
+ def visit_block_node(node)
+ nil
+ end
+end
diff --git a/lib/phlex/compiler/formatter.rb b/lib/phlex/compiler/formatter.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/formatter.rb
@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler
+ class Formatter < VerbatimFormatter
+ def initialize
+ super
+ @new_line_character = "\n"
+ @indentation_character = "\t"
+ @level = 0
+ end
+
+ def visit(node)
+ case node
+ when nil
+ nil
+ when Array
+ visit_array(node)
+ when Proc
+ node.call(self)
+ else
+ super
+ end
+ end
+
+ def visit_array(nodes)
+ nodes.each do |node|
+ case node
+ when Array
+ indent { visit_array(node) }
+ else
+ visit(node)
+ end
+ end
+ end
+
+ def format(node)
+ @buffer.clear
+ visit(node)
+ [@buffer.join, @source_map]
+ end
+
+ def visit_each(nodes)
+ i, len = 0, nodes.length
+ if block_given?
+ while i < len
+ node = nodes[i]
+ i += 1
+ if node
+ visit node
+ yield unless i == len
+ end
+ end
+ else
+ while i < len
+ visit nodes[i]
+ i += 1
+ end
+ end
+ end
+
+ def space
+ push " "
+ end
+
+ def statement
+ ensure_new_line
+ yield
+ end
+
+ def ensure_new_line
+ new_line unless on_new_line?
+ end
+
+ def on_new_line?
+ @new_line_at == @buffer.length
+ end
+
+ def new_line
+ push "#{@new_line_character}#{@indentation_character * @level}"
+ @new_line_at = @buffer.length
+ end
+
+ def indent
+ original_level = @level
+ @level += 1
+ ensure_new_line
+ yield
+ @level = original_level
+ end
+
+ def visit_block_node(node)
+ emit node.opening_loc
+ indent do
+ visit node.body
+ end
+ new_line
+ emit node.closing_loc
+ end
+
+ def visit_call_node(node)
+ visit node.receiver
+ emit node.call_operator_loc
+ emit node.message_loc
+ if node.opening_loc
+ emit node.opening_loc
+ else
+ space
+ end
+ visit node.arguments
+ emit node.closing_loc
+ space
+ visit node.block
+ end
+
+ def visit_def_node(node)
+ emit node.def_keyword_loc
+ space
+ push node.name
+
+ if node.parameters
+ push "("
+ visit node.parameters
+ push ")"
+ end
+
+ indent { visit node.body }
+
+ new_line
+ emit node.end_keyword_loc
+ end
+
+ def visit_statements_node(node)
+ visit_each(node.compact_child_nodes) { ensure_new_line }
+ end
+ end
+end
diff --git a/lib/phlex/compiler/method_compiler.rb b/lib/phlex/compiler/method_compiler.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/method_compiler.rb
@@ -0,0 +1,332 @@
+# frozen_string_literal: true
+
+require "prism"
+
+module Phlex::Compiler
+ class MethodCompiler < Prism::MutationCompiler
+ def initialize(component)
+ @component = component
+ @current_buffer = nil
+ end
+
+ def compile(node)
+ result = visit(node)
+ result.body&.body&.unshift(
+ proc do |f|
+ f.statement do
+ f.push "__phlex_state__ = @_state"
+ end
+ f.statement do
+ f.push "__phlex_buffer__ = __phlex_state__.buffer"
+ end
+ f.statement do
+ f.push "__phlex_me__ = self"
+ end
+ f.statement do
+ f.push "__phlex_should_render__ = __phlex_state__.should_render?; nil"
+ end
+ end
+ )
+
+ source, map = Phlex::Compiler::Formatter.new.format(result)
+ source
+ end
+
+ def visit_call_node(node)
+ if nil == node.receiver
+ if (tag = standard_element?(node))
+ return compile_standard_element(node, tag)
+ elsif (tag = void_element?(node))
+ return compile_void_element(node, tag)
+ elsif whitespace_helper?(node)
+ return compile_whitespace_helper(node)
+ elsif doctype_helper?(node)
+ return compile_doctype_helper(node)
+ elsif plain_helper?(node)
+ return compile_plain_helper(node)
+ elsif fragment_helper?(node)
+ return compile_fragment_helper(node)
+ elsif comment_helper?(node)
+ return compile_comment_helper(node)
+ elsif raw_helper?(node)
+ return compile_raw_helper(node)
+ end
+ end
+
+ super
+ end
+
+ def visit_class_node(node)
+ node
+ end
+
+ def visit_module_node(node)
+ node
+ end
+
+ def compile_standard_element(node, tag)
+ [
+ [
+ buffer("<#{tag}"),
+ *(
+ if node.arguments
+ visit_phlex_attributes(node.arguments)
+ end
+ ),
+ buffer(">"),
+ *(
+ if node.block
+ [visit_phlex_block(node.block)]
+ end
+ ),
+ buffer("</#{tag}>"),
+ ],
+ ]
+ end
+
+ def visit_phlex_attributes(node)
+ if node.arguments in [Prism::KeywordHashNode[elements: attributes]]
+ result = attributes.all? { |attribute| attribute in Prism::AssocNode[key: Prism::SymbolNode, value: Prism::StringNode] }
+ if result
+ return buffer(Phlex::SGML::Attributes.generate_attributes(eval("{#{node.slice}}")))
+ end
+ end
+
+ [
+ ensure_new_line,
+ push("__render_attributes__("),
+ node,
+ push(")"),
+ ]
+ end
+
+ def visit_phlex_block(node)
+ if Prism::BlockArgumentNode === node
+ [statement("__yield_content__("), node, push(")")]
+ elsif output_block?(node)
+ visit(node.body)
+ elsif content_block?(node)
+ content = node.body.body.first
+ case content
+ when Prism::StringNode
+ buffer(Phlex::Escape.html_escape(content.unescaped))
+ else
+ raise
+ end
+ else
+ [
+ statement("__yield_content__ do"),
+ [node.body],
+ statement("end"),
+ ]
+ end
+ end
+
+ def visit_block_node(node)
+ node.copy(
+ body: compile_block_body_node(node.body)
+ )
+ end
+
+ def compile_block_body_node(node)
+ [
+ statement("if __phlex_me__ == self;"),
+ visit(node),
+ statement("else;"),
+ [[node]],
+ statement("end;"),
+ ]
+ end
+
+ def compile_void_element(node, tag)
+ [
+ [
+ buffer("<#{tag}"),
+ *(
+ if node.arguments
+ visit_phlex_attributes(node.arguments)
+ end
+ ),
+ buffer(">"),
+ ],
+ ]
+ end
+
+ def compile_whitespace_helper(node)
+ if node.block
+ [
+ buffer(" "),
+ visit_phlex_block(node.block),
+ buffer(" "),
+ ]
+ else
+ [
+ buffer(" "),
+ ]
+ end
+ end
+
+ def compile_doctype_helper(node)
+ [
+ buffer("<!doctype html>"),
+ ]
+ end
+
+ def compile_plain_helper(node)
+ if node.arguments in [Prism::StringNode]
+ [
+ buffer(node.arguments.child_nodes.first.unescaped),
+ ]
+ else
+ @current_buffer = nil
+ node
+ end
+ end
+
+ def compile_fragment_helper(node)
+ node.copy(
+ block: compile_fragment_helper_block(node.block)
+ )
+ end
+
+ def compile_fragment_helper_block(node)
+ node.copy(
+ body: [
+ statement("__phlex_original_should_render__ = __phlex_should_render__"),
+ statement("__phlex_should_render__ = __phlex_state__.should_render?;"),
+ visit(node.body),
+ statement("__phlex_should_render__ = __phlex_original_should_render__"),
+ ]
+ )
+ end
+
+ def compile_comment_helper(node)
+ [
+ buffer("<!-- "),
+ visit_phlex_block(node.block),
+ buffer(" -->"),
+ ]
+ end
+
+ def compile_raw_helper(node)
+ @current_buffer = nil
+ node
+ end
+
+ private def ensure_new_line
+ proc(&:ensure_new_line)
+ end
+
+ private def new_line
+ @current_buffer = nil
+
+ proc(&:new_line)
+ end
+
+ private def statement(string)
+ @current_buffer = nil
+
+ proc do |f|
+ f.statement do
+ f.push string
+ end
+ end
+ end
+
+ private def push(value)
+ @current_buffer = nil
+
+ proc do |f|
+ f.push value
+ end
+ end
+
+ private def buffer(value)
+ if @current_buffer
+ @current_buffer << value
+ nil
+ else
+ new_buffer = +""
+ @current_buffer = new_buffer
+ new_buffer << value
+
+ proc do |f|
+ f.statement do
+ f.push "__phlex_buffer__ << \"#{new_buffer.gsub('"', '\\"')}\" if __phlex_should_render__; nil;"
+ end
+ end
+ end
+ end
+
+ private def new_scope
+ original_in_scope = @in_scope
+ @in_scope = false
+ yield
+ @in_scope = original_in_scope
+ end
+
+ private def output_block?(node)
+ node.body.body.any? do |child|
+ Prism::CallNode === child && (standard_element?(child) || void_element?(child) || plain_helper?(child) || whitespace_helper?(child))
+ end
+ end
+
+ private def content_block?(node)
+ return false unless node.body.body.length == 1
+ node.body.body.first in Prism::StringNode
+ end
+
+ private def standard_element?(node)
+ if (tag = Phlex::HTML::StandardElements.__registered_elements__[node.name]) &&
+ (Phlex::HTML::StandardElements == @component.instance_method(node.name).owner)
+
+ tag
+ else
+ false
+ end
+ end
+
+ private def void_element?(node)
+ if (tag = Phlex::HTML::VoidElements.__registered_elements__[node.name]) &&
+ (Phlex::HTML::VoidElements == @component.instance_method(node.name).owner)
+
+ tag
+ else
+ false
+ end
+ end
+
+ private def whitespace_helper?(node)
+ node.name == :whitespace && own_method_without_scope?(node)
+ end
+
+ private def doctype_helper?(node)
+ node.name == :doctype && own_method_without_scope?(node)
+ end
+
+ private def plain_helper?(node)
+ node.name == :plain && own_method_without_scope?(node)
+ end
+
+ private def fragment_helper?(node)
+ node.name == :fragment && own_method_without_scope?(node)
+ end
+
+ private def comment_helper?(node)
+ node.name == :comment && own_method_without_scope?(node)
+ end
+
+ private def raw_helper?(node)
+ node.name == :raw && own_method_without_scope?(node)
+ end
+
+ ALLOWED_OWNERS = [Phlex::SGML, Phlex::HTML, Phlex::SVG]
+ private def own_method_without_scope?(node)
+ ALLOWED_OWNERS.include?(@component.instance_method(node.name).owner)
+ end
+
+ private def extract_kwargs_from_string(string)
+ eval("{#{string}}")
+ end
+ end
+end
diff --git a/lib/phlex/compiler/verbatim_formatter.rb b/lib/phlex/compiler/verbatim_formatter.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/verbatim_formatter.rb
@@ -0,0 +1,644 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler
+ class VerbatimFormatter < Prism::BasicVisitor
+ def initialize
+ @buffer = []
+ @source_map = []
+ @current_line = 1
+ end
+
+ def push(value)
+ string = case value
+ when String
+ value
+ when Symbol
+ value.name
+ end
+
+ @buffer << string
+ new_lines = string.count("\n")
+ @current_line += new_lines
+ end
+
+ def emit(node)
+ return unless node
+ source_map = @source_map
+ current_line = @current_line
+ start_line = node.start_line
+ end_line = node.end_line
+ number_of_lines = end_line - start_line
+ i = 0
+ while i <= number_of_lines
+ source_map[current_line + i] = start_line + i
+ i += 1
+ end
+
+ push node.slice
+ end
+
+ def visit_alias_global_variable_node(node)
+ emit node
+ end
+
+ def visit_alias_method_node(node)
+ emit node
+ end
+
+ def visit_alternation_pattern_node(node)
+ emit node
+ end
+
+ def visit_and_node(node)
+ emit node
+ end
+
+ def visit_arguments_node(node)
+ emit node
+ end
+
+ def visit_array_node(node)
+ emit node
+ end
+
+ def visit_array_pattern_node(node)
+ emit node
+ end
+
+ def visit_assoc_node(node)
+ emit node
+ end
+
+ def visit_assoc_splat_node(node)
+ emit node
+ end
+
+ def visit_back_reference_read_node(node)
+ emit node
+ end
+
+ def visit_begin_node(node)
+ emit node
+ end
+
+ def visit_block_argument_node(node)
+ emit node
+ end
+
+ def visit_block_local_variable_node(node)
+ emit node
+ end
+
+ def visit_block_node(node)
+ emit node
+ end
+
+ def visit_block_parameter_node(node)
+ emit node
+ end
+
+ def visit_block_parameters_node(node)
+ emit node
+ end
+
+ def visit_break_node(node)
+ emit node
+ end
+
+ def visit_call_and_write_node(node)
+ emit node
+ end
+
+ def visit_call_node(node)
+ emit node
+ end
+
+ def visit_call_operator_write_node(node)
+ emit node
+ end
+
+ def visit_call_or_write_node(node)
+ emit node
+ end
+
+ def visit_call_target_node(node)
+ emit node
+ end
+
+ def visit_capture_pattern_node(node)
+ emit node
+ end
+
+ def visit_case_match_node(node)
+ emit node
+ end
+
+ def visit_case_node(node)
+ emit node
+ end
+
+ def visit_class_node(node)
+ emit node
+ end
+
+ def visit_class_variable_and_write_node(node)
+ emit node
+ end
+
+ def visit_class_variable_operator_write_node(node)
+ emit node
+ end
+
+ def visit_class_variable_or_write_node(node)
+ emit node
+ end
+
+ def visit_class_variable_read_node(node)
+ emit node
+ end
+
+ def visit_class_variable_target_node(node)
+ emit node
+ end
+
+ def visit_class_variable_write_node(node)
+ emit node
+ end
+
+ def visit_constant_and_write_node(node)
+ emit node
+ end
+
+ def visit_constant_operator_write_node(node)
+ emit node
+ end
+
+ def visit_constant_or_write_node(node)
+ emit node
+ end
+
+ def visit_constant_path_and_write_node(node)
+ emit node
+ end
+
+ def visit_constant_path_node(node)
+ emit node
+ end
+
+ def visit_constant_path_operator_write_node(node)
+ emit node
+ end
+
+ def visit_constant_path_or_write_node(node)
+ emit node
+ end
+
+ def visit_constant_path_target_node(node)
+ emit node
+ end
+
+ def visit_constant_path_write_node(node)
+ emit node
+ end
+
+ def visit_constant_read_node(node)
+ emit node
+ end
+
+ def visit_constant_target_node(node)
+ emit node
+ end
+
+ def visit_constant_write_node(node)
+ emit node
+ end
+
+ def visit_def_node(node)
+ emit node
+ end
+
+ def visit_defined_node(node)
+ emit node
+ end
+
+ def visit_else_node(node)
+ emit node
+ end
+
+ def visit_embedded_statements_node(node)
+ emit node
+ end
+
+ def visit_embedded_variable_node(node)
+ emit node
+ end
+
+ def visit_ensure_node(node)
+ emit node
+ end
+
+ def visit_false_node(node)
+ emit node
+ end
+
+ def visit_find_pattern_node(node)
+ emit node
+ end
+
+ def visit_flip_flop_node(node)
+ emit node
+ end
+
+ def visit_float_node(node)
+ emit node
+ end
+
+ def visit_for_node(node)
+ emit node
+ end
+
+ def visit_forwarding_arguments_node(node)
+ emit node
+ end
+
+ def visit_forwarding_parameter_node(node)
+ emit node
+ end
+
+ def visit_forwarding_super_node(node)
+ emit node
+ end
+
+ def visit_global_variable_and_write_node(node)
+ emit node
+ end
+
+ def visit_global_variable_operator_write_node(node)
+ emit node
+ end
+
+ def visit_global_variable_or_write_node(node)
+ emit node
+ end
+
+ def visit_global_variable_read_node(node)
+ emit node
+ end
+
+ def visit_global_variable_target_node(node)
+ emit node
+ end
+
+ def visit_global_variable_write_node(node)
+ emit node
+ end
+
+ def visit_hash_node(node)
+ emit node
+ end
+
+ def visit_hash_pattern_node(node)
+ emit node
+ end
+
+ def visit_if_node(node)
+ emit node
+ end
+
+ def visit_imaginary_node(node)
+ emit node
+ end
+
+ def visit_implicit_node(node)
+ emit node
+ end
+
+ def visit_implicit_rest_node(node)
+ emit node
+ end
+
+ def visit_in_node(node)
+ emit node
+ end
+
+ def visit_index_and_write_node(node)
+ emit node
+ end
+
+ def visit_index_operator_write_node(node)
+ emit node
+ end
+
+ def visit_index_or_write_node(node)
+ emit node
+ end
+
+ def visit_index_target_node(node)
+ emit node
+ end
+
+ def visit_instance_variable_and_write_node(node)
+ emit node
+ end
+
+ def visit_instance_variable_operator_write_node(node)
+ emit node
+ end
+
+ def visit_instance_variable_or_write_node(node)
+ emit node
+ end
+
+ def visit_instance_variable_read_node(node)
+ emit node
+ end
+
+ def visit_instance_variable_target_node(node)
+ emit node
+ end
+
+ def visit_instance_variable_write_node(node)
+ emit node
+ end
+
+ def visit_integer_node(node)
+ emit node
+ end
+
+ def visit_interpolated_match_last_line_node(node)
+ emit node
+ end
+
+ def visit_interpolated_regular_expression_node(node)
+ emit node
+ end
+
+ def visit_interpolated_string_node(node)
+ emit node
+ end
+
+ def visit_interpolated_symbol_node(node)
+ emit node
+ end
+
+ def visit_interpolated_x_string_node(node)
+ emit node
+ end
+
+ def visit_it_local_variable_read_node(node)
+ emit node
+ end
+
+ def visit_it_parameters_node(node)
+ emit node
+ end
+
+ def visit_keyword_hash_node(node)
+ emit node
+ end
+
+ def visit_keyword_rest_parameter_node(node)
+ emit node
+ end
+
+ def visit_lambda_node(node)
+ emit node
+ end
+
+ def visit_local_variable_and_write_node(node)
+ emit node
+ end
+
+ def visit_local_variable_operator_write_node(node)
+ emit node
+ end
+
+ def visit_local_variable_or_write_node(node)
+ emit node
+ end
+
+ def visit_local_variable_read_node(node)
+ emit node
+ end
+
+ def visit_local_variable_target_node(node)
+ emit node
+ end
+
+ def visit_local_variable_write_node(node)
+ emit node
+ end
+
+ def visit_match_last_line_node(node)
+ emit node
+ end
+
+ def visit_match_predicate_node(node)
+ emit node
+ end
+
+ def visit_match_required_node(node)
+ emit node
+ end
+
+ def visit_match_write_node(node)
+ emit node
+ end
+
+ def visit_missing_node(node)
+ emit node
+ end
+
+ def visit_module_node(node)
+ emit node
+ end
+
+ def visit_multi_target_node(node)
+ emit node
+ end
+
+ def visit_multi_write_node(node)
+ emit node
+ end
+
+ def visit_next_node(node)
+ emit node
+ end
+
+ def visit_nil_node(node)
+ emit node
+ end
+
+ def visit_no_keywords_parameter_node(node)
+ emit node
+ end
+
+ def visit_numbered_parameters_node(node)
+ emit node
+ end
+
+ def visit_numbered_reference_read_node(node)
+ emit node
+ end
+
+ def visit_optional_keyword_parameter_node(node)
+ emit node
+ end
+
+ def visit_optional_parameter_node(node)
+ emit node
+ end
+
+ def visit_or_node(node)
+ emit node
+ end
+
+ def visit_parameters_node(node)
+ emit node
+ end
+
+ def visit_parentheses_node(node)
+ emit node
+ end
+
+ def visit_pinned_expression_node(node)
+ emit node
+ end
+
+ def visit_pinned_variable_node(node)
+ emit node
+ end
+
+ def visit_post_execution_node(node)
+ emit node
+ end
+
+ def visit_pre_execution_node(node)
+ emit node
+ end
+
+ def visit_program_node(node)
+ emit node
+ end
+
+ def visit_range_node(node)
+ emit node
+ end
+
+ def visit_rational_node(node)
+ emit node
+ end
+
+ def visit_redo_node(node)
+ emit node
+ end
+
+ def visit_regular_expression_node(node)
+ emit node
+ end
+
+ def visit_required_keyword_parameter_node(node)
+ emit node
+ end
+
+ def visit_required_parameter_node(node)
+ emit node
+ end
+
+ def visit_rescue_modifier_node(node)
+ emit node
+ end
+
+ def visit_rescue_node(node)
+ emit node
+ end
+
+ def visit_rest_parameter_node(node)
+ emit node
+ end
+
+ def visit_retry_node(node)
+ emit node
+ end
+
+ def visit_return_node(node)
+ emit node
+ end
+
+ def visit_self_node(node)
+ emit node
+ end
+
+ def visit_shareable_constant_node(node)
+ emit node
+ end
+
+ def visit_singleton_class_node(node)
+ emit node
+ end
+
+ def visit_source_encoding_node(node)
+ emit node
+ end
+
+ def visit_source_file_node(node)
+ emit node
+ end
+
+ def visit_source_line_node(node)
+ emit node
+ end
+
+ def visit_splat_node(node)
+ emit node
+ end
+
+ def visit_statements_node(node)
+ emit node
+ end
+
+ def visit_string_node(node)
+ emit node
+ end
+
+ def visit_super_node(node)
+ emit node
+ end
+
+ def visit_symbol_node(node)
+ emit node
+ end
+
+ def visit_true_node(node)
+ emit node
+ end
+
+ def visit_undef_node(node)
+ emit node
+ end
+
+ def visit_unless_node(node)
+ emit node
+ end
+
+ def visit_until_node(node)
+ emit node
+ end
+
+ def visit_when_node(node)
+ emit node
+ end
+
+ def visit_while_node(node)
+ emit node
+ end
+
+ def visit_x_string_node(node)
+ emit node
+ end
+
+ def visit_yield_node(node)
+ emit node
+ end
+ end
+end
diff --git a/lib/phlex/html.rb b/lib/phlex/html.rb
--- a/lib/phlex/html.rb
+++ b/lib/phlex/html.rb
@@ -58,7 +58,7 @@ def tag(name, **attributes, &)
if (tag = StandardElements.__registered_elements__[name]) || (tag = name.name.tr("_", "-")).include?("-")
if attributes.length > 0 # with attributes
if block_given # with content block
- buffer << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << ">"
+ buffer << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes)) << ">"
if tag == "svg"
render Phlex::SVG.new(&)
else
@@ -66,7 +66,7 @@ def tag(name, **attributes, &)
end
buffer << "</#{tag}>"
else # without content
- buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << "></#{tag}>"
+ buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes)) << "></#{tag}>"
end
else # without attributes
if block_given # with content block
@@ -87,7 +87,7 @@ def tag(name, **attributes, &)
end
if attributes.length > 0 # with attributes
- buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << ">"
+ buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes)) << ">"
else # without attributes
buffer << "<#{tag}>"
end
diff --git a/lib/phlex/sgml.rb b/lib/phlex/sgml.rb
--- a/lib/phlex/sgml.rb
+++ b/lib/phlex/sgml.rb
@@ -2,9 +2,6 @@
# **Standard Generalized Markup Language** for behaviour common to {HTML} and {SVG}.
class Phlex::SGML
- UNSAFE_ATTRIBUTES = Set.new(%w[srcdoc sandbox http-equiv]).freeze
- REF_ATTRIBUTES = Set.new(%w[href src action formaction lowsrc dynsrc background ping]).freeze
-
ERBCompiler = ERB::Compiler.new("<>").tap do |compiler|
compiler.pre_cmd = [""]
compiler.put_cmd = "@_state.buffer.<<"
@@ -462,262 +459,10 @@ def json_escape(string)
true
end
- private def __attributes__(attributes, buffer = +"")
- attributes.each do |k, v|
- next unless v
-
- name = case k
- when String then k
- when Symbol then k.name.tr("_", "-")
- else raise Phlex::ArgumentError.new("Attribute keys should be Strings or Symbols.")
- end
-
- value = case v
- when true
- true
- when String
- v.gsub('"', """)
- when Symbol
- v.name.tr("_", "-").gsub('"', """)
- when Integer, Float
- v.to_s
- when Date
- v.iso8601
- when Time
- v.respond_to?(:iso8601) ? v.iso8601 : v.strftime("%Y-%m-%dT%H:%M:%S%:z")
- when Hash
- case k
- when :style
- __styles__(v).gsub('"', """)
- else
- __nested_attributes__(v, "#{name}-", buffer)
- end
- when Array
- case k
- when :style
- __styles__(v).gsub('"', """)
- else
- __nested_tokens__(v)
- end
- when Set
- case k
- when :style
- __styles__(v).gsub('"', """)
- else
- __nested_tokens__(v.to_a)
- end
- when Phlex::SGML::SafeObject
- v.to_s.gsub('"', """)
- else
- raise Phlex::ArgumentError.new("Invalid attribute value for #{k}: #{v.inspect}.")
- end
-
- lower_name = name.downcase
-
- unless Phlex::SGML::SafeObject === v
- normalized_name = lower_name.delete("^a-z-")
-
- if value != true && REF_ATTRIBUTES.include?(normalized_name)
- case value
- when String
- if value.downcase.delete("^a-z:").start_with?("javascript:")
- # We just ignore these because they were likely not specified by the developer.
- next
- end
- else
- raise Phlex::ArgumentError.new("Invalid attribute value for #{k}: #{v.inspect}.")
- end
- end
-
- if normalized_name.bytesize > 2 && normalized_name.start_with?("on") && !normalized_name.include?("-")
- raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
- end
-
- if UNSAFE_ATTRIBUTES.include?(normalized_name)
- raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
- end
- end
-
- if name.match?(/[<>&"']/)
- raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
- end
-
- if lower_name.to_sym == :id && k != :id
- raise Phlex::ArgumentError.new(":id attribute should only be passed as a lowercase symbol.")
- end
-
- case value
- when true
- buffer << " " << name
- when String
- buffer << " " << name << '="' << value << '"'
- end
- end
-
- buffer
- end
-
- # Provides the nested-attributes case for serializing out attributes.
- # This allows us to skip many of the checks the `__attributes__` method must perform.
- private def __nested_attributes__(attributes, base_name, buffer = +"")
- attributes.each do |k, v|
- next unless v
-
- if (root_key = (:_ == k))
- name = ""
- original_base_name = base_name
- base_name = base_name.delete_suffix("-")
- else
- name = case k
- when String then k
- when Symbol then k.name.tr("_", "-")
- else raise Phlex::ArgumentError.new("Attribute keys should be Strings or Symbols")
- end
-
- if name.match?(/[<>&"']/)
- raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
- end
- end
-
- case v
- when true
- buffer << " " << base_name << name
- when String
- buffer << " " << base_name << name << '="' << v.gsub('"', """) << '"'
- when Symbol
- buffer << " " << base_name << name << '="' << v.name.tr("_", "-").gsub('"', """) << '"'
- when Integer, Float
- buffer << " " << base_name << name << '="' << v.to_s << '"'
- when Hash
- __nested_attributes__(v, "#{base_name}#{name}-", buffer)
- when Array
- buffer << " " << base_name << name << '="' << __nested_tokens__(v) << '"'
- when Set
- buffer << " " << base_name << name << '="' << __nested_tokens__(v.to_a) << '"'
- when Phlex::SGML::SafeObject
- buffer << " " << base_name << name << '="' << v.to_s.gsub('"', """) << '"'
- else
- raise Phlex::ArgumentError.new("Invalid attribute value #{v.inspect}.")
- end
-
- if root_key
- base_name = original_base_name
- end
-
- buffer
- end
- end
-
- private def __nested_tokens__(tokens, sep = " ", gsub_from = nil, gsub_to = "")
- buffer = +""
-
- i, length = 0, tokens.length
-
- while i < length
- token = tokens[i]
-
- case token
- when String
- token = token.gsub(gsub_from, gsub_to) if gsub_from
- if i > 0
- buffer << sep << token
- else
- buffer << token
- end
- when Symbol
- if i > 0
- buffer << sep << token.name.tr("_", "-")
- else
- buffer << token.name.tr("_", "-")
- end
- when Integer, Float, Phlex::SGML::SafeObject
- if i > 0
- buffer << sep << token.to_s
- else
- buffer << token.to_s
- end
- when Array
- if token.length > 0
- if i > 0
- buffer << sep << __nested_tokens__(token, sep, gsub_from, gsub_to)
- else
- buffer << __nested_tokens__(token, sep, gsub_from, gsub_to)
- end
- end
- when nil
- # Do nothing
- else
- raise Phlex::ArgumentError.new("Invalid token type: #{token.class}.")
- end
-
- i += 1
- end
-
- buffer.gsub('"', """)
- end
-
- # Result is **unsafe**, so it should be escaped!
- private def __styles__(styles)
- case styles
- when Array, Set
- styles.filter_map do |s|
- case s
- when String
- if s == "" || s.end_with?(";")
- s
- else
- "#{s};"
- end
- when Phlex::SGML::SafeObject
- value = s.to_s
- value.end_with?(";") ? value : "#{value};"
- when Hash
- next __styles__(s)
- when nil
- next nil
- else
- raise Phlex::ArgumentError.new("Invalid style: #{s.inspect}.")
- end
- end.join(" ")
- when Hash
- buffer = +""
- i = 0
- styles.each do |k, v|
- prop = case k
- when String
- k
- when Symbol
- k.name.tr("_", "-")
- else
- raise Phlex::ArgumentError.new("Style keys should be Strings or Symbols.")
- end
-
- value = case v
- when String
- v
- when Symbol
- v.name.tr("_", "-")
- when Integer, Float, Phlex::SGML::SafeObject
- v.to_s
- when nil
- nil
- else
- raise Phlex::ArgumentError.new("Invalid style value: #{v.inspect}")
- end
-
- if value
- if i == 0
- buffer << prop << ": " << value << ";"
- else
- buffer << " " << prop << ": " << value << ";"
- end
- end
-
- i += 1
- end
-
- buffer
- end
+ private def __render_attributes__(attributes)
+ state = @_state
+ return unless state.should_render?
+ state.buffer << (Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes))
end
private_class_method def self.method_added(method_name)
@@ -727,8 +472,13 @@ def json_escape(string)
if location[0] in "/" | "."
Phlex.__expand_attribute_cache__(location)
end
- else
- super
end
+
+ super
+ end
+
+ def self.__compile__(method_name)
+ path, line = instance_method(method_name).source_location
+ Phlex::Compiler::Method.new(self, path, line, method_name).compile
end
end
diff --git a/lib/phlex/sgml/attributes.rb b/lib/phlex/sgml/attributes.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/sgml/attributes.rb
@@ -0,0 +1,266 @@
+# frozen_string_literal: true
+
+module Phlex::SGML::Attributes
+ extend self
+
+ UNSAFE_ATTRIBUTES = Set.new(%w[srcdoc sandbox http-equiv]).freeze
+ REF_ATTRIBUTES = Set.new(%w[href src action formaction lowsrc dynsrc background ping]).freeze
+
+ def generate_attributes(attributes, buffer = +"")
+ attributes.each do |k, v|
+ next unless v
+
+ name = case k
+ when String then k
+ when Symbol then k.name.tr("_", "-")
+ else raise Phlex::ArgumentError.new("Attribute keys should be Strings or Symbols.")
+ end
+
+ value = case v
+ when true
+ true
+ when String
+ v.gsub('"', """)
+ when Symbol
+ v.name.tr("_", "-").gsub('"', """)
+ when Integer, Float
+ v.to_s
+ when Date
+ v.iso8601
+ when Time
+ v.respond_to?(:iso8601) ? v.iso8601 : v.strftime("%Y-%m-%dT%H:%M:%S%:z")
+ when Hash
+ case k
+ when :style
+ generate_styles(v).gsub('"', """)
+ else
+ generate_nested_attributes(v, "#{name}-", buffer)
+ end
+ when Array
+ case k
+ when :style
+ generate_styles(v).gsub('"', """)
+ else
+ generate_nested_tokens(v)
+ end
+ when Set
+ case k
+ when :style
+ generate_styles(v).gsub('"', """)
+ else
+ generate_nested_tokens(v.to_a)
+ end
+ when Phlex::SGML::SafeObject
+ v.to_s.gsub('"', """)
+ else
+ raise Phlex::ArgumentError.new("Invalid attribute value for #{k}: #{v.inspect}.")
+ end
+
+ lower_name = name.downcase
+
+ unless Phlex::SGML::SafeObject === v
+ normalized_name = lower_name.delete("^a-z-")
+
+ if value != true && REF_ATTRIBUTES.include?(normalized_name)
+ case value
+ when String
+ if value.downcase.delete("^a-z:").start_with?("javascript:")
+ # We just ignore these because they were likely not specified by the developer.
+ next
+ end
+ else
+ raise Phlex::ArgumentError.new("Invalid attribute value for #{k}: #{v.inspect}.")
+ end
+ end
+
+ if normalized_name.bytesize > 2 && normalized_name.start_with?("on") && !normalized_name.include?("-")
+ raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
+ end
+
+ if UNSAFE_ATTRIBUTES.include?(normalized_name)
+ raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
+ end
+ end
+
+ if name.match?(/[<>&"']/)
+ raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
+ end
+
+ if lower_name.to_sym == :id && k != :id
+ raise Phlex::ArgumentError.new(":id attribute should only be passed as a lowercase symbol.")
+ end
+
+ case value
+ when true
+ buffer << " " << name
+ when String
+ buffer << " " << name << '="' << value << '"'
+ end
+ end
+
+ buffer
+ end
+
+ # Provides the nested-attributes case for serializing out attributes.
+ # This allows us to skip many of the checks the `__attributes__` method must perform.
+ def generate_nested_attributes(attributes, base_name, buffer = +"")
+ attributes.each do |k, v|
+ next unless v
+
+ if (root_key = (:_ == k))
+ name = ""
+ original_base_name = base_name
+ base_name = base_name.delete_suffix("-")
+ else
+ name = case k
+ when String then k
+ when Symbol then k.name.tr("_", "-")
+ else raise Phlex::ArgumentError.new("Attribute keys should be Strings or Symbols")
+ end
+
+ if name.match?(/[<>&"']/)
+ raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
+ end
+ end
+
+ case v
+ when true
+ buffer << " " << base_name << name
+ when String
+ buffer << " " << base_name << name << '="' << v.gsub('"', """) << '"'
+ when Symbol
+ buffer << " " << base_name << name << '="' << v.name.tr("_", "-").gsub('"', """) << '"'
+ when Integer, Float
+ buffer << " " << base_name << name << '="' << v.to_s << '"'
+ when Hash
+ generate_nested_attributes(v, "#{base_name}#{name}-", buffer)
+ when Array
+ buffer << " " << base_name << name << '="' << generate_nested_tokens(v) << '"'
+ when Set
+ buffer << " " << base_name << name << '="' << generate_nested_tokens(v.to_a) << '"'
+ when Phlex::SGML::SafeObject
+ buffer << " " << base_name << name << '="' << v.to_s.gsub('"', """) << '"'
+ else
+ raise Phlex::ArgumentError.new("Invalid attribute value #{v.inspect}.")
+ end
+
+ if root_key
+ base_name = original_base_name
+ end
+
+ buffer
+ end
+ end
+
+ def generate_nested_tokens(tokens, sep = " ", gsub_from = nil, gsub_to = "")
+ buffer = +""
+
+ i, length = 0, tokens.length
+
+ while i < length
+ token = tokens[i]
+
+ case token
+ when String
+ token = token.gsub(gsub_from, gsub_to) if gsub_from
+ if i > 0
+ buffer << sep << token
+ else
+ buffer << token
+ end
+ when Symbol
+ if i > 0
+ buffer << sep << token.name.tr("_", "-")
+ else
+ buffer << token.name.tr("_", "-")
+ end
+ when Integer, Float, Phlex::SGML::SafeObject
+ if i > 0
+ buffer << sep << token.to_s
+ else
+ buffer << token.to_s
+ end
+ when Array
+ if token.length > 0
+ if i > 0
+ buffer << sep << generate_nested_tokens(token, sep, gsub_from, gsub_to)
+ else
+ buffer << generate_nested_tokens(token, sep, gsub_from, gsub_to)
+ end
+ end
+ when nil
+ # Do nothing
+ else
+ raise Phlex::ArgumentError.new("Invalid token type: #{token.class}.")
+ end
+
+ i += 1
+ end
+
+ buffer.gsub('"', """)
+ end
+
+ # The result is unsafe so should be escaped.
+ def generate_styles(styles)
+ case styles
+ when Array, Set
+ styles.filter_map do |s|
+ case s
+ when String
+ if s == "" || s.end_with?(";")
+ s
+ else
+ "#{s};"
+ end
+ when Phlex::SGML::SafeObject
+ value = s.to_s
+ value.end_with?(";") ? value : "#{value};"
+ when Hash
+ next generate_styles(s)
+ when nil
+ next nil
+ else
+ raise Phlex::ArgumentError.new("Invalid style: #{s.inspect}.")
+ end
+ end.join(" ")
+ when Hash
+ buffer = +""
+ i = 0
+ styles.each do |k, v|
+ prop = case k
+ when String
+ k
+ when Symbol
+ k.name.tr("_", "-")
+ else
+ raise Phlex::ArgumentError.new("Style keys should be Strings or Symbols.")
+ end
+
+ value = case v
+ when String
+ v
+ when Symbol
+ v.name.tr("_", "-")
+ when Integer, Float, Phlex::SGML::SafeObject
+ v.to_s
+ when nil
+ nil
+ else
+ raise Phlex::ArgumentError.new("Invalid style value: #{v.inspect}")
+ end
+
+ if value
+ if i == 0
+ buffer << prop << ": " << value << ";"
+ else
+ buffer << " " << prop << ": " << value << ";"
+ end
+ end
+
+ i += 1
+ end
+
+ buffer
+ end
+ end
+end
diff --git a/lib/phlex/sgml/elements.rb b/lib/phlex/sgml/elements.rb
--- a/lib/phlex/sgml/elements.rb
+++ b/lib/phlex/sgml/elements.rb
@@ -4,16 +4,16 @@ module Phlex::SGML::Elements
COMMA_SEPARATED_TOKENS = {
img: <<~RUBY,
if Array === (srcset_attribute = attributes[:srcset])
- attributes[:srcset] = __nested_tokens__(srcset_attribute, ", ", ",", "%2C")
+ attributes[:srcset] = Phlex::SGML::Attributes.generate_nested_tokens(srcset_attribute, ", ", ",", "%2C")
end
RUBY
link: <<~RUBY,
if Array === (media_attribute = attributes[:media])
- attributes[:media] = __nested_tokens__(media_attribute, ", ", ",", "%2C")
+ attributes[:media] = Phlex::SGML::Attributes.generate_nested_tokens(media_attribute, ", ", ",", "%2C")
end
if Array === (sizes_attribute = attributes[:sizes])
- attributes[:sizes] = __nested_tokens__(sizes_attribute, ", ", ",", "%2C")
+ attributes[:sizes] = Phlex::SGML::Attributes.generate_nested_tokens(sizes_attribute, ", ", ",", "%2C")
end
if Array === (imagesrcset_attribute = attributes[:imagesrcset])
@@ -21,7 +21,7 @@ module Phlex::SGML::Elements
as_attribute = attributes[:as] || attributes["as"]
if ("preload" == rel_attribute || :preload == rel_attribute) && ("image" == as_attribute || :image == as_attribute)
- attributes[:imagesrcset] = __nested_tokens__(imagesrcset_attribute, ", ", ",", "%2C")
+ attributes[:imagesrcset] = Phlex::SGML::Attributes.generate_nested_tokens(imagesrcset_attribute, ", ", ",", "%2C")
end
end
RUBY
@@ -30,7 +30,7 @@ module Phlex::SGML::Elements
type_attribute = attributes[:type] || attributes["type"]
if "file" == type_attribute || :file == type_attribute
- attributes[:accept] = __nested_tokens__(accept_attribute, ", ", ",", "%2C")
+ attributes[:accept] = Phlex::SGML::Attributes.generate_nested_tokens(accept_attribute, ", ", ",", "%2C")
end
end
RUBY
@@ -59,7 +59,7 @@ def #{method_name}(**attributes)
buffer << "<#{tag}"
begin
#{COMMA_SEPARATED_TOKENS[method_name]}
- buffer << (Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes))
+ buffer << (Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes))
ensure
buffer << ">"
end
@@ -90,7 +90,7 @@ def #{method_name}(**attributes)
buffer << "<#{tag}"
begin
#{COMMA_SEPARATED_TOKENS[method_name]}
- buffer << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes))
+ buffer << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes))
ensure
buffer << "></#{tag}>"
end
@@ -152,7 +152,7 @@ def #{method_name}(**attributes)
buffer << "<#{tag}"
begin
#{COMMA_SEPARATED_TOKENS[method_name]}
- buffer << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes))
+ buffer << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes))
ensure
buffer << ">"
end
diff --git a/lib/phlex/svg.rb b/lib/phlex/svg.rb
--- a/lib/phlex/svg.rb
+++ b/lib/phlex/svg.rb
@@ -44,11 +44,11 @@ def tag(name, **attributes, &)
if (tag = StandardElements.__registered_elements__[name]) || (tag = name.name.tr("_", "-")).include?("-")
if attributes.length > 0 # with attributes
if block_given # with content block
- buffer << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << ">"
+ buffer << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes)) << ">"
__yield_content__(&)
buffer << "</#{tag}>"
else # without content
- buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << "></#{tag}>"
+ buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes)) << "></#{tag}>"
end
else # without attributes
if block_given # with content block
diff --git a/quickdraw/compilation_equivalence_cases/basic.rb b/quickdraw/compilation_equivalence_cases/basic.rb
new file mode 100644
--- /dev/null
+++ b/quickdraw/compilation_equivalence_cases/basic.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Basic < Phlex::HTML
+ def view_template
+ h1 { "Hello" }
+ br
+ br(class: "my-class")
+ end
+end
diff --git a/quickdraw/compilation_equivalence_cases/comment.rb b/quickdraw/compilation_equivalence_cases/comment.rb
new file mode 100644
--- /dev/null
+++ b/quickdraw/compilation_equivalence_cases/comment.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Comment < Phlex::HTML
+ def view_template
+ comment { "hello world" }
+ comment { "Begin rendering #{self.class.name}" }
+ end
+end
diff --git a/quickdraw/compilation_equivalence_cases/plain.rb b/quickdraw/compilation_equivalence_cases/plain.rb
new file mode 100644
--- /dev/null
+++ b/quickdraw/compilation_equivalence_cases/plain.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Plain < Phlex::HTML
+ def view_template
+ local_variable = "good"
+ plain "Greetings "
+ plain local_variable
+ plain "sir!"
+ end
+end
diff --git a/quickdraw/compilation_equivalence_cases/raw.rb b/quickdraw/compilation_equivalence_cases/raw.rb
new file mode 100644
--- /dev/null
+++ b/quickdraw/compilation_equivalence_cases/raw.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Raw < Phlex::HTML
+ def view_template
+ p { "output before" }
+ raw(safe("<h1>raw output in the middle</h1>"))
+ p { "output after" }
+ end
+end
diff --git a/quickdraw/compilation_equivalence_cases/whitespace.rb b/quickdraw/compilation_equivalence_cases/whitespace.rb
new file mode 100644
--- /dev/null
+++ b/quickdraw/compilation_equivalence_cases/whitespace.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class Whitespace < Phlex::HTML
+ def view_template
+ h1 { "Hello" }
+ whitespace
+ h2 { "world" }
+ br
+ br
+ p do
+ plain "This sentence has"
+ whitespace { em { "emphasis" } }
+ plain "in it."
+ end
+ end
+end
diff --git a/quickdraw/fixtures/standard_element_example.rb b/quickdraw/fixtures/standard_element_example.rb
new file mode 100644
--- /dev/null
+++ b/quickdraw/fixtures/standard_element_example.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class ExampleComponent < Phlex::HTML
+ def view_template(&)
+ div(&)
+ end
+end
+
+class StandardElementExample < Phlex::HTML
+ def initialize(execution_checker = -> {})
+ @execution_checker = execution_checker
+ end
+
+ def view_template
+ doctype
+ div {
+ comment { h1(id: "target") }
+ h1 { "Before" }
+ img(src: "before.jpg")
+ render ExampleComponent.new { "Should not render" }
+ whitespace
+ comment { "This is a comment" }
+ fragment("target") do
+ h1(id: "target") {
+ plain "Hello"
+ strong { "World" }
+ img(src: "image.jpg")
+ }
+ end
+ @execution_checker.call
+ strong { "Here" }
+ fragment("image") do
+ img(id: "image", src: "after.jpg")
+ end
+ h1(id: "target") { "After" }
+ }
+ end
+end
|
diff --git a/quickdraw/compilation_equivalence.test.rb b/quickdraw/compilation_equivalence.test.rb
new file mode 100644
--- /dev/null
+++ b/quickdraw/compilation_equivalence.test.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+Dir["./compilation_equivalence_cases/*.rb", base: File.dirname(__FILE__)].each do |file|
+ test File.basename(file) do
+ load File.expand_path(file, File.dirname(__FILE__))
+
+ class_name = File.basename(file, ".rb").split("_").map(&:capitalize).join
+ component = Object.const_get(class_name)
+
+ before = component.new.call
+ Phlex::Compiler.compile(component)
+ after = component.new.call
+
+ assert_equal_html after, before
+ end
+end
+
+require_relative "../fixtures/page"
+require_relative "../fixtures/layout"
+
+test "benchmark fixtures" do
+ before = Example::Page.new.call
+ Phlex::Compiler.compile(Example::LayoutComponent)
+ Phlex::Compiler.compile(Example::Page)
+ after = Example::Page.new.call
+
+ assert_equal_html after, before
+end
diff --git a/quickdraw/compiler.test.rb b/quickdraw/compiler.test.rb
new file mode 100644
--- /dev/null
+++ b/quickdraw/compiler.test.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# test "standard element, no args, no block" do
+# snippet = Prism.parse(<<~RUBY).value.statements.body.first
+# def foo
+# h1
+# end
+# RUBY
+
+# compiled = Phlex::Compiler::MethodCompiler.new(Phlex::HTML).compile(snippet)
+
+# assert_equal_ruby compiled.strip, out = <<~RUBY.strip
+# def foo
+# __phlex_buffer__ = @_state.buffer
+# __phlex_buffer__ << "<h1></h1>"
+# end
+# RUBY
+# end
+
+test "sequential elements", skip: true do
+ snippet = Prism.parse(<<~RUBY).value.statements.body.first
+ def foo
+ div do
+ "Hello"
+ end
+ end
+ RUBY
+
+ compiled = Phlex::Compiler::MethodCompiler.new(Phlex::HTML).compile(snippet)
+
+ puts compiled
+
+ assert_equal compiled.strip, out = <<~RUBY.strip
+ def foo
+ __phlex_buffer__ = @_state.buffer
+ __phlex_buffer__ << "<h1></h1><h2></h2>"
+ end
+ RUBY
+end
diff --git a/quickdraw/sgml/attributes.test.rb b/quickdraw/sgml/attributes.test.rb
--- a/quickdraw/sgml/attributes.test.rb
+++ b/quickdraw/sgml/attributes.test.rb
@@ -595,8 +595,3 @@
output = phlex { input(:accept => ["image/jpeg", "image/png"], "type" => "file") }
assert_equal_html output, %(<input accept="image/jpeg, image/png" type="file">)
end
-
-# This is just for coverage.
-Phlex::HTML.call do |c|
- c.__send__(:__styles__, nil)
-end
diff --git a/test/phlex/view/naughty_business.rb b/test/phlex/view/naughty_business.rb
--- a/test/phlex/view/naughty_business.rb
+++ b/test/phlex/view/naughty_business.rb
@@ -157,7 +157,7 @@ def view_template
end
end
- Phlex::SGML::UNSAFE_ATTRIBUTES.each do |event_attribute|
+ Phlex::SGML::Attributes::UNSAFE_ATTRIBUTES.each do |event_attribute|
with "with naughty #{event_attribute} attribute" do
naughty_attributes = { event_attribute => "alert(1);" }
|
Generate source maps
We should be able to create source maps from the compiled source back to the original source code.
| 2025-07-08T14:22:34
|
ruby
|
Hard
|
|
yippee-fun/phlex
| 515
|
yippee-fun__phlex-515
|
[
"467"
] |
850c9be4381dc8b50b3a170ad0adfc932311ee17
|
diff --git a/lib/phlex/elements.rb b/lib/phlex/elements.rb
--- a/lib/phlex/elements.rb
+++ b/lib/phlex/elements.rb
@@ -20,11 +20,11 @@ def register_element(element, tag: element.name.tr("_", "-"))
def __phlex_#{element}__(**attributes, &block)
if attributes.length > 0
if block_given?
- @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || __attributes__(**attributes)) << ">"
+ @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] || __attributes__(**attributes)) << ">"
yield_content(&block)
@_target << "</#{tag}>"
else
- @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || __attributes__(**attributes)) << "></#{tag}>"
+ @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] || __attributes__(**attributes)) << "></#{tag}>"
end
else
if block_given?
@@ -53,7 +53,7 @@ def register_void_element(element, tag: element.name.tr("_", "-"))
def __phlex_#{element}__(**attributes)
if attributes.length > 0
- @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || __attributes__(**attributes)) << ">"
+ @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] || __attributes__(**attributes)) << ">"
else
@_target << "<#{tag}>"
end
diff --git a/lib/phlex/sgml.rb b/lib/phlex/sgml.rb
--- a/lib/phlex/sgml.rb
+++ b/lib/phlex/sgml.rb
@@ -246,12 +246,16 @@ def capture(&block)
# @api private
private def __attributes__(**attributes)
__final_attributes__(**attributes).tap do |buffer|
- Phlex::ATTRIBUTE_CACHE[attributes.hash] = buffer.freeze
+ Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] = buffer.freeze
end
end
# @api private
private def __final_attributes__(**attributes)
+ if respond_to?(:process_attributes)
+ attributes = process_attributes(**attributes)
+ end
+
if attributes[:href]&.start_with?(/\s*javascript:/)
attributes.delete(:href)
end
|
diff --git a/test/phlex/view/process_attributes.rb b/test/phlex/view/process_attributes.rb
new file mode 100644
--- /dev/null
+++ b/test/phlex/view/process_attributes.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+describe Phlex::HTML do
+ extend ViewHelper
+
+ view do
+ def template
+ div(class: "foo")
+ end
+
+ def process_attributes(**attributes)
+ attributes.transform_values { |v| "#{v}-bar" }
+ end
+ end
+
+ it "works" do
+ expect(output).to be == %(<div class="foo-bar"></div>)
+ end
+end
|
Provide an official attributes hook
A few people have expressed an interest in overriding `__attributes__` in order to prepare or validate their tag attributes in some unique way. This is not a supported use-case and was recently broken by #459.
I’m opening this issue to explore the possibility of exposing an official hook like our hooks for `before_template`, `after_template` and `around_template`.
### Performance
Processing a Hash of attributes is by far the slowest thing in Phlex. To manage this, we store a cache of the processed attributes on the first render of any view class. We can then take advantage of this cache in subsequent renders if the attributes are consistent, which is usually the case.
Any hook should ideally happen after the cache check, with any customisations of the attributes included in the cache.
Additionally, adding this hook to Phlex should not slow down normal renders that don't implement the hook.
### Safety
Phlex uses the return value of `__attributes__` in the HTML output, which means if you override `__attributes__` and return a `String` rather than calling and returning `super`, you bypass important HTML-safety checks. Any official attributes hook must not leave the application vulnerable if `super` is not called and returned by the override.
|
I have a few uses for this...
1. Be able to side load assets (js, css, etc) whenever specific html classes or other attributes are used.
2. Add/remove/modify attributes based on other attributes. Kind of like shortcuts
Because these are based on attributes used and will modify the attributes, using the around template hooks won't do the trick really.
Hope that helps
Just trying a few things out here, so please be gentle 😁
```ruby
class Phlex::HTML
private def __fetch_attributes__(**attributes)
attributes = resolve_attributes(**attributes) if respond_to?(:resolve_attributes)
Phlex::ATTRIBUTE_CACHE[attributes.hash] || __attributes__(**attributes)
end
end
```
With the above, anywhere you do `Phlex::ATTRIBUTE_CACHE[attributes.hash] || __attributes__(**attributes)`, replace with `__fetch_attributes__(**attributes)`. Then define `resolve_attributes` in your view, making sure to return the attributes.
This works (and fixes #489) , but unfortunately `resolve_attributes` will be called every single time. So would need to find a way of caching that.
The problem I see is the use of `attributes.hash` as the cache key. This should be used after the attributes have been resolved, otherwise it will be incorrect.
So what else could we use for the cache key? A UUID for each element instance?
Thoughts?
>The problem I see is the use of attributes.hash as the cache key. This should be used after the attributes have been resolved, otherwise it will be incorrect.
If the goal is to prevent `resolve_attributes` from needing to be called every time, wouldn't you want to base it off the `attributes.hash` _before_ resolving them? The assumption would then have to be that `resolve_attributes` is deterministic, always returning the same output for a given input.
I took a swing at this just for fun. If we changed the arguments to `__attributes__` (and the corresponding final method) to accept a key and the attributes, then we can keep the original attribute's hash key as the cache key.
```ruby
private def __fetch_attributes__(**attributes)
key = attributes.hash
Phlex::ATTRIBUTE_CACHE.fetch(key) do
attributes = resolve_attributes(**attributes) if respond_to?(:resolve_attributes)
__attributes__(key, **attributes)
end
end
```
So this will look up based on the provided attributes, and cache the resolved attributes. `__attributes__` is then changed to use that instead of the hash of the provided attributes:
```ruby
private def __attributes__(key, **attributes)
__final_attributes__(key, **attributes).tap do |buffer|
Phlex::ATTRIBUTE_CACHE[key] = buffer.freeze
end
end
```
And the final method just ignores that argument
```ruby
private def __final_attributes__(_key, **attributes)
```
I tried this out on my fork here 1046eddcd90387010c78647556ea5c8e234354e7 and tests are passing, but I haven't done any performance testing on it yet.
Regarding the _need_ for something like this for me, I haven't run into a case where I've needed this functionality. But I can see the potential. I would vote that I value performance over supporting this use case— a vote which is influenced primarily by me not having a need for it 😇 yet?
My expectation is that the hash should be based on the final attributes used - after resolving the hook. Otherwise it's not "correct".
I also tried this in my [branch](https://github.com/joelmoss/phlex/tree/resolve_attributes_hook_with_key), but my tests failed...
```ruby
describe 'resolve_attributes hook' do
describe 'first' do
view1 = Class.new(Phlex::HTML) do
def resolve_attributes(**attributes)
attributes[:class] = '1'
attributes
end
def template
div(identical: 'attribute') { 'one' }
end
end
view2 = Class.new(Phlex::HTML) do
def resolve_attributes(**attributes)
attributes[:class] = '2'
attributes
end
def template
div(identical: 'attribute') { 'two' }
end
end
it 'renders' do
expect(view1.new.call).to be == %(<div identical="attribute" class="1">one</div>)
expect(view2.new.call).to be == %(<div identical="attribute" class="2">two</div>)
end
end
end
```
The above test calls two views with a different template, but identical attributes. However, each view implements the `resolve_attributes` hook, and adds a `class` attribute, with each view having a different `class` value.
The last expectation fails for view2, as it uses the resolved attributes from view1. Which it should obviously not do.
I have [another branch](https://github.com/joelmoss/phlex/tree/resolve_attributes_hook) which has a slight variation on my original proposal, which does pass tests.
FWIW, this is a blocker for me. So i've been having to use my [branch](https://github.com/joelmoss/phlex/tree/resolve_attributes_hook) which has been working nicely, and doesn't suffer to much of a performance hit.
>My expectation is that the hash should be based on the final attributes used - after resolving the hook. Otherwise it's not "correct".
You're right, to have it be correct when multiple definitions of `resolve_attributes` are in play, then you either need to cache based on the final attributes which means that you always have to call `resolve_attributes`, or you would have to have a different cache for each definition of `resolve_attributes`.
It seems like the best implementation is going to be dependent on how people expect to use it. It sounds like you have a use case where you would be defining `resolve_attributes` potentially many times across different components, as opposed to one "global" definition of it at an `ApplicationView` level. Your implementation is good for your use case because you only incur the additional performance hit on the components where the method is defined, and nowhere else.
It might be instructive to see an example of some of the `resolve_attributes` definitions you're currently using, and what types of components you're defining them on, if you have the time.
Having an attribute cache per view class would solve this. There will be a performance cost. That's okay, but I’m looking for a way to implement it so that it doesn't hurt performance for people who are not using the feature.
@joelmoss I am going to have a proper go at this soon. I’m not promising I’ll find a solution but I will try.
Shout if you need a hand. Right now I'm having to use my own fork to provide this, so would love to stop doing that 🙏
Quick update on this: I found a way to perform optional per-class caching with only a 1% performance overhead on classes that don't opt-in, and about a 10% overhead on classes that do opt-in. 1% is reasonable to me, so I’m happy to proceed with this.
| 2023-03-05T10:22:19
|
ruby
|
Hard
|
yippee-fun/phlex
| 251
|
yippee-fun__phlex-251
|
[
"179"
] |
58b5a8231ac45b54a2950632e6fdb39236d6f605
|
diff --git a/Gemfile b/Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,7 @@ gem "webrick", group: [:docs]
gem "zeitwerk", group: [:docs]
gem "redcarpet", group: [:docs]
gem "combustion", group: [:test]
+gem "i18n", group: [:test]
gem "benchmark-ips"
gem "htmlbeautifier", group: [:docs]
gem "benchmark-memory"
diff --git a/docs/components/example.rb b/docs/components/example.rb
--- a/docs/components/example.rb
+++ b/docs/components/example.rb
@@ -13,12 +13,12 @@ def template(&block)
end
end
- def tab(name, code)
+ def tab(name, code, syntax: :ruby)
@t.tab(name) do
- render CodeBlock.new(code, syntax: :ruby)
+ render CodeBlock.new(code, syntax: syntax)
end
- @sandbox.class_eval(code)
+ @sandbox.class_eval(code) if syntax == :ruby
end
def execute(code)
diff --git a/docs/components/layout.rb b/docs/components/layout.rb
--- a/docs/components/layout.rb
+++ b/docs/components/layout.rb
@@ -51,6 +51,7 @@ def template(&block)
render Nav::Item.new("Views", to: Pages::Views, active_page: @_parent)
render Nav::Item.new("Templates", to: Pages::Templates, active_page: @_parent)
render Nav::Item.new("Helpers", to: Pages::Helpers, active_page: @_parent)
+ render Nav::Item.new("Translations", to: Pages::Translations, active_page: @_parent)
end
h2(class: "text-lg font-semibold pt-5") { "Testing" }
diff --git a/docs/pages/helpers.rb b/docs/pages/helpers.rb
--- a/docs/pages/helpers.rb
+++ b/docs/pages/helpers.rb
@@ -3,7 +3,7 @@
module Pages
class Helpers < ApplicationPage
def template
- render Layout.new(title: "Templates in Phlex") do
+ render Layout.new(title: "Helpers") do
render Markdown.new(<<~MD)
# Helpers
diff --git a/docs/pages/translations.rb b/docs/pages/translations.rb
new file mode 100644
--- /dev/null
+++ b/docs/pages/translations.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Pages
+ class Translations < ApplicationPage
+ def initialize
+ I18n.backend.store_translations(
+ "pt-BR", {
+ hello: "Olá",
+ views: { feedback: { welcome_message: { hello: "Olá" } } }
+ }
+ )
+ I18n.locale = "pt-BR"
+ end
+
+ def template
+ render Layout.new(title: "Translations") do
+ render Markdown.new(<<~MD)
+ # Translations
+
+ Phlex has built-in support for translations with the **[I18n Gem](https://github.com/ruby-i18n/i18n)**.
+
+ Just include `Phlex::Translation` in your view and use the `translate` method to access a translation.
+ MD
+
+ render Example.new do |e|
+ e.tab "welcome_message.rb", <<~RUBY
+ class WelcomeMessage < Phlex::View
+ include Phlex::Translation
+
+ def template
+ h1 { translate("hello") }
+ end
+ end
+ RUBY
+
+ e.tab "pt-PR.yml", <<~YAML, syntax: :yaml
+ pt-BR:
+ hello: "Olá"
+ YAML
+
+ e.execute "WelcomeMessage.new.call"
+ end
+
+ render Markdown.new(<<~MD)
+ ## Implicit scoopes
+
+ Start your translate key with a `.` to use the name of the view as an implicit scope.
+ MD
+
+ render Example.new do |e|
+ e.tab "welcome_message.rb", <<~RUBY
+ module Views
+ module Feedback
+ class WelcomeMessage < Phlex::View
+ include Phlex::Translation
+
+ def template
+ h1 { translate(".hello") }
+ end
+ end
+ end
+ end
+ RUBY
+
+ e.tab "pt-BR.yml", <<~YAML, syntax: :yaml
+ pt-BR:
+ views:
+ feedback:
+ welcome_message:
+ hello: Olá
+ YAML
+
+ e.execute <<~RUBY
+ Views::Feedback::WelcomeMessage.translation_path = 'views.feedback.welcome_message'
+ Views::Feedback::WelcomeMessage.new.call
+ RUBY
+ end
+ end
+ end
+ end
+end
diff --git a/fixtures/dummy/app/views/application_view.rb b/fixtures/dummy/app/views/application_view.rb
new file mode 100644
--- /dev/null
+++ b/fixtures/dummy/app/views/application_view.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Views
+ class ApplicationView < Phlex::View
+ include Rails.application.routes.url_helpers
+ include Phlex::Translation
+ end
+end
diff --git a/fixtures/dummy/app/views/articles/form.rb b/fixtures/dummy/app/views/articles/form.rb
--- a/fixtures/dummy/app/views/articles/form.rb
+++ b/fixtures/dummy/app/views/articles/form.rb
@@ -2,7 +2,7 @@
module Views
module Articles
- class Form < Phlex::View
+ class Form < ApplicationView
include Phlex::Rails::Helpers::FormWith
def template
diff --git a/fixtures/dummy/app/views/card.rb b/fixtures/dummy/app/views/card.rb
--- a/fixtures/dummy/app/views/card.rb
+++ b/fixtures/dummy/app/views/card.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Views
- class Card < Phlex::View
+ class Card < ApplicationView
def template(&block)
article class: "drop-shadow p-5 rounded", &block
end
diff --git a/fixtures/dummy/app/views/comments/comment.rb b/fixtures/dummy/app/views/comments/comment.rb
--- a/fixtures/dummy/app/views/comments/comment.rb
+++ b/fixtures/dummy/app/views/comments/comment.rb
@@ -2,7 +2,7 @@
module Views
module Comments
- class Comment < Phlex::View
+ class Comment < ApplicationView
def initialize(name:, body:)
@name = name
@body = body
diff --git a/fixtures/dummy/app/views/comments/reaction.rb b/fixtures/dummy/app/views/comments/reaction.rb
--- a/fixtures/dummy/app/views/comments/reaction.rb
+++ b/fixtures/dummy/app/views/comments/reaction.rb
@@ -2,7 +2,7 @@
module Views
module Comments
- class Reaction < Phlex::View
+ class Reaction < ApplicationView
def initialize(emoji:)
@emoji = emoji
end
diff --git a/fixtures/dummy/app/views/heading.rb b/fixtures/dummy/app/views/heading.rb
--- a/fixtures/dummy/app/views/heading.rb
+++ b/fixtures/dummy/app/views/heading.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Views
- class Heading < Phlex::View
+ class Heading < ApplicationView
def template(&block)
h1(&block)
end
diff --git a/lib/install/phlex.rb b/lib/install/phlex.rb
--- a/lib/install/phlex.rb
+++ b/lib/install/phlex.rb
@@ -22,6 +22,7 @@
module Views
class ApplicationView < Phlex::View
include Rails.application.routes.url_helpers
+ include Phlex::Translation
end
end
RUBY
diff --git a/lib/phlex/translation.rb b/lib/phlex/translation.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/translation.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Phlex
+ module Translation
+ def self.included(view)
+ view.extend(ClassMethods)
+ end
+
+ module ClassMethods
+ attr_writer :translation_path
+
+ def translation_path
+ @translation_path ||= name&.split("::")&.join(".")&.downcase.to_s
+ end
+ end
+
+ def translate(key, **options)
+ key = "#{self.class.translation_path}#{key}" if key.start_with?(".")
+
+ ::I18n.translate(key, **options)
+ end
+ end
+end
|
diff --git a/test/phlex/translation.rb b/test/phlex/translation.rb
new file mode 100644
--- /dev/null
+++ b/test/phlex/translation.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+describe Phlex::Translation do
+ extend ViewHelper
+
+ describe "#translate" do
+ with "key starting with '.'" do
+ view do
+ include Phlex::Translation
+
+ self.translation_path = "articles.card"
+
+ def template
+ text translate(".hello")
+ end
+ end
+
+ it "returns translation using translation_path as scope" do
+ expect(I18n).to receive(:translate).with("articles.card.hello").and_return("Olá")
+
+ expect(output).to be == "Olá"
+ end
+ end
+
+ with "key not starting with '.'" do
+ view do
+ include Phlex::Translation
+
+ self.translation_path = "articles.card"
+
+ def template
+ text translate("hello")
+ end
+ end
+
+ it "returns translation using key without translation_path as scope" do
+ expect(I18n).to receive(:translate).with("hello").and_return("hola")
+
+ expect(output).to be == "hola"
+ end
+ end
+ end
+
+ describe ".translation_path" do
+ with "valid class name" do
+ it "returns I18n scope using class anme" do
+ expect(Views::Articles::Form.translation_path).to be == "views.articles.form"
+ end
+ end
+
+ with "invalid class_name" do
+ it "returns empty string" do
+ view = Class.new(Phlex::View) do
+ include Phlex::Translation
+ end
+
+ expect(view.translation_path).to be == ""
+ end
+ end
+
+ it "memoizes result" do
+ Views::Articles::Form.translation_path # memoize `translation_path` with original result: "articles.form"
+
+ # Mock const_source_location. If memoization doesn't work, the `translation_path` should be "posts.form"
+ mock(Views::Articles::Form) do |mock|
+ mock.replace(:const_source_location) do
+ ["/my-app/app/views/posts/form.rb", 5]
+ end
+ end
+
+ expect(Views::Articles::Form.translation_path).to be == "views.articles.form"
+ end
+ end
+end
|
Better i18n support
Currently Phlex does not provide anything for i18n, one can include `I18n` and then use the translation helpers with absolute keys.
So while this works, adding the rails helpers for i18n will cause problems, when trying to use relative keys like `t(".new")`, it will raise an error, that there is no `@virtual_path` set.
ViewComponent solves this, by setting the `@virtual_path` in the `render_in` method.
ViewComponent also supports having the language files as sidecar files, which is pretty neat, and might be a cool thing for Phlex as well.
Some of my research on the topic can be found here: https://discord.com/channels/629472241427415060/1002702966551216139/1022976024432095373
|
> as you can see, it's easy to include, but you also need to provide the @virtual_path variable. What are your thoughts about this, I feel like i18n should work out of the box.
I agree. Translation should work out of the box when it's available in Rails and we might even be able to provide translation features for non Rails users.
> It's a bit annoying, that an instance var is required. So I actually think, one has to overwrite the new method, as POROs don't really provide any after_initialize or something like that, or is there something along those lines?
If we need to do this, we should be able to do it in the `Renderable#render_in` method which is always called when rendering in Rails.
I’m not sure how I feel about the side car files. I would rather move the translations inline like we've done with templates, though I’m open to optional side car files for people who need translations to be separate for translation service API compatibility, etc.
I don't really like the dot syntax `t("a.b.c")` and would prefer something closer to dig `t(:a, :b, :c)` or even `t.a.b.c`, though I guess it makes sense to support the normal rails syntax for backwards compatibility even if we provide a cleaner API.
For performance, the compiler could inline this as something like `@translations[:a][:b][:c]`.
| 2022-10-12T23:56:16
|
ruby
|
Hard
|
rubyzip/rubyzip
| 411
|
rubyzip__rubyzip-411
|
[
"410",
"410"
] |
2825898f69fbf1efe4e43452adae6ac5d074ec1c
|
diff --git a/lib/zip.rb b/lib/zip.rb
--- a/lib/zip.rb
+++ b/lib/zip.rb
@@ -1,7 +1,6 @@
require 'delegate'
require 'singleton'
require 'tempfile'
-require 'tmpdir'
require 'fileutils'
require 'stringio'
require 'zlib'
diff --git a/lib/zip/streamable_stream.rb b/lib/zip/streamable_stream.rb
--- a/lib/zip/streamable_stream.rb
+++ b/lib/zip/streamable_stream.rb
@@ -2,12 +2,7 @@ module Zip
class StreamableStream < DelegateClass(Entry) # nodoc:all
def initialize(entry)
super(entry)
- dirname = if zipfile.is_a?(::String)
- ::File.dirname(zipfile)
- else
- nil
- end
- @temp_file = Tempfile.new(::File.basename(name), dirname)
+ @temp_file = Tempfile.new(::File.basename(name))
@temp_file.binmode
end
|
diff --git a/test/test_helper.rb b/test/test_helper.rb
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,6 +2,7 @@
require 'minitest/autorun'
require 'minitest/unit'
require 'fileutils'
+require 'tmpdir'
require 'digest/sha1'
require 'zip'
require 'gentestfiles'
|
Tempfile problems on Windows
The same code used on Windows and Linux behaves differently.
Everything works fine on Linux, but on Windows I get errors when trying to open a stream from a zip file that includes a folder/directory name.
10: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/filesystem.rb:246:in `open'
9: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/filesystem.rb:573:in `get_output_stream'
8: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/file.rb:265:in `get_output_stream'
7: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/file.rb:265:in `new'
6: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/streamable_stream.rb:10:in `initialize'
5: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/streamable_stream.rb:10:in `new'
4: from P:/Ruby26-x64/lib/ruby/2.6.0/tempfile.rb:131:in `initialize'
3: from P:/Ruby26-x64/lib/ruby/2.6.0/tmpdir.rb:135:in `create'
2: from P:/Ruby26-x64/lib/ruby/2.6.0/tempfile.rb:133:in `block in initialize'
1: from P:/Ruby26-x64/lib/ruby/2.6.0/tempfile.rb:133:in `open'
P:/Ruby26-x64/lib/ruby/2.6.0/tempfile.rb:133:in `initialize': No such file or directory @ rb_sysopen - dvlp/proxy.local__PROJECT$h595f5a46$h4bbd$h4126$h86a6$hec01f155cb67_resource_com$dnomagic$dmagicdraw$duml_umodel$dshared_umodel$dsnapshot20190927-27860-1nww0sq (Errno::ENOENT)
If I alter line 6 in streamable_stream.rb to:
nil ##::File.dirname(zipfile)
Which in effect enables Tempfile to use the Dir.tempdir for temporary file location everything seems to work fine.
I would like to understand why the temporary file for Streamable objects is being placed it a local folder instead of just using the Dir.tempdir folder.
Tempfile problems on Windows
The same code used on Windows and Linux behaves differently.
Everything works fine on Linux, but on Windows I get errors when trying to open a stream from a zip file that includes a folder/directory name.
10: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/filesystem.rb:246:in `open'
9: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/filesystem.rb:573:in `get_output_stream'
8: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/file.rb:265:in `get_output_stream'
7: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/file.rb:265:in `new'
6: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/streamable_stream.rb:10:in `initialize'
5: from P:/Ruby26-x64/lib/ruby/gems/2.6.0/gems/rubyzip-2.0.0/lib/zip/streamable_stream.rb:10:in `new'
4: from P:/Ruby26-x64/lib/ruby/2.6.0/tempfile.rb:131:in `initialize'
3: from P:/Ruby26-x64/lib/ruby/2.6.0/tmpdir.rb:135:in `create'
2: from P:/Ruby26-x64/lib/ruby/2.6.0/tempfile.rb:133:in `block in initialize'
1: from P:/Ruby26-x64/lib/ruby/2.6.0/tempfile.rb:133:in `open'
P:/Ruby26-x64/lib/ruby/2.6.0/tempfile.rb:133:in `initialize': No such file or directory @ rb_sysopen - dvlp/proxy.local__PROJECT$h595f5a46$h4bbd$h4126$h86a6$hec01f155cb67_resource_com$dnomagic$dmagicdraw$duml_umodel$dshared_umodel$dsnapshot20190927-27860-1nww0sq (Errno::ENOENT)
If I alter line 6 in streamable_stream.rb to:
nil ##::File.dirname(zipfile)
Which in effect enables Tempfile to use the Dir.tempdir for temporary file location everything seems to work fine.
I would like to understand why the temporary file for Streamable objects is being placed it a local folder instead of just using the Dir.tempdir folder.
|
This does seem a bit odd. I'll have a think about this and work up a fix if I can't see any reason why this is currently set up the way that it is.
@jdleesmiller you can assign this to me if you like.
This does seem a bit odd. I'll have a think about this and work up a fix if I can't see any reason why this is currently set up the way that it is.
@jdleesmiller you can assign this to me if you like.
| 2019-10-01T09:39:04
|
ruby
|
Hard
|
yippee-fun/phlex
| 302
|
yippee-fun__phlex-302
|
[
"301"
] |
19f103afaa5fea30d686eb7ef58d50c060f8f79f
|
diff --git a/docs/pages/templates.rb b/docs/pages/templates.rb
--- a/docs/pages/templates.rb
+++ b/docs/pages/templates.rb
@@ -76,6 +76,32 @@ def template
e.execute "ChannelControls.new.call"
end
+ render Markdown.new(<<~MD)
+ ## Processing Attributes
+
+ Sometimes you may want to process, modify, or simply be able to read the attributes that tags are given. For example, you may want to assign an `id` attribute to every tag, or even use the `tokens` helper to automatically tokenize the `class` attribute.
+
+ Simply define a `process_attributes` method in your view. This method will be called on each tag, with the attributes as keyword arguments, and should return a Hash of the attributes.
+ MD
+
+ render Example.new do |e|
+ e.tab "example.rb", <<~RUBY
+ class Example < Phlex::View
+ def template
+ h1(class: 'title') { "Hello" }
+ end
+
+ def process_attributes(**attributes)
+ attributes.tap do |attrs|
+ attrs[:id] = SecureRandom.uuid
+ end
+ end
+ end
+ RUBY
+
+ e.execute "Example.new.call"
+ end
+
render Markdown.new(<<~MD)
## The template tag
diff --git a/docs/pages/views.rb b/docs/pages/views.rb
--- a/docs/pages/views.rb
+++ b/docs/pages/views.rb
@@ -154,7 +154,7 @@ def template
render Markdown.new(<<~MD)
## Callbacks
- Prepend the `Phlex::View::Callbacks` module, and if you define `#before_rendering_template` and/or `#after_rendering_template` method in your view, they will be called immediately before and after your template is compiled.
+ Prepend the `Phlex::View::Callbacks` module, and if you define `#before_rendering_template` and/or `#after_rendering_template` method in your view, they will be called immediately before and after your template is rendered.
MD
render Example.new do |e|
diff --git a/lib/phlex/compiler/generators/element.rb b/lib/phlex/compiler/generators/element.rb
--- a/lib/phlex/compiler/generators/element.rb
+++ b/lib/phlex/compiler/generators/element.rb
@@ -18,7 +18,7 @@ def call
if @node.arguments&.parts&.any?
@formatter.chain_append do |f|
- f.text "process_attributes("
+ f.text "_attributes("
@node.arguments.format(@formatter)
f.text ")"
end
diff --git a/lib/phlex/html.rb b/lib/phlex/html.rb
--- a/lib/phlex/html.rb
+++ b/lib/phlex/html.rb
@@ -137,11 +137,11 @@ def #{element}(content = nil, **attributes, &block)
if attributes.length > 0
if block_given?
- @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || process_attributes(**attributes)) << ">"
+ @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || _attributes(**attributes)) << ">"
yield_content(&block)
@_target << "</#{tag}>"
else
- @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || process_attributes(**attributes)) << "></#{tag}>"
+ @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || _attributes(**attributes)) << "></#{tag}>"
end
else
if block_given?
@@ -164,7 +164,7 @@ def register_void_element(element, tag: element.name.tr("_", "-"))
def #{element}(**attributes)
if attributes.length > 0
- @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || process_attributes(**attributes)) << ">"
+ @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || _attributes(**attributes)) << ">"
else
@_target << "<#{tag}>"
end
diff --git a/lib/phlex/view.rb b/lib/phlex/view.rb
--- a/lib/phlex/view.rb
+++ b/lib/phlex/view.rb
@@ -182,11 +182,19 @@ def helpers
@_view_context
end
- def process_attributes(buffer = +"", **attributes)
+ def _attributes(buffer = +"", **attributes)
if attributes[:href]&.start_with?(/\s*javascript/)
attributes[:href] = attributes[:href].sub(/^\s*(javascript:)+/, "")
end
+ if respond_to?(:process_attributes)
+ attributes = process_attributes(**attributes)
+
+ unless attributes.is_a?(Hash)
+ raise "`#{self.class.name}#process_attributes` must return a hash of attributes"
+ end
+ end
+
_build_attributes(attributes, buffer: buffer)
unless self.class.rendered_at_least_once
|
diff --git a/test/phlex/compilation/standard_element.rb b/test/phlex/compilation/standard_element.rb
--- a/test/phlex/compilation/standard_element.rb
+++ b/test/phlex/compilation/standard_element.rb
@@ -26,7 +26,7 @@ def template
expected = <<~RUBY
def template
- @_target << "<h1" << process_attributes(class: "font-bold") << "></h1>"
+ @_target << "<h1" << _attributes(class: "font-bold") << "></h1>"
end
RUBY
@@ -53,7 +53,7 @@ def template
expect(output.first).to be == <<~RUBY
def template
- @_target << "<h1" << process_attributes(class: "font-bold") << ">Hi</h1>"
+ @_target << "<h1" << _attributes(class: "font-bold") << ">Hi</h1>"
end
RUBY
end
@@ -78,7 +78,7 @@ def template
expected = <<~RUBY
def template
- @_target << "<h1" << process_attributes(class: "font-bold") << ">Hi</h1>"
+ @_target << "<h1" << _attributes(class: "font-bold") << ">Hi</h1>"
end
RUBY
diff --git a/test/phlex/compilation/void_element.rb b/test/phlex/compilation/void_element.rb
--- a/test/phlex/compilation/void_element.rb
+++ b/test/phlex/compilation/void_element.rb
@@ -26,7 +26,7 @@ def template
expected = <<~RUBY
def template
- @_target << "<img" << process_attributes(class: "a b c") << ">"
+ @_target << "<img" << _attributes(class: "a b c") << ">"
end
RUBY
diff --git a/test/phlex/view/attributes.rb b/test/phlex/view/attributes.rb
--- a/test/phlex/view/attributes.rb
+++ b/test/phlex/view/attributes.rb
@@ -17,6 +17,45 @@ def template
end
end
+ with "process_attributes" do
+ view do
+ def template
+ div class: "header"
+ end
+
+ def process_attributes(**attributes)
+ attributes.tap do |attrs|
+ attrs[:class] = "#{attrs[:class]}123abc" if attributes.key?(:class)
+ end
+ end
+ end
+
+ it "calls the attribute method" do
+ expect(output).to be == %(<div class="header123abc"></div>)
+ end
+ end
+
+ with "process_attributes returning no hash" do
+ view do
+ def template
+ div class: "header"
+ end
+
+ def process_attributes(**attributes)
+ nil
+ end
+ end
+
+ it "raises when return value is not a Hash" do
+ expect do
+ output
+ end.to raise_exception(
+ RuntimeError,
+ message: be =~ /process_attributes` must return a hash of attributes/
+ )
+ end
+ end
+
if RUBY_ENGINE == "ruby"
with "unique tag attributes" do
view do
|
Security risk with `process_attributes` override
@joelmoss I’ve just realised a possible problem with encouraging people to override `process_attributes`. If you don’t call `super` but return a String instead, you lose a bunch of security features.
I wonder if we should go back to the idea of having `process_attributes` called from `_attributes` so the attributes are always filtered. What do you think?
|
Oh the joys of forgetting 'super' 😩
I would always prefer not having to worry about super, but you you've been quite persistent on maintaining performance.
I suppose we have to pick our battles, and consider if it's a minor perf hit.
Yeah, I think we should take the performance hit unfortunately. We can optimise it away in the compiler eventually.
It should be a very very minor hit.
I'll get you a new PR
You wanna keep the kwargs change in `_attributes`?
Yeah, I think that's a good change.
| 2022-10-26T22:00:03
|
ruby
|
Hard
|
JEG2/highline
| 259
|
JEG2__highline-259
|
[
"236"
] |
7755f1f3f3b80e4c1c48446ea8234eaf954e6538
|
diff --git a/lib/highline.rb b/lib/highline.rb
--- a/lib/highline.rb
+++ b/lib/highline.rb
@@ -538,6 +538,7 @@ def get_line_raw_no_echo_mode(question)
terminal.raw_no_echo_mode_exec do
loop do
character = terminal.get_character
+ raise Interrupt if character == "\u0003"
break unless character
break if ["\n", "\r"].include? character
diff --git a/lib/highline/io_console_compatible.rb b/lib/highline/io_console_compatible.rb
--- a/lib/highline/io_console_compatible.rb
+++ b/lib/highline/io_console_compatible.rb
@@ -13,7 +13,7 @@
#
module IOConsoleCompatible
- def getch
+ def getch(min:nil, time:nil, intr: nil)
getc
end
diff --git a/lib/highline/terminal/io_console.rb b/lib/highline/terminal/io_console.rb
--- a/lib/highline/terminal/io_console.rb
+++ b/lib/highline/terminal/io_console.rb
@@ -27,7 +27,7 @@ def restore_mode
# (see Terminal#get_character)
def get_character
- input.getch # from ruby io/console
+ input.getch(intr: true) # from ruby io/console
rescue Errno::ENOTTY
input.getc
end
|
diff --git a/test/test_highline.rb b/test/test_highline.rb
--- a/test/test_highline.rb
+++ b/test/test_highline.rb
@@ -1300,6 +1300,20 @@ def test_echoing_with_utf8_when_echo_is_star
assert_equal("maçã", answer)
end
+ def test_echo_false_with_ctrl_c_interrupts
+ @input << "String with a ctrl-c at the end \u0003 \n"
+ @input.rewind
+ @answer = nil
+
+ assert_raises(Interrupt) do
+ @answer = @terminal.ask("Type: ") do |q|
+ q.echo = false
+ end
+ end
+
+ assert_nil @answer
+ end
+
def test_range_requirements
@input << "112\n-541\n28\n"
@input.rewind
|
Ctrl-C improperly handled when q.echo = false
Hi,
Just noticed something a little odd with the handling of a ctrl-c while in an `ask` with echo set to false.
```
#!/usr/bin/env ruby
require 'highline'
cli = HighLine.new
cli.ask("Password?") {|q| q.echo = false}
cli.ask("Anything else?")
```
```
$ ./highline_test.rb
Password?
<hit ctrl-c>
Anything else?
<hit enter>
```
Two things happened here:
1. the ctrl-c did not interrupt the script (it does if `q.echo` is not set to false)
2. after this, and every time I run a new command (ls, ps etc), an empty line will be printed before the output of the command (see example below)
```
$ ls
file1
file2
```
I'm using highline-2.0.0.gem, and `zsh` in the standard terminal app in OSX.
|
I'll be having a look at it as soon as possible.
HighLine dates from a time where all the hard work should be done by it.
This is probably an issue related to the fact that HighLine is handling all cases related to special characters like backspace and others.
If you come up with a PR, feel free to open it, I would be thankful!
If not possible, just wait some time and I will surely try to fix it.
Thanks for reporting the issue! 👍
Hi,
No worries, this isn't in any way a blocking/problematic bug, so don't feel pressed to fix this :) I might look into it on the train sometime, but no promises here :)
I've just run into this as well - we can work around it for now, and if I have time for a PR I'll raise one, but also subscribing for notifications if you happen to fix it before I do. Cheers!
io/console #getpass handles ctrl-C correctly
Just a thought, you could always throw the exit in with the character checks in HighLine#get_line_raw_no_echo_mode, this would "catch" (I say that because `trap` doesn't seem to catch anything in the method, or anywhere for that matter). This worked for me. I am not sure off hand if \u0003 is going to be cross platform but it seems to work in POSIX environments, tested on macOS:
```
diff --git a/lib/highline.rb b/lib/highline.rb
index 3e60cd3..e33e13a 100755
--- a/lib/highline.rb
+++ b/lib/highline.rb
@@ -538,6 +538,7 @@ class HighLine
terminal.raw_no_echo_mode_exec do
loop do
character = terminal.get_character
+ exit 130 if character == "\u0003"
break unless character
break if ["\n", "\r"].include? character
```
| 2023-01-04T09:52:48
|
ruby
|
Hard
|
rubyzip/rubyzip
| 486
|
rubyzip__rubyzip-486
|
[
"422",
"336"
] |
098bce399afacff6bb2534cca570eb97ca8463ef
|
diff --git a/Changelog.md b/Changelog.md
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,7 @@
# 3.0.0 (Next)
+- Fix restore options consistency. [#486](https://github.com/rubyzip/rubyzip/pull/486)
+- View and/or preserve original date created, date modified? (Windows). [#336](https://github.com/rubyzip/rubyzip/issues/336)
- Fix frozen string literal error. [#475](https://github.com/rubyzip/rubyzip/pull/475)
- Set the default `Entry` time to the file's mtime on Windows. [#465](https://github.com/rubyzip/rubyzip/issues/465)
- Ensure that `Entry#time=` sets times as `DOSTime` objects. [#481](https://github.com/rubyzip/rubyzip/issues/481)
diff --git a/lib/zip.rb b/lib/zip.rb
--- a/lib/zip.rb
+++ b/lib/zip.rb
@@ -48,6 +48,12 @@ module Zip
:force_entry_names_encoding,
:validate_entry_sizes
+ DEFAULT_RESTORE_OPTIONS = {
+ restore_ownership: false,
+ restore_permissions: true,
+ restore_times: true
+ }.freeze
+
def reset!
@_ran_once = false
@unicode_names = false
diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
--- a/lib/zip/entry.rb
+++ b/lib/zip/entry.rb
@@ -42,9 +42,9 @@ def set_default_vars_values
end
@follow_symlinks = false
- @restore_times = false
- @restore_permissions = false
- @restore_ownership = false
+ @restore_times = DEFAULT_RESTORE_OPTIONS[:restore_times]
+ @restore_permissions = DEFAULT_RESTORE_OPTIONS[:restore_permissions]
+ @restore_ownership = DEFAULT_RESTORE_OPTIONS[:restore_ownership]
# BUG: need an extra field to support uid/gid's
@unix_uid = nil
@unix_gid = nil
@@ -462,11 +462,6 @@ def set_unix_attributes_on_path(dest_path)
unix_perms_mask = 0o7777 if @restore_ownership
::FileUtils.chmod(@unix_perms & unix_perms_mask, dest_path) if @restore_permissions && @unix_perms
::FileUtils.chown(@unix_uid, @unix_gid, dest_path) if @restore_ownership && @unix_uid && @unix_gid && ::Process.egid == 0
-
- # Restore the timestamp on a file. This will either have come from the
- # original source file that was copied into the archive, or from the
- # creation date of the archive if there was no original source file.
- ::FileUtils.touch(dest_path, mtime: time) if @restore_times
end
def set_extra_attributes_on_path(dest_path) # :nodoc:
@@ -476,6 +471,11 @@ def set_extra_attributes_on_path(dest_path) # :nodoc:
when ::Zip::FSTYPE_UNIX
set_unix_attributes_on_path(dest_path)
end
+
+ # Restore the timestamp on a file. This will either have come from the
+ # original source file that was copied into the archive, or from the
+ # creation date of the archive if there was no original source file.
+ ::FileUtils.touch(dest_path, mtime: time) if @restore_times
end
def pack_c_dir_entry
diff --git a/lib/zip/file.rb b/lib/zip/file.rb
--- a/lib/zip/file.rb
+++ b/lib/zip/file.rb
@@ -53,21 +53,15 @@ class File < CentralDirectory
DATA_BUFFER_SIZE = 8192
IO_METHODS = [:tell, :seek, :read, :eof, :close].freeze
- DEFAULT_OPTIONS = {
- restore_ownership: false,
- restore_permissions: false,
- restore_times: false
- }.freeze
-
attr_reader :name
# default -> false.
attr_accessor :restore_ownership
- # default -> false, but will be set to true in a future version.
+ # default -> true.
attr_accessor :restore_permissions
- # default -> false, but will be set to true in a future version.
+ # default -> true.
attr_accessor :restore_times
# Returns the zip files comment, if it has one
@@ -77,7 +71,7 @@ class File < CentralDirectory
# a new archive if it doesn't exist already.
def initialize(path_or_io, create = false, buffer = false, options = {})
super()
- options = DEFAULT_OPTIONS
+ options = DEFAULT_RESTORE_OPTIONS
.merge(compression_level: ::Zip.default_compression)
.merge(options)
@name = path_or_io.respond_to?(:path) ? path_or_io.path : path_or_io
|
diff --git a/test/file_options_test.rb b/test/file_options_test.rb
--- a/test/file_options_test.rb
+++ b/test/file_options_test.rb
@@ -23,7 +23,7 @@ def teardown
::File.unlink(TXTPATH_755) if ::File.exist?(TXTPATH_755)
end
- def test_restore_permissions
+ def test_restore_permissions_true
# Copy and set up files with different permissions.
::FileUtils.cp(TXTPATH, TXTPATH_600)
::File.chmod(0o600, TXTPATH_600)
@@ -47,6 +47,55 @@ def test_restore_permissions
assert_equal(::File.stat(TXTPATH_755).mode, ::File.stat(EXTPATH_3).mode)
end
+ def test_restore_permissions_false
+ # Copy and set up files with different permissions.
+ ::FileUtils.cp(TXTPATH, TXTPATH_600)
+ ::File.chmod(0o600, TXTPATH_600)
+ ::FileUtils.cp(TXTPATH, TXTPATH_755)
+ ::File.chmod(0o755, TXTPATH_755)
+
+ ::Zip::File.open(ZIPPATH, true) do |zip|
+ zip.add(ENTRY_1, TXTPATH)
+ zip.add(ENTRY_2, TXTPATH_600)
+ zip.add(ENTRY_3, TXTPATH_755)
+ end
+
+ ::Zip::File.open(ZIPPATH, false, restore_permissions: false) do |zip|
+ zip.extract(ENTRY_1, EXTPATH_1)
+ zip.extract(ENTRY_2, EXTPATH_2)
+ zip.extract(ENTRY_3, EXTPATH_3)
+ end
+
+ default_perms = (Zip::RUNNING_ON_WINDOWS ? 0o100_644 : 0o100_666) - ::File.umask
+ assert_equal(default_perms, ::File.stat(EXTPATH_1).mode)
+ assert_equal(default_perms, ::File.stat(EXTPATH_2).mode)
+ assert_equal(default_perms, ::File.stat(EXTPATH_3).mode)
+ end
+
+ def test_restore_permissions_as_default
+ # Copy and set up files with different permissions.
+ ::FileUtils.cp(TXTPATH, TXTPATH_600)
+ ::File.chmod(0o600, TXTPATH_600)
+ ::FileUtils.cp(TXTPATH, TXTPATH_755)
+ ::File.chmod(0o755, TXTPATH_755)
+
+ ::Zip::File.open(ZIPPATH, true) do |zip|
+ zip.add(ENTRY_1, TXTPATH)
+ zip.add(ENTRY_2, TXTPATH_600)
+ zip.add(ENTRY_3, TXTPATH_755)
+ end
+
+ ::Zip::File.open(ZIPPATH) do |zip|
+ zip.extract(ENTRY_1, EXTPATH_1)
+ zip.extract(ENTRY_2, EXTPATH_2)
+ zip.extract(ENTRY_3, EXTPATH_3)
+ end
+
+ assert_equal(::File.stat(TXTPATH).mode, ::File.stat(EXTPATH_1).mode)
+ assert_equal(::File.stat(TXTPATH_600).mode, ::File.stat(EXTPATH_2).mode)
+ assert_equal(::File.stat(TXTPATH_755).mode, ::File.stat(EXTPATH_3).mode)
+ end
+
def test_restore_times_true
::Zip::File.open(ZIPPATH, true) do |zip|
zip.add(ENTRY_1, TXTPATH)
@@ -58,10 +107,6 @@ def test_restore_times_true
zip.extract(ENTRY_2, EXTPATH_2)
end
- # this test is disabled on Windows for now, waiting for #486.
- # please remove this after merging #486.
- skip if Zip::RUNNING_ON_WINDOWS
-
assert_time_equal(::File.mtime(TXTPATH), ::File.mtime(EXTPATH_1))
assert_time_equal(::File.mtime(TXTPATH), ::File.mtime(EXTPATH_2))
end
@@ -81,6 +126,21 @@ def test_restore_times_false
assert_time_equal(::Time.now, ::File.mtime(EXTPATH_2))
end
+ def test_restore_times_true_as_default
+ ::Zip::File.open(ZIPPATH, true) do |zip|
+ zip.add(ENTRY_1, TXTPATH)
+ zip.add_stored(ENTRY_2, TXTPATH)
+ end
+
+ ::Zip::File.open(ZIPPATH) do |zip|
+ zip.extract(ENTRY_1, EXTPATH_1)
+ zip.extract(ENTRY_2, EXTPATH_2)
+ end
+
+ assert_time_equal(::File.mtime(TXTPATH), ::File.mtime(EXTPATH_1))
+ assert_time_equal(::File.mtime(TXTPATH), ::File.mtime(EXTPATH_2))
+ end
+
def test_get_find_consistency
testzip = ::File.expand_path(::File.join('data', 'globTest.zip'), __dir__)
file_f = ::File.expand_path('f_test.txt', Dir.tmpdir)
|
Inconsistent behaviour of `Zip::File#get_entry` and `Zip::File#find_entry` exposes options out of sync.
This is a funny one that has been exposed by fixing #395...
The defaults for `restore_times`, `restore_permissions` and `restore_ownership` are separately specified in both `Zip::File` and `Zip::Entry` and they are out of sync.
Current defaults for each option:
| Option/Class | `Zip::File` | `Zip::Entry` |
|--------:|:------------:|:--------------:|
| `restore_times` | `false` | `true` |
| `restore_permissions` | `false` | `false` |
| `restore_ownership` | `false` | `false` |
This isn't generally an issue as whatever is set in `Zip::File` is percolated through to `Zip::Entry` - except not always :grimacing:
The following example shows how this can get confused:
```ruby
zip = ::Zip::File.open('test/data/globTest.zip')
e1 = zip.find_entry('globTest/food.txt')
e1.extract('f_test.txt')
e2 = zip.get_entry('globTest/food.txt')
e2.extract('g_test.txt')
zip.close
```
`f_test.txt` has a timestamp of 18 May 2012; `g_test.txt` has the current time and date for its timestamp.
This all occurs because the default for the above options are stored twice - and (kind of) need to be due to there not always being a `Zip::File` parent for every `Zip::Entry` - but also because while `Zip::File#get_entry` and `Zip::File#find_entry` are ostensibly doing the same thing, they are implemented very differently.
The quick fix for this is fairly easy, and I'll work up a PR for it later.
The main reason I am documenting this in a detailed issue is to ask: should these options be moved up to the top level, alongside `validate_entry_sizes`, _et al_? Or do we leave them where they are and risk them being out of sync again in the future? @jdleesmiller, @simonoff, I'd appreciate your thoughts, but I reckon moving them up is the right way to go - this would have the happy side-effect of simplifying various interfaces in `Zip::File`. Happy to also work this up as a PR if you agree.
View and/or preserve original date created, date modified?
For files inside the zip file, is there any way in rubyzip to access their original dates created and modified? If I extract them, Windows shows them as having been created and modified at the time of the extraction, which is quite different from the dates showing inside the zip file. I need to be able to list the dates they were originally created and last modified and, ideally, preserve those dates with the extracted files.
I have searched for this answer both here and on the Web, and the only references to solutions I can find use DotNetZip or Python. I would like to use Ruby.
Thanks.
|
Good find. PR approved.
> should these options be moved up to the top level
I feel like the same (large) application might want to treat zips differently in this regard for one feature vs another, so I am not sure about moving them to top level.
A small improvement might be to move the hash with the defaults to top level and then use it in both `Zip::File` and `Zip::Entry` to look up the defaults. That eliminates one way in which they can get out of sync, but it does still require `File` to remember to always pass them to its `Entry`s.
This maybe another instance of behaviour seen in #465, but also could be something that will be fixed by fixing #422. Either way, I'm looking into it (finally).
| 2021-05-31T17:12:35
|
ruby
|
Hard
|
rubyzip/rubyzip
| 237
|
rubyzip__rubyzip-237
|
[
"204"
] |
bbd7cc42167e70eafa4da114e4c8f431bb569789
|
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -141,6 +141,16 @@ fruit/orange
After this, entries in the zip archive will be saved in ordered state.
+### Default permissions of zip archives
+
+On Posix file systems the default file permissions applied to a new archive
+are (0666 - umask), which mimics the behavior of standard tools such as `touch`.
+
+On Windows the default file permissions are set to 0644 as suggested by the
+[Ruby File documentation](http://ruby-doc.org/core-2.2.2/File.html).
+
+When modifying a zip archive the file permissions of the archive are preserved.
+
### Reading a Zip file
```ruby
diff --git a/lib/zip/file.rb b/lib/zip/file.rb
--- a/lib/zip/file.rb
+++ b/lib/zip/file.rb
@@ -71,11 +71,12 @@ def initialize(file_name, create = nil, buffer = false, options = {})
case
when !buffer && ::File.size?(file_name)
@create = nil
- @exist_file_perms = ::File.stat(file_name).mode
+ @file_permissions = ::File.stat(file_name).mode
::File.open(name, 'rb') do |f|
read_from_stream(f)
end
when create
+ @file_permissions = create_file_permissions
@entry_set = EntrySet.new
else
raise Error, "File #{file_name} not found"
@@ -405,7 +406,7 @@ def on_success_replace
tmpfile.close
if yield tmp_filename
::File.rename(tmp_filename, name)
- ::File.chmod(@exist_file_perms, name) if defined?(@exist_file_perms)
+ ::File.chmod(@file_permissions, name) if defined?(@file_permissions)
end
ensure
tmpfile.unlink if tmpfile
@@ -416,6 +417,10 @@ def get_tempfile
temp_file.binmode
temp_file
end
+
+ def create_file_permissions
+ ::Zip::RUNNING_ON_WINDOWS ? 0644 : 0666 - ::File.umask
+ end
end
end
|
diff --git a/test/file_permissions_test.rb b/test/file_permissions_test.rb
new file mode 100644
--- /dev/null
+++ b/test/file_permissions_test.rb
@@ -0,0 +1,69 @@
+require 'test_helper'
+
+class FilePermissionsTest < MiniTest::Test
+
+ FILENAME = File.join(File.dirname(__FILE__), "umask.zip")
+
+ def teardown
+ ::File.unlink(FILENAME)
+ end
+
+ if ::Zip::RUNNING_ON_WINDOWS
+ # Windows tests
+
+ DEFAULT_PERMS = 0644
+
+ def test_windows_perms
+ create_file
+
+ assert_equal DEFAULT_PERMS, ::File.stat(FILENAME).mode
+ end
+
+ else
+ # Unix tests
+
+ DEFAULT_PERMS = 0100666
+
+ def test_current_umask
+ umask = DEFAULT_PERMS - ::File.umask
+ create_file
+
+ assert_equal umask, ::File.stat(FILENAME).mode
+ end
+
+ def test_umask_000
+ set_umask(0000) do
+ create_file
+ end
+
+ assert_equal DEFAULT_PERMS, ::File.stat(FILENAME).mode
+ end
+
+ def test_umask_066
+ umask = 0066
+ set_umask(umask) do
+ create_file
+ end
+
+ assert_equal((DEFAULT_PERMS - umask), ::File.stat(FILENAME).mode)
+ end
+
+ end
+
+ def create_file
+ ::Zip::File.open(FILENAME, ::Zip::File::CREATE) do |zip|
+ zip.comment = "test"
+ end
+ end
+
+ # If anything goes wrong, make sure the umask is restored.
+ def set_umask(umask, &block)
+ begin
+ saved_umask = ::File.umask(umask)
+ yield
+ ensure
+ ::File.umask(saved_umask)
+ end
+ end
+
+end
|
0600 ZIP file permissions with umask 0022
I do:
``` ruby
Zip::File.open(zip_file, Zip::File::CREATE) do |zip|
begin
zip.add(name, bin)
rescue Zip::ZipEntryExistsError
zip.replace(name, bin)
end
end
```
Is there a reason, I get `0600` file permissions on my `zip_file` instead of `0644`, I would expect? Diagnostics:
``` sh
$ umask
0022
$ ruby --version
ruby 2.2.0p0 (2014-12-25 revision 49005) [x86_64-darwin12.0]
```
I googled that and found out an advice to use `File.chmod` implicitly. Am I overlooking something? In particular:
1. Why rubyzip does not default to `umask`-based permissions? Is it documented?
2. Are there any handles to get `umask`-based behaviour, not a hardcoded `0600`? Didn't find them in docs.
|
@chillum Rubyzip uses Tempfile for create a file of newly created zip archive. So created file will have only 600 due the security reasons. But you can use `File.chmod` for extend permissions.
I'm not sure I follow the logic here.
The bug submitted is that rubyzip doesn't do what is generally expected of programs that create files; in this case take into account default permissions and umask.
I'm inclined to agree that this is a bug. The fact that the way rubyzip creates files produces a side-effect that stops this happening doesn't mean it's not a bug.
I'll look into it and see if we can do something better.
| 2015-06-24T17:34:46
|
ruby
|
Hard
|
yippee-fun/phlex
| 202
|
yippee-fun__phlex-202
|
[
"19"
] |
e96ea1aaa6adff4688a96cca380e444ee056500e
|
diff --git a/.rubocop.yml b/.rubocop.yml
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,3 +4,20 @@ inherit_from:
AllCops:
TargetRubyVersion: 2.7
+
+Style/PercentLiteralDelimiters:
+ Enabled: false
+
+Layout/CaseIndentation:
+ Enabled: false
+
+Style/StringConcatenation:
+ Enabled: false
+
+
+
+Security/Eval:
+ Enabled: false
+
+Style/MethodCallWithoutArgsParentheses:
+ Enabled: false
diff --git a/bench.rb b/bench.rb
--- a/bench.rb
+++ b/bench.rb
@@ -9,6 +9,13 @@
puts RUBY_DESCRIPTION
+a = Example::Page.new.call
+# Example::Page.compile
+# Example::LayoutComponent.compile
+b = Example::Page.new.call
+
+raise unless a == b
+
Benchmark.ips do |x|
x.report("Page") { Example::Page.new.call }
end
diff --git a/fixtures/compilation/vcall.rb b/fixtures/compilation/vcall.rb
deleted file mode 100644
--- a/fixtures/compilation/vcall.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Fixtures
- module Compilation
- module VCall
- class WithStandardElement < Phlex::View
- def template
- div
- end
- end
-
- class WithVoidElement < Phlex::View
- def template
- img
- end
- end
-
- class WithAnotherMethodCall < Phlex::View
- def template
- article
- some_other_method
- article
- end
- end
-
- class WithRedefinedTagMethod < Phlex::View
- def template
- title
- article
- end
-
- def title
- h1
- end
- end
- end
- end
-end
diff --git a/fixtures/content.rb b/fixtures/content.rb
new file mode 100644
--- /dev/null
+++ b/fixtures/content.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Fixtures
+ module Content
+ class BareString < Phlex::View
+ def template
+ h1 { "Hello" }
+ end
+ end
+
+ class Symbol < Phlex::View
+ def template
+ h1 { :hello }
+ end
+ end
+
+ class Float < Phlex::View
+ def template
+ h1 { 1.2 }
+ end
+ end
+
+ class Integer < Phlex::View
+ def template
+ h1 { 1 }
+ end
+ end
+
+ class Variable < Phlex::View
+ def template
+ greeting = "Hello"
+ h1 { greeting }
+ end
+ end
+
+ class InstanceVariable < Phlex::View
+ def template
+ h1 { @hello }
+ end
+ end
+
+ class NestedTags < Phlex::View
+ def template
+ article {
+ h1 { "Inside" }
+ }
+ end
+ end
+
+ class NonMutatingNestedContent < Phlex::View
+ def template
+ div { say_hello }
+ end
+
+ def say_hello
+ "Hello"
+ end
+ end
+ end
+end
diff --git a/fixtures/page.rb b/fixtures/page.rb
--- a/fixtures/page.rb
+++ b/fixtures/page.rb
@@ -6,32 +6,26 @@ def template
render LayoutComponent.new do
h1 { "Hi" }
- 5.times do
- div do
- 10.times do
- a(href: "something", unique: SecureRandom.uuid, data: { value: 1 }) { "Test" }
+ table id: "test", class: "a b c d e f g" do
+ tr do
+ td id: "test", class: "a b c d e f g" do
+ span { "Hi" }
end
- end
- end
- table do
- thead do
- 10.times do
- tr do
- th { "Hi" }
- end
+ td id: "test", class: "a b c d e f g" do
+ span { "Hi" }
+ end
+
+ td id: "test", class: "a b c d e f g" do
+ span { "Hi" }
+ end
+
+ td id: "test", class: "a b c d e f g" do
+ span { "Hi" }
end
- end
- tbody do
- 100.times do
- tr class: "a b c d e f g", id: "something" do
- 10.times do
- td class: "f g h i j k l" do
- span { "Test" }
- end
- end
- end
+ td id: "test", class: "a b c d e f g" do
+ span { "Hi" }
end
end
end
diff --git a/fixtures/standard_element.rb b/fixtures/standard_element.rb
new file mode 100644
--- /dev/null
+++ b/fixtures/standard_element.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module Fixtures
+ module StandardElement
+ class WithParens < Phlex::View
+ def template
+ h1()
+ end
+ end
+
+ class WithoutParens < Phlex::View
+ def template
+ h1
+ end
+ end
+
+ module WithAttributes
+ class WithParens < Phlex::View
+ def template
+ h1(class: "font-bold")
+ end
+ end
+
+ class WithoutParens < Phlex::View
+ def template
+ h1 class: "font-bold"
+ end
+ end
+ end
+
+ module WithBraceBlock
+ class WithParens < Phlex::View
+ def template
+ h1() { "Hi" }
+ end
+ end
+
+ class WithoutParens < Phlex::View
+ def template
+ h1 { "Hi" }
+ end
+ end
+
+ class WithAttributes < Phlex::View
+ def template
+ h1(class: "font-bold") { "Hi" }
+ end
+ end
+ end
+
+ module WithDoBlock
+ class WithParens < Phlex::View
+ def template
+ h1() do
+ "Hi"
+ end
+ end
+ end
+
+ class WithoutParens < Phlex::View
+ def template
+ h1 do
+ "Hi"
+ end
+ end
+ end
+
+ module WithAttributes
+ class WithParens < Phlex::View
+ def template
+ h1(class: "font-bold") do
+ "Hi"
+ end
+ end
+ end
+
+ class WithoutParens < Phlex::View
+ def template
+ h1 class: "font-bold" do
+ "Hi"
+ end
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/fixtures/void_element.rb b/fixtures/void_element.rb
new file mode 100644
--- /dev/null
+++ b/fixtures/void_element.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Fixtures
+ module VoidElement
+ class WithParens < Phlex::View
+ def template
+ img()
+ end
+ end
+
+ class WithoutParens < Phlex::View
+ def template
+ img
+ end
+ end
+
+ module WithAttributes
+ class WithParens < Phlex::View
+ def template
+ img(class: "a b c")
+ end
+ end
+
+ class WithoutParens < Phlex::View
+ def template
+ img class: "a b c"
+ end
+ end
+ end
+ end
+end
diff --git a/lib/phlex/compiler.rb b/lib/phlex/compiler.rb
--- a/lib/phlex/compiler.rb
+++ b/lib/phlex/compiler.rb
@@ -6,6 +6,8 @@ def initialize(view)
@view = view
end
+ attr_writer :scope
+
def inspect
"#{self.class.name} for #{@view.name} view class"
end
@@ -14,6 +16,10 @@ def call
Visitors::File.new(self).visit(tree)
end
+ def tag_method?(method_name)
+ (HTML::STANDARD_ELEMENTS.key?(method_name) || HTML::VOID_ELEMENTS.key?(method_name)) && !redefined?(method_name)
+ end
+
def redefined?(method_name)
prototype = @view.allocate
@@ -21,8 +27,22 @@ def redefined?(method_name)
Phlex::View.instance_method(method_name).bind(prototype)
end
- def redefine(method)
- @view.class_eval(method)
+ def redefine(method, line:)
+ patch = scope + method + unscope
+ eval(patch, Kernel.binding, file, (line - 1))
+ end
+
+ def scope
+ @scope.map do |scope|
+ case scope
+ in SyntaxTree::ModuleDeclaration then "module #{scope.constant.constant.value};"
+ in SyntaxTree::ClassDeclaration then "class #{scope.constant.constant.value};"
+ end
+ end.join + "\n"
+ end
+
+ def unscope
+ "; end" * @scope.size
end
def line
diff --git a/lib/phlex/compiler/elements.rb b/lib/phlex/compiler/elements.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/elements.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Elements
+ module VCall
+ def format(formatter)
+ Phlex::Compiler::Generators::Element.new(
+ Phlex::Compiler::Nodes::VCall.new(self),
+ formatter: formatter
+ ).call
+ end
+ end
+
+ module FCall
+ def format(formatter)
+ Phlex::Compiler::Generators::Element.new(
+ Phlex::Compiler::Nodes::FCall.new(self),
+ formatter: formatter
+ ).call
+ end
+ end
+
+ module Command
+ def format(formatter)
+ Phlex::Compiler::Generators::Element.new(
+ Phlex::Compiler::Nodes::Command.new(self),
+ formatter: formatter
+ ).call
+ end
+ end
+
+ module MutatingMethodAddBlock
+ def format(formatter)
+ Phlex::Compiler::Generators::Element.new(
+ Phlex::Compiler::Nodes::MethodAddBlock.new(self),
+ formatter: formatter,
+ mutating: true
+ ).call
+ end
+ end
+
+ module MethodAddBlock
+ def format(formatter)
+ Phlex::Compiler::Generators::Element.new(
+ Phlex::Compiler::Nodes::MethodAddBlock.new(self),
+ formatter: formatter
+ ).call
+ end
+ end
+end
diff --git a/lib/phlex/compiler/generators/content.rb b/lib/phlex/compiler/generators/content.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/generators/content.rb
@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Phlex
+ class Compiler
+ module Generators
+ class Content
+ def initialize(formatter, content:, mutating: false)
+ @formatter = formatter
+ @content = content
+ @mutating = mutating
+ end
+
+ def call
+ return if nil_value?
+ return bare_string_value if bare_string_value?
+ return symbol_value if symbol_value?
+ return numeric_value if numeric_value?
+ return variable_value if variable_value?
+
+ unknown_value
+ end
+
+ private
+
+ def nil_value?
+ case @content
+ in SyntaxTree::VarRef[value: SyntaxTree::Kw[value: "nil"]]
+ true
+ else
+ false
+ end
+ end
+
+ def bare_string_value?
+ case @content
+ in SyntaxTree::StringLiteral[parts: [SyntaxTree::TStringContent]]
+ true
+ else
+ false
+ end
+ end
+
+ def symbol_value?
+ @content.is_a?(SyntaxTree::SymbolLiteral)
+ end
+
+ def numeric_value?
+ @content.is_a?(SyntaxTree::Int) || @content.is_a?(SyntaxTree::FloatLiteral)
+ end
+
+ def variable_value?
+ @content.is_a?(SyntaxTree::VarRef)
+ end
+
+ def bare_string_value
+ @formatter.append do |f|
+ f.text CGI.escape_html(
+ @content.parts.first.value
+ )
+ end
+ end
+
+ def symbol_value
+ @formatter.append do |f|
+ f.text CGI.escape_html(
+ @content.value.value
+ )
+ end
+ end
+
+ def numeric_value
+ @formatter.append do |f|
+ f.text CGI.escape_html(
+ @content.value
+ )
+ end
+ end
+
+ def variable_value
+ @formatter.chain_append do |f|
+ f.text "CGI.escape_html("
+ @content.format(f)
+ f.text ")"
+ end
+ end
+
+ def unknown_value
+ @formatter.breakable(force: true)
+ if @mutating
+ @content.format(@formatter)
+ else
+ @formatter.text "yield_content {"
+ @formatter.breakable(force: true)
+ @content.format(@formatter)
+ @formatter.breakable(force: true)
+ @formatter.text "}"
+ end
+ @formatter.breakable(force: true)
+ end
+ end
+ end
+ end
+end
diff --git a/lib/phlex/compiler/generators/element.rb b/lib/phlex/compiler/generators/element.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/generators/element.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Phlex
+ class Compiler
+ module Generators
+ class Element
+ def initialize(node, formatter:, mutating: false)
+ @node = node
+ @formatter = formatter
+ @mutating = mutating
+ end
+
+ def call
+ @formatter.append do |f|
+ f.text "<"
+ f.text tag
+ end
+
+ if @node.arguments&.parts&.any?
+ @formatter.chain_append do |f|
+ f.text "fetch_attrs("
+ @node.arguments.format(@formatter)
+ f.text ")"
+ end
+ end
+
+ @formatter.append do |f|
+ f.text ">"
+ end
+
+ return if void?
+
+ case @node.content
+ in SyntaxTree::Statements[body: [c]]
+ Content.new(@formatter, content: c, mutating: @mutating).call
+ in nil
+ nil
+ else
+ @node.content.format(@formatter)
+ end
+
+ @formatter.append do |f|
+ f.text "</"
+ f.text tag
+ f.text ">"
+ end
+ end
+
+ private
+
+ def tag
+ HTML::STANDARD_ELEMENTS[@node.name] || HTML::VOID_ELEMENTS[@node.name]
+ end
+
+ def void?
+ HTML::VOID_ELEMENTS.key?(@node.name)
+ end
+ end
+ end
+ end
+end
diff --git a/lib/phlex/compiler/generators/standard_element.rb b/lib/phlex/compiler/generators/standard_element.rb
deleted file mode 100644
--- a/lib/phlex/compiler/generators/standard_element.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
- class Compiler
- module Generators
- class StandardElement
- def initialize(formatter, method_name:, arguments: nil)
- @formatter = formatter
- @method_name = method_name
- end
-
- def call
- @formatter.append do |f|
- f.text "<"
- f.text tag
- f.text ">"
-
- f.text "</"
- f.text tag
- f.text ">"
- end
- end
-
- def tag
- HTML::STANDARD_ELEMENTS[@method_name]
- end
- end
- end
- end
-end
diff --git a/lib/phlex/compiler/generators/void_element.rb b/lib/phlex/compiler/generators/void_element.rb
deleted file mode 100644
--- a/lib/phlex/compiler/generators/void_element.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
- class Compiler
- module Generators
- class VoidElement
- def initialize(formatter, method_name:, arguments: nil)
- @formatter = formatter
- @method_name = method_name
- @arguments = arguments
- end
-
- def call
- @formatter.append do |f|
- f.text "<"
- f.text tag
- f.text " />"
- end
- end
-
- private
-
- def tag
- HTML::VOID_ELEMENTS[@method_name]
- end
- end
- end
- end
-end
diff --git a/lib/phlex/compiler/nodes/base.rb b/lib/phlex/compiler/nodes/base.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/nodes/base.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Nodes
+ class Base
+ def initialize(node)
+ @node = node
+ end
+
+ attr_accessor :node
+
+ def arguments
+ nil
+ end
+
+ def content
+ nil
+ end
+ end
+end
diff --git a/lib/phlex/compiler/nodes/call.rb b/lib/phlex/compiler/nodes/call.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/nodes/call.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Nodes
+ class Call < Base
+ def name
+ nil
+ end
+ end
+end
diff --git a/lib/phlex/compiler/nodes/command.rb b/lib/phlex/compiler/nodes/command.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/nodes/command.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Nodes
+ class Command < Base
+ def name
+ @node.message.value.to_sym
+ end
+
+ def arguments
+ @node.arguments
+ end
+ end
+end
diff --git a/lib/phlex/compiler/nodes/fcall.rb b/lib/phlex/compiler/nodes/fcall.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/nodes/fcall.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Nodes
+ class FCall < Base
+ def name
+ @node.value.value.to_sym
+ end
+
+ def arguments
+ case @node.arguments
+ in SyntaxTree::Args
+ @node.arguments
+ in SyntaxTree::ArgParen
+ @node.arguments.arguments
+ end
+ end
+ end
+end
diff --git a/lib/phlex/compiler/nodes/method_add_block.rb b/lib/phlex/compiler/nodes/method_add_block.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/nodes/method_add_block.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Nodes
+ class MethodAddBlock < Base
+ def name
+ method_call.name
+ end
+
+ def arguments
+ method_call.arguments
+ end
+
+ def method_call
+ @method_call ||= case @node.call
+ in SyntaxTree::FCall
+ Phlex::Compiler::Nodes::FCall.new(@node.call)
+ in SyntaxTree::Command
+ Phlex::Compiler::Nodes::Command.new(@node.call)
+ in SyntaxTree::Call
+ Phlex::Compiler::Nodes::Call.new(@node.call)
+ end
+ end
+
+ def content
+ case @node.block
+ in SyntaxTree::BraceBlock
+ @node.block.statements
+ in SyntaxTree::DoBlock
+ @node.block.bodystmt.statements
+ end
+ end
+ end
+end
diff --git a/lib/phlex/compiler/nodes/vcall.rb b/lib/phlex/compiler/nodes/vcall.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/nodes/vcall.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Nodes
+ class VCall < Base
+ def name
+ @node.value.value.to_sym
+ end
+ end
+end
diff --git a/lib/phlex/compiler/optimizer.rb b/lib/phlex/compiler/optimizer.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/optimizer.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+class Phlex::Compiler
+ class Optimizer
+ def initialize(node, compiler:)
+ @node = node
+ @compiler = compiler
+ end
+
+ def call
+ return optimize_element if optimize_element?
+
+ false
+ end
+
+ private
+
+ def optimize_element
+ case @node
+ in Nodes::VCall
+ @node.node.extend(Phlex::Compiler::Elements::VCall)
+ in Nodes::FCall
+ @node.node.extend(Phlex::Compiler::Elements::FCall)
+ in Nodes::Command
+ @node.node.extend(Phlex::Compiler::Elements::Command)
+ in Nodes::MethodAddBlock
+ optimize_add_method_block_element
+ end
+
+ true
+ end
+
+ def optimize_add_method_block_element
+ visitor = Phlex::Compiler::Visitors::Statements.new(@compiler)
+ visitor.visit(@node.content)
+
+ if visitor.mutating?
+ @node.node.extend(Phlex::Compiler::Elements::MutatingMethodAddBlock)
+ else
+ @node.node.extend(Phlex::Compiler::Elements::MethodAddBlock)
+ end
+
+ Phlex::Compiler::Visitors::ViewMethod.new(@compiler).visit(@node.content)
+ end
+
+ def optimize_element?
+ element? && !redefined?
+ end
+
+ def element?
+ standard_element? || void_element?
+ end
+
+ def redefined?
+ @compiler.redefined?(@node.name)
+ end
+
+ def standard_element?
+ Phlex::HTML::STANDARD_ELEMENTS.key?(@node.name)
+ end
+
+ def void_element?
+ Phlex::HTML::VOID_ELEMENTS.key?(@node.name)
+ end
+ end
+end
diff --git a/lib/phlex/compiler/optimizers/base_optimizer.rb b/lib/phlex/compiler/optimizers/base_optimizer.rb
deleted file mode 100644
--- a/lib/phlex/compiler/optimizers/base_optimizer.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
- class Compiler
- module Optimizers
- class BaseOptimizer
- def initialize(node, compiler:)
- @node = node
- @compiler = compiler
- end
-
- def call
- if standard_element?
- @node.extend(self.class::StandardElement)
- elsif void_element?
- @node.extend(self.class::VoidElement)
- else
- false
- end
- end
-
- private
-
- def standard_element?
- HTML::STANDARD_ELEMENTS[name] && !@compiler.redefined?(name)
- end
-
- def void_element?
- HTML::VOID_ELEMENTS[name] && !@compiler.redefined?(name)
- end
- end
- end
- end
-end
diff --git a/lib/phlex/compiler/optimizers/vcall.rb b/lib/phlex/compiler/optimizers/vcall.rb
deleted file mode 100644
--- a/lib/phlex/compiler/optimizers/vcall.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
- class Compiler
- module Optimizers
- class VCall < BaseOptimizer
- module StandardElement
- def format(formatter)
- Generators::StandardElement.new(formatter,
- method_name: value.value.to_sym).call
- end
- end
-
- module VoidElement
- def format(formatter)
- Generators::VoidElement.new(formatter,
- method_name: value.value.to_sym).call
- end
- end
-
- private
-
- def name
- @node.value.value.to_sym
- end
- end
- end
- end
-end
diff --git a/lib/phlex/compiler/visitors/base.rb b/lib/phlex/compiler/visitors/base.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/visitors/base.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Visitors
+ class Base < SyntaxTree::Visitor
+ def initialize(compiler = nil)
+ @compiler = compiler
+ end
+
+ private
+
+ def format(node)
+ Phlex::Compiler::Formatter.format("", node)
+ end
+ end
+end
diff --git a/lib/phlex/compiler/visitors/base_visitor.rb b/lib/phlex/compiler/visitors/base_visitor.rb
deleted file mode 100644
--- a/lib/phlex/compiler/visitors/base_visitor.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
- class Compiler
- module Visitors
- class BaseVisitor < SyntaxTree::Visitor
- def initialize(compiler = nil)
- @compiler = compiler
- end
-
- private
-
- def format(node)
- Formatter.format("", node)
- end
- end
- end
- end
-end
diff --git a/lib/phlex/compiler/visitors/component.rb b/lib/phlex/compiler/visitors/component.rb
deleted file mode 100644
--- a/lib/phlex/compiler/visitors/component.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
- class Compiler
- module Visitors
- class Component < BaseVisitor
- visit_method def visit_def(node)
- visitor = Visitors::ComponentMethod.new(@compiler)
- visitor.visit_all(node.child_nodes)
-
- if visitor.optimized_something?
- @compiler.redefine(
- format(node)
- )
- end
- end
-
- visit_method def visit_class(node)
- nil
- end
-
- visit_method def visit_module(node)
- nil
- end
- end
- end
- end
-end
diff --git a/lib/phlex/compiler/visitors/component_method.rb b/lib/phlex/compiler/visitors/component_method.rb
deleted file mode 100644
--- a/lib/phlex/compiler/visitors/component_method.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
- class Compiler
- module Visitors
- class ComponentMethod < BaseVisitor
- def optimized_something?
- !!@optimized_something
- end
-
- visit_method def visit_vcall(node)
- @optimized_something = Optimizers::VCall.new(node,
- compiler: @compiler).call
-
- super
- end
-
- visit_method def visit_class(node)
- nil
- end
-
- visit_method def visit_module(node)
- nil
- end
- end
- end
- end
-end
diff --git a/lib/phlex/compiler/visitors/file.rb b/lib/phlex/compiler/visitors/file.rb
--- a/lib/phlex/compiler/visitors/file.rb
+++ b/lib/phlex/compiler/visitors/file.rb
@@ -1,17 +1,29 @@
# frozen_string_literal: true
-module Phlex
- class Compiler
- module Visitors
- class File < BaseVisitor
- visit_method def visit_class(node)
- if node.location.start_line == @compiler.line
- Visitors::Component.new(@compiler).visit_all(node.child_nodes)
- else
- super
- end
- end
+module Phlex::Compiler::Visitors
+ class File < Base
+ def initialize(compiler)
+ @scope = []
+ super
+ end
+
+ visit_method def visit_class(node)
+ @scope.push(node)
+
+ if node.location.start_line == @compiler.line
+ @compiler.scope = @scope
+ View.new(@compiler).visit_all(node.child_nodes)
+ else
+ super
end
+
+ @scope.pop
+ end
+
+ visit_method def visit_module(node)
+ @scope.push(node)
+ super
+ @scope.pop
end
end
end
diff --git a/lib/phlex/compiler/visitors/stable_scope.rb b/lib/phlex/compiler/visitors/stable_scope.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/visitors/stable_scope.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# A mixin for visitors that stops them from visiting other scopes.
+
+module Phlex::Compiler::Visitors::StableScope
+ def visit_class(node)
+ nil
+ end
+
+ def visit_module(node)
+ nil
+ end
+
+ def visit_brace_block(node)
+ nil
+ end
+
+ def visit_do_block(node)
+ nil
+ end
+
+ def visit_method_add_block(node)
+ node = Phlex::Compiler::Nodes::MethodAddBlock.new(node)
+ if node.method_call.name == :render
+ visit(node.content)
+ end
+ end
+end
diff --git a/lib/phlex/compiler/visitors/statements.rb b/lib/phlex/compiler/visitors/statements.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/visitors/statements.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Visitors
+ class Statements < Base
+ MUTATING_METHODS = [:raw, :whitespace, :comment, :text, :doctype]
+
+ include StableScope
+
+ def mutating?
+ !!@mutating
+ end
+
+ visit_method def visit_vcall(node)
+ check Phlex::Compiler::Nodes::VCall.new(node)
+ end
+
+ visit_method def visit_fcall(node)
+ check Phlex::Compiler::Nodes::FCall.new(node)
+ end
+
+ visit_method def visit_command(node)
+ check Phlex::Compiler::Nodes::Command.new(node)
+ end
+
+ visit_method def visit_method_add_block(node)
+ check Phlex::Compiler::Nodes::MethodAddBlock.new(node)
+ end
+
+ private
+
+ def check(node)
+ @mutating = true if @compiler.tag_method?(node.name)
+ @mutating = true if MUTATING_METHODS.include?(node.name) && !@compiler.redefined?(node.name)
+ end
+ end
+end
diff --git a/lib/phlex/compiler/visitors/view.rb b/lib/phlex/compiler/visitors/view.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/visitors/view.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Visitors
+ class View < Base
+ include StableScope
+
+ visit_method def visit_def(node)
+ visitor = ViewMethod.new(@compiler)
+ visitor.visit_all(node.child_nodes)
+
+ if visitor.optimized_something?
+ @compiler.redefine(
+ format(node),
+ line: node.location.start_line
+ )
+ end
+ end
+ end
+end
diff --git a/lib/phlex/compiler/visitors/view_method.rb b/lib/phlex/compiler/visitors/view_method.rb
new file mode 100644
--- /dev/null
+++ b/lib/phlex/compiler/visitors/view_method.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Phlex::Compiler::Visitors
+ class ViewMethod < Base
+ include StableScope
+
+ def optimized_something?
+ !!@optimized_something
+ end
+
+ visit_method def visit_method_add_block(node)
+ return super if node.call.is_a?(SyntaxTree::Call)
+
+ optimizer = Phlex::Compiler::Optimizer.new(
+ Phlex::Compiler::Nodes::MethodAddBlock.new(node),
+ compiler: @compiler
+ )
+
+ if optimizer.call
+ @optimized_something = true
+ end
+
+ super
+ end
+
+ visit_method def visit_vcall(node)
+ optimizer = Phlex::Compiler::Optimizer.new(
+ Phlex::Compiler::Nodes::VCall.new(node),
+ compiler: @compiler
+ )
+
+ if optimizer.call
+ @optimized_something = true
+ end
+ end
+
+ visit_method def visit_fcall(node)
+ optimizer = Phlex::Compiler::Optimizer.new(
+ Phlex::Compiler::Nodes::FCall.new(node),
+ compiler: @compiler
+ )
+
+ if optimizer.call
+ @optimized_something = true
+ end
+ end
+
+ visit_method def visit_command(node)
+ optimizer = Phlex::Compiler::Optimizer.new(
+ Phlex::Compiler::Nodes::Command.new(node),
+ compiler: @compiler
+ )
+
+ if optimizer.call
+ @optimized_something = true
+ end
+ end
+ end
+end
diff --git a/lib/phlex/view.rb b/lib/phlex/view.rb
--- a/lib/phlex/view.rb
+++ b/lib/phlex/view.rb
@@ -73,13 +73,17 @@ def yield_content(&block)
end
def text(content)
- @_target << case content
+ @_target << _output(content)
+
+ nil
+ end
+
+ def _output(content)
+ case content
when String then CGI.escape_html(content)
when Symbol then CGI.escape_html(content.name)
else CGI.escape_html(content.to_s)
end
-
- nil
end
def whitespace
@@ -178,6 +182,10 @@ def helpers
@_view_context
end
+ def fetch_attrs(**kwargs)
+ Phlex::ATTRIBUTE_CACHE[kwargs.hash] || _attributes(kwargs)
+ end
+
def _attributes(attributes, buffer: +"")
if attributes[:href]&.start_with?(/\s*javascript/)
attributes[:href] = attributes[:href].sub(/^\s*(javascript:)+/, "")
|
diff --git a/fixtures/compiler_test_helpers.rb b/fixtures/compiler_test_helpers.rb
new file mode 100644
--- /dev/null
+++ b/fixtures/compiler_test_helpers.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module CompilerTestHelpers
+ # @return Array
+ def compile(view)
+ @compiler = Phlex::Compiler.new(view)
+ output = []
+
+ mock(@compiler) do |m|
+ m.before(:redefine) { output << _1 }
+ end
+
+ @compiler.call
+
+ output.map! do |method|
+ Phlex::Compiler::Formatter.format("", SyntaxTree.parse(method))
+ end
+ end
+end
diff --git a/fixtures/test_helper.rb b/fixtures/test_helper.rb
--- a/fixtures/test_helper.rb
+++ b/fixtures/test_helper.rb
@@ -1,7 +1,17 @@
# frozen_string_literal: true
require "simplecov"
-SimpleCov.start
+
+SimpleCov.start do
+ enable_coverage :branch
+ primary_coverage :branch
+
+ add_filter "/fixtures/"
+
+ add_group "Compiler", %{/lib/phlex/compiler}
+ add_group "Experimental Stdlib", %r{/lib/phlex/(table|collection)\.rb}
+ add_group "Rails", %r{/lib/phlex/rails}
+end
require "phlex"
require "bundler"
@@ -15,5 +25,6 @@
end
require "view_helper"
+require "compiler_test_helpers"
Zeitwerk::Loader.eager_load_all
diff --git a/test/phlex/compilation/content.rb b/test/phlex/compilation/content.rb
new file mode 100644
--- /dev/null
+++ b/test/phlex/compilation/content.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "content"
+
+describe Phlex::Compiler do
+ include CompilerTestHelpers
+
+ it "supports string content" do
+ output = compile(Fixtures::Content::BareString)
+
+ expect(output.first).to be == <<~RUBY
+ def template
+ @_target << "<h1>Hello</h1>"
+ end
+ RUBY
+ end
+
+ it "supports symbol content" do
+ output = compile(Fixtures::Content::Symbol)
+
+ expect(output.first).to be == <<~RUBY
+ def template
+ @_target << "<h1>hello</h1>"
+ end
+ RUBY
+ end
+
+ it "supports float content" do
+ output = compile(Fixtures::Content::Float)
+
+ expect(output.first).to be == <<~RUBY
+ def template
+ @_target << "<h1>1.2</h1>"
+ end
+ RUBY
+ end
+
+ it "supports integer content" do
+ output = compile(Fixtures::Content::Integer)
+
+ expect(output.first).to be == <<~RUBY
+ def template
+ @_target << "<h1>1</h1>"
+ end
+ RUBY
+ end
+
+ it "supports nested tags" do
+ output = compile(Fixtures::Content::NestedTags)
+
+ expect(output.first).to be == <<~RUBY
+ def template
+ @_target << "<article><h1>Inside</h1></article>"
+ end
+ RUBY
+ end
+
+ it "supports variable content" do
+ output = compile(Fixtures::Content::Variable)
+
+ expect(output.first).to be == <<~RUBY
+ def template
+ greeting = "Hello"
+ @_target << "<h1>" << CGI.escape_html(greeting) << "</h1>"
+ end
+ RUBY
+ end
+
+ it "supports instance variable content" do
+ output = compile(Fixtures::Content::InstanceVariable)
+
+ expect(output.first).to be == <<~RUBY
+ def template
+ @_target << "<h1>" << CGI.escape_html(@hello) << "</h1>"
+ end
+ RUBY
+ end
+
+ it "supports non-mutating nested content" do
+ output = compile(Fixtures::Content::NonMutatingNestedContent)
+
+ expect(output.first).to be == <<~RUBY
+ def template
+ @_target << "<div>"
+ yield_content { say_hello }
+ @_target << "</div>"
+ end
+ RUBY
+ end
+end
diff --git a/test/phlex/compilation/standard_element.rb b/test/phlex/compilation/standard_element.rb
new file mode 100644
--- /dev/null
+++ b/test/phlex/compilation/standard_element.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "standard_element"
+
+describe Phlex::Compiler do
+ include CompilerTestHelpers
+
+ it "supports standard elements" do
+ with_parens = compile(Fixtures::StandardElement::WithParens)
+ without_parens = compile(Fixtures::StandardElement::WithoutParens)
+
+ expected = <<~RUBY
+ def template
+ @_target << "<h1></h1>"
+ end
+ RUBY
+
+ expect(with_parens.first).to be == expected
+ expect(without_parens.first).to be == expected
+ end
+
+ it "supports standard elements with attributes" do
+ with_parens = compile(Fixtures::StandardElement::WithAttributes::WithParens)
+ without_parens = compile(Fixtures::StandardElement::WithAttributes::WithoutParens)
+
+ expected = <<~RUBY
+ def template
+ @_target << "<h1" << fetch_attrs(class: "font-bold") << "></h1>"
+ end
+ RUBY
+
+ expect(with_parens.first).to be == expected
+ expect(without_parens.first).to be == expected
+ end
+
+ it "supports standard elements with brace block" do
+ with_parens = compile(Fixtures::StandardElement::WithBraceBlock::WithParens)
+ without_parens = compile(Fixtures::StandardElement::WithBraceBlock::WithoutParens)
+
+ expected = <<~RUBY
+ def template
+ @_target << "<h1>Hi</h1>"
+ end
+ RUBY
+
+ expect(with_parens.first).to be == expected
+ expect(without_parens.first).to be == expected
+ end
+
+ it "supports standard elements with brace block and attributes" do
+ output = compile(Fixtures::StandardElement::WithBraceBlock::WithAttributes)
+
+ expect(output.first).to be == <<~RUBY
+ def template
+ @_target << "<h1" << fetch_attrs(class: "font-bold") << ">Hi</h1>"
+ end
+ RUBY
+ end
+
+ it "supports standard elements with do block" do
+ with_parens = compile(Fixtures::StandardElement::WithDoBlock::WithParens)
+ without_parens = compile(Fixtures::StandardElement::WithDoBlock::WithoutParens)
+
+ expected = <<~RUBY
+ def template
+ @_target << "<h1>Hi</h1>"
+ end
+ RUBY
+
+ expect(with_parens.first).to be == expected
+ expect(without_parens.first).to be == expected
+ end
+
+ it "supports standard elements with do block with attributes" do
+ with_parens = compile(Fixtures::StandardElement::WithDoBlock::WithAttributes::WithParens)
+ without_parens = compile(Fixtures::StandardElement::WithDoBlock::WithAttributes::WithoutParens)
+
+ expected = <<~RUBY
+ def template
+ @_target << "<h1" << fetch_attrs(class: "font-bold") << ">Hi</h1>"
+ end
+ RUBY
+
+ expect(with_parens.first).to be == expected
+ expect(without_parens.first).to be == expected
+ end
+end
diff --git a/test/phlex/compilation/vcall.rb b/test/phlex/compilation/vcall.rb
deleted file mode 100644
--- a/test/phlex/compilation/vcall.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# frozen_string_literal: true
-
-require "test_helper"
-require "compilation/vcall"
-
-describe Phlex::Compiler do
- with "a standard element" do
- let(:compiler) {
- Phlex::Compiler.new(
- Fixtures::Compilation::VCall::WithStandardElement
- )
- }
-
- it "compiles the method" do
- expect(compiler).to receive(:redefine).with <<~RUBY.chomp
- def template
- @_target << "<div></div>"
- end
- RUBY
-
- compiler.call
- end
- end
-
- with "a void element" do
- let(:compiler) {
- Phlex::Compiler.new(
- Fixtures::Compilation::VCall::WithVoidElement
- )
- }
-
- it "compiles the method" do
- expect(compiler).to receive(:redefine).with <<~RUBY.chomp
- def template
- @_target << "<img />"
- end
- RUBY
-
- compiler.call
- end
- end
-
- with "another method call" do
- let(:compiler) {
- Phlex::Compiler.new(
- Fixtures::Compilation::VCall::WithAnotherMethodCall
- )
- }
-
- it "retains the original method call" do
- expect(compiler).to receive(:redefine).with <<~RUBY.chomp
- def template
- @_target << "<article></article>"
- some_other_method
- @_target << "<article></article>"
- end
- RUBY
-
- compiler.call
- end
- end
-
- with "a redefined tag method" do
- let(:compiler) { Phlex::Compiler.new(Fixtures::Compilation::VCall::WithRedefinedTagMethod) }
- let(:optimized_methods) { [] }
-
- it "doesn't optimize overridden HTML tag methods" do
- mock(compiler) do |mock|
- mock.before(:redefine) { optimized_methods << _1 }
- end
-
- compiler.call
-
- expect(optimized_methods).to be == [
- <<~RUBY.chomp,
- def template
- title
- @_target << "<article></article>"
- end
- RUBY
-
- <<~RUBY.chomp
- def title
- @_target << "<h1></h1>"
- end
- RUBY
- ]
- end
- end
-end
diff --git a/test/phlex/compilation/void_element.rb b/test/phlex/compilation/void_element.rb
new file mode 100644
--- /dev/null
+++ b/test/phlex/compilation/void_element.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "void_element"
+
+describe Phlex::Compiler do
+ include CompilerTestHelpers
+
+ it "supports void elements" do
+ with_parens = compile(Fixtures::VoidElement::WithParens)
+ without_parens = compile(Fixtures::VoidElement::WithoutParens)
+
+ expected = <<~RUBY
+ def template
+ @_target << "<img>"
+ end
+ RUBY
+
+ expect(with_parens.first).to be == expected
+ expect(without_parens.first).to be == expected
+ end
+
+ it "supports void elements with attributes" do
+ with_parens = compile(Fixtures::VoidElement::WithAttributes::WithParens)
+ without_parens = compile(Fixtures::VoidElement::WithAttributes::WithoutParens)
+
+ expected = <<~RUBY
+ def template
+ @_target << "<img" << fetch_attrs(class: "a b c") << ">"
+ end
+ RUBY
+
+ expect(with_parens.first).to be == expected
+ expect(without_parens.first).to be == expected
+ end
+end
|
Compiled components
| 2022-09-28T12:12:44
|
ruby
|
Hard
|
|
yippee-fun/phlex
| 703
|
yippee-fun__phlex-703
|
[
"632"
] |
756b006bfd70c8a16a430b94db63a6404d8653f5
|
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,16 +11,11 @@ jobs:
matrix:
os: ["ubuntu-latest", "macos-latest"]
ruby-version:
- - "2.7"
- - "3.0"
- - "3.1"
- "3.2"
- "3.3"
- "head"
- - "truffleruby-22.2"
- - "truffleruby-22.3"
- - "jruby-9.4.6.0"
- - "jruby-head"
+ - "truffleruby-23.1"
+ - "truffleruby-24.0"
runs-on: ${{ matrix.os }}
steps:
diff --git a/.rubocop.yml b/.rubocop.yml
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,7 +3,7 @@ inherit_from:
- "https://www.goodcop.style/tabs.yml"
AllCops:
- TargetRubyVersion: 2.7
+ TargetRubyVersion: 3.2
Style/ExplicitBlockArgument:
Enabled: false
@@ -25,3 +25,9 @@ Naming/MethodName:
Style/ReturnNilInPredicateMethodDefinition:
Enabled: false
+
+Naming/BlockForwarding:
+ Enabled: false
+
+Style/ArgumentsForwarding:
+ Enabled: false
diff --git a/fixtures/components/say_hi.rb b/fixtures/components/say_hi.rb
--- a/fixtures/components/say_hi.rb
+++ b/fixtures/components/say_hi.rb
@@ -6,7 +6,7 @@ def initialize(name, times: 1)
@times = times
end
- def template
+ def view_template
article {
@times.times { h1 { "Hi #{@name}" } }
yield
diff --git a/lib/phlex.rb b/lib/phlex.rb
--- a/lib/phlex.rb
+++ b/lib/phlex.rb
@@ -42,15 +42,7 @@ class NameError < ::NameError
# @api private
ATTRIBUTE_CACHE = {}
- SUPPORTS_FIBER_STORAGE = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.2")
-end
-
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0")
- class Symbol
- def name
- to_s
- end
- end
+ SUPPORTS_FIBER_STORAGE = RUBY_ENGINE == "ruby"
end
def 💪
diff --git a/lib/phlex/csv.rb b/lib/phlex/csv.rb
--- a/lib/phlex/csv.rb
+++ b/lib/phlex/csv.rb
@@ -3,8 +3,8 @@
class Phlex::CSV
include Phlex::Callable
- FORMULA_PREFIXES = ["=", "+", "-", "@", "\t", "\r"].to_h { |prefix| [prefix, true] }.freeze
- SPACE_CHARACTERS = [" ", "\t", "\r"].to_h { |char| [char, true] }.freeze
+ FORMULA_PREFIXES = Set["=", "+", "-", "@", "\t", "\r"].freeze
+ SPACE_CHARACTERS = Set[" ", "\t", "\r"].freeze
def initialize(collection)
@collection = collection
@@ -92,10 +92,6 @@ def yielder(record)
yield(record)
end
- def template(...)
- nil
- end
-
# Override and set to `false` to disable rendering headers.
def render_headers?
true
@@ -120,11 +116,11 @@ def escape(value)
first_char = value[0]
last_char = value[-1]
- if escape_csv_injection? && FORMULA_PREFIXES[first_char]
+ if escape_csv_injection? && FORMULA_PREFIXES.include?(first_char)
# Prefix a single quote to prevent Excel, Google Docs, etc. from interpreting the value as a formula.
# See https://owasp.org/www-community/attacks/CSV_Injection
%("'#{value.gsub('"', '""')}")
- elsif (!trim_whitespace? && (SPACE_CHARACTERS[first_char] || SPACE_CHARACTERS[last_char])) || value.include?('"') || value.include?(",") || value.include?("\n")
+ elsif (!trim_whitespace? && (SPACE_CHARACTERS.include?(first_char) || SPACE_CHARACTERS.include?(last_char))) || value.include?('"') || value.include?(",") || value.include?("\n")
%("#{value.gsub('"', '""')}")
else
value
diff --git a/lib/phlex/elements.rb b/lib/phlex/elements.rb
--- a/lib/phlex/elements.rb
+++ b/lib/phlex/elements.rb
@@ -98,20 +98,11 @@ def #{method_name}(**attributes, &block)
end
# @api private
- def register_void_element(method_name, tag: method_name.name.tr("_", "-"), deprecated: false)
- if deprecated
- deprecation = <<~RUBY
- Kernel.warn "#{deprecated}"
- RUBY
- else
- deprecation = ""
- end
-
+ def register_void_element(method_name, tag: method_name.name.tr("_", "-"))
class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
# frozen_string_literal: true
def #{method_name}(**attributes)
- #{deprecation}
context = @_context
buffer = context.buffer
fragment = context.fragments
diff --git a/lib/phlex/helpers.rb b/lib/phlex/helpers.rb
--- a/lib/phlex/helpers.rb
+++ b/lib/phlex/helpers.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true
-require "set"
-
module Phlex::Helpers
private
diff --git a/lib/phlex/html.rb b/lib/phlex/html.rb
--- a/lib/phlex/html.rb
+++ b/lib/phlex/html.rb
@@ -7,7 +7,7 @@ class HTML < SGML
autoload :VoidElements, "phlex/html/void_elements"
# A list of HTML attributes that have the potential to execute unsafe JavaScript.
- EVENT_ATTRIBUTES = %w[onabort onafterprint onbeforeprint onbeforeunload onblur oncanplay oncanplaythrough onchange onclick oncontextmenu oncopy oncuechange oncut ondblclick ondrag ondragend ondragenter ondragleave ondragover ondragstart ondrop ondurationchange onemptied onended onerror onfocus onhashchange oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata onloadedmetadata onloadstart onmessage onmousedown onmousemove onmouseout onmouseover onmouseup onmousewheel onoffline ononline onpagehide onpageshow onpaste onpause onplay onplaying onpopstate onprogress onratechange onreset onresize onscroll onsearch onseeked onseeking onselect onstalled onstorage onsubmit onsuspend ontimeupdate ontoggle onunload onvolumechange onwaiting onwheel].to_h { [_1, true] }.freeze
+ EVENT_ATTRIBUTES = Set.new(%w[onabort onafterprint onbeforeprint onbeforeunload onblur oncanplay oncanplaythrough onchange onclick oncontextmenu oncopy oncuechange oncut ondblclick ondrag ondragend ondragenter ondragleave ondragover ondragstart ondrop ondurationchange onemptied onended onerror onfocus onhashchange oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata onloadedmetadata onloadstart onmessage onmousedown onmousemove onmouseout onmouseover onmouseup onmousewheel onoffline ononline onpagehide onpageshow onpaste onpause onplay onplaying onpopstate onprogress onratechange onreset onresize onscroll onsearch onseeked onseeking onselect onstalled onstorage onsubmit onsuspend ontimeupdate ontoggle onunload onvolumechange onwaiting onwheel]).freeze
UNBUFFERED_MUTEX = Mutex.new
diff --git a/lib/phlex/html/standard_elements.rb b/lib/phlex/html/standard_elements.rb
--- a/lib/phlex/html/standard_elements.rb
+++ b/lib/phlex/html/standard_elements.rb
@@ -639,7 +639,7 @@ module Phlex::HTML::StandardElements
# @return [nil]
# @yieldparam component [self]
# @see https://developer.mozilla.org/docs/Web/HTML/Element/template
- register_element :template_tag, tag: "template"
+ register_element :template
# @!method textarea(**attributes, &content)
# Outputs a `<textarea>` tag.
diff --git a/lib/phlex/html/void_elements.rb b/lib/phlex/html/void_elements.rb
--- a/lib/phlex/html/void_elements.rb
+++ b/lib/phlex/html/void_elements.rb
@@ -58,12 +58,6 @@ module Phlex::HTML::VoidElements
# @see https://developer.mozilla.org/docs/Web/HTML/Element/meta
register_void_element :meta
- # @!method param(**attributes, &content)
- # Outputs a `<param>` tag.
- # @return [nil]
- # @see https://developer.mozilla.org/docs/Web/HTML/Element/param
- register_void_element :param, deprecated: "⚠️ [DEPRECATION] The <param> tag is deprecated. See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/param"
-
# @!method source(**attributes, &content)
# Outputs a `<source>` tag.
# @return [nil]
diff --git a/lib/phlex/kit.rb b/lib/phlex/kit.rb
--- a/lib/phlex/kit.rb
+++ b/lib/phlex/kit.rb
@@ -1,11 +1,6 @@
# frozen_string_literal: true
module Phlex::Kit
- def self.extended(mod)
- warn "⚠️ [WARNING] Phlex::Kit is experimental and may be removed from future versions of Phlex."
- super
- end
-
# When a kit is included in a module, we need to load all of its components.
def included(mod)
constants.each { |c| const_get(c) if autoload?(c) }
diff --git a/lib/phlex/sgml.rb b/lib/phlex/sgml.rb
--- a/lib/phlex/sgml.rb
+++ b/lib/phlex/sgml.rb
@@ -16,7 +16,7 @@ def call(...)
def new(*args, **kwargs, &block)
if block
object = super(*args, **kwargs, &nil)
- object.instance_variable_set(:@_content_block, block)
+ object.instance_exec { @_content_block = block }
object
else
super
@@ -65,18 +65,8 @@ def element_method?(method_name)
# def view_template(&block)
# article(class: "card", &block)
# end
- def template
- yield
- end
-
- def self.method_added(method_name)
- if method_name == :template
- Kernel.warn "⚠️ [DEPRECATION] Defining the `template` method on a Phlex component will not be supported in Phlex 2.0. Please rename the method to `view_template` instead."
- end
- end
-
- def view_template(&block)
- template(&block)
+ def view_template
+ yield if block_given?
end
def await(task)
@@ -105,8 +95,8 @@ def __final_call__(buffer = +"", context: Phlex::Context.new, view_context: nil,
@_context = context
@_view_context = view_context
@_parent = parent
+
if fragments
- warn "⚠️ [WARNING] Selective Rendering is experimental, incomplete, and may change in future versions."
@_context.target_fragments(fragments)
end
@@ -407,7 +397,7 @@ def __final_attributes__(**attributes)
end
buffer = +""
- __build_attributes__(attributes, buffer: buffer)
+ __build_attributes__(attributes, buffer:)
buffer
end
@@ -427,7 +417,7 @@ def __build_attributes__(attributes, buffer:)
next if lower_name == "href" && v.start_with?(/\s*javascript:/i)
# Detect unsafe attribute names. Attribute names are considered unsafe if they match an event attribute or include unsafe characters.
- if HTML::EVENT_ATTRIBUTES[lower_name] || name.match?(/[<>&"']/)
+ if HTML::EVENT_ATTRIBUTES.include?(lower_name) || name.match?(/[<>&"']/)
raise ArgumentError, "Unsafe attribute name detected: #{k}."
end
@@ -447,7 +437,7 @@ def __build_attributes__(attributes, buffer:)
when Symbol then"#{name}-#{subkey.name.tr('_', '-')}"
else "#{name}-#{subkey}"
end
- }, buffer: buffer
+ }, buffer:
)
when Array
buffer << " " << name << '="' << Phlex::Escape.html_escape(v.compact.join(" ")) << '"'
diff --git a/phlex.gemspec b/phlex.gemspec
--- a/phlex.gemspec
+++ b/phlex.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
spec.description = "A high-performance view framework optimised for fun."
spec.homepage = "https://www.phlex.fun"
spec.license = "MIT"
- spec.required_ruby_version = ">= 2.7"
+ spec.required_ruby_version = ">= 3.2"
spec.metadata["homepage_uri"] = spec.homepage
spec.metadata["source_code_uri"] = "https://github.com/phlex-ruby/phlex"
|
diff --git a/lib/phlex/testing/view_helper.rb b/lib/phlex/testing/view_helper.rb
--- a/lib/phlex/testing/view_helper.rb
+++ b/lib/phlex/testing/view_helper.rb
@@ -7,7 +7,7 @@ def render(view, &block)
view = view.new
end
- view.call(view_context: view_context, &block)
+ view.call(view_context:, &block)
end
def view_context
diff --git a/test/phlex/kit.rb b/test/phlex/kit.rb
--- a/test/phlex/kit.rb
+++ b/test/phlex/kit.rb
@@ -5,14 +5,14 @@
class Example < Phlex::HTML
include Components
- def template
+ def view_template
SayHi("Joel", times: 2) { "Inside" }
Components::SayHi("Will", times: 1) { "Inside" }
end
end
# This feature is only supported in Ruby 3.2 or later.
-if RUBY_VERSION >= "3.2"
+if Phlex::SUPPORTS_FIBER_STORAGE
describe Phlex::Kit do
it "raises when you try to render a component outside of a rendering context" do
expect { Components::SayHi() }.to raise_exception(RuntimeError)
diff --git a/test/phlex/view/capture.rb b/test/phlex/view/capture.rb
--- a/test/phlex/view/capture.rb
+++ b/test/phlex/view/capture.rb
@@ -76,7 +76,7 @@ def view_template
def view_template
srcdoc = capture { yield } if block_given?
- iframe srcdoc: srcdoc
+ iframe srcdoc:
end
end
end
diff --git a/test/phlex/view/legacy_template_method.rb b/test/phlex/view/legacy_template_method.rb
deleted file mode 100644
--- a/test/phlex/view/legacy_template_method.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-describe Phlex::SGML do
- it "warns when you define a template" do
- expect(Kernel).to receive(:warn)
-
- example = Class.new(Phlex::HTML) do
- def template
- h1 { "Hello, world!" }
- end
- end
-
- expect(
- example.new.call
- ).to be == "<h1>Hello, world!</h1>"
- end
-end
diff --git a/test/phlex/view/naughty_business.rb b/test/phlex/view/naughty_business.rb
--- a/test/phlex/view/naughty_business.rb
+++ b/test/phlex/view/naughty_business.rb
@@ -5,7 +5,7 @@
with "naughty javascript links" do
view do
- def template
+ def view_template
a(href: "javascript:alert(1)") { "a" }
a(href: "JAVASCRIPT:alert(1)") { "b" }
a(href: :"JAVASCRIPT:alert(1)") { "c" }
@@ -20,7 +20,7 @@ def template
with "naughty uppercase event tag" do
view do
- def template
+ def view_template
button ONCLICK: "ALERT(1)" do
"naughty button"
end
@@ -85,7 +85,7 @@ def view_template
end
end
- Phlex::HTML::EVENT_ATTRIBUTES.each_key do |event_attribute|
+ Phlex::HTML::EVENT_ATTRIBUTES.each do |event_attribute|
with "with naughty #{event_attribute} attribute" do
naughty_attributes = { event_attribute => "alert(1);" }
|
Remove the `<param>` element
- [ ] Issue a warning in 1.x
- [ ] Remove in 2.0
|
First item solved by: https://github.com/phlex-ruby/phlex/pull/642
@stephannv That `deprecated: true` argument is just a no-op at the moment. We need to update the generated elemen method to issue a warning if that flag is set.
| 2024-04-06T01:25:01
|
ruby
|
Hard
|
JEG2/highline
| 274
|
JEG2__highline-274
|
[
"273"
] |
3de8af1ea83016ede666f33917233fb7a6854fb7
|
diff --git a/.rubocop.yml b/.rubocop.yml
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,8 @@
# https://github.com/bbatsov/rubocop/tree/master/config
AllCops:
- TargetRubyVersion: 2.1
+ TargetRubyVersion: 3.3
+ NewCops: enable
# General
@@ -58,7 +59,7 @@ Style/OptionalArguments:
- 'lib/highline/list_renderer.rb'
# TemplateRenderer should never fail on method missing.
-Style/MethodMissing:
+Style/MissingRespondToMissing:
Exclude:
- 'lib/highline/template_renderer.rb'
@@ -73,7 +74,7 @@ Style/SymbolArray:
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
Exclude:
- 'examples/page_and_wrap.rb'
- 'highline.gemspec'
diff --git a/Changelog.md b/Changelog.md
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,11 @@
Below is a complete listing of changes for each revision of HighLine.
+### 3.1.1 / 2024-08-18
+* PR #274 / I #273 (@costa)
+ * Add Highline#add_to_color_scheme
+ * Dockerize the test environment. Just run `bin/test` and voilá!
+
### 3.1.0 / 2024-07-15
* PR #272 / I #271 - Readline is now completed deprecated over Reline (@abinoam, issue by @64kramsystem)
* PR #269 - Provide a 'Changelog' link on rubygems.org/gems/highline (@mark-young-atg)
diff --git a/Gemfile b/Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,7 @@ group :code_quality do
gem "flog", require: false
gem "pronto", require: false, platform: :ruby
gem "pronto-flay", require: false, platform: :ruby
+ gem "path_expander", "1.1.1", require: false # Remove this lock when path_expander > 1.1.2 and flay > 2.13.3 is released.
# gem "pronto-poper", require: false, platform: :ruby
gem "pronto-reek", require: false, platform: :ruby
gem "pronto-rubocop", require: false, platform: :ruby
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -206,6 +206,9 @@ Contributing
- ```rake acceptance```
- ```pronto run```
+ Alternatively, if you're in a [Docker](https://www.docker.com)ised environment,
+ don't care about installing anything locally -- just run `bin/test` instead.
+
8. Commit your changes
- ```git commit -am "Your commit message"```
diff --git a/lib/highline.rb b/lib/highline.rb
--- a/lib/highline.rb
+++ b/lib/highline.rb
@@ -61,6 +61,14 @@ def using_color_scheme?
true if @color_scheme
end
+ # Pass a +Hash+ to add +new+ colors to the current scheme.
+ def add_to_color_scheme(hash)
+ old_hash = (color_scheme || {}).to_hash
+ fail "Overlapping color schemes: #{old_hash.keys & hash.keys}" unless
+ (old_hash.keys & hash.keys).empty?
+ self.color_scheme = ColorScheme.new(old_hash.merge hash)
+ end
+
# Reset color scheme to default (+nil+)
def reset_color_scheme
self.color_scheme = nil
diff --git a/lib/highline/version.rb b/lib/highline/version.rb
--- a/lib/highline/version.rb
+++ b/lib/highline/version.rb
@@ -2,5 +2,5 @@
class HighLine
# The version of the installed library.
- VERSION = "3.1.0".freeze
+ VERSION = "3.1.1".freeze
end
|
diff --git a/bin/test b/bin/test
new file mode 100755
--- /dev/null
+++ b/bin/test
@@ -0,0 +1,11 @@
+#!/bin/bash -e
+test "$#" -ne 0 && echo "Unsupported args: $@" >&2 && exit 145
+cd "$( dirname "${BASH_SOURCE[0]}" )"/..
+
+export COMPOSE_FILE=test/docker-compose.yml
+export COMPOSE_PROJECT_NAME=highline_dev
+
+docker compose rm -svf
+docker compose build --force-rm
+
+docker compose run --rm tester && docker compose rm -svf || ( docker compose logs && exit 1 )
diff --git a/test/Dockerfile b/test/Dockerfile
new file mode 100644
--- /dev/null
+++ b/test/Dockerfile
@@ -0,0 +1,15 @@
+FROM ruby
+
+WORKDIR /highline
+
+
+RUN bash -ec 'apt update; apt -y install cmake'
+
+ADD Gemfile highline.gemspec .git* ./
+ADD lib/highline/version.rb ./lib/highline/version.rb
+RUN bundle install
+
+ADD . .
+
+ENTRYPOINT ["bundle", "exec"]
+CMD ["bash", "-ec", "rake test; rake acceptance; pronto run"]
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
new file mode 100644
--- /dev/null
+++ b/test/docker-compose.yml
@@ -0,0 +1,5 @@
+services:
+ tester:
+ build:
+ context: ..
+ dockerfile: test/Dockerfile
diff --git a/test/test_color_scheme.rb b/test/test_color_scheme.rb
--- a/test/test_color_scheme.rb
+++ b/test/test_color_scheme.rb
@@ -51,6 +51,8 @@ def test_scheme
info debug row_even row_odd].sort,
HighLine.color_scheme.keys.sort
+ HighLine.add_to_color_scheme calming: [:blue]
+
# Color scheme doesn't care if we use symbols or strings.
# And it isn't case-sensitive
warning1 = HighLine.color_scheme[:warning]
@@ -64,6 +66,7 @@ def test_scheme
assert_equal warning1, warning2
assert_equal warning1, warning3
assert_equal warning1, warning4
+ assert_instance_of HighLine::Style, HighLine.color_scheme[:calming]
# Nonexistent keys return nil
assert_nil HighLine.color_scheme[:nonexistent]
@@ -81,18 +84,23 @@ def test_scheme
assert_equal [:bold, :yellow], defn2
assert_equal [:bold, :yellow], defn3
assert_equal [:bold, :yellow], defn4
+ assert_equal [:blue], HighLine.color_scheme.definition(:calming)
assert_nil HighLine.color_scheme.definition(:nonexistent)
color_scheme_hash = HighLine.color_scheme.to_hash
assert_instance_of Hash, color_scheme_hash
- assert_equal %w[critical error warning notice
+ assert_equal %w[calming critical error warning notice
info debug row_even row_odd].sort,
color_scheme_hash.keys.sort
- assert_instance_of Array, HighLine.color_scheme.definition(:warning)
- assert_equal [:bold, :yellow], HighLine.color_scheme.definition(:warning)
+
+ # adding a color already present should raise an exception
+ assert_raises(StandardError) do
+ HighLine.add_to_color_scheme :critical, [:black]
+ end
# turn it back off, should raise an exception
- HighLine.color_scheme = nil
+ HighLine.reset_color_scheme
+ assert_nil HighLine.color_scheme
assert_raises(NameError) do
@terminal.say("This should be <%= color('nothing at all', :error) %>.")
end
|
`::add_to_color_scheme` improvement
Hi, thanks for the useful gem.
I've been using the following extension for a while, and if you like it too, I could make it into a PR or something.
```ruby
class HighLine
class << self
def add_to_color_scheme(hash)
old_hash = (color_scheme || {}).to_hash
fail "Overlapping color schemes: #{old_hash.keys & hash.keys}" unless
(old_hash.keys & hash.keys).empty?
self.color_scheme = ColorScheme.new(old_hash.merge hash)
end
end
end
```
|
I think this addition doesn't change any previous behavior. So I would welcome a PR as it sounds a good idea. Could you please add tests along the PR? I can help you with any doubt in the code base. Sorry for taking so long to answer.
| 2024-08-03T21:24:00
|
ruby
|
Hard
|
rubyzip/rubyzip
| 150
|
rubyzip__rubyzip-150
|
[
"57",
"57"
] |
63d9ae4c3e55a11ce74be42928ff59a57f259560
|
diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
--- a/lib/zip/entry.rb
+++ b/lib/zip/entry.rb
@@ -560,6 +560,10 @@ def get_raw_input_stream(&block)
end
end
+ def clean_up
+ # By default, do nothing
+ end
+
private
def set_time(binary_dos_date, binary_dos_time)
diff --git a/lib/zip/file.rb b/lib/zip/file.rb
--- a/lib/zip/file.rb
+++ b/lib/zip/file.rb
@@ -303,6 +303,7 @@ def commit
@entry_set.each do |e|
e.write_to_zip_output_stream(zos)
e.dirty = false
+ e.clean_up
end
zos.comment = comment
end
diff --git a/lib/zip/streamable_stream.rb b/lib/zip/streamable_stream.rb
--- a/lib/zip/streamable_stream.rb
+++ b/lib/zip/streamable_stream.rb
@@ -44,6 +44,10 @@ def write_to_zip_output_stream(aZipOutputStream)
aZipOutputStream.put_next_entry(self)
get_input_stream { |is| ::Zip::IOExtras.copy_stream(aZipOutputStream, is) }
end
+
+ def clean_up
+ @temp_file.unlink
+ end
end
end
|
diff --git a/test/file_test.rb b/test/file_test.rb
--- a/test/file_test.rb
+++ b/test/file_test.rb
@@ -89,6 +89,22 @@ def test_get_output_stream
}
end
+ def test_cleans_up_tempfiles_after_close
+ comment = "a short comment"
+
+ zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
+ zf.get_output_stream("myFile") do |os|
+ @tempfile_path = os.path
+ os.write "myFile contains just this"
+ end
+
+ assert_equal(true, File.exists?(@tempfile_path))
+
+ zf.close
+
+ assert_equal(false, File.exists?(@tempfile_path))
+ end
+
def test_add
srcFile = "test/data/file2.txt"
entryName = "newEntryName.rb"
|
Temp files created in get_output_stream not unlinked
I have an issue when I am using rubyzip in a daemon and a lot of tempfiles are creeated (and persist) in the folder where I am creating the zip files.
This seems to be because the temp files which are created are not explicitly unlinked and remain on the disk until the ruby process ends or the tempfile objects are garbage collected.
Temp files created in get_output_stream not unlinked
I have an issue when I am using rubyzip in a daemon and a lot of tempfiles are creeated (and persist) in the folder where I am creating the zip files.
This seems to be because the temp files which are created are not explicitly unlinked and remain on the disk until the ruby process ends or the tempfile objects are garbage collected.
|
It's how works Tempfile. If you don't like it please send me patch.
I will have a look into writing a patch.
According to the Tempfile docs it is good practice:
## Good practices
### Explicit close
When a Tempfile object is garbage collected, or when the Ruby interpreter exits, its associated temporary file is automatically deleted. This means that’s it’s unnecessary to explicitly delete a Tempfile after use, though it’s good practice to do so: not explicitly deleting unused Tempfiles can potentially leave behind large amounts of tempfiles on the filesystem until they’re garbage collected. The existence of these temp files can make it harder to determine a new Tempfile filename.
Therefore, one should always call unlink or close in an ensure block, like this:
``` ruby
file = Tempfile.new('foo')
begin
...do something with file...
ensure
file.close
file.unlink # deletes the temp file
end
```
To work around this I am using GC.start to clean up the temp files
```
def write(name,body)
Zip::ZipFile.open(filename, Zip::ZipFile::CREATE) do |zipfile|
zipfile.get_output_stream(name) { |f| f.puts body }
end
ensure
GC.start # cleanup temporary files
end
```
I haven't found any side effects. If I do I will post them here.
It's how works Tempfile. If you don't like it please send me patch.
I will have a look into writing a patch.
According to the Tempfile docs it is good practice:
## Good practices
### Explicit close
When a Tempfile object is garbage collected, or when the Ruby interpreter exits, its associated temporary file is automatically deleted. This means that’s it’s unnecessary to explicitly delete a Tempfile after use, though it’s good practice to do so: not explicitly deleting unused Tempfiles can potentially leave behind large amounts of tempfiles on the filesystem until they’re garbage collected. The existence of these temp files can make it harder to determine a new Tempfile filename.
Therefore, one should always call unlink or close in an ensure block, like this:
``` ruby
file = Tempfile.new('foo')
begin
...do something with file...
ensure
file.close
file.unlink # deletes the temp file
end
```
To work around this I am using GC.start to clean up the temp files
```
def write(name,body)
Zip::ZipFile.open(filename, Zip::ZipFile::CREATE) do |zipfile|
zipfile.get_output_stream(name) { |f| f.puts body }
end
ensure
GC.start # cleanup temporary files
end
```
I haven't found any side effects. If I do I will post them here.
| 2014-04-04T21:34:25
|
ruby
|
Hard
|
yippee-fun/phlex
| 940
|
yippee-fun__phlex-940
|
[
"920"
] |
8a806f8a7ad4227a6fe0cdef74f3c29760ce66df
|
diff --git a/lib/phlex/compiler/class_compiler.rb b/lib/phlex/compiler/class_compiler.rb
--- a/lib/phlex/compiler/class_compiler.rb
+++ b/lib/phlex/compiler/class_compiler.rb
@@ -11,11 +11,12 @@ def compile(node)
def visit_def_node(node)
return if node.name == :initialize
+ return if node.receiver
compiled_source = Phlex::Compiler::MethodCompiler.new(@compiler.component).compile(node)
if compiled_source
- puts compiled_source
+ # puts compiled_source
@compiler.redefine_method(compiled_source, node.location.start_line)
end
end
|
diff --git a/quickdraw/compiler.test.rb b/quickdraw/compiler.test.rb
--- a/quickdraw/compiler.test.rb
+++ b/quickdraw/compiler.test.rb
@@ -28,7 +28,7 @@ def foo
compiled = Phlex::Compiler::MethodCompiler.new(Phlex::HTML).compile(snippet)
- puts compiled
+ # puts compiled
assert_equal compiled.strip, out = <<~RUBY.strip
def foo
|
Ensure we only compile instance methods
| 2025-07-09T16:59:48
|
ruby
|
Hard
|
|
yippee-fun/phlex
| 889
|
yippee-fun__phlex-889
|
[
"887"
] |
c868b804fe23807c77b54d7d06af3ea4fe002ec3
|
diff --git a/lib/phlex/helpers.rb b/lib/phlex/helpers.rb
--- a/lib/phlex/helpers.rb
+++ b/lib/phlex/helpers.rb
@@ -26,6 +26,10 @@ def mix(*args)
[old] + new.to_a
in [String, String]
"#{old} #{new}"
+ in [_, Hash]
+ { _: old, **new }
+ in [Hash, _]
+ { **old, _: new }
in [_, nil]
old
else
diff --git a/lib/phlex/sgml.rb b/lib/phlex/sgml.rb
--- a/lib/phlex/sgml.rb
+++ b/lib/phlex/sgml.rb
@@ -566,14 +566,20 @@ def __nested_attributes__(attributes, base_name, buffer = +"")
attributes.each do |k, v|
next unless v
- name = case k
- when String then k
- when Symbol then k.name.tr("_", "-")
- else raise Phlex::ArgumentError.new("Attribute keys should be Strings or Symbols")
- end
+ if (root_key = (:_ == k))
+ name = ""
+ original_base_name = base_name
+ base_name = base_name.delete_suffix("-")
+ else
+ name = case k
+ when String then k
+ when Symbol then k.name.tr("_", "-")
+ else raise Phlex::ArgumentError.new("Attribute keys should be Strings or Symbols")
+ end
- if name.match?(/[<>&"']/)
- raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
+ if name.match?(/[<>&"']/)
+ raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
+ end
end
case v
@@ -597,6 +603,10 @@ def __nested_attributes__(attributes, base_name, buffer = +"")
raise Phlex::ArgumentError.new("Invalid attribute value #{v.inspect}.")
end
+ if root_key
+ base_name = original_base_name
+ end
+
buffer
end
end
|
diff --git a/quickdraw/helpers/mix.test.rb b/quickdraw/helpers/mix.test.rb
--- a/quickdraw/helpers/mix.test.rb
+++ b/quickdraw/helpers/mix.test.rb
@@ -33,7 +33,7 @@
{ data: { controller: "bar" } },
)
- assert_equal output, { data: { controller: "bar" } }
+ assert_equal output, { data: { _: ["foo"], controller: "bar" } }
end
test "array + string" do
diff --git a/quickdraw/sgml/attributes.test.rb b/quickdraw/sgml/attributes.test.rb
--- a/quickdraw/sgml/attributes.test.rb
+++ b/quickdraw/sgml/attributes.test.rb
@@ -272,6 +272,14 @@
assert_raises(Phlex::ArgumentError) { phlex { div(attribute: { ">" => "a" }) } }
end
+test "_, Hash(:_, _)" do
+ by_itself = phlex { div(attribute: { _: "world" }) }
+ assert_equal_html by_itself, %(<div attribute="world"></div>)
+
+ with_others = phlex { div(data: { _: "test", controller: "hello" }) }
+ assert_equal_html with_others, %(<div data="test" data-controller="hello"></div>)
+end
+
test "_, Hash(*invalid*, _)" do
assert_raises(Phlex::ArgumentError) { phlex { div(attribute: { Object.new => "a" }) } }
end
|
Support root hash property with flattened hash attributes
```ruby
div(data: { _: "root", foo: "bar" })
```
```html
<div data="root" data-foo="bar'></div>
```
We should also update `mix` to support this.
```ruby
in [_, Hash]
{ _: old, **new }
in [Hash, _]
{ **old, _: new }
```
| 2025-04-04T17:59:26
|
ruby
|
Hard
|
|
sdsykes/fastimage
| 155
|
sdsykes__fastimage-155
|
[
"158"
] |
054f5633212c1083aed76fee9e3b09283b45ff83
|
diff --git a/CHANGELOG b/CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,17 @@
+Version 2.4.0
+
+03-Jan-2025
+
+- IMPROVED: Refactor code into multiple files
+- FIX: error rising from redirects to unknown url scheme
+- FIX: Handle tiff format with long dimensions values
+- FIX: Remove problematic dependency on base64 gem
+- IMPROVED: properties including content_length are fetched more lazily improving performance
+
Version 2.3.1
+
+01-Apr-2024
+
- FIX: avoid bug where a NoMethodError exception is raised on faulty images
Version 2.3.0
diff --git a/lib/fastimage.rb b/lib/fastimage.rb
--- a/lib/fastimage.rb
+++ b/lib/fastimage.rb
@@ -9,7 +9,7 @@
# No external libraries such as ImageMagick are used here, this is a very lightweight solution to
# finding image information.
#
-# FastImage knows about GIF, JPEG, BMP, TIFF, ICO, CUR, PNG, PSD, SVG, WEBP and JXL files.
+# FastImage knows about GIF, JPEG, BMP, TIFF, ICO, CUR, PNG, HEIC/HEIF, AVIF, PSD, SVG, WEBP and JXL files.
#
# FastImage can also read files from the local filesystem by supplying the path instead of a uri.
# In this case FastImage reads the file in chunks of 256 bytes until
@@ -59,9 +59,10 @@
require 'delegate'
require 'pathname'
require 'zlib'
-require 'base64'
require 'uri'
require 'stringio'
+
+require_relative 'fastimage/fastimage'
require_relative 'fastimage/version'
# see http://stackoverflow.com/questions/5208851/i/41048816#41048816
@@ -70,1161 +71,3 @@ module URI
DEFAULT_PARSER = Parser.new(:HOSTNAME => "(?:(?:[a-zA-Z\\d](?:[-\\_a-zA-Z\\d]*[a-zA-Z\\d])?)\\.)*(?:[a-zA-Z](?:[-\\_a-zA-Z\\d]*[a-zA-Z\\d])?)\\.?")
end
end
-
-class FastImage
- attr_reader :size, :type, :content_length, :orientation, :animated
-
- attr_reader :bytes_read
-
- class FastImageException < StandardError # :nodoc:
- end
- class UnknownImageType < FastImageException # :nodoc:
- end
- class ImageFetchFailure < FastImageException # :nodoc:
- end
- class SizeNotFound < FastImageException # :nodoc:
- end
- class CannotParseImage < FastImageException # :nodoc:
- end
- class BadImageURI < FastImageException # :nodoc:
- end
-
- DefaultTimeout = 2 unless const_defined?(:DefaultTimeout)
-
- LocalFileChunkSize = 256 unless const_defined?(:LocalFileChunkSize)
-
- SUPPORTED_IMAGE_TYPES = [:bmp, :gif, :jpeg, :png, :tiff, :psd, :heic, :heif, :webp, :svg, :ico, :cur, :jxl].freeze
-
- # Returns an array containing the width and height of the image.
- # It will return nil if the image could not be fetched, or if the image type was not recognised.
- #
- # By default there is a timeout of 2 seconds for opening and reading from a remote server.
- # This can be changed by passing a :timeout => number_of_seconds in the options.
- #
- # If you wish FastImage to raise if it cannot size the image for any reason, then pass
- # :raise_on_failure => true in the options.
- #
- # FastImage knows about GIF, JPEG, BMP, TIFF, ICO, CUR, PNG, PSD, SVG, WEBP and JXL files.
- #
- # === Example
- #
- # require 'fastimage'
- #
- # FastImage.size("https://switchstep.com/images/ios.gif")
- # => [196, 283]
- # FastImage.size("http://switchstep.com/images/ss_logo.png")
- # => [300, 300]
- # FastImage.size("https://upload.wikimedia.org/wikipedia/commons/0/09/Jpeg_thumb_artifacts_test.jpg")
- # => [1280, 800]
- # FastImage.size("https://eeweb.engineering.nyu.edu/~yao/EL5123/image/lena_gray.bmp")
- # => [512, 512]
- # FastImage.size("test/fixtures/test.jpg")
- # => [882, 470]
- # FastImage.size("http://switchstep.com/does_not_exist")
- # => nil
- # FastImage.size("http://switchstep.com/does_not_exist", :raise_on_failure=>true)
- # => raises FastImage::ImageFetchFailure
- # FastImage.size("http://switchstep.com/images/favicon.ico", :raise_on_failure=>true)
- # => [16, 16]
- # FastImage.size("http://switchstep.com/foo.ics", :raise_on_failure=>true)
- # => raises FastImage::UnknownImageType
- # FastImage.size("http://switchstep.com/images/favicon.ico", :raise_on_failure=>true, :timeout=>0.01)
- # => raises FastImage::ImageFetchFailure
- # FastImage.size("http://switchstep.com/images/faulty.jpg", :raise_on_failure=>true)
- # => raises FastImage::SizeNotFound
- #
- # === Supported options
- # [:timeout]
- # Overrides the default timeout of 2 seconds. Applies both to reading from and opening the http connection.
- # [:raise_on_failure]
- # If set to true causes an exception to be raised if the image size cannot be found for any reason.
- #
- def self.size(uri, options={})
- new(uri, options).size
- end
-
- # Returns an symbol indicating the image type fetched from a uri.
- # It will return nil if the image could not be fetched, or if the image type was not recognised.
- #
- # By default there is a timeout of 2 seconds for opening and reading from a remote server.
- # This can be changed by passing a :timeout => number_of_seconds in the options.
- #
- # If you wish FastImage to raise if it cannot find the type of the image for any reason, then pass
- # :raise_on_failure => true in the options.
- #
- # === Example
- #
- # require 'fastimage'
- #
- # FastImage.type("https://switchstep.com/images/ios.gif")
- # => :gif
- # FastImage.type("http://switchstep.com/images/ss_logo.png")
- # => :png
- # FastImage.type("https://upload.wikimedia.org/wikipedia/commons/0/09/Jpeg_thumb_artifacts_test.jpg")
- # => :jpeg
- # FastImage.type("https://eeweb.engineering.nyu.edu/~yao/EL5123/image/lena_gray.bmp")
- # => :bmp
- # FastImage.type("test/fixtures/test.jpg")
- # => :jpeg
- # FastImage.type("http://switchstep.com/does_not_exist")
- # => nil
- # File.open("/some/local/file.gif", "r") {|io| FastImage.type(io)}
- # => :gif
- # FastImage.type("test/fixtures/test.tiff")
- # => :tiff
- # FastImage.type("test/fixtures/test.psd")
- # => :psd
- #
- # === Supported options
- # [:timeout]
- # Overrides the default timeout of 2 seconds. Applies both to reading from and opening the http connection.
- # [:raise_on_failure]
- # If set to true causes an exception to be raised if the image type cannot be found for any reason.
- #
- def self.type(uri, options={})
- new(uri, options.merge(:type_only=>true)).type
- end
-
- # Returns a boolean value indicating the image is animated.
- # It will return nil if the image could not be fetched, or if the image type was not recognised.
- #
- # By default there is a timeout of 2 seconds for opening and reading from a remote server.
- # This can be changed by passing a :timeout => number_of_seconds in the options.
- #
- # If you wish FastImage to raise if it cannot find the type of the image for any reason, then pass
- # :raise_on_failure => true in the options.
- #
- # === Example
- #
- # require 'fastimage'
- #
- # FastImage.animated?("test/fixtures/test.gif")
- # => false
- # FastImage.animated?("test/fixtures/animated.gif")
- # => true
- #
- # === Supported options
- # [:timeout]
- # Overrides the default timeout of 2 seconds. Applies both to reading from and opening the http connection.
- # [:raise_on_failure]
- # If set to true causes an exception to be raised if the image type cannot be found for any reason.
- #
- def self.animated?(uri, options={})
- new(uri, options.merge(:animated_only=>true)).animated
- end
-
- def initialize(uri, options={})
- @uri = uri
- @options = {
- :type_only => false,
- :timeout => DefaultTimeout,
- :raise_on_failure => false,
- :proxy => nil,
- :http_header => {}
- }.merge(options)
-
- @property = if @options[:animated_only]
- :animated
- elsif @options[:type_only]
- :type
- else
- :size
- end
-
- raise BadImageURI if uri.nil?
-
- @type, @state = nil
-
- if uri.respond_to?(:read)
- fetch_using_read(uri)
- elsif uri.start_with?('data:')
- fetch_using_base64(uri)
- else
- begin
- @parsed_uri = URI.parse(uri)
- rescue URI::InvalidURIError
- fetch_using_file_open
- else
- if @parsed_uri.scheme == "http" || @parsed_uri.scheme == "https"
- fetch_using_http
- else
- fetch_using_file_open
- end
- end
- end
-
- raise SizeNotFound if @options[:raise_on_failure] && @property == :size && !@size
-
- rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET,
- Errno::ENETUNREACH, ImageFetchFailure, Net::HTTPBadResponse, EOFError, Errno::ENOENT,
- OpenSSL::SSL::SSLError
- raise ImageFetchFailure if @options[:raise_on_failure]
- rescue UnknownImageType, BadImageURI
- raise if @options[:raise_on_failure]
- rescue CannotParseImage
- if @options[:raise_on_failure]
- if @property == :size
- raise SizeNotFound
- else
- raise ImageFetchFailure
- end
- end
-
- ensure
- uri.rewind if uri.respond_to?(:rewind)
-
- end
-
- private
-
- def fetch_using_http
- @redirect_count = 0
-
- fetch_using_http_from_parsed_uri
- end
-
- # Some invalid locations need escaping
- def escaped_location(location)
- begin
- URI(location)
- rescue URI::InvalidURIError
- ::URI::DEFAULT_PARSER.escape(location)
- else
- location
- end
- end
-
- def fetch_using_http_from_parsed_uri
- http_header = {'Accept-Encoding' => 'identity'}.merge(@options[:http_header])
-
- setup_http
- @http.request_get(@parsed_uri.request_uri, http_header) do |res|
- if res.is_a?(Net::HTTPRedirection) && @redirect_count < 4
- @redirect_count += 1
- begin
- location = res['Location']
- raise ImageFetchFailure if location.nil? || location.empty?
-
- @parsed_uri = URI.join(@parsed_uri, escaped_location(location))
- rescue URI::InvalidURIError
- else
- fetch_using_http_from_parsed_uri
- break
- end
- end
-
- raise ImageFetchFailure unless res.is_a?(Net::HTTPSuccess)
-
- @content_length = res.content_length
-
- read_fiber = Fiber.new do
- res.read_body do |str|
- Fiber.yield str
- end
- nil
- end
-
- case res['content-encoding']
- when 'deflate', 'gzip', 'x-gzip'
- begin
- gzip = Zlib::GzipReader.new(FiberStream.new(read_fiber))
- rescue FiberError, Zlib::GzipFile::Error
- raise CannotParseImage
- end
-
- read_fiber = Fiber.new do
- while data = gzip.readline
- Fiber.yield data
- end
- nil
- end
- end
-
- parse_packets FiberStream.new(read_fiber)
-
- break # needed to actively quit out of the fetch
- end
- end
-
- def protocol_relative_url?(url)
- url.start_with?("//")
- end
-
- def proxy_uri
- begin
- if @options[:proxy]
- proxy = URI.parse(@options[:proxy])
- else
- proxy = ENV['http_proxy'] && ENV['http_proxy'] != "" ? URI.parse(ENV['http_proxy']) : nil
- end
- rescue URI::InvalidURIError
- proxy = nil
- end
- proxy
- end
-
- def setup_http
- proxy = proxy_uri
-
- if proxy
- @http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new(@parsed_uri.host, @parsed_uri.port)
- else
- @http = Net::HTTP.new(@parsed_uri.host, @parsed_uri.port)
- end
- @http.use_ssl = (@parsed_uri.scheme == "https")
- @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
- @http.open_timeout = @options[:timeout]
- @http.read_timeout = @options[:timeout]
- end
-
- def fetch_using_read(readable)
- readable.rewind if readable.respond_to?(:rewind)
- # Pathnames respond to read, but always return the first
- # chunk of the file unlike an IO (even though the
- # docuementation for it refers to IO). Need to supply
- # an offset in this case.
- if readable.is_a?(Pathname)
- read_fiber = Fiber.new do
- offset = 0
- while str = readable.read(LocalFileChunkSize, offset)
- Fiber.yield str
- offset += LocalFileChunkSize
- end
- nil
- end
- else
- read_fiber = Fiber.new do
- while str = readable.read(LocalFileChunkSize)
- Fiber.yield str
- end
- nil
- end
- end
-
- parse_packets FiberStream.new(read_fiber)
- end
-
- def fetch_using_file_open
- @content_length = File.size?(@uri)
- File.open(@uri) do |s|
- fetch_using_read(s)
- end
- end
-
- def parse_packets(stream)
- @stream = stream
-
- begin
- result = send("parse_#{@property}")
- if result != nil
- # extract exif orientation if it was found
- if @property == :size && result.size == 3
- @orientation = result.pop
- else
- @orientation = 1
- end
-
- instance_variable_set("@#{@property}", result)
- else
- raise CannotParseImage
- end
- rescue FiberError
- raise CannotParseImage
- end
- end
-
- def parse_size
- @type = parse_type unless @type
- send("parse_size_for_#{@type}")
- end
-
- def parse_animated
- @type = parse_type unless @type
- %i(gif png webp avif).include?(@type) ? send("parse_animated_for_#{@type}") : nil
- end
-
- def fetch_using_base64(uri)
- decoded = begin
- Base64.decode64(uri.split(',')[1])
- rescue
- raise CannotParseImage
- end
- @content_length = decoded.size
- fetch_using_read StringIO.new(decoded)
- end
-
- module StreamUtil # :nodoc:
- def read_byte
- read(1)[0].ord
- end
-
- def read_int
- read(2).unpack('n')[0]
- end
-
- def read_string_int
- value = []
- while read(1) =~ /(\d)/
- value << $1
- end
- value.join.to_i
- end
- end
-
- class FiberStream # :nodoc:
- include StreamUtil
- attr_reader :pos
-
- # read_fiber should return nil if it no longer has anything to return when resumed
- # so the result of the whole Fiber block should be set to be nil in case yield is no
- # longer called
- def initialize(read_fiber)
- @read_fiber = read_fiber
- @pos = 0
- @strpos = 0
- @str = ''
- end
-
- # Peeking beyond the end of the input will raise
- def peek(n)
- while @strpos + n > @str.size
- unused_str = @str[@strpos..-1]
-
- new_string = @read_fiber.resume
- raise CannotParseImage if !new_string
- # we are dealing with bytes here, so force the encoding
- new_string.force_encoding("ASCII-8BIT") if new_string.respond_to? :force_encoding
-
- @str = unused_str + new_string
- @strpos = 0
- end
-
- @str[@strpos, n]
- end
-
- def read(n)
- result = peek(n)
- @strpos += n
- @pos += n
- result
- end
-
- def skip(n)
- discarded = 0
- fetched = @str[@strpos..-1].size
- while n > fetched
- discarded += @str[@strpos..-1].size
- new_string = @read_fiber.resume
- raise CannotParseImage if !new_string
-
- new_string.force_encoding("ASCII-8BIT") if new_string.respond_to? :force_encoding
-
- fetched += new_string.size
- @str = new_string
- @strpos = 0
- end
- @strpos = @strpos + n - discarded
- @pos += n
- end
- end
-
- class IOStream < SimpleDelegator # :nodoc:
- include StreamUtil
- end
-
- def parse_type
- parsed_type = case @stream.peek(2)
- when "BM"
- :bmp
- when "GI"
- :gif
- when 0xff.chr + 0xd8.chr
- :jpeg
- when 0x89.chr + "P"
- :png
- when "II", "MM"
- case @stream.peek(11)[8..10]
- when "APC", "CR\002"
- nil # do not recognise CRW or CR2 as tiff
- else
- :tiff
- end
- when '8B'
- :psd
- when "\xFF\x0A".b
- :jxl
- when "\0\0"
- case @stream.peek(3).bytes.to_a.last
- when 0
- # http://www.ftyps.com/what.html
- case @stream.peek(12)[4..-1]
- when "ftypavif"
- :avif
- when "ftypavis"
- :avif
- when "ftypheic"
- :heic
- when "ftypmif1"
- :heif
- else
- if @stream.peek(7)[4..-1] == 'JXL'
- :jxl
- end
- end
- # ico has either a 1 (for ico format) or 2 (for cursor) at offset 3
- when 1 then :ico
- when 2 then :cur
- end
- when "RI"
- :webp if @stream.peek(12)[8..11] == "WEBP"
- when "<s"
- :svg if @stream.peek(4) == "<svg"
- when /\s\s|\s<|<[?!]/, 0xef.chr + 0xbb.chr
- # Peek 10 more chars each time, and if end of file is reached just raise
- # unknown. We assume the <svg tag cannot be within 10 chars of the end of
- # the file, and is within the first 1000 chars.
- begin
- :svg if (1..100).detect {|n| @stream.peek(10 * n).include?("<svg")}
- rescue FiberError, CannotParseImage
- nil
- end
- end
-
- parsed_type or raise UnknownImageType
- end
-
- def parse_size_for_ico
- icons = @stream.read(6)[4..5].unpack('v').first
- sizes = icons.times.map { @stream.read(16).unpack('C2').map { |x| x == 0 ? 256 : x } }.sort_by { |w,h| w * h }
- sizes.last
- end
- alias_method :parse_size_for_cur, :parse_size_for_ico
-
- # HEIC/AVIF are a special case of the general ISO_BMFF format, in which all data is encapsulated in typed boxes,
- # with a mandatory ftyp box that is used to indicate particular file types. Is composed of nested "boxes". Each
- # box has a header composed of
- # - Size (32 bit integer)
- # - Box type (4 chars)
- # - Extended size: only if size === 1, the type field is followed by 64 bit integer of extended size
- # - Payload: Type-dependent
- class IsoBmff # :nodoc:
- def initialize(stream)
- @stream = stream
- end
-
- def width_and_height
- @rotation = 0
- @max_size = nil
- @primary_box = nil
- @ipma_boxes = []
- @ispe_boxes = []
- @final_size = nil
-
- catch :finish do
- read_boxes!
- end
-
- if [90, 270].include?(@rotation)
- @final_size.reverse
- else
- @final_size
- end
- end
-
- private
-
- # Format specs: https://www.loc.gov/preservation/digital/formats/fdd/fdd000525.shtml
-
- # If you need to inspect a heic/heif file, use
- # https://gpac.github.io/mp4box.js/test/filereader.html
- def read_boxes!(max_read_bytes = nil)
- end_pos = max_read_bytes.nil? ? nil : @stream.pos + max_read_bytes
- index = 0
-
- loop do
- return if end_pos && @stream.pos >= end_pos
-
- box_type, box_size = read_box_header!
-
- case box_type
- when "meta"
- handle_meta_box(box_size)
- when "pitm"
- handle_pitm_box(box_size)
- when "ipma"
- handle_ipma_box(box_size)
- when "hdlr"
- handle_hdlr_box(box_size)
- when "iprp", "ipco"
- read_boxes!(box_size)
- when "irot"
- handle_irot_box
- when "ispe"
- handle_ispe_box(box_size, index)
- when "mdat"
- @stream.skip(box_size)
- when "jxlc"
- handle_jxlc_box(box_size)
- else
- @stream.skip(box_size)
- end
-
- index += 1
- end
- end
-
- def handle_irot_box
- @rotation = (read_uint8! & 0x3) * 90
- end
-
- def handle_ispe_box(box_size, index)
- throw :finish if box_size < 12
-
- data = @stream.read(box_size)
- width, height = data[4...12].unpack("N2")
- @ispe_boxes << { index: index, size: [width, height] }
- end
-
- def handle_hdlr_box(box_size)
- throw :finish if box_size < 12
-
- data = @stream.read(box_size)
- throw :finish if data[8...12] != "pict"
- end
-
- def handle_ipma_box(box_size)
- @stream.read(3)
- flags3 = read_uint8!
- entries_count = read_uint32!
-
- entries_count.times do
- id = read_uint16!
- essen_count = read_uint8!
-
- essen_count.times do
- property_index = read_uint8! & 0x7F
-
- if flags3 & 1 == 1
- property_index = (property_index << 7) + read_uint8!
- end
-
- @ipma_boxes << { id: id, property_index: property_index - 1 }
- end
- end
- end
-
- def handle_pitm_box(box_size)
- data = @stream.read(box_size)
- @primary_box = data[4...6].unpack("S>")[0]
- end
-
- def handle_meta_box(box_size)
- throw :finish if box_size < 4
-
- @stream.read(4)
- read_boxes!(box_size - 4)
-
- throw :finish if !@primary_box
-
- primary_indices = @ipma_boxes
- .select { |box| box[:id] == @primary_box }
- .map { |box| box[:property_index] }
-
- ispe_box = @ispe_boxes.find do |box|
- primary_indices.include?(box[:index])
- end
-
- if ispe_box
- @final_size = ispe_box[:size]
- end
-
- throw :finish
- end
-
- def handle_jxlc_box(box_size)
- @final_size = JXL.new(@stream).read_size_header
- throw :finish
- end
-
- def read_box_header!
- size = read_uint32!
- type = @stream.read(4)
- size = read_uint64! - 8 if size == 1
- [type, size - 8]
- end
-
- def read_uint8!
- @stream.read(1).unpack("C")[0]
- end
-
- def read_uint16!
- @stream.read(2).unpack("S>")[0]
- end
-
- def read_uint32!
- @stream.read(4).unpack("N")[0]
- end
-
- def read_uint64!
- @stream.read(8).unpack("Q>")[0]
- end
- end
-
- def parse_size_for_avif
- bmff = IsoBmff.new(@stream)
- bmff.width_and_height
- end
-
- def parse_size_for_heic
- bmff = IsoBmff.new(@stream)
- bmff.width_and_height
- end
-
- def parse_size_for_heif
- bmff = IsoBmff.new(@stream)
- bmff.width_and_height
- end
-
- class JXL
- LENGTHS = [9, 13, 18, 30]
- MULTIPLIERS = [1, 1.2, Rational(4, 3), 1.5, Rational(16, 9), 1.25, 2]
-
- def initialize(stream)
- @stream = stream
- @bit_counter = 0
- end
-
- def read_size_header
- @words = @stream.read(6)[2..5].unpack('vv')
-
- # small mode allows for values <= 256 that are divisible by 8
- small = get_bits(1)
- if small == 1
- y = (get_bits(5) + 1) * 8
- x = x_from_ratio(y)
- if !x
- x = (get_bits(5) + 1) * 8
- end
- return [x, y]
- end
-
- len = LENGTHS[get_bits(2)]
- y = get_bits(len) + 1
- x = x_from_ratio(y)
- if !x
- len = LENGTHS[get_bits(2)]
- x = get_bits(len) + 1
- end
- [x, y]
- end
-
- def get_bits(size)
- if @words.size < (@bit_counter + size) / 16 + 1
- @words += @stream.read(4).unpack('vv')
- end
-
- dest_pos = 0
- dest = 0
- size.times do
- word = @bit_counter / 16
- source_pos = @bit_counter % 16
- dest |= ((@words[word] & (1 << source_pos)) > 0 ? 1 : 0) << dest_pos
- dest_pos += 1
- @bit_counter += 1
- end
- dest
- end
-
- def x_from_ratio(y)
- ratio = get_bits(3)
- if ratio == 0
- return nil
- else
- return (y * MULTIPLIERS[ratio - 1]).to_i
- end
- end
- end
-
- def parse_size_for_jxl
- if @stream.peek(2) == "\xFF\x0A".b
- JXL.new(@stream).read_size_header
- else
- bmff = IsoBmff.new(@stream)
- bmff.width_and_height
- end
- end
-
- class Gif # :nodoc:
- def initialize(stream)
- @stream = stream
- end
-
- def width_and_height
- @stream.read(11)[6..10].unpack('SS')
- end
-
- # Checks if a delay between frames exists and if it does, then the GIFs is
- # animated
- def animated?
- frames = 0
-
- # "GIF" + version (3) + width (2) + height (2)
- @stream.skip(10)
-
- # fields (1) + bg color (1) + pixel ratio (1)
- fields = @stream.read(3).unpack("CCC")[0]
- if fields & 0x80 != 0 # Global Color Table
- # 2 * (depth + 1) colors, each occupying 3 bytes (RGB)
- @stream.skip(3 * 2 ** ((fields & 0x7) + 1))
- end
-
- loop do
- block_type = @stream.read(1).unpack("C")[0]
-
- if block_type == 0x21 # Graphic Control Extension
- # extension type (1) + size (1)
- size = @stream.read(2).unpack("CC")[1]
- @stream.skip(size)
- skip_sub_blocks
- elsif block_type == 0x2C # Image Descriptor
- frames += 1
- return true if frames > 1
-
- # left position (2) + top position (2) + width (2) + height (2) + fields (1)
- fields = @stream.read(9).unpack("SSSSC")[4]
- if fields & 0x80 != 0 # Local Color Table
- # 2 * (depth + 1) colors, each occupying 3 bytes (RGB)
- @stream.skip(3 * 2 ** ((fields & 0x7) + 1))
- end
-
- @stream.skip(1) # LZW min code size (1)
- skip_sub_blocks
- else
- break # unrecognized block
- end
- end
-
- false
- end
-
- private
-
- def skip_sub_blocks
- loop do
- size = @stream.read(1).unpack("C")[0]
- if size == 0
- break
- else
- @stream.skip(size)
- end
- end
- end
- end
-
- def parse_size_for_gif
- gif = Gif.new(@stream)
- gif.width_and_height
- end
-
- def parse_size_for_png
- @stream.read(25)[16..24].unpack('NN')
- end
-
- def parse_size_for_jpeg
- exif = nil
- loop do
- @state = case @state
- when nil
- @stream.skip(2)
- :started
- when :started
- @stream.read_byte == 0xFF ? :sof : :started
- when :sof
- case @stream.read_byte
- when 0xe1 # APP1
- skip_chars = @stream.read_int - 2
- data = @stream.read(skip_chars)
- io = StringIO.new(data)
- if io.read(4) == "Exif"
- io.read(2)
- new_exif = Exif.new(IOStream.new(io)) rescue nil
- exif ||= new_exif # only use the first APP1 segment
- end
- :started
- when 0xe0..0xef
- :skipframe
- when 0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF
- :readsize
- when 0xFF
- :sof
- else
- :skipframe
- end
- when :skipframe
- skip_chars = @stream.read_int - 2
- @stream.skip(skip_chars)
- :started
- when :readsize
- @stream.skip(3)
- height = @stream.read_int
- width = @stream.read_int
- width, height = height, width if exif && exif.rotated?
- return [width, height, exif ? exif.orientation : 1]
- end
- end
- end
-
- def parse_size_for_bmp
- d = @stream.read(32)[14..28]
- header = d.unpack("C")[0]
-
- result = if header == 12
- d[4..8].unpack('SS')
- else
- d[4..-1].unpack('l<l<')
- end
-
- # ImageHeight is expressed in pixels. The absolute value is necessary because ImageHeight can be negative
- [result.first, result.last.abs]
- end
-
- def parse_size_for_webp
- vp8 = @stream.read(16)[12..15]
- _len = @stream.read(4).unpack("V")
- case vp8
- when "VP8 "
- parse_size_vp8
- when "VP8L"
- parse_size_vp8l
- when "VP8X"
- parse_size_vp8x
- else
- nil
- end
- end
-
- def parse_size_vp8
- w, h = @stream.read(10).unpack("@6vv")
- [w & 0x3fff, h & 0x3fff]
- end
-
- def parse_size_vp8l
- @stream.skip(1) # 0x2f
- b1, b2, b3, b4 = @stream.read(4).bytes.to_a
- [1 + (((b2 & 0x3f) << 8) | b1), 1 + (((b4 & 0xF) << 10) | (b3 << 2) | ((b2 & 0xC0) >> 6))]
- end
-
- def parse_size_vp8x
- flags = @stream.read(4).unpack("C")[0]
- b1, b2, b3, b4, b5, b6 = @stream.read(6).unpack("CCCCCC")
- width, height = 1 + b1 + (b2 << 8) + (b3 << 16), 1 + b4 + (b5 << 8) + (b6 << 16)
-
- if flags & 8 > 0 # exif
- # parse exif for orientation
- # TODO: find or create test images for this
- end
-
- return [width, height]
- end
-
- class Exif # :nodoc:
- attr_reader :width, :height, :orientation
-
- def initialize(stream)
- @stream = stream
- @width, @height, @orientation = nil
- parse_exif
- end
-
- def rotated?
- @orientation >= 5
- end
-
- private
-
- def get_exif_byte_order
- byte_order = @stream.read(2)
- case byte_order
- when 'II'
- @short, @long = 'v', 'V'
- when 'MM'
- @short, @long = 'n', 'N'
- else
- raise CannotParseImage
- end
- end
-
- def parse_exif_ifd
- tag_count = @stream.read(2).unpack(@short)[0]
- tag_count.downto(1) do
- type = @stream.read(2).unpack(@short)[0]
- @stream.read(6)
- data = @stream.read(2).unpack(@short)[0]
- case type
- when 0x0100 # image width
- @width = data
- when 0x0101 # image height
- @height = data
- when 0x0112 # orientation
- @orientation = data
- end
- if @width && @height && @orientation
- return # no need to parse more
- end
- @stream.read(2)
- end
- end
-
- def parse_exif
- @start_byte = @stream.pos
-
- get_exif_byte_order
-
- @stream.read(2) # 42
-
- offset = @stream.read(4).unpack(@long)[0]
- if @stream.respond_to?(:skip)
- @stream.skip(offset - 8)
- else
- @stream.read(offset - 8)
- end
-
- parse_exif_ifd
-
- @orientation ||= 1
- end
-
- end
-
- def parse_size_for_tiff
- exif = Exif.new(@stream)
- if exif.rotated?
- [exif.height, exif.width, exif.orientation]
- else
- [exif.width, exif.height, exif.orientation]
- end
- end
-
- def parse_size_for_psd
- @stream.read(26).unpack("x14NN").reverse
- end
-
- class Svg # :nodoc:
- def initialize(stream)
- @stream = stream
- @width, @height, @ratio, @viewbox_width, @viewbox_height = nil
- parse_svg
- end
-
- def width_and_height
- if @width && @height
- [@width, @height]
- elsif @width && @ratio
- [@width, @width / @ratio]
- elsif @height && @ratio
- [@height * @ratio, @height]
- elsif @viewbox_width && @viewbox_height
- [@viewbox_width, @viewbox_height]
- else
- nil
- end
- end
-
- private
-
- def parse_svg
- attr_name = []
- state = nil
-
- while (char = @stream.read(1)) && state != :stop do
- case char
- when "="
- if attr_name.join =~ /width/i
- @stream.read(1)
- @width = @stream.read_string_int
- return if @height
- elsif attr_name.join =~ /height/i
- @stream.read(1)
- @height = @stream.read_string_int
- return if @width
- elsif attr_name.join =~ /viewbox/i
- values = attr_value.split(/\s/)
- if values[2].to_f > 0 && values[3].to_f > 0
- @ratio = values[2].to_f / values[3].to_f
- @viewbox_width = values[2].to_i
- @viewbox_height = values[3].to_i
- end
- end
- when /\w/
- attr_name << char
- when "<"
- attr_name = [char]
- when ">"
- state = :stop if state == :started
- else
- state = :started if attr_name.join == "<svg"
- attr_name.clear
- end
- end
- end
-
- def attr_value
- @stream.read(1)
-
- value = []
- while @stream.read(1) =~ /([^"])/
- value << $1
- end
- value.join
- end
- end
-
- def parse_size_for_svg
- svg = Svg.new(@stream)
- svg.width_and_height
- end
-
- def parse_animated_for_gif
- gif = Gif.new(@stream)
- gif.animated?
- end
-
- def parse_animated_for_png
- # Signature (8) + IHDR chunk (4 + 4 + 13 + 4)
- @stream.read(33)
-
- loop do
- length = @stream.read(4).unpack("L>")[0]
- type = @stream.read(4)
-
- case type
- when "acTL"
- return true
- when "IDAT"
- return false
- end
-
- @stream.skip(length + 4)
- end
- end
-
- def parse_animated_for_webp
- vp8 = @stream.read(16)[12..15]
- _len = @stream.read(4).unpack("V")
- case vp8
- when "VP8 "
- false
- when "VP8L"
- false
- when "VP8X"
- flags = @stream.read(4).unpack("C")[0]
- flags & 2 > 0
- else
- nil
- end
- end
-
- def parse_animated_for_avif
- @stream.peek(12)[4..-1] == "ftypavis"
- end
-end
diff --git a/lib/fastimage/fastimage.rb b/lib/fastimage/fastimage.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage.rb
@@ -0,0 +1,471 @@
+require_relative 'fastimage_parsing/image_base'
+require_relative 'fastimage_parsing/stream_util'
+
+require_relative 'fastimage_parsing/avif'
+require_relative 'fastimage_parsing/bmp'
+require_relative 'fastimage_parsing/exif'
+require_relative 'fastimage_parsing/fiber_stream'
+require_relative 'fastimage_parsing/gif'
+require_relative 'fastimage_parsing/heic'
+require_relative 'fastimage_parsing/ico'
+require_relative 'fastimage_parsing/iso_bmff'
+require_relative 'fastimage_parsing/jpeg'
+require_relative 'fastimage_parsing/jxl'
+require_relative 'fastimage_parsing/jxlc'
+require_relative 'fastimage_parsing/png'
+require_relative 'fastimage_parsing/psd'
+require_relative 'fastimage_parsing/svg'
+require_relative 'fastimage_parsing/tiff'
+require_relative 'fastimage_parsing/type_parser'
+require_relative 'fastimage_parsing/webp'
+
+class FastImage
+ include FastImageParsing
+
+ attr_reader :bytes_read
+
+ class FastImageException < StandardError # :nodoc:
+ end
+ class UnknownImageType < FastImageException # :nodoc:
+ end
+ class ImageFetchFailure < FastImageException # :nodoc:
+ end
+ class SizeNotFound < FastImageException # :nodoc:
+ end
+ class CannotParseImage < FastImageException # :nodoc:
+ end
+ class BadImageURI < FastImageException # :nodoc:
+ end
+
+ DefaultTimeout = 2 unless const_defined?(:DefaultTimeout)
+
+ LocalFileChunkSize = 256 unless const_defined?(:LocalFileChunkSize)
+
+ private
+
+ Parsers = {
+ :bmp => Bmp,
+ :gif => Gif,
+ :jpeg => Jpeg,
+ :png => Png,
+ :tiff => Tiff,
+ :psd => Psd,
+ :heic => Heic,
+ :heif => Heic,
+ :webp => Webp,
+ :svg => Svg,
+ :ico => Ico,
+ :cur => Ico,
+ :jxl => Jxl,
+ :avif => Avif
+ }.freeze
+
+ public
+
+ SUPPORTED_IMAGE_TYPES = Parsers.keys.freeze
+
+ # Returns an array containing the width and height of the image.
+ # It will return nil if the image could not be fetched, or if the image type was not recognised.
+ #
+ # By default there is a timeout of 2 seconds for opening and reading from a remote server.
+ # This can be changed by passing a :timeout => number_of_seconds in the options.
+ #
+ # If you wish FastImage to raise if it cannot size the image for any reason, then pass
+ # :raise_on_failure => true in the options.
+ #
+ # FastImage knows about GIF, JPEG, BMP, TIFF, ICO, CUR, PNG, HEIC/HEIF, AVIF, PSD, SVG, WEBP and JXL files.
+ #
+ # === Example
+ #
+ # require 'fastimage'
+ #
+ # FastImage.size("https://switchstep.com/images/ios.gif")
+ # => [196, 283]
+ # FastImage.size("http://switchstep.com/images/ss_logo.png")
+ # => [300, 300]
+ # FastImage.size("https://upload.wikimedia.org/wikipedia/commons/0/09/Jpeg_thumb_artifacts_test.jpg")
+ # => [1280, 800]
+ # FastImage.size("https://eeweb.engineering.nyu.edu/~yao/EL5123/image/lena_gray.bmp")
+ # => [512, 512]
+ # FastImage.size("test/fixtures/test.jpg")
+ # => [882, 470]
+ # FastImage.size("http://switchstep.com/does_not_exist")
+ # => nil
+ # FastImage.size("http://switchstep.com/does_not_exist", :raise_on_failure=>true)
+ # => raises FastImage::ImageFetchFailure
+ # FastImage.size("http://switchstep.com/images/favicon.ico", :raise_on_failure=>true)
+ # => [16, 16]
+ # FastImage.size("http://switchstep.com/foo.ics", :raise_on_failure=>true)
+ # => raises FastImage::UnknownImageType
+ # FastImage.size("http://switchstep.com/images/favicon.ico", :raise_on_failure=>true, :timeout=>0.01)
+ # => raises FastImage::ImageFetchFailure
+ # FastImage.size("http://switchstep.com/images/faulty.jpg", :raise_on_failure=>true)
+ # => raises FastImage::SizeNotFound
+ #
+ # === Supported options
+ # [:timeout]
+ # Overrides the default timeout of 2 seconds. Applies both to reading from and opening the http connection.
+ # [:raise_on_failure]
+ # If set to true causes an exception to be raised if the image size cannot be found for any reason.
+ #
+ def self.size(uri, options={})
+ new(uri, options).size
+ end
+
+ # Returns an symbol indicating the image type fetched from a uri.
+ # It will return nil if the image could not be fetched, or if the image type was not recognised.
+ #
+ # By default there is a timeout of 2 seconds for opening and reading from a remote server.
+ # This can be changed by passing a :timeout => number_of_seconds in the options.
+ #
+ # If you wish FastImage to raise if it cannot find the type of the image for any reason, then pass
+ # :raise_on_failure => true in the options.
+ #
+ # === Example
+ #
+ # require 'fastimage'
+ #
+ # FastImage.type("https://switchstep.com/images/ios.gif")
+ # => :gif
+ # FastImage.type("http://switchstep.com/images/ss_logo.png")
+ # => :png
+ # FastImage.type("https://upload.wikimedia.org/wikipedia/commons/0/09/Jpeg_thumb_artifacts_test.jpg")
+ # => :jpeg
+ # FastImage.type("https://eeweb.engineering.nyu.edu/~yao/EL5123/image/lena_gray.bmp")
+ # => :bmp
+ # FastImage.type("test/fixtures/test.jpg")
+ # => :jpeg
+ # FastImage.type("http://switchstep.com/does_not_exist")
+ # => nil
+ # File.open("/some/local/file.gif", "r") {|io| FastImage.type(io)}
+ # => :gif
+ # FastImage.type("test/fixtures/test.tiff")
+ # => :tiff
+ # FastImage.type("test/fixtures/test.psd")
+ # => :psd
+ #
+ # === Supported options
+ # [:timeout]
+ # Overrides the default timeout of 2 seconds. Applies both to reading from and opening the http connection.
+ # [:raise_on_failure]
+ # If set to true causes an exception to be raised if the image type cannot be found for any reason.
+ #
+ def self.type(uri, options={})
+ new(uri, options).type
+ end
+
+ # Returns a boolean value indicating the image is animated.
+ # It will return nil if the image could not be fetched, or if the image type was not recognised.
+ #
+ # By default there is a timeout of 2 seconds for opening and reading from a remote server.
+ # This can be changed by passing a :timeout => number_of_seconds in the options.
+ #
+ # If you wish FastImage to raise if it cannot find the type of the image for any reason, then pass
+ # :raise_on_failure => true in the options.
+ #
+ # === Example
+ #
+ # require 'fastimage'
+ #
+ # FastImage.animated?("test/fixtures/test.gif")
+ # => false
+ # FastImage.animated?("test/fixtures/animated.gif")
+ # => true
+ #
+ # === Supported options
+ # [:timeout]
+ # Overrides the default timeout of 2 seconds. Applies both to reading from and opening the http connection.
+ # [:raise_on_failure]
+ # If set to true causes an exception to be raised if the image type cannot be found for any reason.
+ #
+ def self.animated?(uri, options={})
+ new(uri, options).animated
+ end
+
+ def initialize(uri, options={})
+ @uri = uri
+ @options = {
+ :timeout => DefaultTimeout,
+ :raise_on_failure => false,
+ :proxy => nil,
+ :http_header => {}
+ }.merge(options)
+ end
+
+ def type
+ @property = :type
+ fetch unless defined?(@type)
+ @type
+ end
+
+ def size
+ @property = :size
+ begin
+ fetch unless defined?(@size)
+ rescue CannotParseImage
+ end
+
+ raise SizeNotFound if @options[:raise_on_failure] && !@size
+
+ @size
+ end
+
+ def orientation
+ size unless defined?(@size)
+ @orientation ||= 1 if @size
+ end
+
+ def width
+ size && @size[0]
+ end
+
+ def height
+ size && @size[1]
+ end
+
+ def animated
+ @property = :animated
+ fetch unless defined?(@animated)
+ @animated
+ end
+
+ def content_length
+ @property = :content_length
+ fetch unless defined?(@content_length)
+ @content_length
+ end
+
+ # find an appropriate method to fetch the image according to the passed parameter
+ def fetch
+ raise BadImageURI if @uri.nil?
+
+ if @uri.respond_to?(:read)
+ fetch_using_read(@uri)
+ elsif @uri.start_with?('data:')
+ fetch_using_base64(@uri)
+ else
+ begin
+ @parsed_uri = URI.parse(@uri)
+ rescue URI::InvalidURIError
+ fetch_using_file_open
+ else
+ if @parsed_uri.scheme == "http" || @parsed_uri.scheme == "https"
+ fetch_using_http
+ else
+ fetch_using_file_open
+ end
+ end
+ end
+
+ raise SizeNotFound if @options[:raise_on_failure] && @property == :size && !@size
+
+ rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET,
+ Errno::ENETUNREACH, ImageFetchFailure, Net::HTTPBadResponse, EOFError, Errno::ENOENT,
+ OpenSSL::SSL::SSLError
+ raise ImageFetchFailure if @options[:raise_on_failure]
+ rescue UnknownImageType, BadImageURI, CannotParseImage
+ raise if @options[:raise_on_failure]
+
+ ensure
+ @uri.rewind if @uri.respond_to?(:rewind)
+
+ end
+
+ private
+
+ def fetch_using_http
+ @redirect_count = 0
+
+ fetch_using_http_from_parsed_uri
+ end
+
+ # Some invalid locations need escaping
+ def escaped_location(location)
+ begin
+ URI(location)
+ rescue URI::InvalidURIError
+ ::URI::DEFAULT_PARSER.escape(location)
+ else
+ location
+ end
+ end
+
+ def fetch_using_http_from_parsed_uri
+ raise ImageFetchFailure unless @parsed_uri.is_a?(URI::HTTP)
+
+ http_header = {'Accept-Encoding' => 'identity'}.merge(@options[:http_header])
+
+ setup_http
+ @http.request_get(@parsed_uri.request_uri, http_header) do |res|
+ if res.is_a?(Net::HTTPRedirection) && @redirect_count < 4
+ @redirect_count += 1
+ begin
+ location = res['Location']
+ raise ImageFetchFailure if location.nil? || location.empty?
+
+ @parsed_uri = URI.join(@parsed_uri, escaped_location(location))
+ rescue URI::InvalidURIError
+ else
+ fetch_using_http_from_parsed_uri
+ break
+ end
+ end
+
+ raise ImageFetchFailure unless res.is_a?(Net::HTTPSuccess)
+
+ @content_length = res.content_length
+ break if @property == :content_length
+
+ read_fiber = Fiber.new do
+ res.read_body do |str|
+ Fiber.yield str
+ end
+ nil
+ end
+
+ case res['content-encoding']
+ when 'deflate', 'gzip', 'x-gzip'
+ begin
+ gzip = Zlib::GzipReader.new(FiberStream.new(read_fiber))
+ rescue FiberError, Zlib::GzipFile::Error
+ raise CannotParseImage
+ end
+
+ read_fiber = Fiber.new do
+ while data = gzip.readline
+ Fiber.yield data
+ end
+ nil
+ end
+ end
+
+ parse_packets FiberStream.new(read_fiber)
+
+ break # needed to actively quit out of the fetch
+ end
+ end
+
+ def protocol_relative_url?(url)
+ url.start_with?("//")
+ end
+
+ def proxy_uri
+ begin
+ if @options[:proxy]
+ proxy = URI.parse(@options[:proxy])
+ else
+ proxy = ENV['http_proxy'] && ENV['http_proxy'] != "" ? URI.parse(ENV['http_proxy']) : nil
+ end
+ rescue URI::InvalidURIError
+ proxy = nil
+ end
+ proxy
+ end
+
+ def setup_http
+ proxy = proxy_uri
+
+ if proxy
+ @http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new(@parsed_uri.host, @parsed_uri.port)
+ else
+ @http = Net::HTTP.new(@parsed_uri.host, @parsed_uri.port)
+ end
+ @http.use_ssl = (@parsed_uri.scheme == "https")
+ @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+ @http.open_timeout = @options[:timeout]
+ @http.read_timeout = @options[:timeout]
+ end
+
+ def fetch_using_read(readable)
+ return @content_length = readable.size if @property == :content_length && readable.respond_to?(:size)
+
+ readable.rewind if readable.respond_to?(:rewind)
+ # Pathnames respond to read, but always return the first
+ # chunk of the file unlike an IO (even though the
+ # docuementation for it refers to IO). Need to supply
+ # an offset in this case.
+ if readable.is_a?(Pathname)
+ read_fiber = Fiber.new do
+ offset = 0
+ while str = readable.read(LocalFileChunkSize, offset)
+ Fiber.yield str
+ offset += LocalFileChunkSize
+ end
+ nil
+ end
+ else
+ read_fiber = Fiber.new do
+ while str = readable.read(LocalFileChunkSize)
+ Fiber.yield str
+ end
+ nil
+ end
+ end
+
+ parse_packets FiberStream.new(read_fiber)
+ end
+
+ def fetch_using_file_open
+ return @content_length = File.size?(@uri) if @property == :content_length
+
+ File.open(@uri) do |s|
+ fetch_using_read(s)
+ end
+ end
+
+ def fetch_using_base64(uri)
+ decoded = begin
+ uri.split(',')[1].unpack("m").first
+ rescue
+ raise CannotParseImage
+ end
+
+ fetch_using_read StringIO.new(decoded)
+ end
+
+ def parse_packets(stream)
+ @stream = stream
+
+ begin
+ @type = TypeParser.new(@stream).type unless defined?(@type)
+
+ result = case @property
+ when :type
+ @type
+ when :size
+ parse_size
+ when :animated
+ parse_animated
+ end
+
+ if result != nil
+ # extract exif orientation if it was found
+ if @property == :size && result.size == 3
+ @orientation = result.pop
+ else
+ @orientation = 1
+ end
+
+ instance_variable_set("@#{@property}", result)
+ else
+ raise CannotParseImage
+ end
+ rescue FiberError
+ raise CannotParseImage
+ end
+ end
+
+ def parser_class
+ klass = Parsers[@type]
+ raise UnknownImageType unless klass
+ klass
+ end
+
+ def parse_size
+ parser_class.new(@stream).dimensions
+ end
+
+ def parse_animated
+ parser_class.new(@stream).animated?
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/avif.rb b/lib/fastimage/fastimage_parsing/avif.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/avif.rb
@@ -0,0 +1,12 @@
+module FastImageParsing
+ class Avif < ImageBase # :nodoc:
+ def dimensions
+ bmff = IsoBmff.new(@stream)
+ [bmff.width, bmff.height]
+ end
+
+ def animated?
+ @stream.peek(12)[4..-1] == "ftypavis"
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/bmp.rb b/lib/fastimage/fastimage_parsing/bmp.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/bmp.rb
@@ -0,0 +1,17 @@
+module FastImageParsing
+ class Bmp < ImageBase # :nodoc:
+ def dimensions
+ d = @stream.read(32)[14..28]
+ header = d.unpack("C")[0]
+
+ result = if header == 12
+ d[4..8].unpack('SS')
+ else
+ d[4..-1].unpack('l<l<')
+ end
+
+ # ImageHeight is expressed in pixels. The absolute value is necessary because ImageHeight can be negative
+ [result.first, result.last.abs]
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/exif.rb b/lib/fastimage/fastimage_parsing/exif.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/exif.rb
@@ -0,0 +1,76 @@
+module FastImageParsing
+ class Exif # :nodoc:
+ attr_reader :width, :height, :orientation
+
+ def initialize(stream)
+ @stream = stream
+ @width, @height, @orientation = nil
+ parse_exif
+ end
+
+ def rotated?
+ @orientation >= 5
+ end
+
+ private
+
+ def get_exif_byte_order
+ byte_order = @stream.read(2)
+ case byte_order
+ when 'II'
+ @short, @long = 'v', 'V'
+ when 'MM'
+ @short, @long = 'n', 'N'
+ else
+ raise FastImage::CannotParseImage
+ end
+ end
+
+ def parse_exif_ifd
+ tag_count = @stream.read(2).unpack(@short)[0]
+ tag_count.downto(1) do
+ type = @stream.read(2).unpack(@short)[0]
+ data_type = @stream.read(2).unpack(@short)[0]
+ @stream.read(4)
+
+ if data_type == 4
+ data = @stream.read(4).unpack(@long)[0]
+ else
+ data = @stream.read(2).unpack(@short)[0]
+ @stream.read(2)
+ end
+
+ case type
+ when 0x0100 # image width
+ @width = data
+ when 0x0101 # image height
+ @height = data
+ when 0x0112 # orientation
+ @orientation = data
+ end
+ if @width && @height && @orientation
+ return # no need to parse more
+ end
+ end
+ end
+
+ def parse_exif
+ @start_byte = @stream.pos
+
+ get_exif_byte_order
+
+ @stream.read(2) # 42
+
+ offset = @stream.read(4).unpack(@long)[0]
+ if @stream.respond_to?(:skip)
+ @stream.skip(offset - 8)
+ else
+ @stream.read(offset - 8)
+ end
+
+ parse_exif_ifd
+
+ @orientation ||= 1
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/fiber_stream.rb b/lib/fastimage/fastimage_parsing/fiber_stream.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/fiber_stream.rb
@@ -0,0 +1,58 @@
+module FastImageParsing
+ class FiberStream # :nodoc:
+ include StreamUtil
+ attr_reader :pos
+
+ # read_fiber should return nil if it no longer has anything to return when resumed
+ # so the result of the whole Fiber block should be set to be nil in case yield is no
+ # longer called
+ def initialize(read_fiber)
+ @read_fiber = read_fiber
+ @pos = 0
+ @strpos = 0
+ @str = ''
+ end
+
+ # Peeking beyond the end of the input will raise
+ def peek(n)
+ while @strpos + n > @str.size
+ unused_str = @str[@strpos..-1]
+
+ new_string = @read_fiber.resume
+ raise FastImage::CannotParseImage if !new_string
+ # we are dealing with bytes here, so force the encoding
+ new_string.force_encoding("ASCII-8BIT") if new_string.respond_to? :force_encoding
+
+ @str = unused_str + new_string
+ @strpos = 0
+ end
+
+ @str[@strpos, n]
+ end
+
+ def read(n)
+ result = peek(n)
+ @strpos += n
+ @pos += n
+ result
+ end
+
+ def skip(n)
+ discarded = 0
+ fetched = @str[@strpos..-1].size
+ while n > fetched
+ discarded += @str[@strpos..-1].size
+ new_string = @read_fiber.resume
+ raise FastImage::CannotParseImage if !new_string
+
+ new_string.force_encoding("ASCII-8BIT") if new_string.respond_to? :force_encoding
+
+ fetched += new_string.size
+ @str = new_string
+ @strpos = 0
+ end
+ @strpos = @strpos + n - discarded
+ @pos += n
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/gif.rb b/lib/fastimage/fastimage_parsing/gif.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/gif.rb
@@ -0,0 +1,63 @@
+module FastImageParsing
+ class Gif < ImageBase # :nodoc:
+ def dimensions
+ @stream.read(11)[6..10].unpack('SS')
+ end
+
+ # Checks for multiple frames
+ def animated?
+ frames = 0
+
+ # "GIF" + version (3) + width (2) + height (2)
+ @stream.skip(10)
+
+ # fields (1) + bg color (1) + pixel ratio (1)
+ fields = @stream.read(3).unpack("CCC")[0]
+ if fields & 0x80 != 0 # Global Color Table
+ # 2 * (depth + 1) colors, each occupying 3 bytes (RGB)
+ @stream.skip(3 * 2 ** ((fields & 0x7) + 1))
+ end
+
+ loop do
+ block_type = @stream.read(1).unpack("C")[0]
+
+ if block_type == 0x21 # Graphic Control Extension
+ # extension type (1) + size (1)
+ size = @stream.read(2).unpack("CC")[1]
+ @stream.skip(size)
+ skip_sub_blocks
+ elsif block_type == 0x2C # Image Descriptor
+ frames += 1
+ return true if frames > 1
+
+ # left position (2) + top position (2) + width (2) + height (2) + fields (1)
+ fields = @stream.read(9).unpack("SSSSC")[4]
+ if fields & 0x80 != 0 # Local Color Table
+ # 2 * (depth + 1) colors, each occupying 3 bytes (RGB)
+ @stream.skip(3 * 2 ** ((fields & 0x7) + 1))
+ end
+
+ @stream.skip(1) # LZW min code size (1)
+ skip_sub_blocks
+ else
+ break # unrecognized block
+ end
+ end
+
+ false
+ end
+
+ private
+
+ def skip_sub_blocks
+ loop do
+ size = @stream.read(1).unpack("C")[0]
+ if size == 0
+ break
+ else
+ @stream.skip(size)
+ end
+ end
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/heic.rb b/lib/fastimage/fastimage_parsing/heic.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/heic.rb
@@ -0,0 +1,8 @@
+module FastImageParsing
+ class Heic < ImageBase # :nodoc:
+ def dimensions
+ bmff = IsoBmff.new(@stream)
+ [bmff.width, bmff.height]
+ end
+ end
+end
\ No newline at end of file
diff --git a/lib/fastimage/fastimage_parsing/ico.rb b/lib/fastimage/fastimage_parsing/ico.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/ico.rb
@@ -0,0 +1,9 @@
+module FastImageParsing
+ class Ico < ImageBase
+ def dimensions
+ icons = @stream.read(6)[4..5].unpack('v').first
+ sizes = icons.times.map { @stream.read(16).unpack('C2').map { |x| x == 0 ? 256 : x } }.sort_by { |w,h| w * h }
+ sizes.last
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/image_base.rb b/lib/fastimage/fastimage_parsing/image_base.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/image_base.rb
@@ -0,0 +1,17 @@
+module FastImageParsing
+ class ImageBase # :nodoc:
+ def initialize(stream)
+ @stream = stream
+ end
+
+ # Implement in subclasses
+ def dimensions
+ raise NotImplementedError
+ end
+
+ # Implement in subclasses if appropriate
+ def animated?
+ nil
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/iso_bmff.rb b/lib/fastimage/fastimage_parsing/iso_bmff.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/iso_bmff.rb
@@ -0,0 +1,176 @@
+module FastImageParsing
+ # HEIC/AVIF are a special case of the general ISO_BMFF format, in which all data is encapsulated in typed boxes,
+ # with a mandatory ftyp box that is used to indicate particular file types. Is composed of nested "boxes". Each
+ # box has a header composed of
+ # - Size (32 bit integer)
+ # - Box type (4 chars)
+ # - Extended size: only if size === 1, the type field is followed by 64 bit integer of extended size
+ # - Payload: Type-dependent
+ class IsoBmff # :nodoc:
+ attr_reader :width, :height
+
+ def initialize(stream)
+ @stream = stream
+ @width, @height = nil
+ parse_isobmff
+ end
+
+ def parse_isobmff
+ @rotation = 0
+ @max_size = nil
+ @primary_box = nil
+ @ipma_boxes = []
+ @ispe_boxes = []
+ @final_size = nil
+
+ catch :finish do
+ read_boxes!
+ end
+
+ if [90, 270].include?(@rotation)
+ @final_size.reverse!
+ end
+
+ @width, @height = @final_size
+ end
+
+ private
+
+ # Format specs: https://www.loc.gov/preservation/digital/formats/fdd/fdd000525.shtml
+
+ # If you need to inspect a heic/heif file, use
+ # https://gpac.github.io/mp4box.js/test/filereader.html
+ def read_boxes!(max_read_bytes = nil)
+ end_pos = max_read_bytes.nil? ? nil : @stream.pos + max_read_bytes
+ index = 0
+
+ loop do
+ return if end_pos && @stream.pos >= end_pos
+
+ box_type, box_size = read_box_header!
+
+ case box_type
+ when "meta"
+ handle_meta_box(box_size)
+ when "pitm"
+ handle_pitm_box(box_size)
+ when "ipma"
+ handle_ipma_box(box_size)
+ when "hdlr"
+ handle_hdlr_box(box_size)
+ when "iprp", "ipco"
+ read_boxes!(box_size)
+ when "irot"
+ handle_irot_box
+ when "ispe"
+ handle_ispe_box(box_size, index)
+ when "mdat"
+ @stream.skip(box_size)
+ when "jxlc"
+ handle_jxlc_box(box_size)
+ else
+ @stream.skip(box_size)
+ end
+
+ index += 1
+ end
+ end
+
+ def handle_irot_box
+ @rotation = (read_uint8! & 0x3) * 90
+ end
+
+ def handle_ispe_box(box_size, index)
+ throw :finish if box_size < 12
+
+ data = @stream.read(box_size)
+ width, height = data[4...12].unpack("N2")
+ @ispe_boxes << { index: index, size: [width, height] }
+ end
+
+ def handle_hdlr_box(box_size)
+ throw :finish if box_size < 12
+
+ data = @stream.read(box_size)
+ throw :finish if data[8...12] != "pict"
+ end
+
+ def handle_ipma_box(box_size)
+ @stream.read(3)
+ flags3 = read_uint8!
+ entries_count = read_uint32!
+
+ entries_count.times do
+ id = read_uint16!
+ essen_count = read_uint8!
+
+ essen_count.times do
+ property_index = read_uint8! & 0x7F
+
+ if flags3 & 1 == 1
+ property_index = (property_index << 7) + read_uint8!
+ end
+
+ @ipma_boxes << { id: id, property_index: property_index - 1 }
+ end
+ end
+ end
+
+ def handle_pitm_box(box_size)
+ data = @stream.read(box_size)
+ @primary_box = data[4...6].unpack("S>")[0]
+ end
+
+ def handle_meta_box(box_size)
+ throw :finish if box_size < 4
+
+ @stream.read(4)
+ read_boxes!(box_size - 4)
+
+ throw :finish if !@primary_box
+
+ primary_indices = @ipma_boxes
+ .select { |box| box[:id] == @primary_box }
+ .map { |box| box[:property_index] }
+
+ ispe_box = @ispe_boxes.find do |box|
+ primary_indices.include?(box[:index])
+ end
+
+ if ispe_box
+ @final_size = ispe_box[:size]
+ end
+
+ throw :finish
+ end
+
+ def handle_jxlc_box(box_size)
+ jxlc = Jxlc.new(@stream)
+ @final_size = [jxlc.width, jxlc.height]
+ throw :finish
+ end
+
+ def read_box_header!
+ size = read_uint32!
+ type = @stream.read(4)
+ size = read_uint64! - 8 if size == 1
+ [type, size - 8]
+ end
+
+ def read_uint8!
+ @stream.read(1).unpack("C")[0]
+ end
+
+ def read_uint16!
+ @stream.read(2).unpack("S>")[0]
+ end
+
+ def read_uint32!
+ @stream.read(4).unpack("N")[0]
+ end
+
+ def read_uint64!
+ @stream.read(8).unpack("Q>")[0]
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/jpeg.rb b/lib/fastimage/fastimage_parsing/jpeg.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/jpeg.rb
@@ -0,0 +1,52 @@
+module FastImageParsing
+ class IOStream < SimpleDelegator # :nodoc:
+ include StreamUtil
+ end
+
+ class Jpeg < ImageBase # :nodoc:
+ def dimensions
+ exif = nil
+ state = nil
+ loop do
+ state = case state
+ when nil
+ @stream.skip(2)
+ :started
+ when :started
+ @stream.read_byte == 0xFF ? :sof : :started
+ when :sof
+ case @stream.read_byte
+ when 0xe1 # APP1
+ skip_chars = @stream.read_int - 2
+ data = @stream.read(skip_chars)
+ io = StringIO.new(data)
+ if io.read(4) == "Exif"
+ io.read(2)
+ new_exif = Exif.new(IOStream.new(io)) rescue nil
+ exif ||= new_exif # only use the first APP1 segment
+ end
+ :started
+ when 0xe0..0xef
+ :skipframe
+ when 0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF
+ :readsize
+ when 0xFF
+ :sof
+ else
+ :skipframe
+ end
+ when :skipframe
+ skip_chars = @stream.read_int - 2
+ @stream.skip(skip_chars)
+ :started
+ when :readsize
+ @stream.skip(3)
+ height = @stream.read_int
+ width = @stream.read_int
+ width, height = height, width if exif && exif.rotated?
+ return [width, height, exif ? exif.orientation : 1]
+ end
+ end
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/jxl.rb b/lib/fastimage/fastimage_parsing/jxl.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/jxl.rb
@@ -0,0 +1,13 @@
+module FastImageParsing
+ class Jxl < ImageBase # :nodoc:
+ def dimensions
+ if @stream.peek(2) == "\xFF\x0A".b
+ jxlc = Jxlc.new(@stream)
+ [jxlc.width, jxlc.height]
+ else
+ bmff = IsoBmff.new(@stream)
+ [bmff.width, bmff.height]
+ end
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/jxlc.rb b/lib/fastimage/fastimage_parsing/jxlc.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/jxlc.rb
@@ -0,0 +1,75 @@
+module FastImageParsing
+ class Jxlc # :nodoc:
+ attr_reader :width, :height
+
+ LENGTHS = [9, 13, 18, 30]
+ MULTIPLIERS = [1, 1.2, Rational(4, 3), 1.5, Rational(16, 9), 1.25, 2]
+
+ def initialize(stream)
+ @stream = stream
+ @width, @height´ = nil
+ @bit_counter = 0
+ parse_jxlc
+ end
+
+ def parse_jxlc
+ @words = @stream.read(6)[2..5].unpack('vv')
+
+ # small mode allows for values <= 256 that are divisible by 8
+ small = get_bits(1)
+ if small == 1
+ y = (get_bits(5) + 1) * 8
+ x = x_from_ratio(y)
+ if !x
+ x = (get_bits(5) + 1) * 8
+ end
+ @width, @height = x, y
+ return
+ end
+
+ len = LENGTHS[get_bits(2)]
+ y = get_bits(len) + 1
+ x = x_from_ratio(y)
+ if !x
+ len = LENGTHS[get_bits(2)]
+ x = get_bits(len) + 1
+ end
+ @width, @height = x, y
+ end
+
+ def get_bits(size)
+ if @words.size < (@bit_counter + size) / 16 + 1
+ @words += @stream.read(4).unpack('vv')
+ end
+
+ dest_pos = 0
+ dest = 0
+ size.times do
+ word = @bit_counter / 16
+ source_pos = @bit_counter % 16
+ dest |= ((@words[word] & (1 << source_pos)) > 0 ? 1 : 0) << dest_pos
+ dest_pos += 1
+ @bit_counter += 1
+ end
+ dest
+ end
+
+ def x_from_ratio(y)
+ ratio = get_bits(3)
+ if ratio == 0
+ return nil
+ else
+ return (y * MULTIPLIERS[ratio - 1]).to_i
+ end
+ end
+ end
+
+ def parse_size_for_jxl
+ if @stream.peek(2) == "\xFF\x0A".b
+ JXL.new(@stream).read_size_header
+ else
+ bmff = IsoBmff.new(@stream)
+ bmff.width_and_height
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/png.rb b/lib/fastimage/fastimage_parsing/png.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/png.rb
@@ -0,0 +1,26 @@
+module FastImageParsing
+ class Png < ImageBase # :nodoc:
+ def dimensions
+ @stream.read(25)[16..24].unpack('NN')
+ end
+
+ def animated?
+ # Signature (8) + IHDR chunk (4 + 4 + 13 + 4)
+ @stream.read(33)
+
+ loop do
+ length = @stream.read(4).unpack("L>")[0]
+ type = @stream.read(4)
+
+ case type
+ when "acTL"
+ return true
+ when "IDAT"
+ return false
+ end
+
+ @stream.skip(length + 4)
+ end
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/psd.rb b/lib/fastimage/fastimage_parsing/psd.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/psd.rb
@@ -0,0 +1,7 @@
+module FastImageParsing
+ class Psd < ImageBase # :nodoc:
+ def dimensions
+ @stream.read(26).unpack("x14NN").reverse
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/stream_util.rb b/lib/fastimage/fastimage_parsing/stream_util.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/stream_util.rb
@@ -0,0 +1,19 @@
+module FastImageParsing
+ module StreamUtil # :nodoc:
+ def read_byte
+ read(1)[0].ord
+ end
+
+ def read_int
+ read(2).unpack('n')[0]
+ end
+
+ def read_string_int
+ value = []
+ while read(1) =~ /(\d)/
+ value << $1
+ end
+ value.join.to_i
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/svg.rb b/lib/fastimage/fastimage_parsing/svg.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/svg.rb
@@ -0,0 +1,69 @@
+module FastImageParsing
+ class Svg < ImageBase # :nodoc:
+ def dimensions
+ @width, @height, @ratio, @viewbox_width, @viewbox_height = nil
+
+ parse_svg
+
+ if @width && @height
+ [@width, @height]
+ elsif @width && @ratio
+ [@width, @width / @ratio]
+ elsif @height && @ratio
+ [@height * @ratio, @height]
+ elsif @viewbox_width && @viewbox_height
+ [@viewbox_width, @viewbox_height]
+ else
+ nil
+ end
+ end
+
+ private
+
+ def parse_svg
+ attr_name = []
+ state = nil
+
+ while (char = @stream.read(1)) && state != :stop do
+ case char
+ when "="
+ if attr_name.join =~ /width/i
+ @stream.read(1)
+ @width = @stream.read_string_int
+ return if @height
+ elsif attr_name.join =~ /height/i
+ @stream.read(1)
+ @height = @stream.read_string_int
+ return if @width
+ elsif attr_name.join =~ /viewbox/i
+ values = attr_value.split(/\s/)
+ if values[2].to_f > 0 && values[3].to_f > 0
+ @ratio = values[2].to_f / values[3].to_f
+ @viewbox_width = values[2].to_i
+ @viewbox_height = values[3].to_i
+ end
+ end
+ when /\w/
+ attr_name << char
+ when "<"
+ attr_name = [char]
+ when ">"
+ state = :stop if state == :started
+ else
+ state = :started if attr_name.join == "<svg"
+ attr_name.clear
+ end
+ end
+ end
+
+ def attr_value
+ @stream.read(1)
+
+ value = []
+ while @stream.read(1) =~ /([^"])/
+ value << $1
+ end
+ value.join
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/tiff.rb b/lib/fastimage/fastimage_parsing/tiff.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/tiff.rb
@@ -0,0 +1,16 @@
+module FastImageParsing
+ class Tiff < ImageBase # :nodoc:
+ def initialize(stream)
+ @stream = stream
+ end
+
+ def dimensions
+ exif = Exif.new(@stream)
+ if exif.rotated?
+ [exif.height, exif.width, exif.orientation]
+ else
+ [exif.width, exif.height, exif.orientation]
+ end
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/type_parser.rb b/lib/fastimage/fastimage_parsing/type_parser.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/type_parser.rb
@@ -0,0 +1,69 @@
+module FastImageParsing
+ class TypeParser
+ def initialize(stream)
+ @stream = stream
+ end
+
+ # type will use peek to get enough bytes to determing the type of the image
+ def type
+ parsed_type = case @stream.peek(2)
+ when "BM"
+ :bmp
+ when "GI"
+ :gif
+ when 0xff.chr + 0xd8.chr
+ :jpeg
+ when 0x89.chr + "P"
+ :png
+ when "II", "MM"
+ case @stream.peek(11)[8..10]
+ when "APC", "CR\002"
+ nil # do not recognise CRW or CR2 as tiff
+ else
+ :tiff
+ end
+ when '8B'
+ :psd
+ when "\xFF\x0A".b
+ :jxl
+ when "\0\0"
+ case @stream.peek(3).bytes.to_a.last
+ when 0
+ # http://www.ftyps.com/what.html
+ case @stream.peek(12)[4..-1]
+ when "ftypavif"
+ :avif
+ when "ftypavis"
+ :avif
+ when "ftypheic"
+ :heic
+ when "ftypmif1"
+ :heif
+ else
+ if @stream.peek(7)[4..-1] == 'JXL'
+ :jxl
+ end
+ end
+ # ico has either a 1 (for ico format) or 2 (for cursor) at offset 3
+ when 1 then :ico
+ when 2 then :cur
+ end
+ when "RI"
+ :webp if @stream.peek(12)[8..11] == "WEBP"
+ when "<s"
+ :svg if @stream.peek(4) == "<svg"
+ when /\s\s|\s<|<[?!]/, 0xef.chr + 0xbb.chr
+ # Peek 10 more chars each time, and if end of file is reached just raise
+ # unknown. We assume the <svg tag cannot be within 10 chars of the end of
+ # the file, and is within the first 1000 chars.
+ begin
+ :svg if (1..100).detect {|n| @stream.peek(10 * n).include?("<svg")}
+ rescue FiberError, FastImage::CannotParseImage
+ nil
+ end
+ end
+
+ parsed_type or raise FastImage::UnknownImageType
+ end
+ end
+end
diff --git a/lib/fastimage/fastimage_parsing/webp.rb b/lib/fastimage/fastimage_parsing/webp.rb
new file mode 100644
--- /dev/null
+++ b/lib/fastimage/fastimage_parsing/webp.rb
@@ -0,0 +1,60 @@
+module FastImageParsing
+ class Webp < ImageBase # :nodoc:
+ def dimensions
+ vp8 = @stream.read(16)[12..15]
+ _len = @stream.read(4).unpack("V")
+ case vp8
+ when "VP8 "
+ parse_size_vp8
+ when "VP8L"
+ parse_size_vp8l
+ when "VP8X"
+ parse_size_vp8x
+ else
+ nil
+ end
+ end
+
+ def animated?
+ vp8 = @stream.read(16)[12..15]
+ _len = @stream.read(4).unpack("V")
+ case vp8
+ when "VP8 "
+ false
+ when "VP8L"
+ false
+ when "VP8X"
+ flags = @stream.read(4).unpack("C")[0]
+ flags & 2 > 0
+ else
+ nil
+ end
+ end
+
+ private
+
+ def parse_size_vp8
+ w, h = @stream.read(10).unpack("@6vv")
+ [w & 0x3fff, h & 0x3fff]
+ end
+
+ def parse_size_vp8l
+ @stream.skip(1) # 0x2f
+ b1, b2, b3, b4 = @stream.read(4).bytes.to_a
+ [1 + (((b2 & 0x3f) << 8) | b1), 1 + (((b4 & 0xF) << 10) | (b3 << 2) | ((b2 & 0xC0) >> 6))]
+ end
+
+ def parse_size_vp8x
+ flags = @stream.read(4).unpack("C")[0]
+ b1, b2, b3, b4, b5, b6 = @stream.read(6).unpack("CCCCCC")
+ width, height = 1 + b1 + (b2 << 8) + (b3 << 16), 1 + b4 + (b5 << 8) + (b6 << 16)
+
+ if flags & 8 > 0 # exif
+ # parse exif for orientation
+ # TODO: find or create test images for this
+ end
+
+ [width, height]
+ end
+ end
+end
diff --git a/lib/fastimage/version.rb b/lib/fastimage/version.rb
--- a/lib/fastimage/version.rb
+++ b/lib/fastimage/version.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
class FastImage
- VERSION = '2.3.1'
+ VERSION = '2.4.0'
end
|
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,8 +17,10 @@ jobs:
- '3.0'
- '3.1'
- '3.2'
+ - '3.3'
+ - '3.4'
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
@@ -35,7 +37,7 @@ jobs:
- '2.1'
- '2.2'
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
diff --git a/test/fixtures/test.dng b/test/fixtures/test.dng
new file mode 100644
Binary files /dev/null and b/test/fixtures/test.dng differ
diff --git a/test/test.rb b/test/test.rb
--- a/test/test.rb
+++ b/test/test.rb
@@ -60,6 +60,7 @@
"avif/red_green_flash.avif" => [:avif, [256, 256]],
"isobmff.jxl" => [:jxl, [1280,1600]],
"naked.jxl" => [:jxl, [1000,1000]],
+ "test.dng" => [:tiff, [4032, 3024]]
}
BadFixtures = [
@@ -139,6 +140,14 @@ def test_should_report_animated_correctly
assert_equal true, FastImage.animated?(TestUrl + "avif/red_green_flash.avif")
end
+ def test_should_report_multiple_properties
+ fi = FastImage.new(File.join(FixturePath, "animated.gif"))
+ assert_equal :gif, fi.type
+ assert_equal [400, 400], fi.size
+ assert_equal true, fi.animated
+ assert_equal 1001718, fi.content_length
+ end
+
def test_should_return_nil_on_fetch_failure
assert_nil FastImage.size(TestUrl + "does_not_exist")
end
@@ -437,6 +446,13 @@ def test_content_length
FakeWeb.register_uri(:get, url, :body => File.join(FixturePath, "test.jpg"), :content_length => 52)
assert_equal 52, FastImage.new(url).content_length
+
+ assert_equal 322, FastImage.new(File.join(FixturePath, "test.png")).content_length
+ assert_equal 322, FastImage.new(Pathname.new(File.join(FixturePath, "test.png"))).content_length
+
+ string = File.read(File.join(FixturePath, "test.png"))
+ stringio = StringIO.new(string)
+ assert_equal 322, FastImage.new(stringio).content_length
end
def test_content_length_not_provided
@@ -473,7 +489,7 @@ def test_should_raise_when_handling_invalid_ico_files
def test_should_support_data_uri_scheme_images
assert_equal DataUriImageInfo[0], FastImage.type(DataUriImage)
assert_equal DataUriImageInfo[1], FastImage.size(DataUriImage)
- assert_raises(FastImage::ImageFetchFailure) do
+ assert_raises(FastImage::CannotParseImage) do
FastImage.type("data:", :raise_on_failure => true)
end
end
@@ -504,4 +520,25 @@ def test_raises_when_uri_is_nil_and_raise_on_failure_is_set
FastImage.size(nil, :raise_on_failure => true)
end
end
+
+ def test_width
+ assert_equal 30, FastImage.new(TestUrl + "test.png").width
+ assert_equal nil, FastImage.new(TestUrl + "does_not_exist").width
+ end
+
+ def test_height
+ assert_equal 20, FastImage.new(TestUrl + "test.png").height
+ assert_equal nil, FastImage.new(TestUrl + "does_not_exist").height
+ end
+
+ def test_content_length_after_size
+ fi = FastImage.new(File.join(FixturePath, "test.png"))
+ fi.size
+ assert_equal 322, fi.content_length
+ end
+
+ def test_unknown_protocol
+ FakeWeb.register_uri(:get, "http://example.com/test", body: "", location: "hhttp://example.com", :status => 301)
+ assert_nil FastImage.size("http://example.com/test")
+ end
end
|
FastImage.size() breaks on some iPhone .DNG/.TIFF images. Possibly ProRaw related?
There are some iPhone-generated .DNGs that seem to be causing `FastImage.size()` to return [0,0].
Given these example images (not mine): https://www.dropbox.com/scl/fo/w76njtviyc2tipplny42k/AJuB_2lZhZyiyHgWgGgsyNA?dl=0&e=2&rlkey=fh7r7odywwj5s6cwvk6ebqwm9 or https://www.dropbox.com/scl/fo/hawcc5qf30wvspb7n18jv/AMWewSuf0WaUb1r0b9snXdo?rlkey=34csa6pwq9yyvug1poy1ujztg&e=4&dl=0
FastImage will fail to produce their sizes, even though other libs work:
```
FastImage: [0, 0]
ImageSize: [4032, 3024]
Dimensions: [4032, 3024]
ImageProcessing (libvips): [4032, 3024]
```
Tested with this simple script:
```ruby
require 'fastimage'
require 'image_size'
require 'image_processing/vips'
require 'dimensions'
# Function to get dimensions using FastImage
def dimensions_fastimage(file)
FastImage.size(file)
rescue => e
puts "FastImage error: #{e.message}"
nil
end
# Function to get dimensions using ImageSize
def dimensions_image_size(file)
size = ImageSize.path(file)
[size.width, size.height]
rescue => e
puts "ImageSize error: #{e.message}"
nil
end
# Function to get dimensions using ImageProcessing with libvips
def dimensions_image_processing(file)
vips_image = Vips::Image.new_from_file(file)
[vips_image.width, vips_image.height]
rescue => e
puts "ImageProcessing error: #{e.message}"
nil
end
# Function to get dimensions using Dimensions
def dimensions_dimensions(file)
Dimensions.dimensions(file)
rescue => e
puts "Dimensions error: #{e.message}"
nil
end
# Main program
if ARGV.empty?
puts "Usage: ruby image-sizes.rb <image_file>"
exit
end
image_file = ARGV[0]
puts "Comparing image dimensions for: #{image_file}"
puts "FastImage: #{dimensions_fastimage(image_file)}"
puts "ImageSize: #{dimensions_image_size(image_file)}"
puts "Dimensions: #{dimensions_dimensions(image_file)}"
puts "ImageProcessing (libvips): #{dimensions_image_processing(image_file)}"
```
This also seems to affect .TIFF files that have embedded Apple .DNGs, such as the ones outputted by the [ProCamera app](https://apps.apple.com/us/app/procamera-professional-camera/id694647259).
| 2024-04-01T18:21:29
|
ruby
|
Hard
|
|
yippee-fun/phlex
| 697
|
yippee-fun__phlex-697
|
[
"657"
] |
a68bb2d6b8fb82bc3dff117304e82737bc46a3cc
|
diff --git a/Gemfile b/Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,10 @@ gemspec
group :test do
gem "sus"
+ if RUBY_ENGINE == "ruby" && RUBY_VERSION[0] > "3"
+ gem "async"
+ end
+ gem "concurrent-ruby"
end
group :development do
diff --git a/lib/phlex/sgml.rb b/lib/phlex/sgml.rb
--- a/lib/phlex/sgml.rb
+++ b/lib/phlex/sgml.rb
@@ -79,15 +79,13 @@ def view_template(&block)
template(&block)
end
- # @api private
def await(task)
- if defined?(Concurrent::IVar) && task.is_a?(Concurrent::IVar)
+ case task
+ when defined?(Concurrent::IVar) && Concurrent::IVar
flush if task.pending?
-
task.wait.value
- elsif defined?(Async::Task) && task.is_a?(Async::Task)
+ when defined?(Async::Task) && Async::Task
flush if task.running?
-
task.wait
else
raise ArgumentError, "Expected an asynchronous task / promise."
|
diff --git a/test/phlex/sgml/await.rb b/test/phlex/sgml/await.rb
new file mode 100644
--- /dev/null
+++ b/test/phlex/sgml/await.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class Example < Phlex::HTML
+ def initialize(task)
+ @task = task
+ end
+
+ def view_template
+ h1 { "Before" }
+
+ await(@task).then do |message|
+ h1 { message }
+ end
+
+ h1 { "After" }
+ end
+end
+
+describe Phlex::SGML do
+ # The Async gem only works with CRuby 3.0 and above.
+ if RUBY_ENGINE == "ruby" && RUBY_VERSION[0] > "3"
+ describe "with Async tasks" do
+ it "flushes when waiting" do
+ Sync do
+ task = Async { sleep 0.1; "Hello" }
+ buffer = []
+ Example.new(task).call(buffer)
+ expect(buffer).to be == (["<h1>Before</h1>", "<h1>Hello</h1><h1>After</h1>"])
+ end
+ end
+
+ it "doesn't flush when it doesn't need to wait" do
+ Sync do
+ task = Async { sleep 0.1; "Hello" }
+ task.wait
+ buffer = []
+ Example.new(task).call(buffer)
+ expect(buffer).to be == (["<h1>Before</h1><h1>Hello</h1><h1>After</h1>"])
+ end
+ end
+ end
+ end
+
+ describe "with Concurrent Promise" do
+ it "flushes when waiting" do
+ task = Concurrent::Promise.execute { sleep 0.1; "Hello" }
+ buffer = []
+ Example.new(task).call(buffer)
+ expect(buffer).to be == (["<h1>Before</h1>", "<h1>Hello</h1><h1>After</h1>"])
+ end
+
+ it "doesn't flush when it doesn't need to wait" do
+ task = Concurrent::Promise.execute { sleep 0.1; "Hello" }
+ task.wait
+ buffer = []
+ Example.new(task).call(buffer)
+ expect(buffer).to be == (["<h1>Before</h1><h1>Hello</h1><h1>After</h1>"])
+ end
+ end
+end
|
Make `flush` and `await` public
| 2024-03-27T21:04:17
|
ruby
|
Hard
|
|
rubyzip/rubyzip
| 168
|
rubyzip__rubyzip-168
|
[
"164"
] |
2ef328b11ba55b78ef52bc46e1aedaf7d87b997e
|
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,5 @@
.idea
*.gem
-test/5entry_copy.zip
-test/cdirtest.bin
-test/cdir64test.bin
-test/huge.zip
-test/centralEntryHeader.bin
-test/data/generated/
-test/deflatertest.bin
-test/compressiontest_*.bin
-test/dummy.txt
-test/localEntryHeader.bin
-test/okToDeleteMoved.txt
-test/output.zip
-test/test_putOnClosedStream.zip
-test/zipWithDirs_copy.zip
-test/coverage
.bundle
Gemfile.lock
+samples/*.zip
diff --git a/Gemfile b/Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,3 @@
source 'https://rubygems.org'
gemspec
-gem 'rake'
-gem 'coveralls', :require => false
-gem 'pry'
-gem 'minitest'
diff --git a/rubyzip.gemspec b/rubyzip.gemspec
--- a/rubyzip.gemspec
+++ b/rubyzip.gemspec
@@ -16,4 +16,8 @@ spec = Gem::Specification.new do |s|
s.require_paths = ['lib']
s.license = 'BSD 2-Clause'
s.required_ruby_version = '>= 1.9.2'
+ s.add_development_dependency 'rake', '~> 10.3'
+ s.add_development_dependency 'pry', '~> 0.10'
+ s.add_development_dependency 'minitest', '~> 5.2.0'
+ s.add_development_dependency 'coveralls', '~> 0.7'
end
|
diff --git a/test/basic_zip_file_test.rb b/test/basic_zip_file_test.rb
--- a/test/basic_zip_file_test.rb
+++ b/test/basic_zip_file_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class BasicZipFileTest < MiniTest::Unit::TestCase
+class BasicZipFileTest < MiniTest::Test
include AssertEntry
def setup
diff --git a/test/central_directory_entry_test.rb b/test/central_directory_entry_test.rb
--- a/test/central_directory_entry_test.rb
+++ b/test/central_directory_entry_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class ZipCentralDirectoryEntryTest < MiniTest::Unit::TestCase
+class ZipCentralDirectoryEntryTest < MiniTest::Test
def test_read_from_stream
File.open("test/data/testDirectory.bin", "rb") {
diff --git a/test/central_directory_test.rb b/test/central_directory_test.rb
--- a/test/central_directory_test.rb
+++ b/test/central_directory_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class ZipCentralDirectoryTest < MiniTest::Unit::TestCase
+class ZipCentralDirectoryTest < MiniTest::Test
def test_read_from_stream
::File.open(TestZipFile::TEST_ZIP2.zip_name, "rb") {
diff --git a/test/deflater_test.rb b/test/deflater_test.rb
--- a/test/deflater_test.rb
+++ b/test/deflater_test.rb
@@ -1,12 +1,17 @@
require 'test_helper'
-class DeflaterTest < MiniTest::Unit::TestCase
+class DeflaterTest < MiniTest::Test
include CrcTest
+ DEFLATER_TEST_FILE = 'test/data/generated/deflatertest.bin'
+ BEST_COMP_FILE = 'test/data/generated/compressiontest_best_compression.bin'
+ DEFAULT_COMP_FILE = 'test/data/generated/compressiontest_default_compression.bin'
+ NO_COMP_FILE = 'test/data/generated/compressiontest_no_compression.bin'
+
def test_outputOperator
txt = load_file("test/data/file2.txt")
- deflate(txt, "deflatertest.bin")
- inflatedTxt = inflate("deflatertest.bin")
+ deflate(txt, DEFLATER_TEST_FILE)
+ inflatedTxt = inflate(DEFLATER_TEST_FILE)
assert_equal(txt, inflatedTxt)
end
@@ -14,15 +19,15 @@ def test_default_compression
txt = load_file("test/data/file2.txt")
Zip.default_compression = ::Zlib::BEST_COMPRESSION
- deflate(txt, "compressiontest_best_compression.bin")
+ deflate(txt, BEST_COMP_FILE)
Zip.default_compression = ::Zlib::DEFAULT_COMPRESSION
- deflate(txt, "compressiontest_default_compression.bin")
+ deflate(txt, DEFAULT_COMP_FILE)
Zip.default_compression = ::Zlib::NO_COMPRESSION
- deflate(txt, "compressiontest_no_compression.bin")
+ deflate(txt, NO_COMP_FILE)
- best = File.size("compressiontest_best_compression.bin")
- default = File.size("compressiontest_default_compression.bin")
- no = File.size("compressiontest_no_compression.bin")
+ best = File.size(BEST_COMP_FILE)
+ default = File.size(DEFAULT_COMP_FILE)
+ no = File.size(NO_COMP_FILE)
assert(best < default)
assert(best < no)
diff --git a/test/entry_set_test.rb b/test/entry_set_test.rb
--- a/test/entry_set_test.rb
+++ b/test/entry_set_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class ZipEntrySetTest < MiniTest::Unit::TestCase
+class ZipEntrySetTest < MiniTest::Test
ZIP_ENTRIES = [
::Zip::Entry.new("zipfile.zip", "name1", "comment1"),
::Zip::Entry.new("zipfile.zip", "name3", "comment1"),
diff --git a/test/entry_test.rb b/test/entry_test.rb
--- a/test/entry_test.rb
+++ b/test/entry_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class ZipEntryTest < MiniTest::Unit::TestCase
+class ZipEntryTest < MiniTest::Test
TEST_ZIPFILE = "someZipFile.zip"
TEST_COMMENT = "a comment"
TEST_COMPRESSED_SIZE = 1234
@@ -131,7 +131,7 @@ def test_entry_name_cannot_start_with_slash
end
def test_store_file_without_compression
- File.delete('/tmp/no_compress.zip') if File.exists?('/tmp/no_compress.zip')
+ File.delete('/tmp/no_compress.zip') if File.exist?('/tmp/no_compress.zip')
files = Dir[File.join('test/data/globTest', '**', '**')]
Zip.setup do |z|
diff --git a/test/errors_test.rb b/test/errors_test.rb
--- a/test/errors_test.rb
+++ b/test/errors_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class ErrorsTest < MiniTest::Unit::TestCase
+class ErrorsTest < MiniTest::Test
def test_rescue_legacy_zip_error
raise ::Zip::Error
diff --git a/test/extra_field_test.rb b/test/extra_field_test.rb
--- a/test/extra_field_test.rb
+++ b/test/extra_field_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class ZipExtraFieldTest < MiniTest::Unit::TestCase
+class ZipExtraFieldTest < MiniTest::Test
def test_new
extra_pure = ::Zip::ExtraField.new("")
extra_withstr = ::Zip::ExtraField.new("foo")
diff --git a/test/file_extract_directory_test.rb b/test/file_extract_directory_test.rb
--- a/test/file_extract_directory_test.rb
+++ b/test/file_extract_directory_test.rb
@@ -1,8 +1,9 @@
require 'test_helper'
-class ZipFileExtractDirectoryTest < MiniTest::Unit::TestCase
+class ZipFileExtractDirectoryTest < MiniTest::Test
include CommonZipFileFixture
- TEST_OUT_NAME = "emptyOutDir"
+
+ TEST_OUT_NAME = "test/data/generated/emptyOutDir"
def open_zip(&aProc)
assert(aProc != nil)
diff --git a/test/file_extract_test.rb b/test/file_extract_test.rb
--- a/test/file_extract_test.rb
+++ b/test/file_extract_test.rb
@@ -1,8 +1,8 @@
require 'test_helper'
-class ZipFileExtractTest < MiniTest::Unit::TestCase
+class ZipFileExtractTest < MiniTest::Test
include CommonZipFileFixture
- EXTRACTED_FILENAME = "extEntry"
+ EXTRACTED_FILENAME = "test/data/generated/extEntry"
ENTRY_TO_EXTRACT, *REMAINING_ENTRIES = TEST_ZIP.entry_names.reverse
def setup
diff --git a/test/file_split_test.rb b/test/file_split_test.rb
--- a/test/file_split_test.rb
+++ b/test/file_split_test.rb
@@ -1,9 +1,9 @@
require 'test_helper'
-class ZipFileSplitTest < MiniTest::Unit::TestCase
+class ZipFileSplitTest < MiniTest::Test
TEST_ZIP = TestZipFile::TEST_ZIP2.clone
TEST_ZIP.zip_name = "large_zip_file.zip"
- EXTRACTED_FILENAME = "test/data/generated/extEntry"
+ EXTRACTED_FILENAME = "test/data/generated/extEntrySplit"
UNSPLITTED_FILENAME = "test/data/generated/unsplitted.zip"
ENTRY_TO_EXTRACT = TEST_ZIP.entry_names.first
diff --git a/test/file_test.rb b/test/file_test.rb
--- a/test/file_test.rb
+++ b/test/file_test.rb
@@ -1,9 +1,12 @@
require 'test_helper'
-class ZipFileTest < MiniTest::Unit::TestCase
+class ZipFileTest < MiniTest::Test
include CommonZipFileFixture
+ OK_DELETE_FILE = 'test/data/generated/okToDelete.txt'
+ OK_DELETE_MOVED_FILE = 'test/data/generated/okToDeleteMoved.txt'
+
def teardown
::Zip.write_zip64_support = false
end
@@ -87,19 +90,17 @@ def test_get_output_stream
end
def test_cleans_up_tempfiles_after_close
- comment = "a short comment"
-
zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
zf.get_output_stream("myFile") do |os|
@tempfile_path = os.path
os.write "myFile contains just this"
end
- assert_equal(true, File.exists?(@tempfile_path))
+ assert_equal(true, File.exist?(@tempfile_path))
zf.close
- assert_equal(false, File.exists?(@tempfile_path))
+ assert_equal(false, File.exist?(@tempfile_path))
end
def test_add
@@ -386,13 +387,13 @@ def test_write_buffer
# can delete the file you used to add the entry to the zip file
# with
def test_commitUseZipEntry
- FileUtils.cp(TestFiles::RANDOM_ASCII_FILE1, "okToDelete.txt")
+ FileUtils.cp(TestFiles::RANDOM_ASCII_FILE1, OK_DELETE_FILE)
zf = ::Zip::File.open(TEST_ZIP.zip_name)
- zf.add("okToDelete.txt", "okToDelete.txt")
+ zf.add("okToDelete.txt", OK_DELETE_FILE)
assert_contains(zf, "okToDelete.txt")
zf.commit
- File.rename("okToDelete.txt", "okToDeleteMoved.txt")
- assert_contains(zf, "okToDelete.txt", "okToDeleteMoved.txt")
+ File.rename(OK_DELETE_FILE, OK_DELETE_MOVED_FILE)
+ assert_contains(zf, "okToDelete.txt", OK_DELETE_MOVED_FILE)
end
# def test_close
diff --git a/test/filesystem/dir_iterator_test.rb b/test/filesystem/dir_iterator_test.rb
--- a/test/filesystem/dir_iterator_test.rb
+++ b/test/filesystem/dir_iterator_test.rb
@@ -1,7 +1,7 @@
require 'test_helper'
require 'zip/filesystem'
-class ZipFsDirIteratorTest < MiniTest::Unit::TestCase
+class ZipFsDirIteratorTest < MiniTest::Test
FILENAME_ARRAY = [ "f1", "f2", "f3", "f4", "f5", "f6" ]
diff --git a/test/filesystem/directory_test.rb b/test/filesystem/directory_test.rb
--- a/test/filesystem/directory_test.rb
+++ b/test/filesystem/directory_test.rb
@@ -1,7 +1,7 @@
require 'test_helper'
require 'zip/filesystem'
-class ZipFsDirectoryTest < MiniTest::Unit::TestCase
+class ZipFsDirectoryTest < MiniTest::Test
TEST_ZIP = "test/data/generated/zipWithDirs_copy.zip"
def setup
diff --git a/test/filesystem/file_mutating_test.rb b/test/filesystem/file_mutating_test.rb
--- a/test/filesystem/file_mutating_test.rb
+++ b/test/filesystem/file_mutating_test.rb
@@ -1,7 +1,7 @@
require 'test_helper'
require 'zip/filesystem'
-class ZipFsFileMutatingTest < MiniTest::Unit::TestCase
+class ZipFsFileMutatingTest < MiniTest::Test
TEST_ZIP = "test/data/generated/zipWithDirs_copy.zip"
def setup
FileUtils.cp("test/data/zipWithDirs.zip", TEST_ZIP)
diff --git a/test/filesystem/file_nonmutating_test.rb b/test/filesystem/file_nonmutating_test.rb
--- a/test/filesystem/file_nonmutating_test.rb
+++ b/test/filesystem/file_nonmutating_test.rb
@@ -1,7 +1,7 @@
require 'test_helper'
require 'zip/filesystem'
-class ZipFsFileNonmutatingTest < MiniTest::Unit::TestCase
+class ZipFsFileNonmutatingTest < MiniTest::Test
def setup
@zipsha = Digest::SHA1.file("test/data/zipWithDirs.zip")
@zip_file = ::Zip::File.new("test/data/zipWithDirs.zip")
diff --git a/test/filesystem/file_stat_test.rb b/test/filesystem/file_stat_test.rb
--- a/test/filesystem/file_stat_test.rb
+++ b/test/filesystem/file_stat_test.rb
@@ -1,7 +1,7 @@
require 'test_helper'
require 'zip/filesystem'
-class ZipFsFileStatTest < MiniTest::Unit::TestCase
+class ZipFsFileStatTest < MiniTest::Test
def setup
@zip_file = ::Zip::File.new("test/data/zipWithDirs.zip")
diff --git a/test/inflater_test.rb b/test/inflater_test.rb
--- a/test/inflater_test.rb
+++ b/test/inflater_test.rb
@@ -1,5 +1,5 @@
require 'test_helper'
-class InflaterTest < MiniTest::Unit::TestCase
+class InflaterTest < MiniTest::Test
include DecompressorTests
def setup
diff --git a/test/input_stream_test.rb b/test/input_stream_test.rb
--- a/test/input_stream_test.rb
+++ b/test/input_stream_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class ZipInputStreamTest < MiniTest::Unit::TestCase
+class ZipInputStreamTest < MiniTest::Test
include AssertEntry
def test_new
diff --git a/test/ioextras/abstract_input_stream_test.rb b/test/ioextras/abstract_input_stream_test.rb
--- a/test/ioextras/abstract_input_stream_test.rb
+++ b/test/ioextras/abstract_input_stream_test.rb
@@ -1,7 +1,7 @@
require 'test_helper'
require 'zip/ioextras'
-class AbstractInputStreamTest < MiniTest::Unit::TestCase
+class AbstractInputStreamTest < MiniTest::Test
# AbstractInputStream subclass that provides a read method
TEST_LINES = ["Hello world#{$/}",
diff --git a/test/ioextras/abstract_output_stream_test.rb b/test/ioextras/abstract_output_stream_test.rb
--- a/test/ioextras/abstract_output_stream_test.rb
+++ b/test/ioextras/abstract_output_stream_test.rb
@@ -1,7 +1,7 @@
require 'test_helper'
require 'zip/ioextras'
-class AbstractOutputStreamTest < MiniTest::Unit::TestCase
+class AbstractOutputStreamTest < MiniTest::Test
class TestOutputStream
include ::Zip::IOExtras::AbstractOutputStream
diff --git a/test/ioextras/fake_io_test.rb b/test/ioextras/fake_io_test.rb
--- a/test/ioextras/fake_io_test.rb
+++ b/test/ioextras/fake_io_test.rb
@@ -1,7 +1,7 @@
require 'test_helper'
require 'zip/ioextras'
-class FakeIOTest < MiniTest::Unit::TestCase
+class FakeIOTest < MiniTest::Test
class FakeIOUsingClass
include ::Zip::IOExtras::FakeIO
end
diff --git a/test/local_entry_test.rb b/test/local_entry_test.rb
--- a/test/local_entry_test.rb
+++ b/test/local_entry_test.rb
@@ -1,6 +1,9 @@
require 'test_helper'
-class ZipLocalEntryTest < MiniTest::Unit::TestCase
+class ZipLocalEntryTest < MiniTest::Test
+
+ CEH_FILE = 'test/data/generated/centralEntryHeader.bin'
+ LEH_FILE = 'test/data/generated/localEntryHeader.bin'
def teardown
::Zip.write_zip64_support = false
@@ -54,8 +57,8 @@ def test_writeEntry
entry = ::Zip::Entry.new("file.zip", "entryName", "my little comment",
"thisIsSomeExtraInformation", 100, 987654,
::Zip::Entry::DEFLATED, 400)
- write_to_file("localEntryHeader.bin", "centralEntryHeader.bin", entry)
- entryReadLocal, entryReadCentral = read_from_file("localEntryHeader.bin", "centralEntryHeader.bin")
+ write_to_file(LEH_FILE, CEH_FILE, entry)
+ entryReadLocal, entryReadCentral = read_from_file(LEH_FILE, CEH_FILE)
assert(entryReadCentral.extra['Zip64Placeholder'].nil?, 'zip64 placeholder should not be used in central directory')
compare_local_entry_headers(entry, entryReadLocal)
compare_c_dir_entry_headers(entry, entryReadCentral)
@@ -66,8 +69,8 @@ def test_writeEntryWithZip64
entry = ::Zip::Entry.new("file.zip", "entryName", "my little comment",
"thisIsSomeExtraInformation", 100, 987654,
::Zip::Entry::DEFLATED, 400)
- write_to_file("localEntryHeader.bin", "centralEntryHeader.bin", entry)
- entryReadLocal, entryReadCentral = read_from_file("localEntryHeader.bin", "centralEntryHeader.bin")
+ write_to_file(LEH_FILE, CEH_FILE, entry)
+ entryReadLocal, entryReadCentral = read_from_file(LEH_FILE, CEH_FILE)
assert(entryReadLocal.extra['Zip64Placeholder'], 'zip64 placeholder should be used in local file header')
entryReadLocal.extra.delete('Zip64Placeholder') # it was removed when writing the c_dir_entry, so remove from compare
assert(entryReadCentral.extra['Zip64Placeholder'].nil?, 'zip64 placeholder should not be used in central directory')
@@ -81,8 +84,8 @@ def test_write64Entry
"malformed extra field because why not",
0x7766554433221100, 0xDEADBEEF, ::Zip::Entry::DEFLATED,
0x9988776655443322)
- write_to_file("localEntryHeader.bin", "centralEntryHeader.bin", entry)
- entryReadLocal, entryReadCentral = read_from_file("localEntryHeader.bin", "centralEntryHeader.bin")
+ write_to_file(LEH_FILE, CEH_FILE, entry)
+ entryReadLocal, entryReadCentral = read_from_file(LEH_FILE, CEH_FILE)
compare_local_entry_headers(entry, entryReadLocal)
compare_c_dir_entry_headers(entry, entryReadCentral)
end
@@ -106,9 +109,9 @@ def test_rewriteLocalHeader64
def test_readLocalOffset
entry = ::Zip::Entry.new("file.zip", "entryName")
entry.local_header_offset = 12345
- ::File.open('centralEntryHeader.bin', 'wb') { |f| entry.write_c_dir_entry(f) }
+ ::File.open(CEH_FILE, 'wb') { |f| entry.write_c_dir_entry(f) }
read_entry = nil
- ::File.open('centralEntryHeader.bin', 'rb') { |f| read_entry = ::Zip::Entry.read_c_dir_entry(f) }
+ ::File.open(CEH_FILE, 'rb') { |f| read_entry = ::Zip::Entry.read_c_dir_entry(f) }
compare_c_dir_entry_headers(entry, read_entry)
end
@@ -116,9 +119,9 @@ def test_read64LocalOffset
::Zip.write_zip64_support = true
entry = ::Zip::Entry.new("file.zip", "entryName")
entry.local_header_offset = 0x0123456789ABCDEF
- ::File.open('centralEntryHeader.bin', 'wb') { |f| entry.write_c_dir_entry(f) }
+ ::File.open(CEH_FILE, 'wb') { |f| entry.write_c_dir_entry(f) }
read_entry = nil
- ::File.open('centralEntryHeader.bin', 'rb') { |f| read_entry = ::Zip::Entry.read_c_dir_entry(f) }
+ ::File.open(CEH_FILE, 'rb') { |f| read_entry = ::Zip::Entry.read_c_dir_entry(f) }
compare_c_dir_entry_headers(entry, read_entry)
end
diff --git a/test/output_stream_test.rb b/test/output_stream_test.rb
--- a/test/output_stream_test.rb
+++ b/test/output_stream_test.rb
@@ -1,10 +1,10 @@
require 'test_helper'
-class ZipOutputStreamTest < MiniTest::Unit::TestCase
+class ZipOutputStreamTest < MiniTest::Test
include AssertEntry
TEST_ZIP = TestZipFile::TEST_ZIP2.clone
- TEST_ZIP.zip_name = "output.zip"
+ TEST_ZIP.zip_name = "test/data/generated/output.zip"
def test_new
zos = ::Zip::OutputStream.new(TEST_ZIP.zip_name)
@@ -99,7 +99,7 @@ def test_chained_put_into_next_entry
def assert_i_o_error_in_closed_stream
assert_raises(IOError) {
- zos = ::Zip::OutputStream.new("test_putOnClosedStream.zip")
+ zos = ::Zip::OutputStream.new("test/data/generated/test_putOnClosedStream.zip")
zos.close
yield zos
}
diff --git a/test/pass_thru_compressor_test.rb b/test/pass_thru_compressor_test.rb
--- a/test/pass_thru_compressor_test.rb
+++ b/test/pass_thru_compressor_test.rb
@@ -1,10 +1,10 @@
require 'test_helper'
-class PassThruCompressorTest < MiniTest::Unit::TestCase
+class PassThruCompressorTest < MiniTest::Test
include CrcTest
def test_size
- File.open("test/dummy.txt", "wb") {
+ File.open("test/data/generated/dummy.txt", "wb") {
|file|
compressor = ::Zip::PassThruCompressor.new(file)
diff --git a/test/pass_thru_decompressor_test.rb b/test/pass_thru_decompressor_test.rb
--- a/test/pass_thru_decompressor_test.rb
+++ b/test/pass_thru_decompressor_test.rb
@@ -1,5 +1,5 @@
require 'test_helper'
-class PassThruDecompressorTest < MiniTest::Unit::TestCase
+class PassThruDecompressorTest < MiniTest::Test
include DecompressorTests
def setup
diff --git a/test/settings_test.rb b/test/settings_test.rb
--- a/test/settings_test.rb
+++ b/test/settings_test.rb
@@ -1,9 +1,10 @@
require 'test_helper'
-class ZipSettingsTest < MiniTest::Unit::TestCase
+class ZipSettingsTest < MiniTest::Test
# TODO Refactor out into common test module
include CommonZipFileFixture
- TEST_OUT_NAME = "emptyOutDir"
+
+ TEST_OUT_NAME = "test/data/generated/emptyOutDir"
def setup
super
diff --git a/test/test_helper.rb b/test/test_helper.rb
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -9,7 +9,7 @@
TestFiles.create_test_files
TestZipFile.create_test_zips
-::MiniTest::Unit.after_tests do
+::MiniTest.after_run do
FileUtils.rm_rf('test/data/generated')
end
diff --git a/test/unicode_file_names_and_comments_test.rb b/test/unicode_file_names_and_comments_test.rb
--- a/test/unicode_file_names_and_comments_test.rb
+++ b/test/unicode_file_names_and_comments_test.rb
@@ -2,7 +2,7 @@
require 'test_helper'
-class ZipUnicodeFileNamesAndComments < MiniTest::Unit::TestCase
+class ZipUnicodeFileNamesAndComments < MiniTest::Test
FILENAME = File.join(File.dirname(__FILE__), "test1.zip")
diff --git a/test/zip64_full_test.rb b/test/zip64_full_test.rb
--- a/test/zip64_full_test.rb
+++ b/test/zip64_full_test.rb
@@ -7,7 +7,7 @@
# test zip64 support for real, by actually exceeding the 32-bit size/offset limits
# this test does not, of course, run with the normal unit tests! ;)
- class Zip64FullTest < MiniTest::Unit::TestCase
+ class Zip64FullTest < MiniTest::Test
def prepareTestFile(test_filename)
::File.delete(test_filename) if ::File.exist?(test_filename)
return test_filename
diff --git a/test/zip64_support_test.rb b/test/zip64_support_test.rb
--- a/test/zip64_support_test.rb
+++ b/test/zip64_support_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class Zip64SupportTest < MiniTest::Unit::TestCase
+class Zip64SupportTest < MiniTest::Test
TEST_FILE = File.join(File.dirname(__FILE__), 'data', 'zip64-sample.zip')
def test_open_zip64_file
|
Seemingly random test failures in Travis
I can't reproduce this locally, all tests pass all the time, but on Travis we are seeing different jobs within builds fail each time:
- https://travis-ci.org/rubyzip/rubyzip/builds/28115164 (ruby-head and jruby oracle fail)
- https://travis-ci.org/rubyzip/rubyzip/builds/28153919 (2.0.0, 2.1 and rbx-2 fail)
- https://travis-ci.org/rubyzip/rubyzip/builds/27791940 (no fails apart from broken rbx)
- https://travis-ci.org/rubyzip/rubyzip/builds/28113399 (both jrubys fail)
The common factor with the failures seems to be testing for existing files within a zip and/or unpacking a zip on top of files that already exist. Exceptions that are expected for these tests are not being raised.
Given that it appears to be random, and that I can't replicate it locally, I wonder if it's a race condition in the tests exposed by virtualized disks on the test machines. I might be way off with this though.
Any ideas?
|
I've had another look at this and noticed that Travis was installing later versions of some gems than I had installed on my machine. So I did a `bundle update`:
```
$ bundle update
Fetching gem metadata from https://rubygems.org/.........
Fetching additional metadata from https://rubygems.org/..
Resolving dependencies...
Using rake 10.3.2
Using coderay 1.1.0
Using multi_json 1.10.1
Using mime-types 2.3
Installing netrc 0.7.7
Installing rest-client 1.7.2 (was 1.6.7)
Using docile 1.1.5
Using simplecov-html 0.8.0
Using simplecov 0.8.2
Using tins 1.3.0
Using term-ansicolor 1.3.0
Using thor 0.19.1
Using coveralls 0.7.0
Using method_source 0.8.2
Installing minitest 5.4.0 (was 4.7.5)
Using slop 3.5.0
Using pry 0.10.0
Using rubyzip 1.1.6 from source at .
Using bundler 1.6.2
Your bundle is updated!
```
So three updates happened. Minitest and rest-client were both updated to much newer versions and netrc is a newly installed gem.
Now I see the failures locally too, as described in my original post. Any ideas why this might be given which gems changed? It makes no sense to me at all.
| 2014-07-15T17:31:22
|
ruby
|
Hard
|
rubyzip/rubyzip
| 504
|
rubyzip__rubyzip-504
|
[
"503"
] |
4cf801c5f334d989000aeabfed53edd1263551a0
|
diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
--- a/lib/zip/entry.rb
+++ b/lib/zip/entry.rb
@@ -83,14 +83,21 @@ def initialize(
@ftype = name_is_directory? ? :directory : :file
@zipfile = zipfile
- @comment = comment
- @compression_method = compression_method
- @compression_level = compression_level
-
- @compressed_size = compressed_size
- @crc = crc
- @size = size
- @time = time
+ @comment = comment || ''
+ @compression_method = compression_method || DEFLATED
+ @compression_level = compression_level || ::Zip.default_compression
+
+ @compressed_size = compressed_size || 0
+ @crc = crc || 0
+ @size = size || 0
+ @time = case time
+ when ::Zip::DOSTime
+ time
+ when Time
+ ::Zip::DOSTime.from_time(time)
+ else
+ ::Zip::DOSTime.now
+ end
@extra =
extra.kind_of?(ExtraField) ? extra : ExtraField.new(extra.to_s)
diff --git a/lib/zip/output_stream.rb b/lib/zip/output_stream.rb
--- a/lib/zip/output_stream.rb
+++ b/lib/zip/output_stream.rb
@@ -100,15 +100,15 @@ def put_next_entry(
)
raise Error, 'zip stream is closed' if @closed
- new_entry = if entry_name.kind_of?(Entry)
- entry_name
- else
- Entry.new(
- @file_name, entry_name.to_s, comment: comment,
- extra: extra, compression_method: compression_method,
- compression_level: level
- )
- end
+ new_entry =
+ if entry_name.kind_of?(Entry) || entry_name.kind_of?(StreamableStream)
+ entry_name
+ else
+ Entry.new(
+ @file_name, entry_name.to_s, comment: comment, extra: extra,
+ compression_method: compression_method, compression_level: level
+ )
+ end
init_next_entry(new_entry)
@current_entry = new_entry
|
diff --git a/test/entry_test.rb b/test/entry_test.rb
--- a/test/entry_test.rb
+++ b/test/entry_test.rb
@@ -26,7 +26,10 @@ def test_constructor_and_getters
assert_equal(TEST_COMPRESSIONMETHOD, entry.compression_method)
assert_equal(TEST_NAME, entry.name)
assert_equal(TEST_SIZE, entry.size)
- assert_equal(TEST_TIME, entry.time)
+
+ # Reverse times when testing because we need to use DOSTime#== for the
+ # comparison, not Time#==.
+ assert_equal(entry.time, TEST_TIME)
end
def test_is_directory_and_is_file
diff --git a/test/file_test.rb b/test/file_test.rb
--- a/test/file_test.rb
+++ b/test/file_test.rb
@@ -95,7 +95,10 @@ def test_get_output_stream
custom_entry_args[:compression_level], entry.compression_level
)
assert_equal(custom_entry_args[:size], entry.size)
- assert_equal(custom_entry_args[:time], entry.time)
+
+ # Reverse times when testing because we need to use DOSTime#== for the
+ # comparison, not Time#==.
+ assert_equal(entry.time, custom_entry_args[:time])
zf.get_output_stream('entry.bin') do |os|
os.write(::File.open('test/data/generated/5entry.zip', 'rb').read)
@@ -110,6 +113,24 @@ def test_get_output_stream
end
end
+ def test_get_output_stream_with_entry
+ Dir.mktmpdir do |tmp|
+ test_zip = File.join(tmp, 'test.zip')
+ time = Time.new(1999, 12, 31)
+
+ ::Zip::File.open(test_zip, create: true) do |zip|
+ entry = ::Zip::Entry.new(zip.name, 'entry.txt', time: time)
+ zip.get_output_stream(entry) { |out| out.puts 'CONTENT!' }
+ end
+
+ ::Zip::File.open(test_zip) do |zip|
+ # Reverse times when testing because we need to use DOSTime#== for the
+ # comparison, not Time#==.
+ assert_equal(zip.get_entry('entry.txt').time, time)
+ end
+ end
+ end
+
def test_open_buffer_with_string
data = File.read('test/data/rubycode.zip', mode: 'rb')
string = data.dup
|
Can't set time with get_output_stream
I'm trying to put an entry with some arbitrary timestamp into the zip file, but it doesn't work, it always writes `Time.now`:
```ruby
require 'zip'
time = Time.new '2020-01-01' # some random date
Zip::File.open 'foo.zip', create: true do |zip|
e = Zip::Entry.new zip.name, 'some_file'
e.time = Zip::DOSTime.from_time time
zip.get_output_stream(e) {|s| s.puts 'foobar' }
end
```
But unzip reports the current date:
```
$ unzip -l foo.zip
Archive: foo.zip
Length Date Time Name
--------- ---------- ----- ----
7 11-06-2021 17:56 some_file
--------- -------
7 1 file
```
It looks like `File#get_output_stream` adds a `StreamableStream` to `@entry_set`, but later in `OutputStream#put_next_entry` it checks `entry_name.kind_of?(Entry)`, which will be false and it creates a new `Entry` ignoring everything I've set up in the entry. The same happens if I don't create the entry manually but pass the time to `#get_output_stream`.
`File#add` works correctly, but it requires creating a temporary file and manually setting the last modification date on it.
Using ruby 3.0.2p107 and rubyzip 2.3.2.
|
Hi @u3shit, thanks for reporting this.
I think I see what's going wrong here: presumably the type mismatch between `StreamableStream` and `Entry`. I wasn't around when this was written, so I don't know the subtleties of why `StreamableStream` is a delegate, rather than a subclass, of `Entry`, but just naively widening the `kind_of?` check you mention above causes plenty of other errors.
I can see a way to a fix though, so I'll get this sorted as soon as I can.
| 2021-11-07T22:44:30
|
ruby
|
Hard
|
rubyzip/rubyzip
| 300
|
rubyzip__rubyzip-300
|
[
"294",
"294"
] |
7aa3666e341b4ecf3b66321d734802a77bba962b
|
diff --git a/lib/zip/file.rb b/lib/zip/file.rb
--- a/lib/zip/file.rb
+++ b/lib/zip/file.rb
@@ -43,7 +43,7 @@ module Zip
# interface for accessing the filesystem, ie. the File and Dir classes.
class File < CentralDirectory
- CREATE = 1
+ CREATE = true
SPLIT_SIGNATURE = 0x08074b50
ZIP64_EOCD_SIGNATURE = 0x06064b50
MAX_SEGMENT_SIZE = 3_221_225_472
@@ -64,20 +64,19 @@ class File < CentralDirectory
# Opens a zip archive. Pass true as the second parameter to create
# a new archive if it doesn't exist already.
- def initialize(file_name, create = nil, buffer = false, options = {})
+ def initialize(file_name, create = false, buffer = false, options = {})
super()
@name = file_name
@comment = ''
- @create = create
+ @create = create ? true : false # allow any truthy value to mean true
case
when !buffer && ::File.size?(file_name)
- @create = nil
+ @create = false
@file_permissions = ::File.stat(file_name).mode
::File.open(name, 'rb') do |f|
read_from_stream(f)
end
- when create
- @file_permissions = create_file_permissions
+ when @create
@entry_set = EntrySet.new
when ::File.zero?(file_name)
raise Error, "File #{file_name} has zero size. Did you mean to pass the create flag?"
@@ -95,7 +94,7 @@ class << self
# Same as #new. If a block is passed the ZipFile object is passed
# to the block and is automatically closed afterwards just as with
# ruby's builtin File.open method.
- def open(file_name, create = nil)
+ def open(file_name, create = false)
zf = ::Zip::File.new(file_name, create)
return zf unless block_given?
begin
@@ -340,7 +339,7 @@ def commit_required?
@entry_set.each do |e|
return true if e.dirty
end
- @comment != @stored_comment || @entry_set != @stored_entries || @create == ::Zip::File::CREATE
+ @comment != @stored_comment || @entry_set != @stored_entries || @create
end
# Searches for entry with the specified name. Returns nil if
@@ -403,27 +402,18 @@ def check_file(path)
end
def on_success_replace
- tmp_filename = create_tmpname
- if yield tmp_filename
- ::File.rename(tmp_filename, name)
- ::File.chmod(@file_permissions, name) if defined?(@file_permissions)
- end
- ensure
- ::File.unlink(tmp_filename) if ::File.exist?(tmp_filename)
- end
-
- def create_tmpname
dirname, basename = ::File.split(name)
- ::Dir::Tmpname.create(basename, dirname) do |tmpname|
- opts = {perm: 0600, mode: ::File::CREAT | ::File::WRONLY | ::File::EXCL}
- f = File.open(tmpname, opts)
- f.close
+ ::Dir::Tmpname.create(basename, dirname) do |tmp_filename|
+ begin
+ if yield tmp_filename
+ ::File.rename(tmp_filename, name)
+ ::File.chmod(@file_permissions, name) unless @create
+ end
+ ensure
+ ::File.unlink(tmp_filename) if ::File.exist?(tmp_filename)
+ end
end
end
-
- def create_file_permissions
- ::Zip::RUNNING_ON_WINDOWS ? 0644 : 0666 - ::File.umask
- end
end
end
|
diff --git a/test/file_permissions_test.rb b/test/file_permissions_test.rb
--- a/test/file_permissions_test.rb
+++ b/test/file_permissions_test.rb
@@ -2,58 +2,58 @@
class FilePermissionsTest < MiniTest::Test
- FILENAME = File.join(File.dirname(__FILE__), "umask.zip")
+ ZIPNAME = File.join(File.dirname(__FILE__), "umask.zip")
+ FILENAME = File.join(File.dirname(__FILE__), "umask.txt")
def teardown
+ ::File.unlink(ZIPNAME)
::File.unlink(FILENAME)
end
- if ::Zip::RUNNING_ON_WINDOWS
- # Windows tests
-
- DEFAULT_PERMS = 0644
-
- def test_windows_perms
- create_file
+ def test_current_umask
+ create_files
+ assert_matching_permissions FILENAME, ZIPNAME
+ end
- assert_equal DEFAULT_PERMS, ::File.stat(FILENAME).mode
+ def test_umask_000
+ set_umask(0000) do
+ create_files
end
- else
- # Unix tests
-
- DEFAULT_PERMS = 0100666
-
- def test_current_umask
- umask = DEFAULT_PERMS - ::File.umask
- create_file
+ assert_matching_permissions FILENAME, ZIPNAME
+ end
- assert_equal umask, ::File.stat(FILENAME).mode
+ def test_umask_066
+ set_umask(0066) do
+ create_files
end
- def test_umask_000
- set_umask(0000) do
- create_file
- end
+ assert_matching_permissions FILENAME, ZIPNAME
+ end
- assert_equal DEFAULT_PERMS, ::File.stat(FILENAME).mode
+ def test_umask_027
+ set_umask(0027) do
+ create_files
end
- def test_umask_066
- umask = 0066
- set_umask(umask) do
- create_file
- end
-
- assert_equal((DEFAULT_PERMS - umask), ::File.stat(FILENAME).mode)
- end
+ assert_matching_permissions FILENAME, ZIPNAME
+ end
+ def assert_matching_permissions(expected_file, actual_file)
+ assert_equal(
+ ::File.stat(expected_file).mode.to_s(8).rjust(4, '0'),
+ ::File.stat(actual_file).mode.to_s(8).rjust(4, '0')
+ )
end
- def create_file
- ::Zip::File.open(FILENAME, ::Zip::File::CREATE) do |zip|
+ def create_files
+ ::Zip::File.open(ZIPNAME, ::Zip::File::CREATE) do |zip|
zip.comment = "test"
end
+
+ ::File.open(FILENAME, 'w') do |file|
+ file << 'test'
+ end
end
# If anything goes wrong, make sure the umask is restored.
diff --git a/test/file_test.rb b/test/file_test.rb
--- a/test/file_test.rb
+++ b/test/file_test.rb
@@ -40,6 +40,20 @@ def test_create_from_scratch
assert_equal(2, zfRead.entries.length)
end
+ def test_create_from_scratch_with_old_create_parameter
+ comment = 'a short comment'
+
+ zf = ::Zip::File.new(EMPTY_FILENAME, 1)
+ zf.get_output_stream('myFile') { |os| os.write 'myFile contains just this' }
+ zf.mkdir('dir1')
+ zf.comment = comment
+ zf.close
+
+ zfRead = ::Zip::File.new(EMPTY_FILENAME)
+ assert_equal(comment, zfRead.comment)
+ assert_equal(2, zfRead.entries.length)
+ end
+
def test_get_output_stream
entryCount = nil
::Zip::File.open(TEST_ZIP.zip_name) do |zf|
|
Set correct file permissions given a umask of 0027
We lock down our umask to 0027 so that files are not globally readable. When creating files via `File.open` this results in files with permissions of 0640 (i.e. `rw-r----`) but zip files created with this library end up with the very odd permission of 0637 (e.g. `rw--wxrwx`).
[I've added a failing test case to `test/file_permissions_test.rb`](https://github.com/rubyzip/rubyzip/compare/7aa3666e341b4ecf3b66321d734802a77bba962b...metavida:umask-0027) on my branch but haven't had time to actually write a solution nor to do any testing on windows.
Set correct file permissions given a umask of 0027
We lock down our umask to 0027 so that files are not globally readable. When creating files via `File.open` this results in files with permissions of 0640 (i.e. `rw-r----`) but zip files created with this library end up with the very odd permission of 0637 (e.g. `rw--wxrwx`).
[I've added a failing test case to `test/file_permissions_test.rb`](https://github.com/rubyzip/rubyzip/compare/7aa3666e341b4ecf3b66321d734802a77bba962b...metavida:umask-0027) on my branch but haven't had time to actually write a solution nor to do any testing on windows.
| 2016-09-01T11:40:45
|
ruby
|
Hard
|
|
rubyzip/rubyzip
| 413
|
rubyzip__rubyzip-413
|
[
"395"
] |
e43e36057cd11ced462dd6918dff99f2ce1463fd
|
diff --git a/lib/zip/dos_time.rb b/lib/zip/dos_time.rb
--- a/lib/zip/dos_time.rb
+++ b/lib/zip/dos_time.rb
@@ -29,6 +29,11 @@ def dos_equals(other)
to_i / 2 == other.to_i / 2
end
+ # Create a DOSTime instance from a vanilla Time instance.
+ def self.from_time(time)
+ local(time.year, time.month, time.day, time.hour, time.min, time.sec)
+ end
+
def self.parse_binary_dos_format(binaryDosDate, binaryDosTime)
second = 2 * (0b11111 & binaryDosTime)
minute = (0b11111100000 & binaryDosTime) >> 5
diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
--- a/lib/zip/entry.rb
+++ b/lib/zip/entry.rb
@@ -406,16 +406,20 @@ def get_extra_attributes_from_path(path) # :nodoc:
@unix_uid = stat.uid
@unix_gid = stat.gid
@unix_perms = stat.mode & 0o7777
+ @time = ::Zip::DOSTime.from_time(stat.mtime)
end
- def set_unix_permissions_on_path(dest_path)
- # BUG: does not update timestamps into account
+ def set_unix_attributes_on_path(dest_path)
# ignore setuid/setgid bits by default. honor if @restore_ownership
unix_perms_mask = 0o1777
unix_perms_mask = 0o7777 if @restore_ownership
::FileUtils.chmod(@unix_perms & unix_perms_mask, dest_path) if @restore_permissions && @unix_perms
::FileUtils.chown(@unix_uid, @unix_gid, dest_path) if @restore_ownership && @unix_uid && @unix_gid && ::Process.egid == 0
- # File::utimes()
+
+ # Restore the timestamp on a file. This will either have come from the
+ # original source file that was copied into the archive, or from the
+ # creation date of the archive if there was no original source file.
+ ::FileUtils.touch(dest_path, mtime: time) if @restore_times
end
def set_extra_attributes_on_path(dest_path) # :nodoc:
@@ -423,7 +427,7 @@ def set_extra_attributes_on_path(dest_path) # :nodoc:
case @fstype
when ::Zip::FSTYPE_UNIX
- set_unix_permissions_on_path(dest_path)
+ set_unix_attributes_on_path(dest_path)
end
end
@@ -601,8 +605,6 @@ def create_file(dest_path, _continue_on_exists_proc = proc { Zip.continue_on_exi
end
::File.open(dest_path, 'wb') do |os|
get_input_stream do |is|
- set_extra_attributes_on_path(dest_path)
-
bytes_written = 0
warned = false
buf = ''.dup
@@ -621,6 +623,8 @@ def create_file(dest_path, _continue_on_exists_proc = proc { Zip.continue_on_exi
end
end
end
+
+ set_extra_attributes_on_path(dest_path)
end
def create_directory(dest_path)
diff --git a/lib/zip/file.rb b/lib/zip/file.rb
--- a/lib/zip/file.rb
+++ b/lib/zip/file.rb
@@ -51,14 +51,23 @@ class File < CentralDirectory
DATA_BUFFER_SIZE = 8192
IO_METHODS = [:tell, :seek, :read, :close]
+ DEFAULT_OPTIONS = {
+ restore_ownership: false,
+ restore_permissions: false,
+ restore_times: false
+ }.freeze
+
attr_reader :name
- # default -> false
+ # default -> false.
attr_accessor :restore_ownership
- # default -> false
+
+ # default -> false, but will be set to true in a future version.
attr_accessor :restore_permissions
- # default -> true
+
+ # default -> false, but will be set to true in a future version.
attr_accessor :restore_times
+
# Returns the zip files comment, if it has one
attr_accessor :comment
@@ -66,6 +75,7 @@ class File < CentralDirectory
# a new archive if it doesn't exist already.
def initialize(path_or_io, create = false, buffer = false, options = {})
super()
+ options = DEFAULT_OPTIONS.merge(options)
@name = path_or_io.respond_to?(:path) ? path_or_io.path : path_or_io
@comment = ''
@create = create ? true : false # allow any truthy value to mean true
@@ -98,9 +108,9 @@ def initialize(path_or_io, create = false, buffer = false, options = {})
@stored_entries = @entry_set.dup
@stored_comment = @comment
- @restore_ownership = options[:restore_ownership] || false
- @restore_permissions = options[:restore_permissions] || true
- @restore_times = options[:restore_times] || true
+ @restore_ownership = options[:restore_ownership]
+ @restore_permissions = options[:restore_permissions]
+ @restore_times = options[:restore_times]
end
class << self
|
diff --git a/test/file_options_test.rb b/test/file_options_test.rb
new file mode 100644
--- /dev/null
+++ b/test/file_options_test.rb
@@ -0,0 +1,89 @@
+require 'test_helper'
+
+class FileOptionsTest < MiniTest::Test
+ ZIPPATH = ::File.join(Dir.tmpdir, 'options.zip').freeze
+ TXTPATH = ::File.expand_path(::File.join('data', 'file1.txt'), __dir__).freeze
+ TXTPATH_600 = ::File.join(Dir.tmpdir, 'file1.600.txt').freeze
+ TXTPATH_755 = ::File.join(Dir.tmpdir, 'file1.755.txt').freeze
+ EXTPATH_1 = ::File.join(Dir.tmpdir, 'extracted_1.txt').freeze
+ EXTPATH_2 = ::File.join(Dir.tmpdir, 'extracted_2.txt').freeze
+ EXTPATH_3 = ::File.join(Dir.tmpdir, 'extracted_3.txt').freeze
+ ENTRY_1 = 'entry_1.txt'.freeze
+ ENTRY_2 = 'entry_2.txt'.freeze
+ ENTRY_3 = 'entry_3.txt'.freeze
+
+ def teardown
+ ::File.unlink(ZIPPATH) if ::File.exist?(ZIPPATH)
+ ::File.unlink(EXTPATH_1) if ::File.exist?(EXTPATH_1)
+ ::File.unlink(EXTPATH_2) if ::File.exist?(EXTPATH_2)
+ ::File.unlink(EXTPATH_3) if ::File.exist?(EXTPATH_3)
+ ::File.unlink(TXTPATH_600) if ::File.exist?(TXTPATH_600)
+ ::File.unlink(TXTPATH_755) if ::File.exist?(TXTPATH_755)
+ end
+
+ def test_restore_permissions
+ # Copy and set up files with different permissions.
+ ::FileUtils.cp(TXTPATH, TXTPATH_600)
+ ::File.chmod(0600, TXTPATH_600)
+ ::FileUtils.cp(TXTPATH, TXTPATH_755)
+ ::File.chmod(0755, TXTPATH_755)
+
+ ::Zip::File.open(ZIPPATH, true) do |zip|
+ zip.add(ENTRY_1, TXTPATH)
+ zip.add(ENTRY_2, TXTPATH_600)
+ zip.add(ENTRY_3, TXTPATH_755)
+ end
+
+ ::Zip::File.open(ZIPPATH, false, restore_permissions: true) do |zip|
+ zip.extract(ENTRY_1, EXTPATH_1)
+ zip.extract(ENTRY_2, EXTPATH_2)
+ zip.extract(ENTRY_3, EXTPATH_3)
+ end
+
+ assert_equal(::File.stat(TXTPATH).mode, ::File.stat(EXTPATH_1).mode)
+ assert_equal(::File.stat(TXTPATH_600).mode, ::File.stat(EXTPATH_2).mode)
+ assert_equal(::File.stat(TXTPATH_755).mode, ::File.stat(EXTPATH_3).mode)
+ end
+
+ def test_restore_times_true
+ ::Zip::File.open(ZIPPATH, true) do |zip|
+ zip.add(ENTRY_1, TXTPATH)
+ zip.add_stored(ENTRY_2, TXTPATH)
+ end
+
+ ::Zip::File.open(ZIPPATH, false, restore_times: true) do |zip|
+ zip.extract(ENTRY_1, EXTPATH_1)
+ zip.extract(ENTRY_2, EXTPATH_2)
+ end
+
+ assert_time_equal(::File.mtime(TXTPATH), ::File.mtime(EXTPATH_1))
+ assert_time_equal(::File.mtime(TXTPATH), ::File.mtime(EXTPATH_2))
+ end
+
+ def test_restore_times_false
+ ::Zip::File.open(ZIPPATH, true) do |zip|
+ zip.add(ENTRY_1, TXTPATH)
+ zip.add_stored(ENTRY_2, TXTPATH)
+ end
+
+ ::Zip::File.open(ZIPPATH, false, restore_times: false) do |zip|
+ zip.extract(ENTRY_1, EXTPATH_1)
+ zip.extract(ENTRY_2, EXTPATH_2)
+ end
+
+ assert_time_equal(::Time.now, ::File.mtime(EXTPATH_1))
+ assert_time_equal(::Time.now, ::File.mtime(EXTPATH_2))
+ end
+
+ private
+
+ # Method to compare file times. DOS times only have 2 second accuracy.
+ def assert_time_equal(expected, actual)
+ assert_equal(expected.year, actual.year)
+ assert_equal(expected.month, actual.month)
+ assert_equal(expected.day, actual.day)
+ assert_equal(expected.hour, actual.hour)
+ assert_equal(expected.min, actual.min)
+ assert_in_delta(expected.sec, actual.sec, 1)
+ end
+end
|
Options not working in File class
This code
https://github.com/rubyzip/rubyzip/blob/249775f5637e6d65112574b3ac1763dc2393c7f6/lib/zip/file.rb#L88-L89
doesn't do what it is intended to do, because when you pass in `restore_permissions: false` or `restore_times: false`, it will be evaluating to `false || true`, which will always be `true`
|
Interestingly the options code doesn't agree with the comments about defaults above either:
https://github.com/rubyzip/rubyzip/blob/94b7fa276992933592d69eb6bb17fc09105f8395/lib/zip/file.rb#L56-L61
vs
https://github.com/rubyzip/rubyzip/blob/94b7fa276992933592d69eb6bb17fc09105f8395/lib/zip/file.rb#L101-L103
I'll cook up a PR that fixes this issue and works as expected to keep the test passing - adjusting the comments as necessary.
Also, depressingly, it doesn't matter what those options are set to; the tests always all pass. I'll add some tests.
| 2019-10-07T10:22:37
|
ruby
|
Hard
|
yippee-fun/phlex
| 709
|
yippee-fun__phlex-709
|
[
"708"
] |
5f9fbb52b307818721c2c3bda61661dfc93291da
|
diff --git a/lib/phlex/sgml.rb b/lib/phlex/sgml.rb
--- a/lib/phlex/sgml.rb
+++ b/lib/phlex/sgml.rb
@@ -393,9 +393,9 @@ def __attributes__(attributes, buffer = +"")
when true
buffer << " " << name
when String
- buffer << " " << name << '="' << Phlex::Escape.html_escape(v) << '"'
+ buffer << " " << name << '="' << v.gsub('"', """) << '"'
when Symbol
- buffer << " " << name << '="' << Phlex::Escape.html_escape(v.name) << '"'
+ buffer << " " << name << '="' << v.name.gsub('"', """) << '"'
when Integer, Float
buffer << " " << name << '="' << v.to_s << '"'
when Hash
@@ -408,9 +408,9 @@ def __attributes__(attributes, buffer = +"")
}, buffer
)
when Array
- buffer << " " << name << '="' << Phlex::Escape.html_escape(v.compact.join(" ")) << '"'
+ buffer << " " << name << '="' << v.compact.join(" ").gsub('"', """) << '"'
when Set
- buffer << " " << name << '="' << Phlex::Escape.html_escape(v.to_a.compact.join(" ")) << '"'
+ buffer << " " << name << '="' << v.to_a.compact.join(" ").gsub('"', """) << '"'
else
value = if v.respond_to?(:to_phlex_attribute_value)
v.to_phlex_attribute_value
@@ -420,7 +420,7 @@ def __attributes__(attributes, buffer = +"")
v.to_s
end
- buffer << " " << name << '="' << Phlex::Escape.html_escape(value) << '"'
+ buffer << " " << name << '="' << value.gsub('"', """) << '"'
end
end
|
diff --git a/test/phlex/view/capture.rb b/test/phlex/view/capture.rb
--- a/test/phlex/view/capture.rb
+++ b/test/phlex/view/capture.rb
@@ -92,13 +92,13 @@ def view_template
end
it "should contain the full capture" do
- expect(example.call(view_context: self)).to be == %(<h1>Before</h1><iframe srcdoc="<h1>Hello</h1><h1>World</h1>"></iframe><h1>After</h1>)
+ expect(example.call(view_context: self)).to be == %(<h1>Before</h1><iframe srcdoc="<h1>Hello</h1><h1>World</h1>"></iframe><h1>After</h1>)
end
it "should contain the full capture if the buffer is provided" do
my_buffer = +""
example.call(my_buffer, view_context: self)
- expect(my_buffer).to be == %(<h1>Before</h1><iframe srcdoc="<h1>Hello</h1><h1>World</h1>"></iframe><h1>After</h1>)
+ expect(my_buffer).to be == %(<h1>Before</h1><iframe srcdoc="<h1>Hello</h1><h1>World</h1>"></iframe><h1>After</h1>)
end
end
end
diff --git a/test/phlex/view/naughty_business.rb b/test/phlex/view/naughty_business.rb
--- a/test/phlex/view/naughty_business.rb
+++ b/test/phlex/view/naughty_business.rb
@@ -53,7 +53,7 @@ def view_template
end
it "escapes the attributes" do
- expect(output).to be == %(<article id=""><script type="text/javascript" src="bad_script.js"></script>"></article>)
+ expect(output).to be == %(<article id=""><script type="text/javascript" src="bad_script.js"></script>"></article>)
end
end
|
Attribute values being converted to HTML entities (when they should not)
If there's a need to add inline style, with background property
```ruby
class Nav < Phlex::HTML
def template
nav(class: "main-nav", style: "background: url('foo.jpg') no-repeat center center / cover;") {
ul {
li { a(href: "/") { "Home" } }
li { a(href: "/about") { "About" } }
li { a(href: "/contact") { "Contact" } }
}
}
end
end
```
it's generating this HTML (indented for reading)
```html
<nav class="main-nav" style="background: url('foo.jpg') no-repeat center center / cover;">
<ul>
<li><a href="/">Home</a></li>
<li><a href="/about">About</a></li>
<li><a href="/contact">Contact</a></li>
</ul>
</nav>
```
where the `background: url('foo.jpg')` should *not* be transformed into html entities
any suggestion?
thank you
ps: running Phlex 1.10.1
|
oii @fernandes
While [single (and double) quotes are allowed](https://developer.mozilla.org/en-US/docs/Web/CSS/url), you can also omit them, and off the top of my head I think I usually see the quotes omitted. So yes this looks like a bug, but I expect that you can easily work around it just by omitting the single quotation marks.
| 2024-04-23T09:19:10
|
ruby
|
Hard
|
rubyzip/rubyzip
| 507
|
rubyzip__rubyzip-507
|
[
"505"
] |
f7cd692e15d80addc7abeb7bfde643e1649a1390
|
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -61,6 +61,7 @@ Style/ClassAndModuleChildren:
- 'lib/zip/extra_field/old_unix.rb'
- 'lib/zip/extra_field/universal_time.rb'
- 'lib/zip/extra_field/unix.rb'
+ - 'lib/zip/extra_field/unknown.rb'
- 'lib/zip/extra_field/zip64.rb'
- 'lib/zip/extra_field/zip64_placeholder.rb'
diff --git a/lib/zip/central_directory.rb b/lib/zip/central_directory.rb
--- a/lib/zip/central_directory.rb
+++ b/lib/zip/central_directory.rb
@@ -174,7 +174,7 @@ def read_central_directory_entries(io) #:nodoc:
unless offset.nil?
io_save = io.tell
io.seek(offset, IO::SEEK_SET)
- entry.read_extra_field(read_local_extra_field(io))
+ entry.read_extra_field(read_local_extra_field(io), local: true)
io.seek(io_save, IO::SEEK_SET)
end
diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
--- a/lib/zip/entry.rb
+++ b/lib/zip/entry.rb
@@ -313,7 +313,7 @@ def read_local_entry(io) #:nodoc:all
raise ::Zip::Error, 'Truncated local zip entry header'
end
- read_extra_field(extra)
+ read_extra_field(extra, local: true)
parse_zip64_extra(true)
@local_header_size = calculate_local_header_size
end
@@ -417,11 +417,11 @@ def check_c_dir_entry_comment_size
raise ::Zip::Error, 'Truncated cdir zip entry header'
end
- def read_extra_field(buf)
+ def read_extra_field(buf, local: false)
if @extra.kind_of?(::Zip::ExtraField)
- @extra.merge(buf) if buf
+ @extra.merge(buf, local: local) if buf
else
- @extra = ::Zip::ExtraField.new(buf)
+ @extra = ::Zip::ExtraField.new(buf, local: local)
end
end
diff --git a/lib/zip/extra_field.rb b/lib/zip/extra_field.rb
--- a/lib/zip/extra_field.rb
+++ b/lib/zip/extra_field.rb
@@ -4,8 +4,8 @@ module Zip
class ExtraField < Hash
ID_MAP = {}
- def initialize(binstr = nil)
- merge(binstr) if binstr
+ def initialize(binstr = nil, local: false)
+ merge(binstr, local: local) if binstr
end
def extra_field_type_exist(binstr, id, len, index)
@@ -18,25 +18,18 @@ def extra_field_type_exist(binstr, id, len, index)
end
end
- def extra_field_type_unknown(binstr, len, index)
- create_unknown_item unless self['Unknown']
+ def extra_field_type_unknown(binstr, len, index, local)
+ self['Unknown'] ||= Unknown.new
+
if !len || len + 4 > binstr[index..-1].bytesize
- self['Unknown'] << binstr[index..-1]
+ self['Unknown'].merge(binstr[index..-1], local: local)
return
end
- self['Unknown'] << binstr[index, len + 4]
- end
- def create_unknown_item
- s = +''
- class << s
- alias_method :to_c_dir_bin, :to_s
- alias_method :to_local_bin, :to_s
- end
- self['Unknown'] = s
+ self['Unknown'].merge(binstr[index, len + 4], local: local)
end
- def merge(binstr)
+ def merge(binstr, local: false)
return if binstr.empty?
i = 0
@@ -46,8 +39,7 @@ def merge(binstr)
if id && ID_MAP.member?(id)
extra_field_type_exist(binstr, id, len, i)
elsif id
- create_unknown_item unless self['Unknown']
- break unless extra_field_type_unknown(binstr, len, i)
+ break unless extra_field_type_unknown(binstr, len, i, local)
end
i += len + 4
end
@@ -61,8 +53,8 @@ def create(name)
self[name] = field_class.new
end
- # place Unknown last, so "extra" data that is missing the proper signature/size
- # does not prevent known fields from being read back in
+ # Place Unknown last, so "extra" data that is missing the proper
+ # signature/size does not prevent known fields from being read back in.
def ordered_values
result = []
each { |k, v| k == 'Unknown' ? result.push(v) : result.unshift(v) }
@@ -92,6 +84,7 @@ def local_size
end
end
+require 'zip/extra_field/unknown'
require 'zip/extra_field/generic'
require 'zip/extra_field/universal_time'
require 'zip/extra_field/old_unix'
diff --git a/lib/zip/extra_field/unknown.rb b/lib/zip/extra_field/unknown.rb
new file mode 100644
--- /dev/null
+++ b/lib/zip/extra_field/unknown.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Zip
+ # A class to hold unknown extra fields so that they are preserved.
+ class ExtraField::Unknown
+ def initialize
+ @local_bin = +''
+ @cdir_bin = +''
+ end
+
+ def merge(binstr, local: false)
+ return if binstr.empty?
+
+ if local
+ @local_bin << binstr
+ else
+ @cdir_bin << binstr
+ end
+ end
+
+ def to_local_bin
+ @local_bin
+ end
+
+ def to_c_dir_bin
+ @cdir_bin
+ end
+
+ def ==(other)
+ @local_bin == other.to_local_bin && @cdir_bin == other.to_c_dir_bin
+ end
+ end
+end
|
diff --git a/test/extra_field_test.rb b/test/extra_field_test.rb
--- a/test/extra_field_test.rb
+++ b/test/extra_field_test.rb
@@ -6,17 +6,29 @@ class ZipExtraFieldTest < MiniTest::Test
def test_new
extra_pure = ::Zip::ExtraField.new('')
extra_withstr = ::Zip::ExtraField.new('foo')
+ extra_withstr_local = ::Zip::ExtraField.new('foo', local: true)
+
assert_instance_of(::Zip::ExtraField, extra_pure)
assert_instance_of(::Zip::ExtraField, extra_withstr)
+ assert_instance_of(::Zip::ExtraField, extra_withstr_local)
+
+ assert_equal('foo', extra_withstr['Unknown'].to_c_dir_bin)
+ assert_equal('foo', extra_withstr_local['Unknown'].to_local_bin)
end
def test_unknownfield
extra = ::Zip::ExtraField.new('foo')
- assert_equal(extra['Unknown'], 'foo')
+ assert_equal('foo', extra['Unknown'].to_c_dir_bin)
+
extra.merge('a')
- assert_equal(extra['Unknown'], 'fooa')
+ assert_equal('fooa', extra['Unknown'].to_c_dir_bin)
+
extra.merge('barbaz')
- assert_equal(extra.to_s, 'fooabarbaz')
+ assert_equal('fooabarbaz', extra['Unknown'].to_c_dir_bin)
+
+ extra.merge('bar', local: true)
+ assert_equal('bar', extra['Unknown'].to_local_bin)
+ assert_equal('fooabarbaz', extra['Unknown'].to_c_dir_bin)
end
def test_bad_header_id
@@ -66,9 +78,9 @@ def test_to_s
extra = ::Zip::ExtraField.new(str)
assert_instance_of(String, extra.to_s)
- s = extra.to_s
- extra.merge('foo')
- assert_equal(s.length + 3, extra.to_s.length)
+ extra_len = extra.to_s.length
+ extra.merge('foo', local: true)
+ assert_equal(extra_len + 3, extra.to_s.length)
end
def test_equality
@@ -99,4 +111,14 @@ def test_read_local_extra_field
end
end
end
+
+ def test_load_unknown_extra_field
+ ::Zip::File.open('test/data/osx-archive.zip') do |zf|
+ zf.each do |entry|
+ # Check that there is only one occurance of the 'ux' extra field.
+ assert_equal(0, entry.extra['Unknown'].to_c_dir_bin.rindex('ux'))
+ assert_equal(0, entry.extra['Unknown'].to_local_bin.rindex('ux'))
+ end
+ end
+ end
end
diff --git a/test/extra_field_unknown_test.rb b/test/extra_field_unknown_test.rb
new file mode 100644
--- /dev/null
+++ b/test/extra_field_unknown_test.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class ZipExtraFieldUnknownTest < MiniTest::Test
+ def test_new
+ extra = ::Zip::ExtraField::Unknown.new
+ assert_empty(extra.to_c_dir_bin)
+ assert_empty(extra.to_local_bin)
+ end
+
+ def test_merge_cdir_then_local
+ extra = ::Zip::ExtraField::Unknown.new
+ field = "ux\v\x00\x01\x04\xF6\x01\x00\x00\x04\x14\x00\x00\x00"
+
+ extra.merge(field)
+ assert_empty(extra.to_local_bin)
+ assert_equal(field, extra.to_c_dir_bin)
+
+ extra.merge(field, local: true)
+ assert_equal(field, extra.to_local_bin)
+ assert_equal(field, extra.to_c_dir_bin)
+ end
+
+ def test_merge_local_only
+ extra = ::Zip::ExtraField::Unknown.new
+ field = "ux\v\x00\x01\x04\xF6\x01\x00\x00\x04\x14\x00\x00\x00"
+
+ extra.merge(field, local: true)
+ assert_equal(field, extra.to_local_bin)
+ assert_empty(extra.to_c_dir_bin)
+ end
+
+ def test_equality
+ extra1 = ::Zip::ExtraField::Unknown.new
+ extra2 = ::Zip::ExtraField::Unknown.new
+ assert_equal(extra1, extra2)
+
+ extra1.merge("ux\v\x00\x01\x04\xF6\x01\x00\x00\x04\x14\x00\x00\x00")
+ refute_equal(extra1, extra2)
+
+ extra2.merge("ux\v\x00\x01\x04\xF6\x01\x00\x00\x04\x14\x00\x00\x00")
+ assert_equal(extra1, extra2)
+
+ extra1.merge('foo', local: true)
+ refute_equal(extra1, extra2)
+
+ extra2.merge('foo', local: true)
+ assert_equal(extra1, extra2)
+ end
+end
diff --git a/test/local_entry_test.rb b/test/local_entry_test.rb
--- a/test/local_entry_test.rb
+++ b/test/local_entry_test.rb
@@ -83,6 +83,7 @@ def test_write_entry_with_zip64
'file.zip', 'entry_name', comment: 'my little comment', size: 400,
extra: 'thisIsSomeExtraInformation', compressed_size: 100, crc: 987_654
)
+ entry.extra.merge('thisIsSomeExtraInformation', local: true)
write_to_file(LEH_FILE, CEH_FILE, entry)
local_entry, central_entry = read_from_file(LEH_FILE, CEH_FILE)
@@ -153,18 +154,23 @@ def test_read64_local_offset
private
- def compare_local_entry_headers(entry1, entry2)
+ def compare_common_entry_headers(entry1, entry2)
assert_equal(entry1.compressed_size, entry2.compressed_size)
assert_equal(entry1.crc, entry2.crc)
- assert_equal(entry1.extra, entry2.extra)
assert_equal(entry1.compression_method, entry2.compression_method)
assert_equal(entry1.name, entry2.name)
assert_equal(entry1.size, entry2.size)
assert_equal(entry1.local_header_offset, entry2.local_header_offset)
end
+ def compare_local_entry_headers(entry1, entry2)
+ compare_common_entry_headers(entry1, entry2)
+ assert_equal(entry1.extra.to_local_bin, entry2.extra.to_local_bin)
+ end
+
def compare_c_dir_entry_headers(entry1, entry2)
- compare_local_entry_headers(entry1, entry2)
+ compare_common_entry_headers(entry1, entry2)
+ assert_equal(entry1.extra.to_c_dir_bin, entry2.extra.to_c_dir_bin)
assert_equal(entry1.comment, entry2.comment)
end
|
Unknown extra fields are not merged correctly when loading.
When loading extra fields from both the central directory and local headers, unknown fields are not merged correctly. Currently they are appended, which means that we end up with the two versions stuck together.
This potentially causes all sorts of subtle issues, such as the local header size being miscalculated, and so on.
| 2021-11-16T21:54:53
|
ruby
|
Hard
|
|
rubyzip/rubyzip
| 554
|
rubyzip__rubyzip-554
|
[
"540"
] |
58f053afb09e287c936bced568b9b1034763c062
|
diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
--- a/lib/zip/entry.rb
+++ b/lib/zip/entry.rb
@@ -247,21 +247,25 @@ def next_header_offset #:nodoc:all
local_entry_offset + compressed_size
end
- # Extracts entry to file dest_path (defaults to @name).
- # NB: The caller is responsible for making sure dest_path is safe, if it
- # is passed.
- def extract(dest_path = nil, &block)
- if dest_path.nil? && !name_safe?
- warn "WARNING: skipped '#{@name}' as unsafe."
+ # Extracts this entry to a file at `entry_path`, with
+ # `destination_directory` as the base location in the filesystem.
+ #
+ # NB: The caller is responsible for making sure `destination_directory` is
+ # safe, if it is passed.
+ def extract(entry_path = @name, destination_directory: '.', &block)
+ dest_dir = ::File.absolute_path(destination_directory || '.')
+ extract_path = ::File.absolute_path(::File.join(dest_dir, entry_path))
+
+ unless extract_path.start_with?(dest_dir)
+ warn "WARNING: skipped extracting '#{@name}' to '#{extract_path}' as unsafe."
return self
end
- dest_path ||= @name
block ||= proc { ::Zip.on_exists_proc }
raise "unknown file type #{inspect}" unless directory? || file? || symlink?
- __send__("create_#{ftype}", dest_path, &block)
+ __send__("create_#{ftype}", extract_path, &block)
self
end
diff --git a/lib/zip/file.rb b/lib/zip/file.rb
--- a/lib/zip/file.rb
+++ b/lib/zip/file.rb
@@ -245,11 +245,16 @@ def replace(entry, src_path)
add(entry, src_path)
end
- # Extracts entry to file dest_path.
- def extract(entry, dest_path, &block)
+ # Extracts `entry` to a file at `entry_path`, with `destination_directory`
+ # as the base location in the filesystem.
+ #
+ # NB: The caller is responsible for making sure `destination_directory` is
+ # safe, if it is passed.
+ def extract(entry, entry_path = nil, destination_directory: '.', &block)
block ||= proc { ::Zip.on_exists_proc }
found_entry = get_entry(entry)
- found_entry.extract(dest_path, &block)
+ entry_path ||= found_entry.name
+ found_entry.extract(entry_path, destination_directory: destination_directory, &block)
end
# Commits changes that has been made since the previous commit to
|
diff --git a/test/file_extract_directory_test.rb b/test/file_extract_directory_test.rb
--- a/test/file_extract_directory_test.rb
+++ b/test/file_extract_directory_test.rb
@@ -48,7 +48,7 @@ def test_extract_directory_exists_as_file_overwrite
called = false
extract_test_dir do |entry, dest_path|
called = true
- assert_equal(TEST_OUT_NAME, dest_path)
+ assert_equal(File.absolute_path(TEST_OUT_NAME), dest_path)
assert(entry.directory?)
true
end
diff --git a/test/file_extract_test.rb b/test/file_extract_test.rb
--- a/test/file_extract_test.rb
+++ b/test/file_extract_test.rb
@@ -5,6 +5,7 @@
class ZipFileExtractTest < MiniTest::Test
include CommonZipFileFixture
EXTRACTED_FILENAME = 'test/data/generated/extEntry'
+ EXTRACTED_FILENAME_ABS = ::File.absolute_path(EXTRACTED_FILENAME)
ENTRY_TO_EXTRACT, *REMAINING_ENTRIES = TEST_ZIP.entry_names.reverse
def setup
@@ -58,7 +59,7 @@ def test_extract_exists_overwrite
::Zip::File.open(TEST_ZIP.zip_name) do |zf|
zf.extract(zf.entries.first, EXTRACTED_FILENAME) do |entry, extract_loc|
called_correctly = zf.entries.first == entry &&
- extract_loc == EXTRACTED_FILENAME
+ extract_loc == EXTRACTED_FILENAME_ABS
true
end
end
diff --git a/test/file_options_test.rb b/test/file_options_test.rb
--- a/test/file_options_test.rb
+++ b/test/file_options_test.rb
@@ -7,12 +7,15 @@ class FileOptionsTest < MiniTest::Test
TXTPATH = ::File.expand_path(::File.join('data', 'file1.txt'), __dir__).freeze
TXTPATH_600 = ::File.join(Dir.tmpdir, 'file1.600.txt').freeze
TXTPATH_755 = ::File.join(Dir.tmpdir, 'file1.755.txt').freeze
- EXTPATH_1 = ::File.join(Dir.tmpdir, 'extracted_1.txt').freeze
- EXTPATH_2 = ::File.join(Dir.tmpdir, 'extracted_2.txt').freeze
- EXTPATH_3 = ::File.join(Dir.tmpdir, 'extracted_3.txt').freeze
ENTRY_1 = 'entry_1.txt'
ENTRY_2 = 'entry_2.txt'
ENTRY_3 = 'entry_3.txt'
+ EXTRACT_1 = 'extracted_1.txt'
+ EXTRACT_2 = 'extracted_2.txt'
+ EXTRACT_3 = 'extracted_3.txt'
+ EXTPATH_1 = ::File.join(Dir.tmpdir, EXTRACT_1).freeze
+ EXTPATH_2 = ::File.join(Dir.tmpdir, EXTRACT_2).freeze
+ EXTPATH_3 = ::File.join(Dir.tmpdir, EXTRACT_3).freeze
def teardown
::File.unlink(ZIPPATH) if ::File.exist?(ZIPPATH)
@@ -37,9 +40,9 @@ def test_restore_permissions_true
end
::Zip::File.open(ZIPPATH, restore_permissions: true) do |zip|
- zip.extract(ENTRY_1, EXTPATH_1)
- zip.extract(ENTRY_2, EXTPATH_2)
- zip.extract(ENTRY_3, EXTPATH_3)
+ zip.extract(ENTRY_1, EXTRACT_1, destination_directory: Dir.tmpdir)
+ zip.extract(ENTRY_2, EXTRACT_2, destination_directory: Dir.tmpdir)
+ zip.extract(ENTRY_3, EXTRACT_3, destination_directory: Dir.tmpdir)
end
assert_equal(::File.stat(TXTPATH).mode, ::File.stat(EXTPATH_1).mode)
@@ -61,9 +64,9 @@ def test_restore_permissions_false
end
::Zip::File.open(ZIPPATH, restore_permissions: false) do |zip|
- zip.extract(ENTRY_1, EXTPATH_1)
- zip.extract(ENTRY_2, EXTPATH_2)
- zip.extract(ENTRY_3, EXTPATH_3)
+ zip.extract(ENTRY_1, EXTRACT_1, destination_directory: Dir.tmpdir)
+ zip.extract(ENTRY_2, EXTRACT_2, destination_directory: Dir.tmpdir)
+ zip.extract(ENTRY_3, EXTRACT_3, destination_directory: Dir.tmpdir)
end
default_perms = (Zip::RUNNING_ON_WINDOWS ? 0o100_644 : 0o100_666) - ::File.umask
@@ -86,9 +89,9 @@ def test_restore_permissions_as_default
end
::Zip::File.open(ZIPPATH) do |zip|
- zip.extract(ENTRY_1, EXTPATH_1)
- zip.extract(ENTRY_2, EXTPATH_2)
- zip.extract(ENTRY_3, EXTPATH_3)
+ zip.extract(ENTRY_1, EXTRACT_1, destination_directory: Dir.tmpdir)
+ zip.extract(ENTRY_2, EXTRACT_2, destination_directory: Dir.tmpdir)
+ zip.extract(ENTRY_3, EXTRACT_3, destination_directory: Dir.tmpdir)
end
assert_equal(::File.stat(TXTPATH).mode, ::File.stat(EXTPATH_1).mode)
@@ -103,8 +106,8 @@ def test_restore_times_true
end
::Zip::File.open(ZIPPATH, restore_times: true) do |zip|
- zip.extract(ENTRY_1, EXTPATH_1)
- zip.extract(ENTRY_2, EXTPATH_2)
+ zip.extract(ENTRY_1, EXTRACT_1, destination_directory: Dir.tmpdir)
+ zip.extract(ENTRY_2, EXTRACT_2, destination_directory: Dir.tmpdir)
end
assert_time_equal(::File.mtime(TXTPATH), ::File.mtime(EXTPATH_1))
@@ -118,8 +121,8 @@ def test_restore_times_false
end
::Zip::File.open(ZIPPATH, restore_times: false) do |zip|
- zip.extract(ENTRY_1, EXTPATH_1)
- zip.extract(ENTRY_2, EXTPATH_2)
+ zip.extract(ENTRY_1, EXTRACT_1, destination_directory: Dir.tmpdir)
+ zip.extract(ENTRY_2, EXTRACT_2, destination_directory: Dir.tmpdir)
end
assert_time_equal(::Time.now, ::File.mtime(EXTPATH_1))
@@ -133,8 +136,8 @@ def test_restore_times_true_as_default
end
::Zip::File.open(ZIPPATH) do |zip|
- zip.extract(ENTRY_1, EXTPATH_1)
- zip.extract(ENTRY_2, EXTPATH_2)
+ zip.extract(ENTRY_1, EXTRACT_1, destination_directory: Dir.tmpdir)
+ zip.extract(ENTRY_2, EXTRACT_2, destination_directory: Dir.tmpdir)
end
assert_time_equal(::File.mtime(TXTPATH), ::File.mtime(EXTPATH_1))
@@ -143,20 +146,19 @@ def test_restore_times_true_as_default
def test_get_find_consistency
testzip = ::File.expand_path(::File.join('data', 'globTest.zip'), __dir__)
- file_f = ::File.expand_path('f_test.txt', Dir.tmpdir)
- file_g = ::File.expand_path('g_test.txt', Dir.tmpdir)
-
- ::Zip::File.open(testzip) do |zip|
- e1 = zip.find_entry('globTest/food.txt')
- e1.extract(file_f)
- e2 = zip.get_entry('globTest/food.txt')
- e2.extract(file_g)
+ Dir.mktmpdir do |tmp|
+ file_f = ::File.expand_path('f_test.txt', tmp)
+ file_g = ::File.expand_path('g_test.txt', tmp)
+
+ ::Zip::File.open(testzip) do |zip|
+ e1 = zip.find_entry('globTest/food.txt')
+ e1.extract('f_test.txt', destination_directory: tmp)
+ e2 = zip.get_entry('globTest/food.txt')
+ e2.extract('g_test.txt', destination_directory: tmp)
+ end
+
+ assert_time_equal(::File.mtime(file_f), ::File.mtime(file_g))
end
-
- assert_time_equal(::File.mtime(file_f), ::File.mtime(file_g))
- ensure
- ::File.unlink(file_f)
- ::File.unlink(file_g)
end
private
diff --git a/test/path_traversal_test.rb b/test/path_traversal_test.rb
--- a/test/path_traversal_test.rb
+++ b/test/path_traversal_test.rb
@@ -39,23 +39,31 @@ def in_tmpdir
end
def test_leading_slash
- entries = { '/tmp/moo' => /WARNING: skipped '\/tmp\/moo'/ }
- in_tmpdir do
+ entries = { '/tmp/moo' => '' }
+ in_tmpdir do |test_path|
+ Dir.mkdir('tmp') # Create 'tmp' dir within test directory.
extract_paths(['jwilk', 'absolute1.zip'], entries)
+
+ # Check that only the relative file is created.
refute File.exist?('/tmp/moo')
+ assert File.exist?(File.join(test_path, 'tmp', 'moo'))
end
end
def test_multiple_leading_slashes
- entries = { '//tmp/moo' => /WARNING: skipped '\/\/tmp\/moo'/ }
- in_tmpdir do
+ entries = { '//tmp/moo' => '' }
+ in_tmpdir do |test_path|
+ Dir.mkdir('tmp') # Create 'tmp' dir within test directory.
extract_paths(['jwilk', 'absolute2.zip'], entries)
+
+ # Check that only the relative file is created.
refute File.exist?('/tmp/moo')
+ assert File.exist?(File.join(test_path, 'tmp', 'moo'))
end
end
def test_leading_dot_dot
- entries = { '../moo' => /WARNING: skipped '\.\.\/moo'/ }
+ entries = { '../moo' => /WARNING: skipped extracting '\.\.\/moo'/ }
in_tmpdir do
extract_paths(['jwilk', 'relative0.zip'], entries)
refute File.exist?('../moo')
@@ -65,7 +73,7 @@ def test_leading_dot_dot
def test_non_leading_dot_dot_with_existing_folder
entries = {
'tmp/' => '',
- 'tmp/../../moo' => /WARNING: skipped 'tmp\/\.\.\/\.\.\/moo'/
+ 'tmp/../../moo' => /WARNING: skipped extracting 'tmp\/\.\.\/\.\.\/moo'/
}
in_tmpdir do
extract_paths('relative1.zip', entries)
@@ -75,7 +83,7 @@ def test_non_leading_dot_dot_with_existing_folder
end
def test_non_leading_dot_dot_without_existing_folder
- entries = { 'tmp/../../moo' => /WARNING: skipped 'tmp\/\.\.\/\.\.\/moo'/ }
+ entries = { 'tmp/../../moo' => /WARNING: skipped extracting 'tmp\/\.\.\/\.\.\/moo'/ }
in_tmpdir do
extract_paths(['jwilk', 'relative2.zip'], entries)
refute File.exist?('../moo')
@@ -94,7 +102,7 @@ def test_file_symlink
def test_directory_symlink
# Can't create tmp/moo, because the tmp symlink is skipped.
entries = {
- 'tmp' => /WARNING: skipped symlink 'tmp'/,
+ 'tmp' => /WARNING: skipped symlink '.*\/tmp'/,
'tmp/moo' => :error
}
in_tmpdir do
@@ -106,8 +114,8 @@ def test_directory_symlink
def test_two_directory_symlinks_a
# Can't create par/moo because the symlinks are skipped.
entries = {
- 'cur' => /WARNING: skipped symlink 'cur'/,
- 'par' => /WARNING: skipped symlink 'par'/,
+ 'cur' => /WARNING: skipped symlink '.*\/cur'/,
+ 'par' => /WARNING: skipped symlink '.*\/par'/,
'par/moo' => :error
}
in_tmpdir do
@@ -121,8 +129,8 @@ def test_two_directory_symlinks_a
def test_two_directory_symlinks_b
# Can't create par/moo, because the symlinks are skipped.
entries = {
- 'cur' => /WARNING: skipped symlink 'cur'/,
- 'cur/par' => /WARNING: skipped symlink 'cur\/par'/,
+ 'cur' => /WARNING: skipped symlink '.*\/cur'/,
+ 'cur/par' => /WARNING: skipped symlink '.*\/cur\/par'/,
'par/moo' => :error
}
in_tmpdir do
@@ -132,14 +140,29 @@ def test_two_directory_symlinks_b
end
end
- def test_entry_name_with_absolute_path_does_not_extract
- entries = {
- '/tmp/' => /WARNING: skipped '\/tmp\/'/,
- '/tmp/file.txt' => /WARNING: skipped '\/tmp\/file.txt'/
- }
- in_tmpdir do
- extract_paths(['tuzovakaoff', 'absolutepath.zip'], entries)
+ def test_entry_name_with_absolute_path_does_not_extract_by_accident
+ in_tmpdir do |test_path|
+ zip_path = File.join(TEST_FILE_ROOT, 'tuzovakaoff', 'absolutepath.zip')
+ Zip::File.open(zip_path) do |zip_file|
+ zip_file.each do |entry|
+ entry.extract(entry.name, destination_directory: nil)
+ assert File.exist?(File.join(test_path, entry.name))
+ refute File.exist?(entry.name) unless entry.name == '/tmp/'
+ end
+ end
+ end
+ end
+
+ def test_entry_name_with_absolute_path_extracts_to_cwd_by_default
+ in_tmpdir do |test_path|
+ zip_path = File.join(TEST_FILE_ROOT, 'tuzovakaoff', 'absolutepath.zip')
+ Zip::File.open(zip_path) do |zip_file|
+ zip_file.each(&:extract)
+ end
+
+ # Check that only the relative file is created.
refute File.exist?('/tmp/file.txt')
+ assert File.exist?(File.join(test_path, 'tmp', 'file.txt'))
end
end
@@ -148,17 +171,20 @@ def test_entry_name_with_absolute_path_extract_when_given_different_path
zip_path = File.join(TEST_FILE_ROOT, 'tuzovakaoff', 'absolutepath.zip')
Zip::File.open(zip_path) do |zip_file|
zip_file.each do |entry|
- entry.extract(File.join(test_path, entry.name))
+ entry.extract(destination_directory: test_path)
end
end
+
+ # Check that only the relative file is created.
refute File.exist?('/tmp/file.txt')
+ assert File.exist?(File.join(test_path, 'tmp', 'file.txt'))
end
end
def test_entry_name_with_relative_symlink
# Doesn't create the symlink path, so can't create path/file.txt.
entries = {
- 'path' => /WARNING: skipped symlink 'path'/,
+ 'path' => /WARNING: skipped symlink '.*\/path'/,
'path/file.txt' => :error
}
in_tmpdir do
|
Directory traversal vulnerability
## Summary
In version 2.3.2, we are again experiencing the exact same problem as below.
https://github.com/rubyzip/rubyzip/issues/315
## PoC
```
root@ea8d5cb86e9f:/work# ruby -v
ruby 3.1.2p20 (2022-04-12 revision 4491bb740a) [aarch64-linux]
root@ea8d5cb86e9f:/work# uname -a
Linux ea8d5cb86e9f 5.15.64-0-virt #1-Alpine SMP Mon, 05 Sep 2022 08:02:49 +0000 aarch64 GNU/Linux
root@ea8d5cb86e9f:/work# gem list | grep rubyzip
rubyzip (2.3.2)
root@ea8d5cb86e9f:/work# zipinfo traversal.zip
Archive: traversal.zip
Zip file size: 166 bytes, number of entries: 1
-rw-r--r-- 5.2 unx 0 t- defN 22-Nov-15 07:57 ../../.././../../../../tmp/hacked
1 file, 0 bytes uncompressed, 2 bytes compressed: 0.0%
root@ea8d5cb86e9f:/work# ls -l /tmp
total 0
root@ea8d5cb86e9f:/work# ruby extract.rb
Extracting ../../.././../../../../tmp/hacked
root@ea8d5cb86e9f:/work# ls -l /tmp
total 0
-rw-r--r-- 1 root root 0 Nov 16 00:55 hacked
```
**extract.rb**
```ruby
require 'zip'
Zip::File.open('traversal.zip') do |zip_file|
# Handle entries one by one
zip_file.each do |entry|
# Extract to file/directory/symlink
puts "Extracting #{entry.name}"
entry.extract(entry.name)
end
end
```
|
Sorry.
I missed reading the following.
https://github.com/rubyzip/rubyzip/blob/v2.3.2/lib/zip/entry.rb#L174
Is there any particular plan to correct this issue?
If not, we will close this Issue and propose a fix in the Security Advisory.
https://github.com/github/advisory-database/pull/832
Hi @wonda-tea-coffee and thanks for raising this again.
The above code clearly short-circuits around the protections that Rubyzip has for traversal. For example the following code would be safe, simply by changing `entry.extract(entry.name)` to `entry.extract`:
```ruby
require 'zip'
Zip::File.open('traversal.zip') do |zip_file|
# Handle entries one by one
zip_file.each do |entry|
# Extract to file/directory/symlink
puts "Extracting #{entry.name}"
entry.extract
end
end
```
A developer would need to specifically write the unsafe version that you supply above, but I agree that it's probably easy to do so without knowing you've done it.
I do think it should be possible for a developer to knowingly and deliberately allow extracting to potentially unsafe names, if for their particular situation it is perfectly safe, but:
* it should not be the default;
* the default should be to not allow this, and the developer should have to specifically allow it themselves; and
* we should never allow extracting to an unsafe place directly to the name provided in zip archive itself
Do you think that would be acceptable?
I will think on how to implement that and get it into version 3 - which is getting closer (honest).
@hainesr
Thanks for the reply.
I completely agree with the above 👍
OK, having now tried a somewhat naive implementation based solely on that bulleted list above, I see a rather large UX hole. The above prevents one from extracting to, say, `/tmp` unless you were to completely turn off checks for unsafe paths. Anything starting with a `/` is currently considered unsafe - which it would be if the leading `/` was in the entry name in the zip file, but it should be OK to extract to `/tmp`.
I think the solution then is to add a parameter to the `extract` method which specifies a target directory for the extraction. This would be combined with the entry name and then we'd check that the result was safe. For example:
* `/tmp` joined with `etc/passwd` is safe
* `/tmp` joined with `../etc/passwd` is not safe
This seems to be how other libraries manage this situation: https://github.com/commonsguy/cwac-security/blob/master/security/src/main/java/com/commonsware/cwac/security/ZipUtils.java#L171-L181
| 2023-04-08T06:49:40
|
ruby
|
Hard
|
JEG2/highline
| 222
|
JEG2__highline-222
|
[
"221"
] |
413ad89036ab535e53642c66333e9622323fdf32
|
diff --git a/Changelog.md b/Changelog.md
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,9 @@
Below is a complete listing of changes for each revision of HighLine.
+### 2.0.0-develop.14 / 2017-11-21
+* PR #222 / I #221 - Fix inconsistent behaviour when using agree with readline (@abinoam, @ailisp)
+
### 2.0.0-develop.13 / 2017-11-05
* PR #219 - Make possible to use a callable as response (@abinoam)
diff --git a/lib/highline.rb b/lib/highline.rb
--- a/lib/highline.rb
+++ b/lib/highline.rb
@@ -196,6 +196,7 @@ def agree(yes_or_no_question, character = nil)
q.responses[:not_valid] = 'Please enter "yes" or "no".'
q.responses[:ask_on_error] = :question
q.character = character
+ q.completion = %w[yes no]
yield q if block_given?
end
diff --git a/lib/highline/question.rb b/lib/highline/question.rb
--- a/lib/highline/question.rb
+++ b/lib/highline/question.rb
@@ -575,7 +575,7 @@ def ask_on_error_msg
# @param highline [HighLine] context
# @return [void]
def show_question(highline)
- highline.say(self) unless readline && (echo == true && !limit)
+ highline.say(self)
end
# Returns an echo string that is adequate for this Question settings.
diff --git a/lib/highline/terminal.rb b/lib/highline/terminal.rb
--- a/lib/highline/terminal.rb
+++ b/lib/highline/terminal.rb
@@ -98,9 +98,7 @@ def get_line(question, highline)
def get_line_with_readline(question, highline)
require "readline" # load only if needed
- question_string = highline.render_statement(question)
-
- raw_answer = readline_read(question_string, question)
+ raw_answer = readline_read(question)
if !raw_answer && highline.track_eof?
raise EOFError, "The input stream is exhausted."
@@ -113,7 +111,7 @@ def get_line_with_readline(question, highline)
# @param prompt [String] Readline prompt
# @param question [HighLine::Question] question from where to get
# autocomplete candidate strings
- def readline_read(prompt, question)
+ def readline_read(question)
# prep auto-completion
unless question.selection.empty?
Readline.completion_proc = lambda do |str|
@@ -126,7 +124,7 @@ def readline_read(prompt, question)
$VERBOSE = nil
raw_answer = run_preserving_stty do
- Readline.readline(prompt, true)
+ Readline.readline("", true)
end
$VERBOSE = old_verbose
diff --git a/lib/highline/version.rb b/lib/highline/version.rb
--- a/lib/highline/version.rb
+++ b/lib/highline/version.rb
@@ -2,5 +2,5 @@
class HighLine
# The version of the installed library.
- VERSION = "2.0.0-develop.13".freeze
+ VERSION = "2.0.0-develop.14".freeze
end
|
diff --git a/test/acceptance/at_readline_agree.rb b/test/acceptance/at_readline_agree.rb
new file mode 100644
--- /dev/null
+++ b/test/acceptance/at_readline_agree.rb
@@ -0,0 +1,18 @@
+# coding: utf-8
+
+require_relative "acceptance_test"
+
+HighLine::AcceptanceTest.check do |t|
+ t.desc =
+ "This step checks if the readline works well with agree.\n" \
+ "You should press <tab> and readline should give the default " \
+ "(yes/no) options to autocomplete."
+
+ t.action = proc do
+ answer = agree("Do you agree?") { |q| q.readline = true }
+ puts "You've entered -> #{answer} <-"
+ end
+
+ t.question =
+ "Did HighLine#agree worked well using question.readline = true (y/n)? "
+end
|
Incosistent behavior when ask with a validator and readline=true
Hi, we're using highline in a console for a cloud management platform: https://github.com/manageiq/manageiq-appliance_console. Recently we add all `Highline.ask` with `readline=true` option to add arrow key navigation. It works fine for no validator `ask`, but for cases with a validator, like `Highline.agree` or `Highline.choose`, it's behavior is inconsistent with the same method call of `readline=false` option. Though we use a previous version of highline, but I just test with current master branch and inconsistency still exist. For a minimum example, try some invalid input to these two `agree`:
```ruby
#!/usr/bin/env ruby
require 'highline'
def agree_readline(prompt)
HighLine.new.agree(prompt) do |q|
q.readline=true
end
end
def agree(prompt)
HighLine.new.agree(prompt)
end
agree_readline("agree readline=true? ")
agree("agree readline=false? ")
```
Similar problems for `choose` or manually call `ask` given validator. I did some hacks in our project to make them lo behave the same way as `readline=false`. But I think it's better to fix here.
|
Hi @ailisp,
Thanks for reporting the issue.
What exactly is happening on your setup?
What **behaviour** is inconsistent?
Hi @abinoam Thanks for quick response. In a clone of current master branch. save the content I provide in previous comment as test.rb:
```
[boyao@new-host highline]$ bundler exec ./test.rb
agree readline=true?aaa
Please enter "yes" or "no".
agree readline=true?
agree readline=true?
Please enter "yes" or "no".
agree readline=true?
agree readline=true?yes
agree readline=false?
aaa
Please enter "yes" or "no".
agree readline=false?
Please enter "yes" or "no".
agree readline=false?
yes
```
I input `aaa`, nothing and `yes` for both case (`readline=true` or `false`), and you can see with `readline=true` there's no extra newline after question, but a redundant question.
For `choose`, if we have `readline=true` then giving an invalid input, the question and menu will both display again, but for `readline=false` only question will display again.
I think I understood.
I've had a quick look at the code now and couldn't figure out a quick fix.
I'll try to take a look at it next week and try to fix it or at least provide a way to work around it.
👍
I see that the use of `readline = true` at `agree` is pretty much unimplemented.
It doesn't even autocomplete for **yes** or **no**.
Yes. just noticed the auto complete part is not implemented. And here's of some hacks I did for make `choose` and `agree` looks the same as `readline=false`, it works but with some ugly hacks so I don't make a PR here direcly. I think you're more familiar with GNU Readline, but hope this can save you some time.
- readline replacement of `agree`
https://github.com/ManageIQ/manageiq-appliance_console/pull/6/files#diff-11f3fdac8dc445b3e93dd2459f62b9a9
- readline replacement for `choose`, based on a modified `ask`, some observations of my experiments are in comments
https://github.com/ManageIQ/manageiq-appliance_console/pull/6/files#diff-70eae34541a813654c1e209ef9e093f4
| 2017-11-22T01:09:40
|
ruby
|
Hard
|
rubyzip/rubyzip
| 363
|
rubyzip__rubyzip-363
|
[
"356"
] |
8887b703490337f7ab68ebfb4880354db28ba648
|
diff --git a/lib/zip/filesystem.rb b/lib/zip/filesystem.rb
--- a/lib/zip/filesystem.rb
+++ b/lib/zip/filesystem.rb
@@ -573,6 +573,10 @@ def get_output_stream(fileName, permissionInt = nil, &aProc)
@zipFile.get_output_stream(expand_to_entry(fileName), permissionInt, &aProc)
end
+ def glob(pattern, *flags, &block)
+ @zipFile.glob(expand_to_entry(pattern), *flags, &block)
+ end
+
def read(fileName)
@zipFile.read(expand_to_entry(fileName))
end
|
diff --git a/test/filesystem/directory_test.rb b/test/filesystem/directory_test.rb
--- a/test/filesystem/directory_test.rb
+++ b/test/filesystem/directory_test.rb
@@ -3,6 +3,7 @@
class ZipFsDirectoryTest < MiniTest::Test
TEST_ZIP = 'test/data/generated/zipWithDirs_copy.zip'
+ GLOB_TEST_ZIP = 'test/data/globTest.zip'
def setup
FileUtils.cp('test/data/zipWithDirs.zip', TEST_ZIP)
@@ -93,11 +94,28 @@ def test_chroot
end
end
- # Globbing not supported yet
- # def test_glob
- # # test alias []-operator too
- # fail "implement test"
- # end
+ def test_glob
+ globbed_files = [
+ 'globTest/foo/bar/baz/foo.txt',
+ 'globTest/foo.txt',
+ 'globTest/food.txt'
+ ]
+
+ ::Zip::File.open(GLOB_TEST_ZIP) do |zf|
+ zf.dir.glob('**/*.txt') do |f|
+ assert globbed_files.include?(f.name)
+ end
+
+ zf.dir.glob('globTest/foo/**/*.txt') do |f|
+ assert_equal globbed_files[0], f.name
+ end
+
+ zf.dir.chdir('globTest/foo')
+ zf.dir.glob('**/*.txt') do |f|
+ assert_equal globbed_files[0], f.name
+ end
+ end
+ end
def test_open_new
::Zip::File.open(TEST_ZIP) do |zf|
|
`Zip::FileSystem::ZipFsDir#glob` triggers non-existing `Zip::FileSystem::ZipFileNameMapper#glob` method
Code:
```ruby
require 'zip'
require 'zip/filesystem'
Zip::File.open('archive.zip') do |zip_file|
zip_file.dir.glob('flags/**/*')
end
```
Output:
```
NoMethodError: undefined method `glob' for #<Zip::FileSystem::ZipFileNameMapper:0x00005654bd818c98>
from /home/alex/.rbenv/versions/2.5.0/lib/ruby/gems/2.5.0/gems/rubyzip-1.2.1/lib/zip/filesystem.rb:475:in `glob'
```
| 2018-04-30T21:46:51
|
ruby
|
Hard
|
|
rubyzip/rubyzip
| 462
|
rubyzip__rubyzip-462
|
[
"461",
"461"
] |
e5e3f97ec891cb596f1af8950fc9749c99b809e9
|
diff --git a/Changelog.md b/Changelog.md
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,7 @@
# X.X.X (Next)
+- Fix input stream partial read error. [#462](https://github.com/rubyzip/rubyzip/pull/462)
+
Tooling:
- Update rubocop again and run it in CI. [#444](https://github.com/rubyzip/rubyzip/pull/444)
diff --git a/lib/zip/ioextras/abstract_input_stream.rb b/lib/zip/ioextras/abstract_input_stream.rb
--- a/lib/zip/ioextras/abstract_input_stream.rb
+++ b/lib/zip/ioextras/abstract_input_stream.rb
@@ -19,7 +19,7 @@ def initialize
def read(number_of_bytes = nil, buf = '')
tbuf = if @output_buffer.bytesize > 0
- if number_of_bytes <= @output_buffer.bytesize
+ if number_of_bytes && number_of_bytes <= @output_buffer.bytesize
@output_buffer.slice!(0, number_of_bytes)
else
number_of_bytes -= @output_buffer.bytesize if number_of_bytes
|
diff --git a/test/input_stream_test.rb b/test/input_stream_test.rb
--- a/test/input_stream_test.rb
+++ b/test/input_stream_test.rb
@@ -179,4 +179,14 @@ def test_ungetc
assert_equal('$VERBOSE =', zis.read(10))
end
end
+
+ def test_readline_then_read
+ ::Zip::InputStream.open(TestZipFile::TEST_ZIP2.zip_name) do |zis|
+ zis.get_next_entry
+ assert_equal("#!/usr/bin/env ruby\n", zis.readline)
+ refute(zis.eof?)
+ refute_empty(zis.read) # Also should not raise an error.
+ assert(zis.eof?)
+ end
+ end
end
|
read remainder of entry through input stream fails if a partial read has already been performed.
/lib/zip/ioextras/abstract_input_stream.rb line 22 does not check number_of_bytes for nil before using it. If the output buffer is not empty due to a partial read on the stream, and a read with no parameters is performed then NoMethodError is raised instead of returning the remainder of the stream. Can be reproduced via this pseudocode:
z = Zip::File.open('my-zip-file.zip')
e = z.entries.first # Assume first entry is a file
s = e.get_input_stream # get an input stream to read the file entry
l = s.readline # read the first line of the entry
r = s.read # read remainder of entry
#<NoMethodError: undefined method `<=' for nil:NilClass>
read remainder of entry through input stream fails if a partial read has already been performed.
/lib/zip/ioextras/abstract_input_stream.rb line 22 does not check number_of_bytes for nil before using it. If the output buffer is not empty due to a partial read on the stream, and a read with no parameters is performed then NoMethodError is raised instead of returning the remainder of the stream. Can be reproduced via this pseudocode:
z = Zip::File.open('my-zip-file.zip')
e = z.entries.first # Assume first entry is a file
s = e.get_input_stream # get an input stream to read the file entry
l = s.readline # read the first line of the entry
r = s.read # read remainder of entry
#<NoMethodError: undefined method `<=' for nil:NilClass>
| 2020-11-08T17:49:33
|
ruby
|
Hard
|
|
JEG2/highline
| 171
|
JEG2__highline-171
|
[
"168",
"168"
] |
38ea035ae6866523e8a14e4e45a95b008b810c67
|
diff --git a/lib/highline/paginator.rb b/lib/highline/paginator.rb
--- a/lib/highline/paginator.rb
+++ b/lib/highline/paginator.rb
@@ -19,12 +19,12 @@ def initialize(highline)
def page_print(text)
return text unless highline.page_at
- lines = text.scan(/[^\n]*\n?/)
+ lines = text.lines.to_a
while lines.size > highline.page_at
highline.puts lines.slice!(0...highline.page_at).join
highline.puts
# Return last line if user wants to abort paging
- return (["...\n"] + lines.slice(-2,1)).join unless continue_paging?
+ return "...\n#{lines.last}" unless continue_paging?
end
return lines.join
end
|
diff --git a/test/test_paginator.rb b/test/test_paginator.rb
--- a/test/test_paginator.rb
+++ b/test/test_paginator.rb
@@ -27,4 +27,47 @@ def test_paging
(45..50).map { |n| "This is line #{n}.\n"}.join,
@output.string )
end
+
+ def test_statement_lines_count_equal_to_page_at_shouldnt_paginate
+ @terminal.page_at = 6
+
+ @input << "\n"
+ @input.rewind
+
+ list = "a\nb\nc\nd\ne\nf\n"
+
+ @terminal.say(list)
+ assert_equal(list, @output.string)
+ end
+
+ def test_statement_with_one_line_bigger_than_page_at_should_paginate
+ @terminal.page_at = 6
+
+ @input << "\n"
+ @input.rewind
+
+ list = "a\nb\nc\nd\ne\nf\ng\n"
+
+ paginated =
+ "a\nb\nc\nd\ne\nf\n" \
+ "\n-- press enter/return to continue or q to stop -- \n\n" \
+ "g\n"
+
+ @terminal.say(list)
+ assert_equal(paginated, @output.string)
+ end
+
+ def test_quiting_paging_shouldnt_raise
+ # See https://github.com/JEG2/highline/issues/168
+
+ @terminal.page_at = 6
+
+ @input << "q"
+ @input.rewind
+
+ list = "a\nb\nc\nd\ne\nf\n"
+
+ # expect not to raise an error on next line
+ @terminal.say(list)
+ end
end
\ No newline at end of file
|
TypeError when calling say
When calling `HighLine#say` a `TypeError` is raised when printing the same number of lines as your `$terminal.page_at` value.
It can be reproduced with this gist:
https://gist.github.com/carbonin/4163f462345581956f4b
Traceback:
```
/home/ncarboni/.gem/ruby/2.2.2/gems/highline-1.7.7/lib/highline.rb:997:in `+': no implicit conversion of nil into Array (TypeError)
from /home/ncarboni/.gem/ruby/2.2.2/gems/highline-1.7.7/lib/highline.rb:997:in `page_print'
from /home/ncarboni/.gem/ruby/2.2.2/gems/highline-1.7.7/lib/highline.rb:724:in `format_statement'
from /home/ncarboni/.gem/ruby/2.2.2/gems/highline-1.7.7/lib/highline.rb:621:in `say'
from highline_bug.rb:9:in `<main>'
```
A fix would be to change the `lines.slice(-2,1)` to `[lines.last]` at `lib/highline.rb:997` which I think would get the desired behaviour.
The `$terminal.page_at` value can be increased as a temporary work around to prevent paging entirely, but that only works for me as my application typically has a fixed number of lines being printed.
TypeError when calling say
When calling `HighLine#say` a `TypeError` is raised when printing the same number of lines as your `$terminal.page_at` value.
It can be reproduced with this gist:
https://gist.github.com/carbonin/4163f462345581956f4b
Traceback:
```
/home/ncarboni/.gem/ruby/2.2.2/gems/highline-1.7.7/lib/highline.rb:997:in `+': no implicit conversion of nil into Array (TypeError)
from /home/ncarboni/.gem/ruby/2.2.2/gems/highline-1.7.7/lib/highline.rb:997:in `page_print'
from /home/ncarboni/.gem/ruby/2.2.2/gems/highline-1.7.7/lib/highline.rb:724:in `format_statement'
from /home/ncarboni/.gem/ruby/2.2.2/gems/highline-1.7.7/lib/highline.rb:621:in `say'
from highline_bug.rb:9:in `<main>'
```
A fix would be to change the `lines.slice(-2,1)` to `[lines.last]` at `lib/highline.rb:997` which I think would get the desired behaviour.
The `$terminal.page_at` value can be increased as a temporary work around to prevent paging entirely, but that only works for me as my application typically has a fixed number of lines being printed.
|
@carbonin I was not able to reproduce the issue with the code on your gist.
Could rerun the gist exactly as it is and confirm the issue?
Can you share the output of the following?
```
$ ruby -r highline -ve 'p [HighLine::VERSION, HighLine::SystemExtensions::CHARACTER_MODE]'
```
My output is as follow:
```
ruby 2.2.3p173 (2015-08-18 revision 51636) [x86_64-darwin14]
["1.7.7", "stty"]
```
Oh, I forgot to mention that at the pagination prompt you have to press 'q' to stop. Then you should get the traceback.
```
ruby 2.2.2p95 (2015-04-13 revision 50295) [x86_64-linux]
["1.7.7", "stty"]
```
Is the output from
`$ ruby -r highline -ve 'p [HighLine::VERSION, HighLine::SystemExtensions::CHARACTER_MODE]'`
Great, now I get the error.
If the fix is so simple, don't you want to fire a PR yourself?
So you enter to the "hall of fame" of HighLine contributors :smiley:
But, if you prefer I can do it.
The branch is `1-7-stable`
@carbonin
If the sentence has the exact same lines of `HighLIne#page_at` maybe the proper behaviour would be "not even paginate", do you agree? (So it was a **double** bug ;-) )
I'm crafting the tests here and will push a patch soon.
Can I do PR to your fork branch so we merge it on our master altogether?
@carbonin I was not able to reproduce the issue with the code on your gist.
Could rerun the gist exactly as it is and confirm the issue?
Can you share the output of the following?
```
$ ruby -r highline -ve 'p [HighLine::VERSION, HighLine::SystemExtensions::CHARACTER_MODE]'
```
My output is as follow:
```
ruby 2.2.3p173 (2015-08-18 revision 51636) [x86_64-darwin14]
["1.7.7", "stty"]
```
Oh, I forgot to mention that at the pagination prompt you have to press 'q' to stop. Then you should get the traceback.
```
ruby 2.2.2p95 (2015-04-13 revision 50295) [x86_64-linux]
["1.7.7", "stty"]
```
Is the output from
`$ ruby -r highline -ve 'p [HighLine::VERSION, HighLine::SystemExtensions::CHARACTER_MODE]'`
Great, now I get the error.
If the fix is so simple, don't you want to fire a PR yourself?
So you enter to the "hall of fame" of HighLine contributors :smiley:
But, if you prefer I can do it.
The branch is `1-7-stable`
@carbonin
If the sentence has the exact same lines of `HighLIne#page_at` maybe the proper behaviour would be "not even paginate", do you agree? (So it was a **double** bug ;-) )
I'm crafting the tests here and will push a patch soon.
Can I do PR to your fork branch so we merge it on our master altogether?
| 2015-10-09T18:42:18
|
ruby
|
Hard
|
JEG2/highline
| 122
|
JEG2__highline-122
|
[
"98"
] |
c59543d2a3f5a52aa025ae48a76d1dbfc40e1662
|
diff --git a/lib/highline.rb b/lib/highline.rb
--- a/lib/highline.rb
+++ b/lib/highline.rb
@@ -715,7 +715,7 @@ def output_rows
private
def format_statement statement
- statement = (statement || "").dup.to_str
+ statement = String(statement || "").dup
return statement unless statement.length > 0
template = ERB.new(statement, nil, "%")
|
diff --git a/test/tc_highline.rb b/test/tc_highline.rb
--- a/test/tc_highline.rb
+++ b/test/tc_highline.rb
@@ -1094,6 +1094,19 @@ def test_say
assert_equal("", @output.string)
end
+ def test_say_handles_non_string_argument
+ integer = 10
+ hash = { :a => 20 }
+
+ assert_nothing_raised { @terminal.say(integer) }
+ assert_equal String(integer), @output.string.chomp
+
+ @output.truncate(@output.rewind)
+
+ assert_nothing_raised { @terminal.say(hash) }
+ assert_equal String(hash), @output.string.chomp
+ end
+
def test_terminal_size
assert_instance_of(Fixnum, @terminal.terminal_size[0])
assert_instance_of(Fixnum, @terminal.terminal_size[1])
|
Highline v1.6.2 Error
Hi James,
I was working on a chef setup with vagrant and hit a wall with it dying on https://github.com/JEG2/highline/blob/master/lib/highline.rb#L711
```
chef] Destroying VM and associated drives...
[chef] Running cleanup tasks for 'chef_solo' provisioner...
/Users/mdesilva/.vagrant.d/gems/gems/highline-1.6.20/lib/highline.rb:711:in `format_statement': undefined method `to_str' for {"chef-server"=>"2.0.0"}:Hash (NoMethodError)
from /Users/mdesilva/.vagrant.d/gems/gems/highline-1.6.20/lib/highline.rb:617:in `say'
```
I've 'patched' it locally by hand by changing `to_str` to `to_s`.
|
If you want to work up a patch for this I'm happy to apply it.
I wouldn't say it's HighLine bug. You're passing Hash to `format_statement` but it doesn't make sense. It's supposed to be a string. Why Hash?
That's a fair point. I didn't look at that error message closely enough.
It's bubbling up through from Vagrant's use of Berkshelf
```
[chef] Destroying VM and associated drives...
[chef] Running cleanup tasks for 'chef_solo' provisioner...
/Users/mdesilva/.vagrant.d/gems/gems/highline-1.6.20/lib/highline.rb:711:in `format_statement': undefined method `to_str' for {"chef-server"=>"2.0.0"}:Hash (NoMethodError)
from /Users/mdesilva/.vagrant.d/gems/gems/highline-1.6.20/lib/highline.rb:617:in `say'
from /Users/mdesilva/.vagrant.d/gems/gems/solve-0.8.1/lib/solve/tracers/human_readable.rb:43:in `solution'
from /Users/mdesilva/.vagrant.d/gems/gems/solve-0.8.1/lib/solve/solver.rb:124:in `resolve'
from /Users/mdesilva/.vagrant.d/gems/gems/solve-0.8.1/lib/solve.rb:39:in `it!'
from /Users/mdesilva/.vagrant.d/gems/gems/berkshelf-2.0.10/lib/berkshelf/resolver.rb:102:in `resolve'
from /Users/mdesilva/.vagrant.d/gems/gems/berkshelf-2.0.10/lib/berkshelf/berksfile.rb:671:in `resolve'
from /Users/mdesilva/.vagrant.d/gems/gems/berkshelf-2.0.10/lib/berkshelf/berksfile.rb:418:in `install'`
```
Then we probably need to submit a bug to them, don't you think?
The main output method in Ruby is **#puts**.
**#puts** accepts anything as argument and it just convert it into a String.
So, when we see #say or #ask we naturally think we can pass any arbitrary object, like the hash that was being passed in https://github.com/berkshelf/solve/blob/v0.8.1/lib/solve/tracers/human_readable.rb#L43 and was fixed here https://github.com/berkshelf/solve/commit/6d7540867f5be9585a61dfbe66280bb2b178a082 just to work along with HighLine.
What about to give **#say** some of the **#puts** superpowers?
The current problem is that **#say** is trying to #dup and #to_str the arguments. But some objects have problems with #dup, and others have problems with #to_str.
So, I tried to improve on this by first calling String (conversion method), and #dup only after we have a String.
| 2015-02-02T04:22:11
|
ruby
|
Hard
|
rubyzip/rubyzip
| 448
|
rubyzip__rubyzip-448
|
[
"433"
] |
e397af3e0d918516f74202c45d5d1f5aa644e6a5
|
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -9,21 +9,21 @@
# Offense count: 5
# Configuration parameters: CountComments.
Metrics/ClassLength:
- Max: 570
+ Max: 610
# Offense count: 26
Metrics/CyclomaticComplexity:
- Max: 14
+ Max: 15
# Offense count: 44
# Configuration parameters: CountComments, ExcludedMethods.
Metrics/MethodLength:
- Max: 29
+ Max: 32
# Offense count: 2
# Configuration parameters: CountKeywordArgs.
Metrics/ParameterLists:
- Max: 10
+ Max: 12
# Offense count: 20
Metrics/PerceivedComplexity:
diff --git a/Changelog.md b/Changelog.md
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,6 @@
# X.X.X (Next)
+- Set compression level on a per-zipfile basis. [#448](https://github.com/rubyzip/rubyzip/pull/448)
- Fix input stream partial read error. [#462](https://github.com/rubyzip/rubyzip/pull/462)
Tooling:
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -288,15 +288,25 @@ Zip.validate_entry_sizes = false
Note that if you use the lower level `Zip::InputStream` interface, `rubyzip` does *not* check the entry `size`s. In this case, the caller is responsible for making sure it does not read more data than expected from the input stream.
-### Default Compression
+### Compression level
-You can set the default compression level like so:
+When adding entries to a zip archive you can set the compression level to trade-off compressed size against compression speed. By default this is set to the same as the underlying Zlib library's default (`Zlib::DEFAULT_COMPRESSION`), which is somewhere in the middle.
+
+You can configure the default compression level with:
```ruby
-Zip.default_compression = Zlib::DEFAULT_COMPRESSION
+Zip.default_compression = X
```
-It defaults to `Zlib::DEFAULT_COMPRESSION`. Possible values are `Zlib::BEST_COMPRESSION`, `Zlib::DEFAULT_COMPRESSION` and `Zlib::NO_COMPRESSION`
+Where X is an integer between 0 and 9, inclusive. If this option is set to 0 (`Zlib::NO_COMPRESSION`) then entries will be stored in the zip archive uncompressed. A value of 1 (`Zlib::BEST_SPEED`) gives the fastest compression and 9 (`Zlib::BEST_COMPRESSION`) gives the smallest compressed file size.
+
+This can also be set for each archive as an option to `Zip::File`:
+
+```ruby
+Zip::File.open('foo.zip', Zip::File::CREATE, {compression_level: 9}) do |zip|
+ zip.add ...
+end
+```
### Zip64 Support
@@ -323,13 +333,22 @@ You can set multiple settings at the same time by using a block:
## Developing
-To run the test you need to do this:
+Install the dependencies:
-```
+```shell
bundle install
+```
+
+Run the tests with `rake`:
+
+```shell
rake
```
+Please also run `rubocop` over your changes.
+
+Our CI is here: https://travis-ci.org/github/rubyzip/rubyzip. Please note that `rubocop` is run as part of the CI configuration and will fail a build if errors are found.
+
## Website and Project Home
http://github.com/rubyzip/rubyzip
@@ -338,15 +357,22 @@ http://rdoc.info/github/rubyzip/rubyzip/master/frames
## Authors
-Alexander Simonov ( alex at simonov.me)
+See https://github.com/rubyzip/rubyzip/graphs/contributors for a comprehensive list.
+
+### Current contributors
+
+* Robert Haines (@hainesr)
+* John Lees-Miller (@jdleesmiller)
-Alan Harper ( alan at aussiegeek.net)
+### Past contributors
-Thomas Sondergaard (thomas at sondergaard.cc)
+* Pavel Lobashov (@ShockwaveNN)
+* Oleksandr Simonov (@simonoff)
+* Alan Harper (@aussiegeek)
-Technorama Ltd. (oss-ruby-zip at technorama.net)
+### Original author
-extra-field support contributed by Tatsuki Sugiura (sugi at nemui.org)
+* Thomas Sondergaard
## License
diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
--- a/lib/zip/entry.rb
+++ b/lib/zip/entry.rb
@@ -1,19 +1,25 @@
require 'pathname'
module Zip
class Entry
- STORED = 0
- DEFLATED = 8
+ STORED = ::Zip::COMPRESSION_METHOD_STORE
+ DEFLATED = ::Zip::COMPRESSION_METHOD_DEFLATE
+
# Language encoding flag (EFS) bit
EFS = 0b100000000000
- attr_accessor :comment, :compressed_size, :crc, :extra, :compression_method,
- :name, :size, :local_header_offset, :zipfile, :fstype, :external_file_attributes,
- :internal_file_attributes,
- :gp_flags, :header_signature, :follow_symlinks,
- :restore_times, :restore_permissions, :restore_ownership,
- :unix_uid, :unix_gid, :unix_perms,
- :dirty
- attr_reader :ftype, :filepath # :nodoc:
+ # Compression level flags (used as part of the gp flags).
+ COMPRESSION_LEVEL_SUPERFAST_GPFLAG = 0b110
+ COMPRESSION_LEVEL_FAST_GPFLAG = 0b100
+ COMPRESSION_LEVEL_MAX_GPFLAG = 0b010
+
+ attr_accessor :comment, :compressed_size, :follow_symlinks, :name,
+ :restore_ownership, :restore_permissions, :restore_times,
+ :size, :unix_gid, :unix_perms, :unix_uid, :zipfile
+
+ attr_accessor :crc, :dirty, :external_file_attributes, :fstype, :gp_flags,
+ :internal_file_attributes, :local_header_offset # :nodoc:
+
+ attr_reader :extra, :compression_level, :ftype, :filepath # :nodoc:
def set_default_vars_values
@local_header_offset = 0
@@ -52,25 +58,33 @@ def check_name(name)
raise ::Zip::EntryNameError, "Illegal ZipEntry name '#{name}', name must not start with /"
end
- def initialize(*args)
- name = args[1] || ''
- check_name(name)
+ def initialize(
+ zipfile = '', name = '',
+ comment: '', size: 0, compressed_size: 0, crc: 0,
+ compression_method: DEFLATED,
+ compression_level: ::Zip.default_compression,
+ time: ::Zip::DOSTime.now, extra: ::Zip::ExtraField.new
+ )
+ @name = name
+ check_name(@name)
set_default_vars_values
@fstype = ::Zip::RUNNING_ON_WINDOWS ? ::Zip::FSTYPE_FAT : ::Zip::FSTYPE_UNIX
+ @ftype = name_is_directory? ? :directory : :file
- @zipfile = args[0] || ''
- @name = name
- @comment = args[2] || ''
- @extra = args[3] || ''
- @compressed_size = args[4] || 0
- @crc = args[5] || 0
- @compression_method = args[6] || ::Zip::Entry::DEFLATED
- @size = args[7] || 0
- @time = args[8] || ::Zip::DOSTime.now
+ @zipfile = zipfile
+ @comment = comment
+ @compression_method = compression_method
+ @compression_level = compression_level
- @ftype = name_is_directory? ? :directory : :file
- @extra = ::Zip::ExtraField.new(@extra.to_s) unless @extra.kind_of?(::Zip::ExtraField)
+ @compressed_size = compressed_size
+ @crc = crc
+ @size = size
+ @time = time
+ @extra =
+ extra.kind_of?(ExtraField) ? extra : ExtraField.new(extra.to_s)
+
+ set_compression_level_flags
end
def encrypted?
@@ -81,6 +95,14 @@ def incomplete?
gp_flags & 8 == 8
end
+ def extra=(field)
+ @extra = if field.nil?
+ ExtraField.new
+ else
+ field.kind_of?(ExtraField) ? field : ExtraField.new(field.to_s)
+ end
+ end
+
def time
if @extra['UniversalTime']
@extra['UniversalTime'].mtime
@@ -103,6 +125,16 @@ def time=(value)
@time = value
end
+ def compression_method
+ return STORED if @ftype == :directory || @compression_level == 0
+
+ @compression_method
+ end
+
+ def compression_method=(method)
+ @compression_method = (@ftype == :directory ? STORED : method)
+ end
+
def file_type_is?(type)
raise InternalError, "current filetype is unknown: #{inspect}" unless @ftype
@@ -281,7 +313,7 @@ def pack_local_entry
[::Zip::LOCAL_ENTRY_SIGNATURE,
@version_needed_to_extract, # version needed to extract
@gp_flags, # @gp_flags
- @compression_method,
+ compression_method,
@time.to_binary_dos_time, # @last_mod_time
@time.to_binary_dos_date, # @last_mod_date
@crc,
@@ -363,7 +395,7 @@ def check_c_dir_entry_static_header_length(buf)
end
def check_c_dir_entry_signature
- return if header_signature == ::Zip::CENTRAL_DIRECTORY_ENTRY_SIGNATURE
+ return if @header_signature == ::Zip::CENTRAL_DIRECTORY_ENTRY_SIGNATURE
raise Error, "Zip local header magic not found at location '#{local_header_offset}'"
end
@@ -447,7 +479,7 @@ def pack_c_dir_entry
@fstype, # filesystem type
@version_needed_to_extract, # @versionNeededToExtract
@gp_flags, # @gp_flags
- @compression_method,
+ compression_method,
@time.to_binary_dos_time, # @last_mod_time
@time.to_binary_dos_date, # @last_mod_date
@crc,
@@ -572,10 +604,12 @@ def gather_fileinfo_from_srcpath(src_path) # :nodoc:
def write_to_zip_output_stream(zip_output_stream) #:nodoc:all
if @ftype == :directory
- zip_output_stream.put_next_entry(self, nil, nil, ::Zip::Entry::STORED)
+ zip_output_stream.put_next_entry(self)
elsif @filepath
- zip_output_stream.put_next_entry(self, nil, nil, compression_method || ::Zip::Entry::DEFLATED)
- get_input_stream { |is| ::Zip::IOExtras.copy_stream(zip_output_stream, is) }
+ zip_output_stream.put_next_entry(self)
+ get_input_stream do |is|
+ ::Zip::IOExtras.copy_stream(zip_output_stream, is)
+ end
else
zip_output_stream.copy_raw_entry(self)
end
@@ -673,6 +707,27 @@ def data_descriptor_size
(@gp_flags & 0x0008) > 0 ? 16 : 0
end
+ # For DEFLATED compression *only*: set the general purpose flags 1 and 2 to
+ # indicate compression level. This seems to be mainly cosmetic but they are
+ # generally set by other tools - including in docx files. It is these flags
+ # that are used by commandline tools (and elsewhere) to give an indication
+ # of how compressed a file is. See the PKWARE APPNOTE for more information:
+ # https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
+ #
+ # It's safe to simply OR these flags here as compression_level is read only.
+ def set_compression_level_flags
+ return unless compression_method == DEFLATED
+
+ case @compression_level
+ when 1
+ @gp_flags |= COMPRESSION_LEVEL_SUPERFAST_GPFLAG
+ when 2
+ @gp_flags |= COMPRESSION_LEVEL_FAST_GPFLAG
+ when 8, 9
+ @gp_flags |= COMPRESSION_LEVEL_MAX_GPFLAG
+ end
+ end
+
# create a zip64 extra information field if we need one
def prep_zip64_extra(for_local_header) #:nodoc:all
return unless ::Zip.write_zip64_support
diff --git a/lib/zip/file.rb b/lib/zip/file.rb
--- a/lib/zip/file.rb
+++ b/lib/zip/file.rb
@@ -75,7 +75,9 @@ class File < CentralDirectory
# a new archive if it doesn't exist already.
def initialize(path_or_io, create = false, buffer = false, options = {})
super()
- options = DEFAULT_OPTIONS.merge(options)
+ options = DEFAULT_OPTIONS
+ .merge(compression_level: ::Zip.default_compression)
+ .merge(options)
@name = path_or_io.respond_to?(:path) ? path_or_io.path : path_or_io
@comment = ''
@create = create ? true : false # allow any truthy value to mean true
@@ -111,6 +113,7 @@ def initialize(path_or_io, create = false, buffer = false, options = {})
@restore_ownership = options[:restore_ownership]
@restore_permissions = options[:restore_permissions]
@restore_times = options[:restore_times]
+ @compression_level = options[:compression_level]
end
class << self
@@ -266,14 +269,19 @@ def get_input_stream(entry, &a_proc)
# File.open method.
def get_output_stream(entry, permission_int = nil, comment = nil,
extra = nil, compressed_size = nil, crc = nil,
- compression_method = nil, size = nil, time = nil,
- &a_proc)
+ compression_method = nil, compression_level = nil,
+ size = nil, time = nil, &a_proc)
new_entry =
if entry.kind_of?(Entry)
entry
else
- Entry.new(@name, entry.to_s, comment, extra, compressed_size, crc, compression_method, size, time)
+ Entry.new(
+ @name, entry.to_s, comment: comment, extra: extra,
+ compressed_size: compressed_size, crc: crc, size: size,
+ compression_method: compression_method,
+ compression_level: compression_level, time: time
+ )
end
if new_entry.directory?
raise ArgumentError,
@@ -299,7 +307,14 @@ def read(entry)
def add(entry, src_path, &continue_on_exists_proc)
continue_on_exists_proc ||= proc { ::Zip.continue_on_exists_proc }
check_entry_exists(entry, continue_on_exists_proc, 'add')
- new_entry = entry.kind_of?(::Zip::Entry) ? entry : ::Zip::Entry.new(@name, entry.to_s)
+ new_entry = if entry.kind_of?(::Zip::Entry)
+ entry
+ else
+ ::Zip::Entry.new(
+ @name, entry.to_s,
+ compression_level: @compression_level
+ )
+ end
new_entry.gather_fileinfo_from_srcpath(src_path)
new_entry.dirty = true
@entry_set << new_entry
@@ -308,7 +323,9 @@ def add(entry, src_path, &continue_on_exists_proc)
# Convenience method for adding the contents of a file to the archive
# in Stored format (uncompressed)
def add_stored(entry, src_path, &continue_on_exists_proc)
- entry = ::Zip::Entry.new(@name, entry.to_s, nil, nil, nil, nil, ::Zip::Entry::STORED)
+ entry = ::Zip::Entry.new(
+ @name, entry.to_s, compression_method: ::Zip::Entry::STORED
+ )
add(entry, src_path, &continue_on_exists_proc)
end
diff --git a/lib/zip/output_stream.rb b/lib/zip/output_stream.rb
--- a/lib/zip/output_stream.rb
+++ b/lib/zip/output_stream.rb
@@ -89,20 +89,23 @@ def close_buffer
# Closes the current entry and opens a new for writing.
# +entry+ can be a ZipEntry object or a string.
- def put_next_entry(entry_name, comment = nil, extra = nil, compression_method = Entry::DEFLATED, level = Zip.default_compression)
+ def put_next_entry(
+ entry_name, comment = '', extra = ExtraField.new,
+ compression_method = Entry::DEFLATED, level = Zip.default_compression
+ )
raise Error, 'zip stream is closed' if @closed
new_entry = if entry_name.kind_of?(Entry)
entry_name
else
- Entry.new(@file_name, entry_name.to_s)
+ Entry.new(
+ @file_name, entry_name.to_s, comment: comment,
+ extra: extra, compression_method: compression_method,
+ compression_level: level
+ )
end
- new_entry.comment = comment unless comment.nil?
- unless extra.nil?
- new_entry.extra = extra.kind_of?(ExtraField) ? extra : ExtraField.new(extra.to_s)
- end
- new_entry.compression_method = compression_method unless compression_method.nil?
- init_next_entry(new_entry, level)
+
+ init_next_entry(new_entry)
@current_entry = new_entry
end
@@ -142,19 +145,19 @@ def finalize_current_entry
@compressor = ::Zip::NullCompressor.instance
end
- def init_next_entry(entry, level = Zip.default_compression)
+ def init_next_entry(entry)
finalize_current_entry
@entry_set << entry
entry.write_local_entry(@output_stream)
@encrypter.reset!
@output_stream << @encrypter.header(entry.mtime)
- @compressor = get_compressor(entry, level)
+ @compressor = get_compressor(entry)
end
- def get_compressor(entry, level)
+ def get_compressor(entry)
case entry.compression_method
when Entry::DEFLATED
- ::Zip::Deflater.new(@output_stream, level, @encrypter)
+ ::Zip::Deflater.new(@output_stream, entry.compression_level, @encrypter)
when Entry::STORED
::Zip::PassThruCompressor.new(@output_stream)
else
|
diff --git a/test/case_sensitivity_test.rb b/test/case_sensitivity_test.rb
--- a/test/case_sensitivity_test.rb
+++ b/test/case_sensitivity_test.rb
@@ -7,7 +7,7 @@ class ZipCaseSensitivityTest < MiniTest::Test
['test/data/file2.txt', 'testFILE.rb']]
def teardown
- ::Zip.case_insensitive_match = false
+ ::Zip.reset!
end
# Ensure that everything functions normally when +case_insensitive_match = false+
diff --git a/test/central_directory_test.rb b/test/central_directory_test.rb
--- a/test/central_directory_test.rb
+++ b/test/central_directory_test.rb
@@ -38,9 +38,14 @@ def test_read_from_truncated_zip_file
end
def test_write_to_stream
- entries = [::Zip::Entry.new('file.zip', 'flimse', 'myComment', 'somethingExtra'),
- ::Zip::Entry.new('file.zip', 'secondEntryName'),
- ::Zip::Entry.new('file.zip', 'lastEntry.txt', 'Has a comment too')]
+ entries = [
+ ::Zip::Entry.new(
+ 'file.zip', 'flimse',
+ comment: 'myComment', extra: 'somethingExtra'
+ ),
+ ::Zip::Entry.new('file.zip', 'secondEntryName'),
+ ::Zip::Entry.new('file.zip', 'lastEntry.txt', comment: 'Has a comment')
+ ]
cdir = ::Zip::CentralDirectory.new(entries, 'my zip comment')
File.open('test/data/generated/cdirtest.bin', 'wb') do |f|
@@ -57,10 +62,26 @@ def test_write_to_stream
def test_write64_to_stream
::Zip.write_zip64_support = true
- entries = [::Zip::Entry.new('file.zip', 'file1-little', 'comment1', '', 200, 101, ::Zip::Entry::STORED, 200),
- ::Zip::Entry.new('file.zip', 'file2-big', 'comment2', '', 18_000_000_000, 102, ::Zip::Entry::DEFLATED, 20_000_000_000),
- ::Zip::Entry.new('file.zip', 'file3-alsobig', 'comment3', '', 15_000_000_000, 103, ::Zip::Entry::DEFLATED, 21_000_000_000),
- ::Zip::Entry.new('file.zip', 'file4-little', 'comment4', '', 100, 104, ::Zip::Entry::DEFLATED, 121)]
+ entries = [
+ ::Zip::Entry.new(
+ 'file.zip', 'file1-little', comment: 'comment1', size: 200,
+ compressed_size: 200, crc: 101,
+ compression_method: ::Zip::Entry::STORED
+ ),
+ ::Zip::Entry.new(
+ 'file.zip', 'file2-big', comment: 'comment2',
+ size: 20_000_000_000, compressed_size: 18_000_000_000, crc: 102
+ ),
+ ::Zip::Entry.new(
+ 'file.zip', 'file3-alsobig', comment: 'comment3',
+ size: 21_000_000_000, compressed_size: 15_000_000_000, crc: 103
+ ),
+ ::Zip::Entry.new(
+ 'file.zip', 'file4-little', comment: 'comment4',
+ size: 121, compressed_size: 100, crc: 104
+ )
+ ]
+
[0, 250, 18_000_000_300, 33_000_000_350].each_with_index do |offset, index|
entries[index].local_header_offset = offset
end
@@ -80,25 +101,37 @@ def test_write64_to_stream
end
def test_equality
- cdir1 = ::Zip::CentralDirectory.new([::Zip::Entry.new('file.zip', 'flimse', nil,
- 'somethingExtra'),
- ::Zip::Entry.new('file.zip', 'secondEntryName'),
- ::Zip::Entry.new('file.zip', 'lastEntry.txt')],
- 'my zip comment')
- cdir2 = ::Zip::CentralDirectory.new([::Zip::Entry.new('file.zip', 'flimse', nil,
- 'somethingExtra'),
- ::Zip::Entry.new('file.zip', 'secondEntryName'),
- ::Zip::Entry.new('file.zip', 'lastEntry.txt')],
- 'my zip comment')
- cdir3 = ::Zip::CentralDirectory.new([::Zip::Entry.new('file.zip', 'flimse', nil,
- 'somethingExtra'),
- ::Zip::Entry.new('file.zip', 'secondEntryName'),
- ::Zip::Entry.new('file.zip', 'lastEntry.txt')],
- 'comment?')
- cdir4 = ::Zip::CentralDirectory.new([::Zip::Entry.new('file.zip', 'flimse', nil,
- 'somethingExtra'),
- ::Zip::Entry.new('file.zip', 'lastEntry.txt')],
- 'comment?')
+ cdir1 = ::Zip::CentralDirectory.new(
+ [
+ ::Zip::Entry.new('file.zip', 'flimse', extra: 'somethingExtra'),
+ ::Zip::Entry.new('file.zip', 'secondEntryName'),
+ ::Zip::Entry.new('file.zip', 'lastEntry.txt')
+ ],
+ 'my zip comment'
+ )
+ cdir2 = ::Zip::CentralDirectory.new(
+ [
+ ::Zip::Entry.new('file.zip', 'flimse', extra: 'somethingExtra'),
+ ::Zip::Entry.new('file.zip', 'secondEntryName'),
+ ::Zip::Entry.new('file.zip', 'lastEntry.txt')
+ ],
+ 'my zip comment'
+ )
+ cdir3 = ::Zip::CentralDirectory.new(
+ [
+ ::Zip::Entry.new('file.zip', 'flimse', extra: 'somethingExtra'),
+ ::Zip::Entry.new('file.zip', 'secondEntryName'),
+ ::Zip::Entry.new('file.zip', 'lastEntry.txt')
+ ],
+ 'comment?'
+ )
+ cdir4 = ::Zip::CentralDirectory.new(
+ [
+ ::Zip::Entry.new('file.zip', 'flimse', extra: 'somethingExtra'),
+ ::Zip::Entry.new('file.zip', 'lastEntry.txt')
+ ],
+ 'comment?'
+ )
assert_equal(cdir1, cdir1)
assert_equal(cdir1, cdir2)
diff --git a/test/deflater_test.rb b/test/deflater_test.rb
--- a/test/deflater_test.rb
+++ b/test/deflater_test.rb
@@ -8,6 +8,10 @@ class DeflaterTest < MiniTest::Test
DEFAULT_COMP_FILE = 'test/data/generated/compressiontest_default_compression.bin'
NO_COMP_FILE = 'test/data/generated/compressiontest_no_compression.bin'
+ def teardown
+ Zip.reset!
+ end
+
def test_output_operator
txt = load_file('test/data/file2.txt')
deflate(txt, DEFLATER_TEST_FILE)
diff --git a/test/encryption_test.rb b/test/encryption_test.rb
--- a/test/encryption_test.rb
+++ b/test/encryption_test.rb
@@ -5,12 +5,11 @@ class EncryptionTest < MiniTest::Test
INPUT_FILE1 = 'test/data/file1.txt'
def setup
- @default_compression = Zip.default_compression
Zip.default_compression = ::Zlib::DEFAULT_COMPRESSION
end
def teardown
- Zip.default_compression = @default_compression
+ Zip.reset!
end
def test_encrypt
diff --git a/test/entry_set_test.rb b/test/entry_set_test.rb
--- a/test/entry_set_test.rb
+++ b/test/entry_set_test.rb
@@ -2,12 +2,12 @@
class ZipEntrySetTest < MiniTest::Test
ZIP_ENTRIES = [
- ::Zip::Entry.new('zipfile.zip', 'name1', 'comment1'),
- ::Zip::Entry.new('zipfile.zip', 'name3', 'comment1'),
- ::Zip::Entry.new('zipfile.zip', 'name2', 'comment1'),
- ::Zip::Entry.new('zipfile.zip', 'name4', 'comment1'),
- ::Zip::Entry.new('zipfile.zip', 'name5', 'comment1'),
- ::Zip::Entry.new('zipfile.zip', 'name6', 'comment1')
+ ::Zip::Entry.new('zipfile.zip', 'name1', comment: 'comment1'),
+ ::Zip::Entry.new('zipfile.zip', 'name3', comment: 'comment1'),
+ ::Zip::Entry.new('zipfile.zip', 'name2', comment: 'comment1'),
+ ::Zip::Entry.new('zipfile.zip', 'name4', comment: 'comment1'),
+ ::Zip::Entry.new('zipfile.zip', 'name5', comment: 'comment1'),
+ ::Zip::Entry.new('zipfile.zip', 'name6', comment: 'comment1')
]
def setup
@@ -20,13 +20,17 @@ def teardown
def test_include
assert(@zip_entry_set.include?(ZIP_ENTRIES.first))
- assert(!@zip_entry_set.include?(::Zip::Entry.new('different.zip', 'different', 'aComment')))
+ assert(
+ !@zip_entry_set.include?(
+ ::Zip::Entry.new('different.zip', 'different', comment: 'aComment')
+ )
+ )
end
def test_size
assert_equal(ZIP_ENTRIES.size, @zip_entry_set.size)
assert_equal(ZIP_ENTRIES.size, @zip_entry_set.length)
- @zip_entry_set << ::Zip::Entry.new('a', 'b', 'c')
+ @zip_entry_set << ::Zip::Entry.new('a', 'b', comment: 'c')
assert_equal(ZIP_ENTRIES.size + 1, @zip_entry_set.length)
end
@@ -66,7 +70,9 @@ def test_entries
end
def test_find_entry
- entries = [::Zip::Entry.new('zipfile.zip', 'MiXeDcAsEnAmE', 'comment1')]
+ entries = [
+ ::Zip::Entry.new('zipfile.zip', 'MiXeDcAsEnAmE', comment: 'comment1')
+ ]
::Zip.case_insensitive_match = true
zip_entry_set = ::Zip::EntrySet.new(entries)
@@ -96,7 +102,9 @@ def test_entries_sorted_in_each
end
def test_compound
- new_entry = ::Zip::Entry.new('zf.zip', 'new entry', "new entry's comment")
+ new_entry = ::Zip::Entry.new(
+ 'zf.zip', 'new entry', comment: "new entry's comment"
+ )
assert_equal(ZIP_ENTRIES.size, @zip_entry_set.size)
@zip_entry_set << new_entry
assert_equal(ZIP_ENTRIES.size + 1, @zip_entry_set.size)
diff --git a/test/entry_test.rb b/test/entry_test.rb
--- a/test/entry_test.rb
+++ b/test/entry_test.rb
@@ -3,16 +3,19 @@
class ZipEntryTest < MiniTest::Test
include ZipEntryData
+ def teardown
+ ::Zip.reset!
+ end
+
def test_constructor_and_getters
- entry = ::Zip::Entry.new(TEST_ZIPFILE,
- TEST_NAME,
- TEST_COMMENT,
- TEST_EXTRA,
- TEST_COMPRESSED_SIZE,
- TEST_CRC,
- TEST_COMPRESSIONMETHOD,
- TEST_SIZE,
- TEST_TIME)
+ entry = ::Zip::Entry.new(
+ TEST_ZIPFILE, TEST_NAME,
+ comment: TEST_COMMENT, extra: TEST_EXTRA,
+ compressed_size: TEST_COMPRESSED_SIZE,
+ crc: TEST_CRC, size: TEST_SIZE, time: TEST_TIME,
+ compression_method: TEST_COMPRESSIONMETHOD,
+ compression_level: TEST_COMPRESSIONLEVEL
+ )
assert_equal(TEST_COMMENT, entry.comment)
assert_equal(TEST_COMPRESSED_SIZE, entry.compressed_size)
@@ -39,30 +42,54 @@ def test_is_directory_and_is_file
end
def test_equality
- entry1 = ::Zip::Entry.new('file.zip', 'name', 'isNotCompared',
- 'something extra', 123, 1234,
- ::Zip::Entry::DEFLATED, 10_000)
- entry2 = ::Zip::Entry.new('file.zip', 'name', 'isNotComparedXXX',
- 'something extra', 123, 1234,
- ::Zip::Entry::DEFLATED, 10_000)
- entry3 = ::Zip::Entry.new('file.zip', 'name2', 'isNotComparedXXX',
- 'something extra', 123, 1234,
- ::Zip::Entry::DEFLATED, 10_000)
- entry4 = ::Zip::Entry.new('file.zip', 'name2', 'isNotComparedXXX',
- 'something extraXX', 123, 1234,
- ::Zip::Entry::DEFLATED, 10_000)
- entry5 = ::Zip::Entry.new('file.zip', 'name2', 'isNotComparedXXX',
- 'something extraXX', 12, 1234,
- ::Zip::Entry::DEFLATED, 10_000)
- entry6 = ::Zip::Entry.new('file.zip', 'name2', 'isNotComparedXXX',
- 'something extraXX', 12, 123,
- ::Zip::Entry::DEFLATED, 10_000)
- entry7 = ::Zip::Entry.new('file.zip', 'name2', 'isNotComparedXXX',
- 'something extraXX', 12, 123,
- ::Zip::Entry::STORED, 10_000)
- entry8 = ::Zip::Entry.new('file.zip', 'name2', 'isNotComparedXXX',
- 'something extraXX', 12, 123,
- ::Zip::Entry::STORED, 100_000)
+ entry1 = ::Zip::Entry.new(
+ 'file.zip', 'name',
+ comment: 'isNotCompared', extra: 'something extra',
+ compressed_size: 123, crc: 1234, size: 10_000
+ )
+
+ entry2 = ::Zip::Entry.new(
+ 'file.zip', 'name',
+ comment: 'isNotComparedXXX', extra: 'something extra',
+ compressed_size: 123, crc: 1234, size: 10_000
+ )
+
+ entry3 = ::Zip::Entry.new(
+ 'file.zip', 'name2',
+ comment: 'isNotComparedXXX', extra: 'something extra',
+ compressed_size: 123, crc: 1234, size: 10_000
+ )
+
+ entry4 = ::Zip::Entry.new(
+ 'file.zip', 'name2',
+ comment: 'isNotComparedXXX', extra: 'something extraXX',
+ compressed_size: 123, crc: 1234, size: 10_000
+ )
+
+ entry5 = ::Zip::Entry.new(
+ 'file.zip', 'name2',
+ comment: 'isNotComparedXXX', extra: 'something extraXX',
+ compressed_size: 12, crc: 1234, size: 10_000
+ )
+
+ entry6 = ::Zip::Entry.new(
+ 'file.zip', 'name2',
+ comment: 'isNotComparedXXX', extra: 'something extraXX',
+ compressed_size: 12, crc: 123, size: 10_000
+ )
+
+ entry7 = ::Zip::Entry.new(
+ 'file.zip', 'name2', comment: 'isNotComparedXXX',
+ extra: 'something extraXX', compressed_size: 12, crc: 123, size: 10_000,
+ compression_method: ::Zip::Entry::STORED
+ )
+
+ entry8 = ::Zip::Entry.new(
+ 'file.zip', 'name2',
+ comment: 'isNotComparedXXX', extra: 'something extraXX',
+ compressed_size: 12, crc: 123, size: 100_000,
+ compression_method: ::Zip::Entry::STORED
+ )
assert_equal(entry1, entry1)
assert_equal(entry1, entry2)
@@ -130,13 +157,11 @@ def test_store_file_without_compression
end
zipfile = Zip::File.open('/tmp/no_compress.zip', Zip::File::CREATE)
- mimetype_entry = Zip::Entry.new(zipfile, # @zipfile
- 'mimetype', # @name
- '', # @comment
- '', # @extra
- 0, # @compressed_size
- 0, # @crc
- Zip::Entry::STORED) # @comppressed_method
+ mimetype_entry = Zip::Entry.new(
+ zipfile, # @zipfile
+ 'mimetype', # @name
+ compression_method: Zip::Entry::STORED
+ )
zipfile.add(mimetype_entry, 'test/data/mimetype')
@@ -169,4 +194,64 @@ def test_incomplete?
entry.gp_flags = 0
assert_equal(false, entry.incomplete?)
end
+
+ def test_compression_level_flags
+ [
+ [Zip.default_compression, 0],
+ [0, 0],
+ [1, 6],
+ [2, 4],
+ [3, 0],
+ [7, 0],
+ [8, 2],
+ [9, 2]
+ ].each do |level, flags|
+ # Check flags are set correctly when DEFLATED is (implicitly) specified.
+ e_def = Zip::Entry.new(
+ '', '',
+ compression_level: level
+ )
+ assert_equal(flags, e_def.gp_flags & 0b110)
+
+ # Check that flags are not set when STORED is specified.
+ e_sto = Zip::Entry.new(
+ '', '',
+ compression_method: Zip::Entry::STORED,
+ compression_level: level
+ )
+ assert_equal(0, e_sto.gp_flags & 0b110)
+ end
+
+ # Check that a directory entry's flags are not set, even if DEFLATED
+ # is specified.
+ e_dir = Zip::Entry.new(
+ '', 'd/', compression_method: Zip::Entry::DEFLATED, compression_level: 1
+ )
+ assert_equal(0, e_dir.gp_flags & 0b110)
+ end
+
+ def test_compression_method_reader
+ [
+ [Zip.default_compression, Zip::Entry::DEFLATED],
+ [0, Zip::Entry::STORED],
+ [1, Zip::Entry::DEFLATED],
+ [9, Zip::Entry::DEFLATED]
+ ].each do |level, method|
+ # Check that the correct method is returned when DEFLATED is specified.
+ entry = Zip::Entry.new(compression_level: level)
+ assert_equal(method, entry.compression_method)
+ end
+
+ # Check that the correct method is returned when STORED is specified.
+ entry = Zip::Entry.new(
+ compression_method: Zip::Entry::STORED, compression_level: 1
+ )
+ assert_equal(Zip::Entry::STORED, entry.compression_method)
+
+ # Check that directories are always STORED, whatever level is specified.
+ entry = Zip::Entry.new(
+ '', 'd/', compression_method: Zip::Entry::DEFLATED, compression_level: 1
+ )
+ assert_equal(Zip::Entry::STORED, entry.compression_method)
+ end
end
diff --git a/test/file_test.rb b/test/file_test.rb
--- a/test/file_test.rb
+++ b/test/file_test.rb
@@ -8,7 +8,7 @@ class ZipFileTest < MiniTest::Test
OK_DELETE_MOVED_FILE = 'test/data/generated/okToDeleteMoved.txt'
def teardown
- ::Zip.write_zip64_support = false
+ ::Zip.reset!
end
def test_create_from_scratch_to_buffer
@@ -77,7 +77,10 @@ def test_get_output_stream
assert_equal(count + 1, zf.size)
assert_equal('Putting stuff in data/generated/empty.txt', zf.read('test/data/generated/empty.txt'))
- custom_entry_args = [TEST_COMMENT, TEST_EXTRA, TEST_COMPRESSED_SIZE, TEST_CRC, ::Zip::Entry::STORED, TEST_SIZE, TEST_TIME]
+ custom_entry_args = [
+ TEST_COMMENT, TEST_EXTRA, TEST_COMPRESSED_SIZE, TEST_CRC,
+ ::Zip::Entry::STORED, ::Zlib::BEST_SPEED, TEST_SIZE, TEST_TIME
+ ]
zf.get_output_stream('entry_with_custom_args.txt', nil, *custom_entry_args) do |os|
os.write 'Some data'
end
@@ -87,8 +90,9 @@ def test_get_output_stream
assert_equal(custom_entry_args[2], entry.compressed_size)
assert_equal(custom_entry_args[3], entry.crc)
assert_equal(custom_entry_args[4], entry.compression_method)
- assert_equal(custom_entry_args[5], entry.size)
- assert_equal(custom_entry_args[6], entry.time)
+ assert_equal(custom_entry_args[5], entry.compression_level)
+ assert_equal(custom_entry_args[6], entry.size)
+ assert_equal(custom_entry_args[7], entry.time)
zf.get_output_stream('entry.bin') do |os|
os.write(::File.open('test/data/generated/5entry.zip', 'rb').read)
@@ -188,7 +192,7 @@ def test_cleans_up_tempfiles_after_close
assert_equal(false, File.exist?(@tempfile_path))
end
- def test_add
+ def test_add_default_compression
src_file = 'test/data/file2.txt'
entry_name = 'newEntryName.rb'
assert(::File.exist?(src_file))
@@ -197,9 +201,84 @@ def test_add
zf.close
zf_read = ::Zip::File.new(EMPTY_FILENAME)
+ entry = zf_read.entries.first
assert_equal('', zf_read.comment)
assert_equal(1, zf_read.entries.length)
assert_equal(entry_name, zf_read.entries.first.name)
+ assert_equal(File.size(src_file), entry.size)
+ assert_equal(8_764, entry.compressed_size)
+ AssertEntry.assert_contents(src_file,
+ zf_read.get_input_stream(entry_name, &:read))
+ end
+
+ def test_add_best_compression
+ src_file = 'test/data/file2.txt'
+ entry_name = 'newEntryName.rb'
+ assert(::File.exist?(src_file))
+ zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE, false, { compression_level: Zlib::BEST_COMPRESSION })
+ zf.add(entry_name, src_file)
+ zf.close
+
+ zf_read = ::Zip::File.new(EMPTY_FILENAME)
+ entry = zf_read.entries.first
+ assert_equal(1, zf_read.entries.length)
+ assert_equal(File.size(src_file), entry.size)
+ assert_equal(8_658, entry.compressed_size)
+ AssertEntry.assert_contents(src_file,
+ zf_read.get_input_stream(entry_name, &:read))
+ end
+
+ def test_add_best_compression_as_default
+ ::Zip.default_compression = Zlib::BEST_COMPRESSION
+
+ src_file = 'test/data/file2.txt'
+ entry_name = 'newEntryName.rb'
+ assert(::File.exist?(src_file))
+ zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
+ zf.add(entry_name, src_file)
+ zf.close
+
+ zf_read = ::Zip::File.new(EMPTY_FILENAME)
+ entry = zf_read.entries.first
+ assert_equal(1, zf_read.entries.length)
+ assert_equal(File.size(src_file), entry.size)
+ assert_equal(8_658, entry.compressed_size)
+ AssertEntry.assert_contents(src_file,
+ zf_read.get_input_stream(entry_name, &:read))
+ end
+
+ def test_add_best_speed
+ src_file = 'test/data/file2.txt'
+ entry_name = 'newEntryName.rb'
+ assert(::File.exist?(src_file))
+ zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE, false, { compression_level: Zlib::BEST_SPEED })
+ zf.add(entry_name, src_file)
+ zf.close
+
+ zf_read = ::Zip::File.new(EMPTY_FILENAME)
+ entry = zf_read.entries.first
+ assert_equal(1, zf_read.entries.length)
+ assert_equal(File.size(src_file), entry.size)
+ assert_equal(10_938, entry.compressed_size)
+ AssertEntry.assert_contents(src_file,
+ zf_read.get_input_stream(entry_name, &:read))
+ end
+
+ def test_add_best_speed_as_default
+ ::Zip.default_compression = Zlib::BEST_SPEED
+
+ src_file = 'test/data/file2.txt'
+ entry_name = 'newEntryName.rb'
+ assert(::File.exist?(src_file))
+ zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
+ zf.add(entry_name, src_file)
+ zf.close
+
+ zf_read = ::Zip::File.new(EMPTY_FILENAME)
+ entry = zf_read.entries.first
+ assert_equal(1, zf_read.entries.length)
+ assert_equal(File.size(src_file), entry.size)
+ assert_equal(10_938, entry.compressed_size)
AssertEntry.assert_contents(src_file,
zf_read.get_input_stream(entry_name, &:read))
end
diff --git a/test/local_entry_test.rb b/test/local_entry_test.rb
--- a/test/local_entry_test.rb
+++ b/test/local_entry_test.rb
@@ -5,7 +5,7 @@ class ZipLocalEntryTest < MiniTest::Test
LEH_FILE = 'test/data/generated/localEntryHeader.bin'
def teardown
- ::Zip.write_zip64_support = false
+ ::Zip.reset!
end
def test_read_local_entry_header_of_first_test_zip_entry
@@ -53,9 +53,11 @@ def test_read_local_entry_from_truncated_zip_file
end
def test_write_entry
- entry = ::Zip::Entry.new('file.zip', 'entry_name', 'my little comment',
- 'thisIsSomeExtraInformation', 100, 987_654,
- ::Zip::Entry::DEFLATED, 400)
+ entry = ::Zip::Entry.new(
+ 'file.zip', 'entry_name', comment: 'my little comment', size: 400,
+ extra: 'thisIsSomeExtraInformation', compressed_size: 100, crc: 987_654
+ )
+
write_to_file(LEH_FILE, CEH_FILE, entry)
local_entry, central_entry = read_from_file(LEH_FILE, CEH_FILE)
assert(
@@ -68,9 +70,10 @@ def test_write_entry
def test_write_entry_with_zip64
::Zip.write_zip64_support = true
- entry = ::Zip::Entry.new('file.zip', 'entry_name', 'my little comment',
- 'thisIsSomeExtraInformation', 100, 987_654,
- ::Zip::Entry::DEFLATED, 400)
+ entry = ::Zip::Entry.new(
+ 'file.zip', 'entry_name', comment: 'my little comment', size: 400,
+ extra: 'thisIsSomeExtraInformation', compressed_size: 100, crc: 987_654
+ )
write_to_file(LEH_FILE, CEH_FILE, entry)
local_entry, central_entry = read_from_file(LEH_FILE, CEH_FILE)
@@ -92,10 +95,12 @@ def test_write_entry_with_zip64
def test_write_64entry
::Zip.write_zip64_support = true
- entry = ::Zip::Entry.new('bigfile.zip', 'entry_name', 'my little equine',
- 'malformed extra field because why not',
- 0x7766554433221100, 0xDEADBEEF, ::Zip::Entry::DEFLATED,
- 0x9988776655443322)
+ entry = ::Zip::Entry.new(
+ 'bigfile.zip', 'entry_name', comment: 'my little equine',
+ extra: 'malformed extra field because why not', size: 0x9988776655443322,
+ compressed_size: 0x7766554433221100, crc: 0xDEADBEEF
+ )
+
write_to_file(LEH_FILE, CEH_FILE, entry)
local_entry, central_entry = read_from_file(LEH_FILE, CEH_FILE)
compare_local_entry_headers(entry, local_entry)
diff --git a/test/output_stream_test.rb b/test/output_stream_test.rb
--- a/test/output_stream_test.rb
+++ b/test/output_stream_test.rb
@@ -92,7 +92,9 @@ def test_put_next_entry
def test_put_next_entry_using_zip_entry_creates_entries_with_correct_timestamps
file = ::File.open('test/data/file2.txt', 'rb')
::Zip::OutputStream.open(TEST_ZIP.zip_name) do |zos|
- zip_entry = ::Zip::Entry.new(zos, file.path, '', '', 0, 0, ::Zip::Entry::DEFLATED, 0, ::Zip::DOSTime.at(file.mtime))
+ zip_entry = ::Zip::Entry.new(
+ zos, file.path, time: ::Zip::DOSTime.at(file.mtime)
+ )
zos.put_next_entry(zip_entry)
zos << file.read
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -218,6 +218,7 @@ module ZipEntryData
TEST_CRC = 325_324
TEST_EXTRA = 'Some data here'
TEST_COMPRESSIONMETHOD = ::Zip::Entry::DEFLATED
+ TEST_COMPRESSIONLEVEL = ::Zip.default_compression
TEST_NAME = 'entry name'
TEST_SIZE = 8432
TEST_ISDIRECTORY = false
diff --git a/test/unicode_file_names_and_comments_test.rb b/test/unicode_file_names_and_comments_test.rb
--- a/test/unicode_file_names_and_comments_test.rb
+++ b/test/unicode_file_names_and_comments_test.rb
@@ -3,6 +3,10 @@
class ZipUnicodeFileNamesAndComments < MiniTest::Test
FILENAME = File.join(File.dirname(__FILE__), 'test1.zip')
+ def teardown
+ ::Zip.reset!
+ end
+
def test_unicode_file_name
file_entrys = ['текстовыйфайл.txt', 'Résumé.txt', '슬레이어스휘.txt']
directory_entrys = ['папка/текстовыйфайл.txt', 'Résumé/Résumé.txt', '슬레이어스휘/슬레이어스휘.txt']
|
Set compression on a per-operation basis
There may already be an API for this that I'm not seeing, but it would be nice to be able to set the compression on a per-operation basis. Something along the lines of:
``` def write(compress: false)
entries = Dir.entries(@inputDir); entries.delete("."); entries.delete("..")
io = Zip::File.open(
@outputFile, Zip::File::CREATE,
{ compression: Zlib::BEST_COMPRESSION } # New Part
);
writeEntries(entries, "", io)
io.close();
end```
Right at the moment, it only appears possible (based on the documentation) to set this setting globally, which is rather annoying.
|
Yes. Looking at this, it seems that there is an API a bit deeper in to be able to do this per entry even, but it's not exposed higher up the stack.
Before I go any further looking at this, what is the behaviour you are looking for here? Above you are suggesting that it would be good to be able to control this per zip file (I agree), but would it be useful to be able to control the compression per entry in a zip file too?
I honestly can't see any utility in doing it per file. Setting it per operation is enough.
| 2020-05-24T20:55:36
|
ruby
|
Hard
|
sdsykes/fastimage
| 131
|
sdsykes__fastimage-131
|
[
"130"
] |
4bdc51424956af7743b3ece9ccbec675c1f3949d
|
diff --git a/lib/fastimage.rb b/lib/fastimage.rb
--- a/lib/fastimage.rb
+++ b/lib/fastimage.rb
@@ -589,6 +589,7 @@ def initialize(stream)
end
def width_and_height
+ @rotation = 0
@max_size = nil
@primary_box = nil
@ipma_boxes = []
@@ -599,11 +600,19 @@ def width_and_height
read_boxes!
end
- @final_size
+ if [90, 270].include?(@rotation)
+ @final_size.reverse
+ else
+ @final_size
+ end
end
private
+ # Format specs: https://www.loc.gov/preservation/digital/formats/fdd/fdd000525.shtml
+
+ # If you need to inspect a heic/heif file, use
+ # https://gpac.github.io/mp4box.js/test/filereader.html
def read_boxes!(max_read_bytes = nil)
end_pos = max_read_bytes.nil? ? nil : @stream.pos + max_read_bytes
index = 0
@@ -624,6 +633,8 @@ def read_boxes!(max_read_bytes = nil)
handle_hdlr_box(box_size)
when "iprp", "ipco"
read_boxes!(box_size)
+ when "irot"
+ handle_irot_box
when "ispe"
handle_ispe_box(box_size, index)
when "mdat"
@@ -636,6 +647,10 @@ def read_boxes!(max_read_bytes = nil)
end
end
+ def handle_irot_box
+ @rotation = (read_uint8! & 0x3) * 90
+ end
+
def handle_ispe_box(box_size, index)
throw :finish if box_size < 12
|
diff --git a/test/fixtures/heic/inverted.heic b/test/fixtures/heic/inverted.heic
new file mode 100644
Binary files /dev/null and b/test/fixtures/heic/inverted.heic differ
diff --git a/test/test.rb b/test/test.rb
--- a/test/test.rb
+++ b/test/test.rb
@@ -48,6 +48,7 @@
"heic/heic-maybebroken.HEIC"=>[:heic,[4032,3024]],
"heic/heic-single.heic"=>[:heif,[1440,960]],
"heic/heic-collection.heic"=>[:heif,[1440,960]],
+ "heic/inverted.heic"=>[:heic,[3024, 4032]],
"test6.svg" => [:svg, [450, 450]]
}
|
Inverted width and height for HEIC portrait image (taken in upright position)
Hello,
I was testing the HEIC support on 2.2.4 and noticed the width and height are inverted for images taken on an iPhone XR (heic format; iOS 14.4.2). The phone was upright, in portrait orientation and not rotated to any side, so the width of the image in its correct orientation should really be the lesser value (3024) but instead FastImage returns 4032. The image in question is named `Sanex-Portrait-Upright.heic` and is available at the URL in the logs below. A second image was taken with the same phone rotated to the right (90 degrees) and has been included for comparison and test; this one has the correct width and height.
```
irb(main):008:0> FastImage.new('https://abe-pix.s3.amazonaws.com/Sanex-Portrait-Upright.heic').size
=> [4032, 3024]
irb(main):009:0> FastImage.new('https://abe-pix.s3.amazonaws.com/Jabra-Lenovo.heic').size
=> [4032, 3024]
```
I know HEIC format support has been added recently, but is this a known bug yet? Grateful to know of any workaround/fixes, if available yet.
I have included the `exiftool` outputs for both images. The Rotation of 270 on Sanex-Portrait-Upright.heic caught my eye.
Thank you.
<details>
<summary>exiftool output for Sanex-Portrait-Upright.heic</summary>
<pre>
ExifTool Version Number : 11.88
File Name : Sanex-Portrait-Upright.heic
Directory : .
File Size : 1868 kB
File Modification Date/Time : 2021:07:16 11:04:44+04:00
File Access Date/Time : 2021:07:16 11:05:11+04:00
File Inode Change Date/Time : 2021:07:16 11:05:10+04:00
File Permissions : rw-rw-r--
File Type : HEIC
File Type Extension : heic
MIME Type : image/heic
Major Brand : High Efficiency Image Format HEVC still image (.HEIC)
Minor Version : 0.0.0
Compatible Brands : mif1, MiPr, miaf, MiHB, heic
Handler Type : Picture
Primary Item Reference : 49
Exif Byte Order : Big-endian (Motorola, MM)
Make : Apple
Camera Model Name : iPhone XR
Orientation : Rotate 90 CW
X Resolution : 72
Y Resolution : 72
Resolution Unit : inches
Software : 14.4.2
Modify Date : 2021:07:16 11:03:35
Host Computer : iPhone XR
Y Cb Cr Positioning : Centered
Exposure Time : 1/30
F Number : 1.8
Exposure Program : Program AE
ISO : 640
Exif Version : 0232
Date/Time Original : 2021:07:16 11:03:35
Create Date : 2021:07:16 11:03:35
Offset Time : +04:00
Offset Time Original : +04:00
Offset Time Digitized : +04:00
Components Configuration : Y, Cb, Cr, -
Shutter Speed Value : 1/30
Aperture Value : 1.8
Brightness Value : -0.6311776391
Exposure Compensation : 0
Metering Mode : Multi-segment
Flash : Off, Did not fire
Focal Length : 4.2 mm
Subject Area : 2013 1511 2217 1330
Run Time Flags : Valid
Run Time Value : 32967269717166
Run Time Scale : 1000000000
Run Time Epoch : 0
Acceleration Vector : -0.006256081162 -0.9754549861 -0.2277138979
Sub Sec Time Original : 353
Sub Sec Time Digitized : 353
Flashpix Version : 0100
Color Space : Uncalibrated
Exif Image Width : 4032
Exif Image Height : 3024
Sensing Method : One-chip color area
Scene Type : Directly photographed
Exposure Mode : Auto
White Balance : Auto
Focal Length In 35mm Format : 26 mm
Scene Capture Type : Standard
Lens Info : 4.25mm f/1.8
Lens Make : Apple
Lens Model : iPhone XR back camera 4.25mm f/1.8
Composite Image : General Composite Image
GPS Latitude Ref : South
GPS Longitude Ref : East
GPS Altitude Ref : Above Sea Level
GPS Speed Ref : km/h
GPS Speed : 0
GPS Img Direction Ref : True North
GPS Img Direction : 148.2856597
GPS Dest Bearing Ref : True North
GPS Dest Bearing : 148.2856597
GPS Date Stamp : 2021:07:16
GPS Horizontal Positioning Error: 56.0282416 m
Profile CMM Type : Apple Computer Inc.
Profile Version : 4.0.0
Profile Class : Display Device Profile
Color Space Data : RGB
Profile Connection Space : XYZ
Profile Date Time : 2017:07:07 13:22:32
Profile File Signature : acsp
Primary Platform : Apple Computer Inc.
CMM Flags : Not Embedded, Independent
Device Manufacturer : Apple Computer Inc.
Device Model :
Device Attributes : Reflective, Glossy, Positive, Color
Rendering Intent : Perceptual
Connection Space Illuminant : 0.9642 1 0.82491
Profile Creator : Apple Computer Inc.
Profile ID : ca1a9582257f104d389913d5d1ea1582
Profile Description : Display P3
Profile Copyright : Copyright Apple Inc., 2017
Media White Point : 0.95045 1 1.08905
Red Matrix Column : 0.51512 0.2412 -0.00105
Green Matrix Column : 0.29198 0.69225 0.04189
Blue Matrix Column : 0.1571 0.06657 0.78407
Red Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
Chromatic Adaptation : 1.04788 0.02292 -0.0502 0.02959 0.99048 -0.01706 -0.00923 0.01508 0.75168
Blue Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
Green Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
HEVC Configuration Version : 1
General Profile Space : Conforming
General Tier Flag : Main Tier
General Profile IDC : Main Still Picture Profile
Gen Profile Compatibility Flags : Main Still Picture, Main 10, Main
Constraint Indicator Flags : 176 0 0 0 0 0
General Level IDC : 90 (level 3.0)
Min Spatial Segmentation IDC : 0
Parallelism Type : 0
Chroma Format : 4:2:0
Bit Depth Luma : 8
Bit Depth Chroma : 8
Average Frame Rate : 0
Constant Frame Rate : Unknown
Num Temporal Layers : 1
Temporal ID Nested : No
Image Width : 4032
Image Height : 3024
Image Spatial Extent : 4032x3024
Rotation : 270
Image Pixel Depth : 8 8 8
Media Data Size : 1909033
Media Data Offset : 3432
Run Time Since Power Up : 9:09:27
Aperture : 1.8
Image Size : 4032x3024
Megapixels : 12.2
Scale Factor To 35 mm Equivalent: 6.1
Shutter Speed : 1/30
Create Date : 2021:07:16 11:03:35.353+04:00
Date/Time Original : 2021:07:16 11:03:35.353+04:00
Modify Date : 2021:07:16 11:03:35+04:00
GPS Altitude : 38.5 m Above Sea Level
GPS Latitude : 20 deg 6' 27.84" S
GPS Longitude : 57 deg 41' 42.03" E
Circle Of Confusion : 0.005 mm
Field Of View : 69.4 deg
Focal Length : 4.2 mm (35 mm equivalent: 26.0 mm)
GPS Position : 20 deg 6' 27.84" S, 57 deg 41' 42.03" E
Hyperfocal Distance : 2.04 m
Light Value : 3.9
</pre>
</details>
<details>
<summary>exiftool output for Jabra-Lenovo.heic</summary>
<pre>
ExifTool Version Number : 11.88
File Name : Jabra-Lenovo.heic
Directory : .
File Size : 1440 kB
File Modification Date/Time : 2021:07:16 10:29:34+04:00
File Access Date/Time : 2021:07:16 10:39:56+04:00
File Inode Change Date/Time : 2021:07:16 10:39:46+04:00
File Permissions : rw-rw-r--
File Type : HEIC
File Type Extension : heic
MIME Type : image/heic
Major Brand : High Efficiency Image Format HEVC still image (.HEIC)
Minor Version : 0.0.0
Compatible Brands : mif1, MiPr, miaf, MiHB, heic
Handler Type : Picture
Primary Item Reference : 49
Exif Byte Order : Big-endian (Motorola, MM)
Make : Apple
Camera Model Name : iPhone XR
Orientation : Rotate 180
X Resolution : 72
Y Resolution : 72
Resolution Unit : inches
Software : 14.4.2
Modify Date : 2021:07:16 10:28:44
Host Computer : iPhone XR
Y Cb Cr Positioning : Centered
Exposure Time : 1/60
F Number : 1.8
Exposure Program : Program AE
ISO : 250
Exif Version : 0232
Date/Time Original : 2021:07:16 10:28:44
Create Date : 2021:07:16 10:28:44
Offset Time : +04:00
Offset Time Original : +04:00
Offset Time Digitized : +04:00
Components Configuration : Y, Cb, Cr, -
Shutter Speed Value : 1/60
Aperture Value : 1.8
Brightness Value : 1.699890519
Exposure Compensation : 0
Metering Mode : Multi-segment
Flash : Off, Did not fire
Focal Length : 4.2 mm
Subject Area : 2013 1511 2217 1330
Run Time Flags : Valid
Run Time Value : 32399352062000
Run Time Scale : 1000000000
Run Time Epoch : 0
Acceleration Vector : 0.9033768773 -0.1174672618 -0.3998516504
Sub Sec Time Original : 125
Sub Sec Time Digitized : 125
Flashpix Version : 0100
Color Space : Uncalibrated
Exif Image Width : 4032
Exif Image Height : 3024
Sensing Method : One-chip color area
Scene Type : Directly photographed
Exposure Mode : Auto
White Balance : Auto
Focal Length In 35mm Format : 26 mm
Scene Capture Type : Standard
Lens Info : 4.25mm f/1.8
Lens Make : Apple
Lens Model : iPhone XR back camera 4.25mm f/1.8
Composite Image : General Composite Image
GPS Latitude Ref : South
GPS Longitude Ref : East
GPS Altitude Ref : Above Sea Level
GPS Speed Ref : km/h
GPS Speed : 0
GPS Img Direction Ref : True North
GPS Img Direction : 284.750084
GPS Dest Bearing Ref : True North
GPS Dest Bearing : 284.750084
GPS Date Stamp : 2021:07:16
GPS Horizontal Positioning Error: 12.44248371 m
Profile CMM Type : Apple Computer Inc.
Profile Version : 4.0.0
Profile Class : Display Device Profile
Color Space Data : RGB
Profile Connection Space : XYZ
Profile Date Time : 2017:07:07 13:22:32
Profile File Signature : acsp
Primary Platform : Apple Computer Inc.
CMM Flags : Not Embedded, Independent
Device Manufacturer : Apple Computer Inc.
Device Model :
Device Attributes : Reflective, Glossy, Positive, Color
Rendering Intent : Perceptual
Connection Space Illuminant : 0.9642 1 0.82491
Profile Creator : Apple Computer Inc.
Profile ID : ca1a9582257f104d389913d5d1ea1582
Profile Description : Display P3
Profile Copyright : Copyright Apple Inc., 2017
Media White Point : 0.95045 1 1.08905
Red Matrix Column : 0.51512 0.2412 -0.00105
Green Matrix Column : 0.29198 0.69225 0.04189
Blue Matrix Column : 0.1571 0.06657 0.78407
Red Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
Chromatic Adaptation : 1.04788 0.02292 -0.0502 0.02959 0.99048 -0.01706 -0.00923 0.01508 0.75168
Blue Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
Green Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
HEVC Configuration Version : 1
General Profile Space : Conforming
General Tier Flag : Main Tier
General Profile IDC : Main Still Picture Profile
Gen Profile Compatibility Flags : Main Still Picture, Main 10, Main
Constraint Indicator Flags : 176 0 0 0 0 0
General Level IDC : 90 (level 3.0)
Min Spatial Segmentation IDC : 0
Parallelism Type : 0
Chroma Format : 4:2:0
Bit Depth Luma : 8
Bit Depth Chroma : 8
Average Frame Rate : 0
Constant Frame Rate : Unknown
Num Temporal Layers : 1
Temporal ID Nested : No
Image Width : 4032
Image Height : 3024
Image Spatial Extent : 4032x3024
Rotation : 180
Image Pixel Depth : 8 8 8
Media Data Size : 1471586
Media Data Offset : 3432
Run Time Since Power Up : 8:59:59
Aperture : 1.8
Image Size : 4032x3024
Megapixels : 12.2
Scale Factor To 35 mm Equivalent: 6.1
Shutter Speed : 1/60
Create Date : 2021:07:16 10:28:44.125+04:00
Date/Time Original : 2021:07:16 10:28:44.125+04:00
Modify Date : 2021:07:16 10:28:44+04:00
GPS Altitude : 38.8 m Above Sea Level
GPS Latitude : 20 deg 6' 27.93" S
GPS Longitude : 57 deg 41' 41.78" E
Circle Of Confusion : 0.005 mm
Field Of View : 69.4 deg
Focal Length : 4.2 mm (35 mm equivalent: 26.0 mm)
GPS Position : 20 deg 6' 27.93" S, 57 deg 41' 41.78" E
Hyperfocal Distance : 2.04 m
Light Value : 6.3
</pre>
</details>
|
@stefanoverna any ideas here? Looks to me like we would be open for a PR to fix this.
@azharbeebeejaun can you confirm we compensate for rotation on jpgs?
@SamSaffron yes indeed, jpgs work great.
Here are the output for pictures taken on the same phone but in .jpg format (changed the format setting to most compatible from high efficiency).
```
irb(main):001:0> FastImage.new('https://abe-pix.s3.amazonaws.com/XR-jpg-p.jpg').size
=> [3024, 4032]
irb(main):002:0> FastImage.new('https://abe-pix.s3.amazonaws.com/XR-jpg-l.jpg').size
=> [4032, 3024]
```
<details>
<summary>exiftool output for XR-jpg-p.jpg</summary>
<pre>
ExifTool Version Number : 11.88
File Name : XR-jpg-p.jpg
Directory : .
File Size : 2013 kB
File Modification Date/Time : 2021:07:19 09:12:37+04:00
File Access Date/Time : 2021:07:19 09:13:03+04:00
File Inode Change Date/Time : 2021:07:19 09:12:49+04:00
File Permissions : rw-rw-r--
File Type : JPEG
File Type Extension : jpg
MIME Type : image/jpeg
Exif Byte Order : Big-endian (Motorola, MM)
Make : Apple
Camera Model Name : iPhone XR
Orientation : Rotate 90 CW
X Resolution : 72
Y Resolution : 72
Resolution Unit : inches
Software : 14.4.2
Modify Date : 2021:07:19 09:08:05
Host Computer : iPhone XR
Y Cb Cr Positioning : Centered
Exposure Time : 1/871
F Number : 1.8
Exposure Program : Program AE
ISO : 25
Exif Version : 0232
Date/Time Original : 2021:07:19 09:08:05
Create Date : 2021:07:19 09:08:05
Offset Time : +04:00
Offset Time Original : +04:00
Offset Time Digitized : +04:00
Components Configuration : Y, Cb, Cr, -
Shutter Speed Value : 1/871
Aperture Value : 1.8
Brightness Value : 8.452682127
Exposure Compensation : 0
Metering Mode : Multi-segment
Flash : Off, Did not fire
Focal Length : 4.2 mm
Subject Area : 2013 1511 2217 1330
Run Time Flags : Valid
Run Time Value : 36778734825458
Run Time Scale : 1000000000
Run Time Epoch : 0
Acceleration Vector : -0.002466715639 -0.8906965256 -0.454434067
Sub Sec Time Original : 510
Sub Sec Time Digitized : 510
Flashpix Version : 0100
Color Space : Uncalibrated
Exif Image Width : 4032
Exif Image Height : 3024
Sensing Method : One-chip color area
Scene Type : Directly photographed
Exposure Mode : Auto
White Balance : Auto
Focal Length In 35mm Format : 26 mm
Scene Capture Type : Standard
Lens Info : 4.25mm f/1.8
Lens Make : Apple
Lens Model : iPhone XR back camera 4.25mm f/1.8
Composite Image : General Composite Image
GPS Latitude Ref : South
GPS Longitude Ref : East
GPS Altitude Ref : Above Sea Level
GPS Speed Ref : km/h
GPS Speed : 0
GPS Img Direction Ref : True North
GPS Img Direction : 17.17580414
GPS Dest Bearing Ref : True North
GPS Dest Bearing : 17.17580414
GPS Date Stamp : 2021:07:19
GPS Horizontal Positioning Error: 20.85939082 m
Compression : JPEG (old-style)
Thumbnail Offset : 2442
Thumbnail Length : 7155
Profile CMM Type : Apple Computer Inc.
Profile Version : 4.0.0
Profile Class : Display Device Profile
Color Space Data : RGB
Profile Connection Space : XYZ
Profile Date Time : 2017:07:07 13:22:32
Profile File Signature : acsp
Primary Platform : Apple Computer Inc.
CMM Flags : Not Embedded, Independent
Device Manufacturer : Apple Computer Inc.
Device Model :
Device Attributes : Reflective, Glossy, Positive, Color
Rendering Intent : Perceptual
Connection Space Illuminant : 0.9642 1 0.82491
Profile Creator : Apple Computer Inc.
Profile ID : ca1a9582257f104d389913d5d1ea1582
Profile Description : Display P3
Profile Copyright : Copyright Apple Inc., 2017
Media White Point : 0.95045 1 1.08905
Red Matrix Column : 0.51512 0.2412 -0.00105
Green Matrix Column : 0.29198 0.69225 0.04189
Blue Matrix Column : 0.1571 0.06657 0.78407
Red Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
Chromatic Adaptation : 1.04788 0.02292 -0.0502 0.02959 0.99048 -0.01706 -0.00923 0.01508 0.75168
Blue Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
Green Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
Image Width : 4032
Image Height : 3024
Encoding Process : Baseline DCT, Huffman coding
Bits Per Sample : 8
Color Components : 3
Y Cb Cr Sub Sampling : YCbCr4:2:0 (2 2)
Run Time Since Power Up : 10:12:59
Aperture : 1.8
Image Size : 4032x3024
Megapixels : 12.2
Scale Factor To 35 mm Equivalent: 6.1
Shutter Speed : 1/871
Create Date : 2021:07:19 09:08:05.510+04:00
Date/Time Original : 2021:07:19 09:08:05.510+04:00
Modify Date : 2021:07:19 09:08:05+04:00
Thumbnail Image : (Binary data 7155 bytes, use -b option to extract)
GPS Altitude : 39.3 m Above Sea Level
GPS Latitude : 20 deg 6' 27.83" S
GPS Longitude : 57 deg 41' 42.04" E
Circle Of Confusion : 0.005 mm
Field Of View : 69.4 deg
Focal Length : 4.2 mm (35 mm equivalent: 26.0 mm)
GPS Position : 20 deg 6' 27.83" S, 57 deg 41' 42.04" E
Hyperfocal Distance : 2.04 m
Light Value : 13.5
</pre>
</details>
<details>
<summary>exiftool output for XR-jpg-l.jpg</summary>
<pre>
ExifTool Version Number : 11.88
File Name : XR-jpg-l.jpg
Directory : .
File Size : 1973 kB
File Modification Date/Time : 2021:07:19 09:13:11+04:00
File Access Date/Time : 2021:07:19 09:13:49+04:00
File Inode Change Date/Time : 2021:07:19 09:13:11+04:00
File Permissions : rw-rw-r--
File Type : JPEG
File Type Extension : jpg
MIME Type : image/jpeg
Exif Byte Order : Big-endian (Motorola, MM)
Make : Apple
Camera Model Name : iPhone XR
Orientation : Rotate 180
X Resolution : 72
Y Resolution : 72
Resolution Unit : inches
Software : 14.4.2
Modify Date : 2021:07:19 09:07:56
Host Computer : iPhone XR
Y Cb Cr Positioning : Centered
Exposure Time : 1/429
F Number : 1.8
Exposure Program : Program AE
ISO : 25
Exif Version : 0232
Date/Time Original : 2021:07:19 09:07:56
Create Date : 2021:07:19 09:07:56
Offset Time : +04:00
Offset Time Original : +04:00
Offset Time Digitized : +04:00
Components Configuration : Y, Cb, Cr, -
Shutter Speed Value : 1/429
Aperture Value : 1.8
Brightness Value : 7.694290935
Exposure Compensation : 0
Metering Mode : Multi-segment
Flash : Off, Did not fire
Focal Length : 4.2 mm
Subject Area : 2013 1511 2217 1330
Run Time Flags : Valid
Run Time Value : 36769393391125
Run Time Scale : 1000000000
Run Time Epoch : 0
Acceleration Vector : 0.9488855599 -0.0628478825 -0.2945564392
Sub Sec Time Original : 336
Sub Sec Time Digitized : 336
Flashpix Version : 0100
Color Space : Uncalibrated
Exif Image Width : 4032
Exif Image Height : 3024
Sensing Method : One-chip color area
Scene Type : Directly photographed
Exposure Mode : Auto
White Balance : Auto
Focal Length In 35mm Format : 26 mm
Scene Capture Type : Standard
Lens Info : 4.25mm f/1.8
Lens Make : Apple
Lens Model : iPhone XR back camera 4.25mm f/1.8
Composite Image : General Composite Image
GPS Latitude Ref : South
GPS Longitude Ref : East
GPS Altitude Ref : Above Sea Level
GPS Speed Ref : km/h
GPS Speed : 0.9206481575
GPS Img Direction Ref : True North
GPS Img Direction : 342.0844037
GPS Dest Bearing Ref : True North
GPS Dest Bearing : 342.0844037
GPS Date Stamp : 2021:07:19
GPS Horizontal Positioning Error: 24.15145428 m
Compression : JPEG (old-style)
Thumbnail Offset : 2442
Thumbnail Length : 5711
Profile CMM Type : Apple Computer Inc.
Profile Version : 4.0.0
Profile Class : Display Device Profile
Color Space Data : RGB
Profile Connection Space : XYZ
Profile Date Time : 2017:07:07 13:22:32
Profile File Signature : acsp
Primary Platform : Apple Computer Inc.
CMM Flags : Not Embedded, Independent
Device Manufacturer : Apple Computer Inc.
Device Model :
Device Attributes : Reflective, Glossy, Positive, Color
Rendering Intent : Perceptual
Connection Space Illuminant : 0.9642 1 0.82491
Profile Creator : Apple Computer Inc.
Profile ID : ca1a9582257f104d389913d5d1ea1582
Profile Description : Display P3
Profile Copyright : Copyright Apple Inc., 2017
Media White Point : 0.95045 1 1.08905
Red Matrix Column : 0.51512 0.2412 -0.00105
Green Matrix Column : 0.29198 0.69225 0.04189
Blue Matrix Column : 0.1571 0.06657 0.78407
Red Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
Chromatic Adaptation : 1.04788 0.02292 -0.0502 0.02959 0.99048 -0.01706 -0.00923 0.01508 0.75168
Blue Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
Green Tone Reproduction Curve : (Binary data 32 bytes, use -b option to extract)
Image Width : 4032
Image Height : 3024
Encoding Process : Baseline DCT, Huffman coding
Bits Per Sample : 8
Color Components : 3
Y Cb Cr Sub Sampling : YCbCr4:2:0 (2 2)
Run Time Since Power Up : 10:12:49
Aperture : 1.8
Image Size : 4032x3024
Megapixels : 12.2
Scale Factor To 35 mm Equivalent: 6.1
Shutter Speed : 1/429
Create Date : 2021:07:19 09:07:56.336+04:00
Date/Time Original : 2021:07:19 09:07:56.336+04:00
Modify Date : 2021:07:19 09:07:56+04:00
Thumbnail Image : (Binary data 5711 bytes, use -b option to extract)
GPS Altitude : 39.5 m Above Sea Level
GPS Latitude : 20 deg 6' 27.58" S
GPS Longitude : 57 deg 41' 41.61" E
Circle Of Confusion : 0.005 mm
Field Of View : 69.4 deg
Focal Length : 4.2 mm (35 mm equivalent: 26.0 mm)
GPS Position : 20 deg 6' 27.58" S, 57 deg 41' 41.61" E
Hyperfocal Distance : 2.04 m
Light Value : 12.4
</pre>
</details>
I don't have much time at this moment, so PRs are super welcome :) I'll try to do my best in the next days!
@stefanoverna I tried get the exifs location, but stopped when I had to parse the iloc box...
https://github.com/sdsykes/fastimage/compare/master...ombr:heic-orientation?expand=1
I might get back to it later, but put it there meanwhile.
| 2021-08-06T13:59:41
|
ruby
|
Hard
|
JEG2/highline
| 260
|
JEG2__highline-260
|
[
"43"
] |
8e5f773e9e4180f30f850a6ec364a082b8bc8f3f
|
diff --git a/lib/highline.rb b/lib/highline.rb
--- a/lib/highline.rb
+++ b/lib/highline.rb
@@ -546,6 +546,9 @@ def get_line_raw_no_echo_mode(question)
if character == "\b" || character == "\u007F"
chopped = line.chop!
output_erase_char if chopped && question.echo
+ elsif character == "\cU"
+ line.size.times { output_erase_char } if question.echo
+ line = ""
elsif character == "\e"
ignore_arrow_key
else
|
diff --git a/test/test_highline.rb b/test/test_highline.rb
--- a/test/test_highline.rb
+++ b/test/test_highline.rb
@@ -349,6 +349,44 @@ def test_after_some_chars_backspace_does_not_enter_prompt_when_utf8
assert_equal(4, @output.string.count("\b"))
end
+ def test_erase_line_does_not_enter_prompt
+ @input << "\cU\cU\cU\cU\cU\cU\cU\cU\cU"
+ @input.rewind
+ answer = @terminal.ask("Please enter your password: ") do |q|
+ q.echo = "*"
+ end
+ assert_equal("", answer)
+ assert_equal("Please enter your password: \n", @output.string)
+
+ # There's no backspaces as the line is already empty
+ assert_equal(0, @output.string.count("\b"))
+ end
+
+ def test_after_some_chars_erase_line_does_not_enter_prompt_when_ascii
+ @input << "apple\cU\cU\cU\cU\cU\cU\cU\cU"
+ @input.rewind
+ answer = @terminal.ask("Please enter your password: ") do |q|
+ q.echo = "*"
+ end
+ assert_equal("", answer)
+
+ # There's only enough backspaces to clear the given string
+ assert_equal(5, @output.string.count("\b"))
+ end
+
+
+ def test_after_some_chars_erase_line_does_not_enter_prompt_when_utf8
+ @input << "maçã\cU\cU\cU\cU\cU\cU\cU\cU"
+ @input.rewind
+ answer = @terminal.ask("Please enter your password: ") do |q|
+ q.echo = "*"
+ end
+ assert_equal("", answer)
+
+ # There's only enough backspaces to clear the given string
+ assert_equal(4, @output.string.count("\b"))
+ end
+
def test_readline_mode
#
# Rubinius (and JRuby) seems to be ignoring
|
Does not support CTRL-U in password mode
Type "helloCTRL-Uworld"
``` ruby
ask("Usrename: ") -> "world"
ask("Password: "){|q| q.echo = false} -> "hello\x15world"
```
|
Wow, you really type passwords like that? :)
It's true that we have to setup some special terminal modes to avoid echoing the password. That swallows some key combinations. I have found that to be a problem thus far, but I'll take patches from people it bothers who can find a way around it.
Hi @GutenYe , just to be sure I'm understanding correctly. Are you expecting HighLine to "delete" all the line and come back to "home", so it would return only "world", not "hello\u0015world" ?
If so, I think we could try to do this.
But, should we try to emulate all control keys from the terminal?
For most common purposes of the **echo = false** use cases, handling backspace correctly is enough.
Yeah, I'm not sure how much it's HighLine's responsibility to emulate full terminal behavior. It seems weird to me that a simple HighLine call might erase my terminal screen.
We are currently planning the next major version of HighLine. We will include a discussion of where to draw these lines in the plans we make for that release.
> Are you expecting HighLine to "delete" all the line
Yes, that's what I wanted.
Hi @gutenye,
Most projects that I know just delete (deprecate) old issues. But it's not the case here in HighLine. We don't give up! :smile:
This issue has **more than 10 years**! Oh - MY - GOD!
The first release of "io/console" was 0.3 at October 16, 2011 (6,5 KB). But, not mature, and in a time that some of the releases were yanked.
The first "usable" release that I have notice is 0.4.1 at February 04, 2013 (8,5 KB) **AFTER** the opening of this issue.
You can see the whole release history at https://rubygems.org/gems/io-console/versions
The good news is that we currently have an "io/console" more mature with more features we could rely on so we don't have to take all the responsibilities for the console inside HighLine's code.
I've just merged a PR that solves handling "CTRL-C" by relying on "io/console" functionalities that were released with Ruby version 2.7.0 at December, 2019 (when this issue had 7 years old.
Then I remembered about this old issue over here and this improvements in "io/console" gave me some hope.
I can't promise, but I'll be trying to solve it.
Is there any GitHub badge for solving a 10 years old issue? :smile:
Hey @JEG2 keep an eye on this? Perhaps we take a picture of an "anniversary cake" for the issue.
| 2023-01-07T01:12:50
|
ruby
|
Hard
|
yippee-fun/phlex
| 192
|
yippee-fun__phlex-192
|
[
"191"
] |
bb358e7942749d7834f679bb8c6e54115d5616cd
|
diff --git a/docs/components/callout.rb b/docs/components/callout.rb
--- a/docs/components/callout.rb
+++ b/docs/components/callout.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Components
- class Callout < Phlex::Component
+ class Callout < Phlex::View
def template(&block)
div(class: "rounded bg-orange-50 text-sm p-5 border border-orange-100", &block)
end
diff --git a/docs/components/code_block.rb b/docs/components/code_block.rb
--- a/docs/components/code_block.rb
+++ b/docs/components/code_block.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Components
- class CodeBlock < Phlex::Component
+ class CodeBlock < Phlex::View
FORMATTER = Rouge::Formatters::HTML.new
def initialize(code, syntax:)
diff --git a/docs/components/example.rb b/docs/components/example.rb
--- a/docs/components/example.rb
+++ b/docs/components/example.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Components
- class Example < Phlex::Component
+ class Example < Phlex::View
def initialize
@sandbox = Module.new
end
diff --git a/docs/components/heading.rb b/docs/components/heading.rb
--- a/docs/components/heading.rb
+++ b/docs/components/heading.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Components
- class Heading < Phlex::Component
+ class Heading < Phlex::View
def template(&block)
h2(class: "text-xl font-bold mt-10 mb-5", &block)
end
diff --git a/docs/components/layout.rb b/docs/components/layout.rb
--- a/docs/components/layout.rb
+++ b/docs/components/layout.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Components
- class Layout < Phlex::Component
+ class Layout < Phlex::View
register_element :style
def initialize(title:)
@@ -28,7 +28,7 @@ def template(&block)
ul do
li { a "Introduction", href: "/" }
li { a "Templates", href: "/templates" }
- li { a "Components", href: "/components" }
+ li { a "Views", href: "/components" }
li { a "Rails integration", href: "/rails-integration" }
li { a "Source code", href: "https://github.com/joeldrapper/phlex" }
end
diff --git a/docs/components/markdown.rb b/docs/components/markdown.rb
--- a/docs/components/markdown.rb
+++ b/docs/components/markdown.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Components
- class Markdown < Phlex::Component
+ class Markdown < Phlex::View
class Render < Redcarpet::Render::HTML
def header(text, level)
case level
diff --git a/docs/components/tabs.rb b/docs/components/tabs.rb
--- a/docs/components/tabs.rb
+++ b/docs/components/tabs.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Components
- class Tabs < Phlex::Component
+ class Tabs < Phlex::View
def initialize
@index = 1
end
diff --git a/docs/components/tabs/tab.rb b/docs/components/tabs/tab.rb
--- a/docs/components/tabs/tab.rb
+++ b/docs/components/tabs/tab.rb
@@ -2,7 +2,7 @@
module Components
class Tabs
- class Tab < Phlex::Component
+ class Tab < Phlex::View
def initialize(name:, checked:)
@name = name
@checked = checked
diff --git a/docs/components/title.rb b/docs/components/title.rb
--- a/docs/components/title.rb
+++ b/docs/components/title.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Components
- class Title < Phlex::Component
+ class Title < Phlex::View
def template(&block)
h1(class: "text-2xl font-bold my-5", &block)
end
diff --git a/docs/pages/application_page.rb b/docs/pages/application_page.rb
--- a/docs/pages/application_page.rb
+++ b/docs/pages/application_page.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Pages
- class ApplicationPage < Phlex::Component
+ class ApplicationPage < Phlex::View
include ::Components
end
end
diff --git a/docs/pages/rails_integration.rb b/docs/pages/rails_integration.rb
--- a/docs/pages/rails_integration.rb
+++ b/docs/pages/rails_integration.rb
@@ -18,7 +18,7 @@ def template
# app/views/card.rb
module Views
- class Card < Phlex::Component
+ class Card < Phlex::View
def template
end
end
diff --git a/docs/pages/templates.rb b/docs/pages/templates.rb
--- a/docs/pages/templates.rb
+++ b/docs/pages/templates.rb
@@ -9,14 +9,14 @@ def template
Rather than use another langauge like ERB, HAML or Slim, Phlex provides a Ruby DSL for defining HTML templates.
- You can create a component class by subclassing `Phlex::Component` and defining a method called `template`. Within the `template` method, you can compose HTML markup by calling the name of any [HTML element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element).
+ You can create a component class by subclassing `Phlex::View` and defining a method called `template`. Within the `template` method, you can compose HTML markup by calling the name of any [HTML element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element).
The first argument to an HTML element method is the _text content_ for that element. For example, here’s a component with an `<h1>` element that says “Hello World!”
MD
render Example.new do |e|
e.tab "heading.rb", <<~RUBY
- class Heading < Phlex::Component
+ class Heading < Phlex::View
def template
h1 "Hello World!"
end
@@ -36,7 +36,7 @@ def template
render Example.new do |e|
e.tab "heading.rb", <<~RUBY
- class Heading < Phlex::Component
+ class Heading < Phlex::View
def template
h1 "Hello World!",
class: "text-xl font-bold",
@@ -54,7 +54,7 @@ def template
render Example.new do |e|
e.tab "example.rb", <<~RUBY
- class Example < Phlex::Component
+ class Example < Phlex::View
def template
input type: "radio", name: "channel", id: "1", checked: true
input type: "radio", name: "channel", id: "2", checked: false
@@ -73,7 +73,7 @@ def template
render Example.new do |e|
e.tab "nav.rb", <<~RUBY
- class Nav < Phlex::Component
+ class Nav < Phlex::View
def template
nav do
ul do
@@ -97,7 +97,7 @@ def template
render Example.new do |e|
e.tab "heading.rb", <<~RUBY
- class Heading < Phlex::Component
+ class Heading < Phlex::View
def template
h1 { strong "Hello "; text "World!" }
end
@@ -115,7 +115,7 @@ def template
render Example.new do |e|
e.tab "links.rb", <<~RUBY
- class Links < Phlex::Component
+ class Links < Phlex::View
def template
a "Home", href: "/"
whitespace
@@ -143,7 +143,7 @@ def template
render Example.new do |e|
e.tab "link.rb", <<~RUBY
- class Link < Phlex::Component
+ class Link < Phlex::View
def initialize(text, to:, active:)
@text = text
@to = to
@@ -162,7 +162,7 @@ def active? = @active
RUBY
e.tab "example.rb", <<~RUBY
- class Example < Phlex::Component
+ class Example < Phlex::View
def template
nav do
ul do
@@ -183,7 +183,7 @@ def template
render Example.new do |e|
e.tab "link.rb", <<~RUBY
- class Link < Phlex::Component
+ class Link < Phlex::View
def initialize(text, to:, active:)
@text = text
@to = to
@@ -202,7 +202,7 @@ def active? = @active
RUBY
e.tab "example.rb", <<~RUBY
- class Example < Phlex::Component
+ class Example < Phlex::View
def template
nav do
ul do
@@ -225,7 +225,7 @@ def template
render Example.new do |e|
e.tab "example.rb", <<~RUBY
- class Example < Phlex::Component
+ class Example < Phlex::View
def template
template_tag do
img src: "hidden.jpg", alt: "A hidden image."
diff --git a/docs/pages/components.rb b/docs/pages/views.rb
similarity index 89%
rename from docs/pages/components.rb
rename to docs/pages/views.rb
--- a/docs/pages/components.rb
+++ b/docs/pages/views.rb
@@ -1,11 +1,11 @@
# frozen_string_literal: true
module Pages
- class Components < ApplicationPage
+ class Views < ApplicationPage
def template
render Layout.new(title: "Components in Phlex") do
render Markdown.new(<<~MD)
- # Components
+ # Views
## Yielding content
@@ -14,7 +14,7 @@ def template
render Example.new do |e|
e.tab "card.rb", <<~RUBY
- class Card < Phlex::Component
+ class Card < Phlex::View
def template(&)
article(class: "drop-shadow rounded p-5") {
h1 "Amazing content!"
@@ -35,7 +35,7 @@ def template(&)
render Example.new do |e|
e.tab "card.rb", <<~RUBY
- class Card < Phlex::Component
+ class Card < Phlex::View
def template(&)
article(class: "drop-shadow rounded p-5", &)
end
@@ -53,7 +53,7 @@ def template(&)
render Example.new do |e|
e.tab "example.rb", <<~RUBY
- class Example < Phlex::Component
+ class Example < Phlex::View
def template
render Card.new do
h1 "Hello"
@@ -63,7 +63,7 @@ def template
RUBY
e.tab "card.rb", <<~RUBY
- class Card < Phlex::Component
+ class Card < Phlex::View
def template(&)
article(class: "drop-shadow rounded p-5", &)
end
@@ -79,7 +79,7 @@ def template(&)
render Example.new do |e|
e.tab "example.rb", <<~RUBY
- class Example < Phlex::Component
+ class Example < Phlex::View
def template
render(Card.new) { "Hi" }
end
@@ -87,7 +87,7 @@ def template
RUBY
e.tab "card.rb", <<~RUBY
- class Card < Phlex::Component
+ class Card < Phlex::View
def template(&)
article(class: "drop-shadow rounded p-5", &)
end
@@ -105,7 +105,7 @@ def template(&)
render Example.new do |e|
e.tab "hello.rb", <<~RUBY
- class Hello < Phlex::Component
+ class Hello < Phlex::View
def initialize(name:)
@name = name
end
@@ -117,7 +117,7 @@ def template
RUBY
e.tab "example.rb", <<~RUBY
- class Example < Phlex::Component
+ class Example < Phlex::View
def template
render Hello.new(name: "Joel")
end
@@ -137,7 +137,7 @@ def template
render Example.new do |e|
e.tab "status.rb", <<~RUBY
- class Status < Phlex::Component
+ class Status < Phlex::View
def initialize(status:)
@status = status
end
@@ -160,7 +160,7 @@ def status_emoji
RUBY
e.tab "example.rb", <<~RUBY
- class Example < Phlex::Component
+ class Example < Phlex::View
def template
render Status.new(status: :success)
end
diff --git a/fixtures/compilation/vcall.rb b/fixtures/compilation/vcall.rb
--- a/fixtures/compilation/vcall.rb
+++ b/fixtures/compilation/vcall.rb
@@ -3,19 +3,19 @@
module Fixtures
module Compilation
module VCall
- class WithStandardElement < Phlex::Component
+ class WithStandardElement < Phlex::View
def template
div
end
end
- class WithVoidElement < Phlex::Component
+ class WithVoidElement < Phlex::View
def template
img
end
end
- class WithAnotherMethodCall < Phlex::Component
+ class WithAnotherMethodCall < Phlex::View
def template
article
some_other_method
@@ -23,7 +23,7 @@ def template
end
end
- class WithRedefinedTagMethod < Phlex::Component
+ class WithRedefinedTagMethod < Phlex::View
def template
title
article
diff --git a/fixtures/dummy/app/views/articles/form.rb b/fixtures/dummy/app/views/articles/form.rb
--- a/fixtures/dummy/app/views/articles/form.rb
+++ b/fixtures/dummy/app/views/articles/form.rb
@@ -2,7 +2,7 @@
module Views
module Articles
- class Form < Phlex::Component
+ class Form < Phlex::View
def template
form_with url: "test" do |f|
f.text_field :name
diff --git a/fixtures/dummy/app/views/card.rb b/fixtures/dummy/app/views/card.rb
--- a/fixtures/dummy/app/views/card.rb
+++ b/fixtures/dummy/app/views/card.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Views
- class Card < Phlex::Component
+ class Card < Phlex::View
def template(&block)
article class: "drop-shadow p-5 rounded", &block
end
diff --git a/fixtures/dummy/app/views/heading.rb b/fixtures/dummy/app/views/heading.rb
--- a/fixtures/dummy/app/views/heading.rb
+++ b/fixtures/dummy/app/views/heading.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Views
- class Heading < Phlex::Component
+ class Heading < Phlex::View
def template(&block)
h1(&block)
end
diff --git a/fixtures/layout.rb b/fixtures/layout.rb
--- a/fixtures/layout.rb
+++ b/fixtures/layout.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Example
- class LayoutComponent < Phlex::Component
+ class LayoutComponent < Phlex::View
def initialize(title: "Example")
@title = title
end
diff --git a/fixtures/page.rb b/fixtures/page.rb
--- a/fixtures/page.rb
+++ b/fixtures/page.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Example
- class Page < Phlex::Component
+ class Page < Phlex::View
def template
render LayoutComponent.new do
h1 "Hi"
diff --git a/fixtures/component_helper.rb b/fixtures/view_helper.rb
similarity index 50%
rename from fixtures/component_helper.rb
rename to fixtures/view_helper.rb
--- a/fixtures/component_helper.rb
+++ b/fixtures/view_helper.rb
@@ -1,16 +1,16 @@
# frozen_string_literal: true
-module ComponentHelper
+module ViewHelper
def self.extended(parent)
parent.class_exec do
let(:output) { example.call }
- let(:example) { component.new }
+ let(:example) { view.new }
end
end
- def component(&block)
- let :component do
- Class.new(Phlex::Component, &block)
+ def view(&block)
+ let :view do
+ Class.new(Phlex::View, &block)
end
end
end
diff --git a/lib/generators/phlex/component/component_generator.rb b/lib/generators/phlex/component/component_generator.rb
--- a/lib/generators/phlex/component/component_generator.rb
+++ b/lib/generators/phlex/component/component_generator.rb
@@ -5,7 +5,7 @@ module Generators
class ComponentGenerator < ::Rails::Generators::NamedBase
source_root File.expand_path("templates", __dir__)
- def create_component
+ def create_view
template "component.rb.erb", File.join("app/views", class_path, "#{file_name}.rb")
end
end
diff --git a/lib/generators/phlex/component/templates/component.rb.erb b/lib/generators/phlex/component/templates/component.rb.erb
--- a/lib/generators/phlex/component/templates/component.rb.erb
+++ b/lib/generators/phlex/component/templates/component.rb.erb
@@ -1,6 +1,6 @@
<% module_namespacing do -%>
module Views
- class <%= class_name %> < Phlex::Component
+ class <%= class_name %> < Phlex::View
def template
end
end
diff --git a/lib/phlex.rb b/lib/phlex.rb
--- a/lib/phlex.rb
+++ b/lib/phlex.rb
@@ -14,11 +14,20 @@
module Phlex
Error = Module.new
ArgumentError = Class.new(ArgumentError) { include Error }
+ NameError = Class.new(NameError) { include Error }
extend self
ATTRIBUTE_CACHE = {}
+ def const_missing(name)
+ if name == :Component
+ raise NameError, "👋 Phlex::Component is now Phlex::View"
+ else
+ super
+ end
+ end
+
def configuration
@configuration ||= Configuration.new
end
diff --git a/lib/phlex/compiler.rb b/lib/phlex/compiler.rb
--- a/lib/phlex/compiler.rb
+++ b/lib/phlex/compiler.rb
@@ -18,7 +18,7 @@ def redefined?(method_name)
prototype = @component.allocate
@component.instance_method(method_name).bind(prototype) !=
- Phlex::Component.instance_method(method_name).bind(prototype)
+ Phlex::View.instance_method(method_name).bind(prototype)
end
def redefine(method)
diff --git a/lib/phlex/engine.rb b/lib/phlex/engine.rb
--- a/lib/phlex/engine.rb
+++ b/lib/phlex/engine.rb
@@ -5,7 +5,7 @@
module Phlex
class Engine < ::Rails::Engine
initializer "phlex.tag_helpers" do
- Phlex::Component.include(Phlex::Rails::TagHelpers)
+ Phlex::View.include(Phlex::Rails::TagHelpers)
end
end
end
diff --git a/lib/phlex/renderable.rb b/lib/phlex/renderable.rb
--- a/lib/phlex/renderable.rb
+++ b/lib/phlex/renderable.rb
@@ -3,13 +3,13 @@
module Phlex
module Renderable
def render(renderable, *args, **kwargs, &block)
- if renderable.is_a?(Component)
+ if renderable.is_a?(View)
if block_given? && !block.binding.receiver.is_a?(Phlex::Block)
block = Phlex::Block.new(self, &block)
end
renderable.call(@_target, view_context: @_view_context, parent: self, &block)
- elsif renderable.is_a?(Class) && renderable < Component
+ elsif renderable.is_a?(Class) && renderable < View
raise ArgumentError, "You tried to render the Phlex component class: #{renderable.name} but you probably meant to render an instance of that class instead."
else
@_target << @_view_context.render(renderable, *args, **kwargs, &block)
diff --git a/lib/phlex/component.rb b/lib/phlex/view.rb
similarity index 99%
rename from lib/phlex/component.rb
rename to lib/phlex/view.rb
--- a/lib/phlex/component.rb
+++ b/lib/phlex/view.rb
@@ -5,7 +5,7 @@
end
module Phlex
- class Component
+ class View
extend HTML
include Renderable
|
diff --git a/fixtures/test_helper.rb b/fixtures/test_helper.rb
--- a/fixtures/test_helper.rb
+++ b/fixtures/test_helper.rb
@@ -10,4 +10,4 @@
config.autoload_paths << "#{root}/app"
end
-require "component_helper"
+require "view_helper"
diff --git a/test/phlex/rails.rb b/test/phlex/rails.rb
--- a/test/phlex/rails.rb
+++ b/test/phlex/rails.rb
@@ -2,7 +2,7 @@
require "test_helper"
-describe Phlex::Component do
+describe Phlex::View do
with "rendered in an ERB view" do
let(:output) { ArticlesController.render "index" }
diff --git a/test/phlex/rails/form_with.rb b/test/phlex/rails/form_with.rb
--- a/test/phlex/rails/form_with.rb
+++ b/test/phlex/rails/form_with.rb
@@ -2,7 +2,7 @@
require "test_helper"
-describe Phlex::Component do
+describe Phlex::View do
let(:output) { ArticlesController.render "new" }
with "form_with" do
diff --git a/test/phlex/component/attributes.rb b/test/phlex/view/attributes.rb
similarity index 79%
rename from test/phlex/component/attributes.rb
rename to test/phlex/view/attributes.rb
--- a/test/phlex/component/attributes.rb
+++ b/test/phlex/view/attributes.rb
@@ -2,11 +2,11 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "hash attributes" do
- component do
+ view do
def template
div data: { name: { first_name: "Joel" } }
end
@@ -19,17 +19,17 @@ def template
if RUBY_ENGINE == "ruby"
with "unique tag attributes" do
- component do
+ view do
def template
div class: SecureRandom.hex
end
end
let :report do
- component.new.call
+ view.new.call
MemoryProfiler.report do
- 2.times { component.new.call }
+ 2.times { view.new.call }
end
end
diff --git a/test/phlex/component/call.rb b/test/phlex/view/call.rb
similarity index 78%
rename from test/phlex/component/call.rb
rename to test/phlex/view/call.rb
--- a/test/phlex/component/call.rb
+++ b/test/phlex/view/call.rb
@@ -2,10 +2,10 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
- component do
+ view do
def template
text "Hi"
end
@@ -17,7 +17,7 @@ def template
end
with "a spent component" do
- let(:example) { component.new.tap(&:call) }
+ let(:example) { view.new.tap(&:call) }
it "raises an ArgumentError" do
expect { example.call }.to raise_exception RuntimeError,
diff --git a/test/phlex/component/comment.rb b/test/phlex/view/comment.rb
similarity index 87%
rename from test/phlex/component/comment.rb
rename to test/phlex/view/comment.rb
--- a/test/phlex/component/comment.rb
+++ b/test/phlex/view/comment.rb
@@ -2,11 +2,11 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "simple comment" do
- component do
+ view do
def template
comment "This is an HTML comment"
end
@@ -18,7 +18,7 @@ def template
end
with "empty comment" do
- component do
+ view do
def template
comment
end
@@ -30,7 +30,7 @@ def template
end
with "number comment" do
- component do
+ view do
def template
comment 1
end
@@ -42,7 +42,7 @@ def template
end
with "escaped comment" do
- component do
+ view do
def template
comment "<b>Important</b>"
end
diff --git a/test/phlex/component/content.rb b/test/phlex/view/content.rb
similarity index 79%
rename from test/phlex/component/content.rb
rename to test/phlex/view/content.rb
--- a/test/phlex/component/content.rb
+++ b/test/phlex/view/content.rb
@@ -2,11 +2,11 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "content" do
- component do
+ view do
def template(&block)
div do
content(&block)
diff --git a/test/phlex/component/custom_elements.rb b/test/phlex/view/custom_elements.rb
similarity index 85%
rename from test/phlex/component/custom_elements.rb
rename to test/phlex/view/custom_elements.rb
--- a/test/phlex/component/custom_elements.rb
+++ b/test/phlex/view/custom_elements.rb
@@ -2,11 +2,11 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "custom elements" do
- component do
+ view do
register_element :trix_editor
register_element :trix_toolbar
diff --git a/test/phlex/component/doctype.rb b/test/phlex/view/doctype.rb
similarity index 80%
rename from test/phlex/component/doctype.rb
rename to test/phlex/view/doctype.rb
--- a/test/phlex/component/doctype.rb
+++ b/test/phlex/view/doctype.rb
@@ -2,11 +2,11 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "a doctype" do
- component do
+ view do
def template
html do
head { doctype }
diff --git a/test/phlex/component/naughty_business.rb b/test/phlex/view/naughty_business.rb
similarity index 93%
rename from test/phlex/component/naughty_business.rb
rename to test/phlex/view/naughty_business.rb
--- a/test/phlex/component/naughty_business.rb
+++ b/test/phlex/view/naughty_business.rb
@@ -2,11 +2,11 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "naughty text" do
- component do
+ view do
def template
text %("><script type="text/javascript" src="bad_script.js"></script>)
end
@@ -18,7 +18,7 @@ def template
end
with "naughty tag attribute values" do
- component do
+ view do
def template
article id: %("><script type="text/javascript" src="bad_script.js"></script>)
end
@@ -30,7 +30,7 @@ def template
end
with "naughty javascript link protocol in href" do
- component do
+ view do
def template
a "naughty link", href: "javascript:javascript:alert(1)"
end
@@ -45,7 +45,7 @@ def template
with "with naughty #{event_attribute} attribute" do
naughty_attributes = { event_attribute => "alert(1);" }
- component do
+ view do
define_method :template do
send(:div, **naughty_attributes)
end
@@ -63,7 +63,7 @@ def template
naughty_attribute = "abc#{naughty_character}123"
naughty_attributes = { naughty_attribute => "alert(1);" }
- component do
+ view do
define_method :template do
send(:div, **naughty_attributes)
end
diff --git a/test/phlex/component/numbers.rb b/test/phlex/view/numbers.rb
similarity index 84%
rename from test/phlex/component/numbers.rb
rename to test/phlex/view/numbers.rb
--- a/test/phlex/component/numbers.rb
+++ b/test/phlex/view/numbers.rb
@@ -2,11 +2,11 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "numbers" do
- component do
+ view do
def template
span 1
span 2.0
@@ -19,7 +19,7 @@ def template
end
with "numbers in block" do
- component do
+ view do
def template
span do
1
diff --git a/test/phlex/component/raw.rb b/test/phlex/view/raw.rb
similarity index 79%
rename from test/phlex/component/raw.rb
rename to test/phlex/view/raw.rb
--- a/test/phlex/component/raw.rb
+++ b/test/phlex/view/raw.rb
@@ -2,11 +2,11 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "raw content" do
- component do
+ view do
def template
raw %(<h1 class="test">Hello</h1>)
end
diff --git a/test/phlex/component/renderable/format.rb b/test/phlex/view/renderable/format.rb
similarity index 70%
rename from test/phlex/component/renderable/format.rb
rename to test/phlex/view/renderable/format.rb
--- a/test/phlex/component/renderable/format.rb
+++ b/test/phlex/view/renderable/format.rb
@@ -2,10 +2,10 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
- component
+ view
with "format" do
it "returns :html" do
diff --git a/test/phlex/component/renderable/render.rb b/test/phlex/view/renderable/render.rb
similarity index 76%
rename from test/phlex/component/renderable/render.rb
rename to test/phlex/view/renderable/render.rb
--- a/test/phlex/component/renderable/render.rb
+++ b/test/phlex/view/renderable/render.rb
@@ -2,14 +2,14 @@
require "test_helper"
-Example = Class.new(Phlex::Component)
+Example = Class.new(Phlex::View)
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "#render" do
with "a component class" do
- component do
+ view do
def template
render Example
end
@@ -22,16 +22,16 @@ def template
end
with "another component" do
- other_component = Class.new Phlex::Component do
+ other_view = Class.new Phlex::View do
def template(&block)
div(&block)
end
end
with "markup" do
- component do
+ view do
define_method :template do
- render(other_component.new) do
+ render(other_view.new) do
h1 "Hi!"
end
end
@@ -43,9 +43,9 @@ def template(&block)
end
with "text" do
- component do
+ view do
define_method :template do
- render(other_component.new) { "Hello world!" }
+ render(other_view.new) { "Hello world!" }
end
end
diff --git a/test/phlex/component/tags.rb b/test/phlex/view/tags.rb
similarity index 92%
rename from test/phlex/component/tags.rb
rename to test/phlex/view/tags.rb
--- a/test/phlex/component/tags.rb
+++ b/test/phlex/view/tags.rb
@@ -2,12 +2,12 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
Phlex::HTML::STANDARD_ELEMENTS.each do |method_name, tag|
with "<#{method_name}> with text content and attributes" do
- component do
+ view do
define_method :template do
send(method_name, "content", class: "class", id: "id", disabled: true, selected: false)
end
@@ -19,7 +19,7 @@
end
with "<#{method_name}> with block content and attributes" do
- component do
+ view do
define_method :template do
send(method_name, class: "class", id: "id", disabled: true, selected: false) { h1 "Hello" }
end
@@ -31,7 +31,7 @@
end
with "<#{method_name}> with block text content and attributes" do
- component do
+ view do
define_method :template do
send(method_name, class: "class", id: "id", disabled: true, selected: false) { "content" }
end
@@ -45,7 +45,7 @@
Phlex::HTML::VOID_ELEMENTS.each do |method_name, tag|
with "<#{method_name}> with attributes" do
- component do
+ view do
define_method :template do
send(method_name, class: "class", id: "id", disabled: true, selected: false)
end
diff --git a/test/phlex/component/text.rb b/test/phlex/view/text.rb
similarity index 83%
rename from test/phlex/component/text.rb
rename to test/phlex/view/text.rb
--- a/test/phlex/component/text.rb
+++ b/test/phlex/view/text.rb
@@ -2,11 +2,11 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "text" do
- component do
+ view do
def template
text "Hi"
end
@@ -18,7 +18,7 @@ def template
end
with "int as text" do
- component do
+ view do
def template
text 1
end
@@ -30,7 +30,7 @@ def template
end
with "float as text" do
- component do
+ view do
def template
text 2.0
end
diff --git a/test/phlex/component/tokens.rb b/test/phlex/view/tokens.rb
similarity index 89%
rename from test/phlex/component/tokens.rb
rename to test/phlex/view/tokens.rb
--- a/test/phlex/component/tokens.rb
+++ b/test/phlex/view/tokens.rb
@@ -2,12 +2,12 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "conditional classes" do
with "symbol conditionals" do
- component do
+ view do
def template
a "Home", href: "/", **classes("a", "b", "c", active?: "active", primary?: "primary")
end
@@ -28,7 +28,7 @@ def primary?
end
with "proc conditionals" do
- component do
+ view do
def template
a "Home", href: "/", **classes("a", "b", "c",
-> { true } => "true",
diff --git a/test/phlex/component/whitespace.rb b/test/phlex/view/whitespace.rb
similarity index 79%
rename from test/phlex/component/whitespace.rb
rename to test/phlex/view/whitespace.rb
--- a/test/phlex/component/whitespace.rb
+++ b/test/phlex/view/whitespace.rb
@@ -2,11 +2,11 @@
require "test_helper"
-describe Phlex::Component do
- extend ComponentHelper
+describe Phlex::View do
+ extend ViewHelper
with "whitespace" do
- component do
+ view do
def template
a "Home"
whitespace
|
Rename `Phlex::Component` → `Phlex::View`
Phlex can be used to build layouts and pages as well as components. I think the word "component" it quite limiting. It refers to _part of something_ but not _the whole of something_.
| 2022-09-27T13:58:22
|
ruby
|
Hard
|
|
yippee-fun/phlex
| 817
|
yippee-fun__phlex-817
|
[
"816"
] |
86e565d3f0f81272e4f3ffca364f4f8b004ca111
|
diff --git a/lib/phlex/sgml.rb b/lib/phlex/sgml.rb
--- a/lib/phlex/sgml.rb
+++ b/lib/phlex/sgml.rb
@@ -401,9 +401,16 @@ def __attributes__(attributes, buffer = +"")
unless Phlex::SGML::SafeObject === v
normalized_name = lower_name.delete("^a-z-")
- if value != true && REF_ATTRIBUTES.include?(normalized_name) && value.downcase.delete("^a-z:").start_with?("javascript:")
- # We just ignore these because they were likely not specified by the developer.
- next
+ if value != true && REF_ATTRIBUTES.include?(normalized_name)
+ case value
+ when String
+ if value.downcase.delete("^a-z:").start_with?("javascript:")
+ # We just ignore these because they were likely not specified by the developer.
+ next
+ end
+ else
+ raise Phlex::ArgumentError.new("Invalid attribute value for #{k}: #{v.inspect}.")
+ end
end
if normalized_name.bytesize > 2 && normalized_name.start_with?("on") && !normalized_name.include?("-")
|
diff --git a/quickdraw/sgml/attributes.test.rb b/quickdraw/sgml/attributes.test.rb
--- a/quickdraw/sgml/attributes.test.rb
+++ b/quickdraw/sgml/attributes.test.rb
@@ -26,6 +26,14 @@
end
end
+test "href with hash" do
+ expect {
+ phlex { a(href: {}) }
+ }.to_raise(Phlex::ArgumentError) do |error|
+ expect(error.message) == "Invalid attribute value for href: #{{}.inspect}."
+ end
+end
+
test "unsafe href attribute" do
expect(
phlex { div(href: "javascript:alert('hello')") },
|
If you pass a Hash to `href`, you get an error about calling `downcase` on it
| 2024-10-29T21:44:08
|
ruby
|
Hard
|
|
rubyzip/rubyzip
| 489
|
rubyzip__rubyzip-489
|
[
"485"
] |
22a54853e6c1dc39579e6d18a527ab11b200b637
|
diff --git a/lib/zip/entry.rb b/lib/zip/entry.rb
--- a/lib/zip/entry.rb
+++ b/lib/zip/entry.rb
@@ -164,8 +164,9 @@ def name_safe?
return false unless cleanpath.relative?
root = ::File::SEPARATOR
- naive_expanded_path = ::File.join(root, cleanpath.to_s)
- ::File.absolute_path(cleanpath.to_s, root) == naive_expanded_path
+ naive = ::File.join(root, cleanpath.to_s)
+ # Allow for Windows drive mappings at the root.
+ ::File.absolute_path(cleanpath.to_s, root).match?(/([A-Z]:)?#{naive}/i)
end
def local_entry_offset #:nodoc:all
diff --git a/lib/zip/filesystem.rb b/lib/zip/filesystem.rb
--- a/lib/zip/filesystem.rb
+++ b/lib/zip/filesystem.rb
@@ -620,7 +620,7 @@ def each
end
def expand_path(path)
- expanded = ::File.expand_path(path, @pwd)
+ expanded = path.start_with?('/') ? path.dup : ::File.join(@pwd, path)
expanded.gsub!(/\/\.(\/|$)/, '')
expanded.gsub!(/[^\/]+\/\.\.(\/|$)/, '')
expanded.empty? ? '/' : expanded
diff --git a/lib/zip/output_stream.rb b/lib/zip/output_stream.rb
--- a/lib/zip/output_stream.rb
+++ b/lib/zip/output_stream.rb
@@ -30,7 +30,7 @@ def initialize(file_name, stream = false, encrypter = nil)
super()
@file_name = file_name
@output_stream = if stream
- iostream = @file_name.dup
+ iostream = Zip::RUNNING_ON_WINDOWS ? @file_name : @file_name.dup
iostream.reopen(@file_name)
iostream.rewind
iostream
|
diff --git a/test/data/.gitattributes b/test/data/.gitattributes
new file mode 100644
--- /dev/null
+++ b/test/data/.gitattributes
@@ -0,0 +1,2 @@
+file1.txt eol=lf
+file2.txt eol=lf
diff --git a/test/entry_test.rb b/test/entry_test.rb
--- a/test/entry_test.rb
+++ b/test/entry_test.rb
@@ -151,32 +151,35 @@ def test_entry_name_cannot_start_with_slash
end
def test_store_file_without_compression
- File.delete('/tmp/no_compress.zip') if File.exist?('/tmp/no_compress.zip')
- files = Dir[File.join('test/data/globTest', '**', '**')]
+ Dir.mktmpdir do |tmp|
+ tmp_zip = File.join(tmp, 'no_compress.zip')
- Zip.setup do |z|
- z.write_zip64_support = false
- end
+ Zip.setup do |z|
+ z.write_zip64_support = false
+ end
- zipfile = Zip::File.open('/tmp/no_compress.zip', Zip::File::CREATE)
- mimetype_entry = Zip::Entry.new(
- zipfile, # @zipfile
- 'mimetype', # @name
- compression_method: Zip::Entry::STORED
- )
+ zipfile = Zip::File.open(tmp_zip, Zip::File::CREATE)
+
+ mimetype_entry = Zip::Entry.new(
+ zipfile, # @zipfile
+ 'mimetype', # @name
+ compression_method: Zip::Entry::STORED
+ )
+ zipfile.add(mimetype_entry, 'test/data/mimetype')
- zipfile.add(mimetype_entry, 'test/data/mimetype')
+ files = Dir[File.join('test/data/globTest', '**', '**')]
+ files.each do |file|
+ zipfile.add(file.sub('test/data/globTest/', ''), file)
+ end
- files.each do |file|
- zipfile.add(file.sub('test/data/globTest/', ''), file)
- end
- zipfile.close
+ zipfile.close
- f = File.open('/tmp/no_compress.zip', 'rb')
- first_100_bytes = f.read(100)
- f.close
+ f = File.open(tmp_zip, 'rb')
+ first_100_bytes = f.read(100)
+ f.close
- assert_match(/mimetypeapplication\/epub\+zip/, first_100_bytes)
+ assert_match(/mimetypeapplication\/epub\+zip/, first_100_bytes)
+ end
end
def test_encrypted?
diff --git a/test/file_options_test.rb b/test/file_options_test.rb
--- a/test/file_options_test.rb
+++ b/test/file_options_test.rb
@@ -58,6 +58,10 @@ def test_restore_times_true
zip.extract(ENTRY_2, EXTPATH_2)
end
+ # this test is disabled on Windows for now, waiting for #486.
+ # please remove this after merging #486.
+ skip if Zip::RUNNING_ON_WINDOWS
+
assert_time_equal(::File.mtime(TXTPATH), ::File.mtime(EXTPATH_1))
assert_time_equal(::File.mtime(TXTPATH), ::File.mtime(EXTPATH_2))
end
diff --git a/test/file_test.rb b/test/file_test.rb
--- a/test/file_test.rb
+++ b/test/file_test.rb
@@ -113,21 +113,21 @@ def test_get_output_stream
end
def test_open_buffer_with_string
- string = File.read('test/data/rubycode.zip')
+ string = File.read('test/data/rubycode.zip', mode: 'rb')
::Zip::File.open_buffer string do |zf|
assert zf.entries.map(&:name).include?('zippedruby1.rb')
end
end
def test_open_buffer_with_stringio
- string_io = StringIO.new File.read('test/data/rubycode.zip')
+ string_io = StringIO.new File.read('test/data/rubycode.zip', mode: 'rb')
::Zip::File.open_buffer string_io do |zf|
assert zf.entries.map(&:name).include?('zippedruby1.rb')
end
end
def test_close_buffer_with_stringio
- string_io = StringIO.new File.read('test/data/rubycode.zip')
+ string_io = StringIO.new File.read('test/data/rubycode.zip', mode: 'rb')
zf = ::Zip::File.open_buffer string_io
assert_nil zf.close
end
@@ -178,7 +178,7 @@ def test_open_buffer_with_io_and_block
end
def test_open_buffer_without_block
- string_io = StringIO.new File.read('test/data/rubycode.zip')
+ string_io = StringIO.new File.read('test/data/rubycode.zip', mode: 'rb')
zf = ::Zip::File.open_buffer string_io
assert zf.entries.map(&:name).include?('zippedruby1.rb')
end
@@ -285,16 +285,20 @@ def test_add_stored
end
def test_recover_permissions_after_add_files_to_archive
+ # Windows NT does not support granular permissions
+ skip if Zip::RUNNING_ON_WINDOWS
+
src_zip = TEST_ZIP.zip_name
- ::File.chmod(0o664, src_zip)
- src_file = 'test/data/file2.txt'
- entry_name = 'newEntryName.rb'
- assert_equal(::File.stat(src_zip).mode, 0o100664)
assert(::File.exist?(src_zip))
+
+ ::File.chmod(0o664, src_zip)
+ assert_equal(0o100664, ::File.stat(src_zip).mode)
+
zf = ::Zip::File.new(src_zip, ::Zip::File::CREATE)
- zf.add(entry_name, src_file)
+ zf.add('newEntryName.rb', 'test/data/file2.txt')
zf.close
- assert_equal(::File.stat(src_zip).mode, 0o100664)
+
+ assert_equal(0o100664, ::File.stat(src_zip).mode)
end
def test_add_existing_entry_name
diff --git a/test/gentestfiles.rb b/test/gentestfiles.rb
--- a/test/gentestfiles.rb
+++ b/test/gentestfiles.rb
@@ -79,19 +79,19 @@ def self.create_test_zips
"zip -q #{TEST_ZIP1.zip_name} -d test/data/file2.txt"
)
- File.open('test/data/generated/empty.txt', 'w') {} # Empty file.
- File.open('test/data/generated/empty_chmod640.txt', 'w') {} # Empty file.
+ File.open('test/data/generated/empty.txt', 'wb') {} # Empty file.
+ File.open('test/data/generated/empty_chmod640.txt', 'wb') {} # Empty file.
::File.chmod(0o640, 'test/data/generated/empty_chmod640.txt')
- File.open('test/data/generated/short.txt', 'w') { |file| file << 'ABCDEF' }
+ File.open('test/data/generated/short.txt', 'wb') { |file| file << 'ABCDEF' }
test_text = ''
- File.open('test/data/file2.txt') { |file| test_text = file.read }
- File.open('test/data/generated/longAscii.txt', 'w') do |file|
+ File.open('test/data/file2.txt', 'rb') { |file| test_text = file.read }
+ File.open('test/data/generated/longAscii.txt', 'wb') do |file|
file << test_text while file.tell < 1E5
end
binary_pattern = ''
- File.open('test/data/generated/empty.zip') do |file|
+ File.open('test/data/generated/empty.zip', 'rb') do |file|
binary_pattern = file.read
end
binary_pattern *= 4
@@ -108,7 +108,7 @@ def self.create_test_zips
if RUBY_PLATFORM.match?(/mswin|mingw|cygwin/)
raise "failed to add comment to test zip '#{TEST_ZIP2.zip_name}'" \
unless system(
- "echo #{TEST_ZIP2.comment}| zip -zq #{TEST_ZIP2.zip_name}\""
+ "cmd /c \"<NUL set /p = \"#{TEST_ZIP2.comment}\"| zip -zq #{TEST_ZIP2.zip_name}\""
)
else
# without bash system interprets everything after echo as parameters to
diff --git a/test/input_stream_test.rb b/test/input_stream_test.rb
--- a/test/input_stream_test.rb
+++ b/test/input_stream_test.rb
@@ -42,13 +42,13 @@ def test_open_buffer_with_block
end
def test_open_string_io_without_block
- string_io = ::StringIO.new(::File.read(TestZipFile::TEST_ZIP2.zip_name))
+ string_io = ::StringIO.new(::File.read(TestZipFile::TEST_ZIP2.zip_name, mode: 'rb'))
zis = ::Zip::InputStream.open(string_io)
assert_stream_contents(zis, TestZipFile::TEST_ZIP2)
end
def test_open_string_io_with_block
- string_io = ::StringIO.new(::File.read(TestZipFile::TEST_ZIP2.zip_name))
+ string_io = ::StringIO.new(::File.read(TestZipFile::TEST_ZIP2.zip_name, mode: 'rb'))
::Zip::InputStream.open(string_io) do |zis|
assert_stream_contents(zis, TestZipFile::TEST_ZIP2)
assert_equal(true, zis.eof?)
@@ -106,7 +106,7 @@ def test_incomplete_reads
end
def test_incomplete_reads_from_string_io
- string_io = ::StringIO.new(::File.read(TestZipFile::TEST_ZIP2.zip_name))
+ string_io = ::StringIO.new(::File.read(TestZipFile::TEST_ZIP2.zip_name, mode: 'rb'))
::Zip::InputStream.open(string_io) do |zis|
entry = zis.get_next_entry # longAscii.txt
assert_equal(false, zis.eof?)
diff --git a/test/output_stream_test.rb b/test/output_stream_test.rb
--- a/test/output_stream_test.rb
+++ b/test/output_stream_test.rb
@@ -85,7 +85,7 @@ def test_put_next_entry
zos << stored_text
end
- assert(File.read(TEST_ZIP.zip_name)[stored_text])
+ assert(File.read(TEST_ZIP.zip_name, mode: 'rb')[stored_text])
::Zip::File.open(TEST_ZIP.zip_name) do |zf|
assert_equal(stored_text, zf.read(entry_name))
end
diff --git a/test/pass_thru_decompressor_test.rb b/test/pass_thru_decompressor_test.rb
--- a/test/pass_thru_decompressor_test.rb
+++ b/test/pass_thru_decompressor_test.rb
@@ -6,7 +6,7 @@ class PassThruDecompressorTest < MiniTest::Test
def setup
super
- @file = File.new(TEST_FILE)
+ @file = File.new(TEST_FILE, 'rb')
@decompressor = ::Zip::PassThruDecompressor.new(@file, File.size(TEST_FILE))
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -57,7 +57,7 @@ module DecompressorTests
def setup
@ref_text = ''
- File.open(TEST_FILE) { |f| @ref_text = f.read }
+ File.open(TEST_FILE, 'rb') { |f| @ref_text = f.read }
@ref_lines = @ref_text.split($INPUT_RECORD_SEPARATOR)
end
|
Many tests failing under Windows.
A lot of failures appear to be due to hardcoded paths into places like `/tmp` which should be easy to fix. Other tests appear to fail due to unexpected line endings - `\r\n` vs `\n` - which I think suggests that we're testing what comes out of a zip file (`\n`) with a text file that has been auto-converted to `\r\n` in the checkout process?
| 2021-06-06T13:05:49
|
ruby
|
Hard
|
|
rubyzip/rubyzip
| 421
|
rubyzip__rubyzip-421
|
[
"395"
] |
d3027eab9556c7b803686a7256843b4a764ef116
|
diff --git a/lib/zip/extra_field/universal_time.rb b/lib/zip/extra_field/universal_time.rb
--- a/lib/zip/extra_field/universal_time.rb
+++ b/lib/zip/extra_field/universal_time.rb
@@ -4,24 +4,51 @@ class ExtraField::UniversalTime < ExtraField::Generic
HEADER_ID = 'UT'
register_map
+ ATIME_MASK = 0b010
+ CTIME_MASK = 0b100
+ MTIME_MASK = 0b001
+
def initialize(binstr = nil)
@ctime = nil
@mtime = nil
@atime = nil
- @flag = nil
- binstr && merge(binstr)
+ @flag = 0
+
+ merge(binstr) unless binstr.nil?
+ end
+
+ attr_reader :atime, :ctime, :mtime, :flag
+
+ def atime=(time)
+ @flag = time.nil? ? @flag & ~ATIME_MASK : @flag | ATIME_MASK
+ @atime = time
end
- attr_accessor :atime, :ctime, :mtime, :flag
+ def ctime=(time)
+ @flag = time.nil? ? @flag & ~CTIME_MASK : @flag | CTIME_MASK
+ @ctime = time
+ end
+
+ def mtime=(time)
+ @flag = time.nil? ? @flag & ~MTIME_MASK : @flag | MTIME_MASK
+ @mtime = time
+ end
def merge(binstr)
return if binstr.empty?
+
size, content = initial_parse(binstr)
- size || return
- @flag, mtime, atime, ctime = content.unpack('CVVV')
- mtime && @mtime ||= ::Zip::DOSTime.at(mtime)
- atime && @atime ||= ::Zip::DOSTime.at(atime)
- ctime && @ctime ||= ::Zip::DOSTime.at(ctime)
+ return if !size || size <= 0
+
+ @flag, *times = content.unpack('Cl<l<l<')
+
+ # Parse the timestamps, in order, based on which flags are set.
+ return if times[0].nil?
+ @mtime ||= ::Zip::DOSTime.at(times.shift) unless @flag & MTIME_MASK == 0
+ return if times[0].nil?
+ @atime ||= ::Zip::DOSTime.at(times.shift) unless @flag & ATIME_MASK == 0
+ return if times[0].nil?
+ @ctime ||= ::Zip::DOSTime.at(times.shift) unless @flag & CTIME_MASK == 0
end
def ==(other)
@@ -32,15 +59,15 @@ def ==(other)
def pack_for_local
s = [@flag].pack('C')
- @flag & 1 != 0 && s << [@mtime.to_i].pack('V')
- @flag & 2 != 0 && s << [@atime.to_i].pack('V')
- @flag & 4 != 0 && s << [@ctime.to_i].pack('V')
+ s << [@mtime.to_i].pack('l<') unless @flag & MTIME_MASK == 0
+ s << [@atime.to_i].pack('l<') unless @flag & ATIME_MASK == 0
+ s << [@ctime.to_i].pack('l<') unless @flag & CTIME_MASK == 0
s
end
def pack_for_c_dir
s = [@flag].pack('C')
- @flag & 1 == 1 && s << [@mtime.to_i].pack('V')
+ s << [@mtime.to_i].pack('l<') unless @flag & MTIME_MASK == 0
s
end
end
|
diff --git a/test/extra_field_ut_test.rb b/test/extra_field_ut_test.rb
new file mode 100644
--- /dev/null
+++ b/test/extra_field_ut_test.rb
@@ -0,0 +1,97 @@
+require 'test_helper'
+
+class ZipExtraFieldUTTest < MiniTest::Test
+
+ PARSE_TESTS = [
+ ["UT\x05\x00\x01PS>A", 0b001, true, true, false],
+ ["UT\x05\x00\x02PS>A", 0b010, false, true, true],
+ ["UT\x05\x00\x04PS>A", 0b100, true, false, true],
+ ["UT\x09\x00\x03PS>APS>A", 0b011, false, true, false],
+ ["UT\x09\x00\x05PS>APS>A", 0b101, true, false, false],
+ ["UT\x09\x00\x06PS>APS>A", 0b110, false, false, true],
+ ["UT\x13\x00\x07PS>APS>APS>A", 0b111, false, false, false]
+ ]
+
+ def test_parse
+ PARSE_TESTS.each do |bin, flags, a, c, m|
+ ut = ::Zip::ExtraField::UniversalTime.new(bin)
+ assert_equal(flags, ut.flag)
+ assert(ut.atime.nil? == a)
+ assert(ut.ctime.nil? == c)
+ assert(ut.mtime.nil? == m)
+ end
+ end
+
+ def test_parse_size_zero
+ ut = ::Zip::ExtraField::UniversalTime.new("UT\x00")
+ assert_equal(0b000, ut.flag)
+ assert_nil(ut.atime)
+ assert_nil(ut.ctime)
+ assert_nil(ut.mtime)
+ end
+
+ def test_parse_size_nil
+ ut = ::Zip::ExtraField::UniversalTime.new('UT')
+ assert_equal(0b000, ut.flag)
+ assert_nil(ut.atime)
+ assert_nil(ut.ctime)
+ assert_nil(ut.mtime)
+ end
+
+ def test_parse_nil
+ ut = ::Zip::ExtraField::UniversalTime.new
+ assert_equal(0b000, ut.flag)
+ assert_nil(ut.atime)
+ assert_nil(ut.ctime)
+ assert_nil(ut.mtime)
+ end
+
+ def test_set_clear_times
+ time = ::Zip::DOSTime.now
+ ut = ::Zip::ExtraField::UniversalTime.new
+ assert_equal(0b000, ut.flag)
+
+ ut.mtime = time
+ assert_equal(0b001, ut.flag)
+ assert_equal(time, ut.mtime)
+
+ ut.ctime = time
+ assert_equal(0b101, ut.flag)
+ assert_equal(time, ut.ctime)
+
+ ut.atime = time
+ assert_equal(0b111, ut.flag)
+ assert_equal(time, ut.atime)
+
+ ut.ctime = nil
+ assert_equal(0b011, ut.flag)
+ assert_nil ut.ctime
+
+ ut.mtime = nil
+ assert_equal(0b010, ut.flag)
+ assert_nil ut.mtime
+
+ ut.atime = nil
+ assert_equal(0b000, ut.flag)
+ assert_nil ut.atime
+ end
+
+ def test_pack
+ time = ::Zip::DOSTime.at('PS>A'.unpack1('l<'))
+ ut = ::Zip::ExtraField::UniversalTime.new
+ assert_equal("\x00", ut.pack_for_local)
+ assert_equal("\x00", ut.pack_for_c_dir)
+
+ ut.mtime = time
+ assert_equal("\x01PS>A", ut.pack_for_local)
+ assert_equal("\x01PS>A", ut.pack_for_c_dir)
+
+ ut.atime = time
+ assert_equal("\x03PS>APS>A", ut.pack_for_local)
+ assert_equal("\x03PS>A", ut.pack_for_c_dir)
+
+ ut.ctime = time
+ assert_equal("\x07PS>APS>APS>A", ut.pack_for_local)
+ assert_equal("\x07PS>A", ut.pack_for_c_dir)
+ end
+end
|
Options not working in File class
This code
https://github.com/rubyzip/rubyzip/blob/249775f5637e6d65112574b3ac1763dc2393c7f6/lib/zip/file.rb#L88-L89
doesn't do what it is intended to do, because when you pass in `restore_permissions: false` or `restore_times: false`, it will be evaluating to `false || true`, which will always be `true`
|
Interestingly the options code doesn't agree with the comments about defaults above either:
https://github.com/rubyzip/rubyzip/blob/94b7fa276992933592d69eb6bb17fc09105f8395/lib/zip/file.rb#L56-L61
vs
https://github.com/rubyzip/rubyzip/blob/94b7fa276992933592d69eb6bb17fc09105f8395/lib/zip/file.rb#L101-L103
I'll cook up a PR that fixes this issue and works as expected to keep the test passing - adjusting the comments as necessary.
Also, depressingly, it doesn't matter what those options are set to; the tests always all pass. I'll add some tests.
So, on further investigation, I don't think that `restore_times: true` can ever work, because I don't think that when you extract a file it ever even attempts to set the timestamp.
As far as I can tell, this is the code which does the actual extraction to a file:
https://github.com/rubyzip/rubyzip/blob/34d2074ecbf6ef8557c29efc03a585c309be5c4b/lib/zip/entry.rb#L597-L624
And there's nothing there that would restore times...
I'm looking at this in more depth.
Sorry, overzealous auto-closing. This is still a problem.
| 2019-10-30T17:21:57
|
ruby
|
Hard
|
yippee-fun/phlex
| 308
|
yippee-fun__phlex-308
|
[
"262"
] |
e8a4afd4026ce4dd6aaf1bcf09dd0daaccdc6fec
|
diff --git a/docs/components/code_block.rb b/docs/components/code_block.rb
--- a/docs/components/code_block.rb
+++ b/docs/components/code_block.rb
@@ -11,7 +11,7 @@ def initialize(code, syntax:)
def template
pre(class: "highlight p-5 whitespace-pre-wrap bg-stone-50") {
- raw FORMATTER.format(
+ unsafe_raw FORMATTER.format(
lexer.lex(@code)
)
}
diff --git a/docs/components/heading.rb b/docs/components/heading.rb
--- a/docs/components/heading.rb
+++ b/docs/components/heading.rb
@@ -3,7 +3,7 @@
module Components
class Heading < Phlex::View
def template(&block)
- h2(class: "text-2xl font-semibold mt-10 mb-5") { raw(&block) }
+ h2(class: "text-2xl font-semibold mt-10 mb-5") { unsafe_raw(&block) }
end
end
end
diff --git a/docs/components/layout.rb b/docs/components/layout.rb
--- a/docs/components/layout.rb
+++ b/docs/components/layout.rb
@@ -17,7 +17,7 @@ def template(&block)
meta name: "viewport", content: "width=device-width, initial-scale=1"
title { @title }
link href: "/application.css", rel: "stylesheet"
- style { raw Rouge::Theme.find("github").render(scope: ".highlight") }
+ style { unsafe_raw Rouge::Theme.find("github").render(scope: ".highlight") }
end
body class: "text-stone-700" do
@@ -25,7 +25,7 @@ def template(&block)
header class: "border-b py-4 px-4 lg:px-10 flex justify-between items-center sticky top-0 left-0 bg-white z-50" do
div class: "flex flex-row items-center gap-2" do
label for: "nav-toggle", class: "cursor-pointer lg:hidden" do
- raw '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-8 h-8"> <path fill-rule="evenodd" d="M3 6.75A.75.75 0 013.75 6h16.5a.75.75 0 010 1.5H3.75A.75.75 0 013 6.75zM3 12a.75.75 0 01.75-.75h16.5a.75.75 0 010 1.5H3.75A.75.75 0 013 12zm0 5.25a.75.75 0 01.75-.75h16.5a.75.75 0 010 1.5H3.75a.75.75 0 01-.75-.75z" clip-rule="evenodd" /> </svg>'
+ unsafe_raw '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-8 h-8"> <path fill-rule="evenodd" d="M3 6.75A.75.75 0 013.75 6h16.5a.75.75 0 010 1.5H3.75A.75.75 0 013 6.75zM3 12a.75.75 0 01.75-.75h16.5a.75.75 0 010 1.5H3.75A.75.75 0 013 12zm0 5.25a.75.75 0 01.75-.75h16.5a.75.75 0 010 1.5H3.75a.75.75 0 01-.75-.75z" clip-rule="evenodd" /> </svg>'
end
a(href: "/", class: "block") { img src: "/assets/logo.png", width: "100" }
diff --git a/docs/components/markdown.rb b/docs/components/markdown.rb
--- a/docs/components/markdown.rb
+++ b/docs/components/markdown.rb
@@ -34,7 +34,7 @@ def initialize(content)
end
def template
- raw MARKDOWN.render(@content)
+ unsafe_raw MARKDOWN.render(@content)
end
end
end
diff --git a/docs/components/title.rb b/docs/components/title.rb
--- a/docs/components/title.rb
+++ b/docs/components/title.rb
@@ -3,7 +3,7 @@
module Components
class Title < Phlex::View
def template(&block)
- h1(class: "text-3xl font-semibold my-5") { raw(&block) }
+ h1(class: "text-3xl font-semibold my-5") { unsafe_raw(&block) }
end
end
end
diff --git a/docs/pages/rails/helpers.rb b/docs/pages/rails/helpers.rb
--- a/docs/pages/rails/helpers.rb
+++ b/docs/pages/rails/helpers.rb
@@ -35,7 +35,7 @@ def template
Using these is equvalent to passing the output of the original Rails helpers to `raw`, e.g:
```ruby
- raw helpers.javascript_include_tag
+ unsafe_raw helpers.javascript_include_tag
```
## Including proxies
diff --git a/lib/phlex/rails/helpers.rb b/lib/phlex/rails/helpers.rb
--- a/lib/phlex/rails/helpers.rb
+++ b/lib/phlex/rails/helpers.rb
@@ -29,7 +29,7 @@ def action_cable_meta_tag
module FormWith
def form_with(*args, **kwargs, &block)
- raw @_view_context.form_with(*args, **kwargs) { |form|
+ @_target << @_view_context.form_with(*args, **kwargs) { |form|
capture do
yield(
Phlex::Buffered.new(form, buffer: @_target)
diff --git a/lib/phlex/renderable.rb b/lib/phlex/renderable.rb
--- a/lib/phlex/renderable.rb
+++ b/lib/phlex/renderable.rb
@@ -28,7 +28,7 @@ def render_in(view_context, &block)
if unchanged
if defined?(ActiveSupport::SafeBuffer) && output.is_a?(ActiveSupport::SafeBuffer)
- raw(output)
+ unsafe_raw(output)
else
text(output)
end
diff --git a/lib/phlex/view.rb b/lib/phlex/view.rb
--- a/lib/phlex/view.rb
+++ b/lib/phlex/view.rb
@@ -101,7 +101,7 @@ def doctype
nil
end
- def raw(content = nil, &block)
+ def unsafe_raw(content = nil, &block)
@_target << (content || instance_exec(&block))
nil
end
|
diff --git a/test/phlex/view/raw.rb b/test/phlex/view/unsafe_raw.rb
similarity index 85%
rename from test/phlex/view/raw.rb
rename to test/phlex/view/unsafe_raw.rb
--- a/test/phlex/view/raw.rb
+++ b/test/phlex/view/unsafe_raw.rb
@@ -8,7 +8,7 @@
with "raw content" do
view do
def template
- raw %(<h1 class="test">Hello</h1>)
+ unsafe_raw %(<h1 class="test">Hello</h1>)
end
end
|
Rename `raw` to indicate just how unsafe it is
| 2022-10-31T20:22:16
|
ruby
|
Hard
|
|
hyperium/h2
| 160
|
hyperium__h2-160
|
[
"11"
] |
0ed146001640f12e538ac5eed7c45837e2d63d69
|
diff --git a/src/proto/streams/prioritize.rs b/src/proto/streams/prioritize.rs
--- a/src/proto/streams/prioritize.rs
+++ b/src/proto/streams/prioritize.rs
@@ -1,7 +1,7 @@
use super::*;
use super::store::Resolve;
-use frame::Reason;
+use frame::{Reason, StreamId};
use codec::UserError;
use codec::UserError::*;
@@ -11,9 +11,18 @@ use bytes::buf::Take;
use std::{cmp, fmt};
use std::io;
+/// # Warning
+///
+/// Queued streans are ordered by stream ID, as we need to ensure that
+/// lower-numbered streams are sent headers before higher-numbered ones.
+/// This is because "idle" stream IDs – those which have been initiated but
+/// have yet to receive frames – will be implicitly closed on receipt of a
+/// frame on a higher stream ID. If these queues was not ordered by stream
+/// IDs, some mechanism would be necessary to ensure that the lowest-numberedh]
+/// idle stream is opened first.
#[derive(Debug)]
pub(super) struct Prioritize {
- /// Queue of streams waiting for socket capacity to send a frame
+ /// Queue of streams waiting for socket capacity to send a frame.
pending_send: store::Queue<stream::NextSend>,
/// Queue of streams waiting for window capacity to produce data.
@@ -24,6 +33,9 @@ pub(super) struct Prioritize {
/// Connection level flow control governing sent data
flow: FlowControl,
+
+ /// Stream ID of the last stream opened.
+ last_opened_id: StreamId,
}
pub(crate) struct Prioritized<B> {
@@ -55,6 +67,7 @@ impl Prioritize {
pending_capacity: store::Queue::new(),
pending_open: store::Queue::new(),
flow: flow,
+ last_opened_id: StreamId::ZERO
}
}
@@ -613,6 +626,11 @@ impl Prioritize {
trace!("pop_frame; frame={:?}", frame);
+ if cfg!(debug_assertions) && stream.state.is_idle() {
+ debug_assert!(stream.id > self.last_opened_id);
+ self.last_opened_id = stream.id;
+ }
+
if !stream.pending_send.is_empty() || stream.state.is_canceled() {
// TODO: Only requeue the sender IF it is ready to send
// the next frame. i.e. don't requeue it if the next
@@ -636,6 +654,7 @@ impl Prioritize {
while counts.can_inc_num_send_streams() {
if let Some(mut stream) = self.pending_open.pop(store) {
trace!("schedule_pending_open; stream={:?}", stream.id);
+
counts.inc_num_send_streams();
self.pending_send.push(&mut stream);
if let Some(task) = stream.open_task.take() {
diff --git a/src/proto/streams/state.rs b/src/proto/streams/state.rs
--- a/src/proto/streams/state.rs
+++ b/src/proto/streams/state.rs
@@ -331,6 +331,13 @@ impl State {
}
}
+ pub fn is_idle(&self) -> bool {
+ match self.inner {
+ Idle => true,
+ _ => false,
+ }
+ }
+
pub fn ensure_recv_open(&self) -> Result<bool, proto::Error> {
use std::io;
|
diff --git a/tests/stream_states.rs b/tests/stream_states.rs
--- a/tests/stream_states.rs
+++ b/tests/stream_states.rs
@@ -367,6 +367,60 @@ fn recv_goaway_finishes_processed_streams() {
h2.join(srv).wait().expect("wait");
}
+#[test]
+fn skipped_stream_ids_are_implicitly_closed() {
+ let _ = ::env_logger::init();
+ let (io, srv) = mock::new();
+
+ let srv = srv
+ .assert_client_handshake()
+ .expect("handshake")
+ .recv_settings()
+ .recv_frame(frames::headers(5)
+ .request("GET", "https://example.com/")
+ .eos(),
+ )
+ // send the response on a lower-numbered stream, which should be
+ // implicitly closed.
+ .send_frame(frames::headers(3).response(200));
+
+ let h2 = Client::builder()
+ .initial_stream_id(5)
+ .handshake::<_, Bytes>(io)
+ .expect("handshake")
+ .and_then(|(mut client, h2)| {
+ let request = Request::builder()
+ .method(Method::GET)
+ .uri("https://example.com/")
+ .body(())
+ .unwrap();
+
+ let req = client.send_request(request, true)
+ .unwrap()
+ .0.then(|res| {
+ let err = res.unwrap_err();
+ assert_eq!(
+ err.to_string(),
+ "protocol error: unspecific protocol error detected");
+ Ok::<(), ()>(())
+ });
+ // client should see a conn error
+ let conn = h2.then(|res| {
+ let err = res.unwrap_err();
+ assert_eq!(
+ err.to_string(),
+ "protocol error: unspecific protocol error detected"
+ );
+ Ok::<(), ()>(())
+ });
+ conn.unwrap().join(req)
+ });
+
+
+ h2.join(srv).wait().expect("wait");
+
+}
+
/*
#[test]
fn send_data_after_headers_eos() {
diff --git a/tests/support/future_ext.rs b/tests/support/future_ext.rs
--- a/tests/support/future_ext.rs
+++ b/tests/support/future_ext.rs
@@ -15,6 +15,30 @@ pub trait FutureExt: Future {
}
}
+ /// Panic on success, yielding the content of an `Err`.
+ fn unwrap_err(self) -> UnwrapErr<Self>
+ where
+ Self: Sized,
+ Self::Error: fmt::Debug,
+ {
+ UnwrapErr {
+ inner: self,
+ }
+ }
+
+ /// Panic on success, with a message.
+ fn expect_err<T>(self, msg: T) -> ExpectErr<Self>
+ where
+ Self: Sized,
+ Self::Error: fmt::Debug,
+ T: fmt::Display,
+ {
+ ExpectErr{
+ inner: self,
+ msg: msg.to_string(),
+ }
+ }
+
/// Panic on error, with a message.
fn expect<T>(self, msg: T) -> Expect<Self>
where
@@ -68,6 +92,32 @@ where
}
}
+// ===== UnwrapErr ======
+
+/// Panic on success.
+pub struct UnwrapErr<T> {
+ inner: T,
+}
+
+impl<T> Future for UnwrapErr<T>
+where
+ T: Future,
+ T::Item: fmt::Debug,
+ T::Error: fmt::Debug,
+{
+ type Item = T::Error;
+ type Error = ();
+
+ fn poll(&mut self) -> Poll<T::Error, ()> {
+ let poll =
+ self.inner.poll()
+ .map_err(Async::Ready)
+ .unwrap_err();
+ Ok(poll)
+ }
+}
+
+
// ===== Expect ======
@@ -91,6 +141,32 @@ where
}
}
+// ===== ExpectErr ======
+
+/// Panic on success
+pub struct ExpectErr<T> {
+ inner: T,
+ msg: String,
+}
+
+impl<T> Future for ExpectErr<T>
+where
+ T: Future,
+ T::Item: fmt::Debug,
+ T::Error: fmt::Debug,
+{
+ type Item = T::Error;
+ type Error = ();
+
+ fn poll(&mut self) -> Poll<T::Error, ()> {
+ let poll =
+ self.inner.poll()
+ .map_err(Async::Ready)
+ .expect_err(&self.msg);
+ Ok(poll)
+ }
+}
+
// ===== Drive ======
/// Drive a future to completion while also polling the driver
|
Beware: Idle states
I noticed [the following](http://httpwg.org/specs/rfc7540.html#StreamIdentifiers):
> The first use of a new stream identifier implicitly closes all streams in the "idle" state that might have been initiated by that peer with a lower-valued stream identifier. For example, if a client sends a HEADERS frame on stream 7 without ever sending a frame on stream 5, then stream 5 transitions to the "closed" state when the first frame for stream 7 is sent or received.
We need to be careful that we don't initialize streams in the idle state such that they may be moved into reserved/open out of order. We should probably only ever initialize streams directly to a Reserved or Open (or HalfOpenRemote) state.
|
This issue can be closed once there is a test ensuring this behavior is followed. I am pretty sure this behavior is already implemented.
To expand on my comment above: we need the client's send side (i.e. prioritize.rs) to ensure that headers are sent in stream-id-order.
> In fact, h2 probably should have an assert that stream id of initial headers frame is greater than all previously sent stream ids
| 2017-10-20T18:38:54
|
rust
|
Hard
|
hyperium/h2
| 428
|
hyperium__h2-428
|
[
"427"
] |
37b66e89810f6d3d5a73760c853b86d496a166f1
|
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -47,9 +47,9 @@ jobs:
# TODO: Change it to stable after Rust 1.38 release
run: ./ci/h2spec.sh
if: matrix.rust == 'nightly'
- - name: Check minimal versions
- run: cargo clean; cargo update -Zminimal-versions; cargo check
- if: matrix.rust == 'nightly'
+ #- name: Check minimal versions
+ # run: cargo clean; cargo update -Zminimal-versions; cargo check
+ # if: matrix.rust == 'nightly'
publish_docs:
name: Publish Documentation
diff --git a/Cargo.toml b/Cargo.toml
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,18 +38,16 @@ members = [
]
[dependencies]
-futures-core-preview = "=0.3.0-alpha.19"
-futures-sink-preview = "=0.3.0-alpha.19"
-futures-util-preview = "=0.3.0-alpha.19"
-tokio-codec = "=0.2.0-alpha.6"
-tokio-io = { version = "=0.2.0-alpha.6", features = ["util"] }
-tokio-sync = "=0.2.0-alpha.6"
-bytes = "0.4.7"
-http = "0.1.8"
+futures-core = "0.3"
+futures-sink = "0.3"
+futures-util = { version = "0.3", default-features = false, features = [] }
+tokio-util = { version = "0.2", features = ["codec"] }
+tokio = { version = "0.2", features = ["io-util", "sync"] }
+bytes = "0.5.2"
+http = { git = "https://github.com/hyperium/http" } #"0.1.8"
log = "0.4.1"
fnv = "1.0.5"
slab = "0.4.0"
-string = "0.2"
indexmap = "1.0"
[dev-dependencies]
@@ -64,10 +62,12 @@ walkdir = "1.0.0"
serde = "1.0.0"
serde_json = "1.0.0"
-# Akamai example
-tokio = "=0.2.0-alpha.6"
+# Examples
+tokio = { version = "0.2", features = ["dns", "macros", "rt-core", "tcp"] }
env_logger = { version = "0.5.3", default-features = false }
-rustls = "0.16"
-tokio-rustls = "0.12.0-alpha.4"
-webpki = "0.21"
-webpki-roots = "0.17"
+# TODO: re-enable when tokio-rustls is updated
+#rustls = "0.16"
+#tokio-rustls = "0.12.0-alpha.4"
+#webpki = "0.21"
+#webpki-roots = "0.17"
+
diff --git a/examples/akamai.rs b/examples/akamai.rs
--- a/examples/akamai.rs
+++ b/examples/akamai.rs
@@ -1,3 +1,5 @@
+fn main() {}
+/* TODO: re-enable when tokio-rustls is updated
use h2::client;
use http::{Method, Request};
use tokio::net::TcpStream;
@@ -73,3 +75,4 @@ pub async fn main() -> Result<(), Box<dyn Error>> {
}
Ok(())
}
+*/
diff --git a/examples/server.rs b/examples/server.rs
--- a/examples/server.rs
+++ b/examples/server.rs
@@ -1,13 +1,11 @@
-use h2::server;
-
-use bytes::*;
-use http::{Response, StatusCode};
-
use std::error::Error;
+
+use bytes::Bytes;
+use h2::server;
use tokio::net::{TcpListener, TcpStream};
#[tokio::main]
-pub async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
let _ = env_logger::try_init();
let mut listener = TcpListener::bind("127.0.0.1:5928").await?;
@@ -25,14 +23,14 @@ pub async fn main() -> Result<(), Box<dyn Error>> {
}
}
-async fn handle(socket: TcpStream) -> Result<(), Box<dyn Error>> {
+async fn handle(socket: TcpStream) -> Result<(), Box<dyn Error + Send + Sync>> {
let mut connection = server::handshake(socket).await?;
println!("H2 connection bound");
while let Some(result) = connection.accept().await {
let (request, mut respond) = result?;
println!("GOT request: {:?}", request);
- let response = Response::builder().status(StatusCode::OK).body(()).unwrap();
+ let response = http::Response::new(());
let mut send = respond.send_response(response, false)?;
diff --git a/src/client.rs b/src/client.rs
--- a/src/client.rs
+++ b/src/client.rs
@@ -140,7 +140,7 @@ use crate::frame::{Headers, Pseudo, Reason, Settings, StreamId};
use crate::proto;
use crate::{FlowControl, PingPong, RecvStream, SendStream};
-use bytes::{Bytes, IntoBuf};
+use bytes::{Buf, Bytes};
use http::{uri, HeaderMap, Method, Request, Response, Version};
use std::fmt;
use std::future::Future;
@@ -148,7 +148,7 @@ use std::pin::Pin;
use std::task::{Context, Poll};
use std::time::Duration;
use std::usize;
-use tokio_io::{AsyncRead, AsyncWrite, AsyncWriteExt};
+use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
/// Initializes new HTTP/2.0 streams on a connection by sending a request.
///
@@ -171,15 +171,15 @@ use tokio_io::{AsyncRead, AsyncWrite, AsyncWriteExt};
/// [`Connection`]: struct.Connection.html
/// [`Clone`]: https://doc.rust-lang.org/std/clone/trait.Clone.html
/// [`Error`]: ../struct.Error.html
-pub struct SendRequest<B: IntoBuf> {
- inner: proto::Streams<B::Buf, Peer>,
+pub struct SendRequest<B: Buf> {
+ inner: proto::Streams<B, Peer>,
pending: Option<proto::OpaqueStreamRef>,
}
/// Returns a `SendRequest` instance once it is ready to send at least one
/// request.
#[derive(Debug)]
-pub struct ReadySendRequest<B: IntoBuf> {
+pub struct ReadySendRequest<B: Buf> {
inner: Option<SendRequest<B>>,
}
@@ -208,7 +208,7 @@ pub struct ReadySendRequest<B: IntoBuf> {
/// # Examples
///
/// ```
-/// # use tokio_io::*;
+/// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client;
/// # use h2::client::*;
/// #
@@ -227,7 +227,7 @@ pub struct ReadySendRequest<B: IntoBuf> {
/// # pub fn main() {}
/// ```
#[must_use = "futures do nothing unless polled"]
-pub struct Connection<T, B: IntoBuf = Bytes> {
+pub struct Connection<T, B: Buf = Bytes> {
inner: proto::Connection<T, Peer, B>,
}
@@ -286,7 +286,7 @@ pub struct PushPromises {
/// # Examples
///
/// ```
-/// # use tokio_io::*;
+/// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use bytes::Bytes;
/// #
@@ -336,8 +336,7 @@ pub(crate) struct Peer;
impl<B> SendRequest<B>
where
- B: IntoBuf + Unpin,
- B::Buf: Unpin + 'static,
+ B: Buf + Unpin + 'static,
{
/// Returns `Ready` when the connection can initialize a new HTTP/2.0
/// stream.
@@ -521,7 +520,7 @@ where
impl<B> fmt::Debug for SendRequest<B>
where
- B: IntoBuf,
+ B: Buf,
{
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
fmt.debug_struct("SendRequest").finish()
@@ -530,7 +529,7 @@ where
impl<B> Clone for SendRequest<B>
where
- B: IntoBuf,
+ B: Buf,
{
fn clone(&self) -> Self {
SendRequest {
@@ -543,7 +542,7 @@ where
#[cfg(feature = "unstable")]
impl<B> SendRequest<B>
where
- B: IntoBuf,
+ B: Buf,
{
/// Returns the number of active streams.
///
@@ -567,8 +566,7 @@ where
impl<B> Future for ReadySendRequest<B>
where
- B: IntoBuf + Unpin,
- B::Buf: Unpin + 'static,
+ B: Buf + Unpin + 'static,
{
type Output = Result<SendRequest<B>, crate::Error>;
@@ -595,7 +593,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use bytes::Bytes;
/// #
@@ -637,7 +635,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use bytes::Bytes;
/// #
@@ -672,7 +670,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use bytes::Bytes;
/// #
@@ -706,7 +704,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use bytes::Bytes;
/// #
@@ -746,7 +744,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use bytes::Bytes;
/// #
@@ -795,7 +793,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use bytes::Bytes;
/// #
@@ -836,7 +834,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use bytes::Bytes;
/// #
@@ -881,7 +879,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use bytes::Bytes;
/// #
@@ -926,7 +924,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use std::time::Duration;
/// # use bytes::Bytes;
@@ -964,7 +962,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use std::time::Duration;
/// # use bytes::Bytes;
@@ -1023,7 +1021,7 @@ impl Builder {
/// Basic usage:
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use bytes::Bytes;
/// #
@@ -1044,7 +1042,7 @@ impl Builder {
/// type will be `&'static [u8]`.
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// #
/// # async fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
@@ -1065,8 +1063,7 @@ impl Builder {
) -> impl Future<Output = Result<(SendRequest<B>, Connection<T, B>), crate::Error>>
where
T: AsyncRead + AsyncWrite + Unpin,
- B: IntoBuf + Unpin,
- B::Buf: Unpin + 'static,
+ B: Buf + Unpin + 'static,
{
Connection::handshake2(io, self.clone())
}
@@ -1098,7 +1095,7 @@ impl Default for Builder {
/// # Examples
///
/// ```
-/// # use tokio_io::*;
+/// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client;
/// # use h2::client::*;
/// #
@@ -1126,8 +1123,7 @@ where
impl<T, B> Connection<T, B>
where
T: AsyncRead + AsyncWrite + Unpin,
- B: IntoBuf + Unpin,
- B::Buf: Unpin,
+ B: Buf + Unpin + 'static,
{
async fn handshake2(
mut io: T,
@@ -1233,8 +1229,7 @@ where
impl<T, B> Future for Connection<T, B>
where
T: AsyncRead + AsyncWrite + Unpin,
- B: IntoBuf + Unpin,
- B::Buf: Unpin,
+ B: Buf + Unpin + 'static,
{
type Output = Result<(), crate::Error>;
@@ -1248,8 +1243,7 @@ impl<T, B> fmt::Debug for Connection<T, B>
where
T: AsyncRead + AsyncWrite,
T: fmt::Debug,
- B: fmt::Debug + IntoBuf,
- B::Buf: fmt::Debug,
+ B: fmt::Debug + Buf,
{
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
fmt::Debug::fmt(&self.inner, fmt)
@@ -1459,10 +1453,10 @@ impl proto::Peer for Peer {
) -> Result<Self::Poll, RecvError> {
let mut b = Response::builder();
- b.version(Version::HTTP_2);
+ b = b.version(Version::HTTP_2);
if let Some(status) = pseudo.status {
- b.status(status);
+ b = b.status(status);
}
let mut response = match b.body(()) {
diff --git a/src/codec/framed_read.rs b/src/codec/framed_read.rs
--- a/src/codec/framed_read.rs
+++ b/src/codec/framed_read.rs
@@ -14,9 +14,9 @@ use std::io;
use std::pin::Pin;
use std::task::{Context, Poll};
-use tokio_codec::FramedRead as InnerFramedRead;
-use tokio_codec::{LengthDelimitedCodec, LengthDelimitedCodecError};
-use tokio_io::AsyncRead;
+use tokio::io::AsyncRead;
+use tokio_util::codec::FramedRead as InnerFramedRead;
+use tokio_util::codec::{LengthDelimitedCodec, LengthDelimitedCodecError};
// 16 MB "sane default" taken from golang http2
const DEFAULT_SETTINGS_MAX_HEADER_LIST_SIZE: usize = 16 << 20;
diff --git a/src/codec/framed_write.rs b/src/codec/framed_write.rs
--- a/src/codec/framed_write.rs
+++ b/src/codec/framed_write.rs
@@ -3,13 +3,24 @@ use crate::codec::UserError::*;
use crate::frame::{self, Frame, FrameSize};
use crate::hpack;
-use bytes::{Buf, BufMut, BytesMut};
+use bytes::{
+ buf::{BufExt, BufMutExt},
+ Buf, BufMut, BytesMut,
+};
use std::pin::Pin;
use std::task::{Context, Poll};
-use tokio_io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncWrite};
use std::io::{self, Cursor};
+// A macro to get around a method needing to borrow &mut self
+macro_rules! limited_write_buf {
+ ($self:expr) => {{
+ let limit = $self.max_frame_size() + frame::HEADER_LEN;
+ $self.buf.get_mut().limit(limit)
+ }};
+}
+
#[derive(Debug)]
pub struct FramedWrite<T, B> {
/// Upstream `AsyncWrite`
@@ -126,12 +137,14 @@ where
}
}
Frame::Headers(v) => {
- if let Some(continuation) = v.encode(&mut self.hpack, self.buf.get_mut()) {
+ let mut buf = limited_write_buf!(self);
+ if let Some(continuation) = v.encode(&mut self.hpack, &mut buf) {
self.next = Some(Next::Continuation(continuation));
}
}
Frame::PushPromise(v) => {
- if let Some(continuation) = v.encode(&mut self.hpack, self.buf.get_mut()) {
+ let mut buf = limited_write_buf!(self);
+ if let Some(continuation) = v.encode(&mut self.hpack, &mut buf) {
self.next = Some(Next::Continuation(continuation));
}
}
@@ -177,7 +190,7 @@ where
match self.next {
Some(Next::Data(ref mut frame)) => {
log::trace!(" -> queued data frame");
- let mut buf = Buf::by_ref(&mut self.buf).chain(frame.payload_mut());
+ let mut buf = (&mut self.buf).chain(frame.payload_mut());
ready!(Pin::new(&mut self.inner).poll_write_buf(cx, &mut buf))?;
}
_ => {
@@ -200,7 +213,8 @@ where
}
Some(Next::Continuation(frame)) => {
// Buffer the continuation frame, then try to write again
- if let Some(continuation) = frame.encode(&mut self.hpack, self.buf.get_mut()) {
+ let mut buf = limited_write_buf!(self);
+ if let Some(continuation) = frame.encode(&mut self.hpack, &mut buf) {
// We previously had a CONTINUATION, and after encoding
// it, we got *another* one? Let's just double check
// that at least some progress is being made...
@@ -268,7 +282,7 @@ impl<T, B> FramedWrite<T, B> {
}
impl<T: AsyncRead + Unpin, B: Unpin> AsyncRead for FramedWrite<T, B> {
- unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [u8]) -> bool {
+ unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [std::mem::MaybeUninit<u8>]) -> bool {
self.inner.prepare_uninitialized_buffer(buf)
}
diff --git a/src/codec/mod.rs b/src/codec/mod.rs
--- a/src/codec/mod.rs
+++ b/src/codec/mod.rs
@@ -14,8 +14,8 @@ use futures_core::Stream;
use futures_sink::Sink;
use std::pin::Pin;
use std::task::{Context, Poll};
-use tokio_codec::length_delimited;
-use tokio_io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncWrite};
+use tokio_util::codec::length_delimited;
use std::io;
@@ -186,7 +186,7 @@ where
}
// TODO: remove (or improve) this
-impl<T> From<T> for Codec<T, ::std::io::Cursor<::bytes::Bytes>>
+impl<T> From<T> for Codec<T, bytes::Bytes>
where
T: AsyncRead + AsyncWrite + Unpin,
{
diff --git a/src/frame/go_away.rs b/src/frame/go_away.rs
--- a/src/frame/go_away.rs
+++ b/src/frame/go_away.rs
@@ -41,7 +41,7 @@ impl GoAway {
let (last_stream_id, _) = StreamId::parse(&payload[..4]);
let error_code = unpack_octets_4!(payload, 4, u32);
- let debug_data = Bytes::from(&payload[8..]);
+ let debug_data = Bytes::copy_from_slice(&payload[8..]);
Ok(GoAway {
last_stream_id,
@@ -54,8 +54,8 @@ impl GoAway {
log::trace!("encoding GO_AWAY; code={:?}", self.error_code);
let head = Head::new(Kind::GoAway, 0, StreamId::zero());
head.encode(8, dst);
- dst.put_u32_be(self.last_stream_id.into());
- dst.put_u32_be(self.error_code.into());
+ dst.put_u32(self.last_stream_id.into());
+ dst.put_u32(self.error_code.into());
}
}
diff --git a/src/frame/head.rs b/src/frame/head.rs
--- a/src/frame/head.rs
+++ b/src/frame/head.rs
@@ -66,10 +66,10 @@ impl Head {
pub fn encode<T: BufMut>(&self, payload_len: usize, dst: &mut T) {
debug_assert!(self.encode_len() <= dst.remaining_mut());
- dst.put_uint_be(payload_len as u64, 3);
+ dst.put_uint(payload_len as u64, 3);
dst.put_u8(self.kind as u8);
dst.put_u8(self.flag);
- dst.put_u32_be(self.stream_id.into());
+ dst.put_u32(self.stream_id.into());
}
}
diff --git a/src/frame/headers.rs b/src/frame/headers.rs
--- a/src/frame/headers.rs
+++ b/src/frame/headers.rs
@@ -1,16 +1,17 @@
use super::{util, StreamDependency, StreamId};
use crate::frame::{Error, Frame, Head, Kind};
-use crate::hpack;
+use crate::hpack::{self, BytesStr};
use http::header::{self, HeaderName, HeaderValue};
use http::{uri, HeaderMap, Method, Request, StatusCode, Uri};
use bytes::{Bytes, BytesMut};
-use string::String;
use std::fmt;
use std::io::Cursor;
+type EncodeBuf<'a> = bytes::buf::ext::Limit<&'a mut BytesMut>;
+
// Minimum MAX_FRAME_SIZE is 16kb, so save some arbitrary space for frame
// head and other header bits.
const MAX_HEADER_LENGTH: usize = 1024 * 16 - 100;
@@ -67,9 +68,9 @@ pub struct Continuation {
pub struct Pseudo {
// Request
pub method: Option<Method>,
- pub scheme: Option<String<Bytes>>,
- pub authority: Option<String<Bytes>>,
- pub path: Option<String<Bytes>>,
+ pub scheme: Option<BytesStr>,
+ pub authority: Option<BytesStr>,
+ pub path: Option<BytesStr>,
// Response
pub status: Option<StatusCode>,
@@ -261,7 +262,11 @@ impl Headers {
self.header_block.fields
}
- pub fn encode(self, encoder: &mut hpack::Encoder, dst: &mut BytesMut) -> Option<Continuation> {
+ pub fn encode(
+ self,
+ encoder: &mut hpack::Encoder,
+ dst: &mut EncodeBuf<'_>,
+ ) -> Option<Continuation> {
// At this point, the `is_end_headers` flag should always be set
debug_assert!(self.flags.is_end_headers());
@@ -465,7 +470,11 @@ impl PushPromise {
self.header_block.is_over_size
}
- pub fn encode(self, encoder: &mut hpack::Encoder, dst: &mut BytesMut) -> Option<Continuation> {
+ pub fn encode(
+ self,
+ encoder: &mut hpack::Encoder,
+ dst: &mut EncodeBuf<'_>,
+ ) -> Option<Continuation> {
use bytes::BufMut;
// At this point, the `is_end_headers` flag should always be set
@@ -477,7 +486,7 @@ impl PushPromise {
self.header_block
.into_encoding()
.encode(&head, encoder, dst, |dst| {
- dst.put_u32_be(promised_id.into());
+ dst.put_u32(promised_id.into());
})
}
@@ -515,7 +524,11 @@ impl Continuation {
Head::new(Kind::Continuation, END_HEADERS, self.stream_id)
}
- pub fn encode(self, encoder: &mut hpack::Encoder, dst: &mut BytesMut) -> Option<Continuation> {
+ pub fn encode(
+ self,
+ encoder: &mut hpack::Encoder,
+ dst: &mut EncodeBuf<'_>,
+ ) -> Option<Continuation> {
// Get the CONTINUATION frame head
let head = self.head();
@@ -542,7 +555,7 @@ impl Pseudo {
method: Some(method),
scheme: None,
authority: None,
- path: Some(to_string(path)),
+ path: Some(unsafe { BytesStr::from_utf8_unchecked(path) }),
status: None,
};
@@ -556,7 +569,7 @@ impl Pseudo {
// If the URI includes an authority component, add it to the pseudo
// headers
if let Some(authority) = parts.authority {
- pseudo.set_authority(to_string(authority.into()));
+ pseudo.set_authority(unsafe { BytesStr::from_utf8_unchecked(authority.into()) });
}
pseudo
@@ -573,18 +586,14 @@ impl Pseudo {
}
pub fn set_scheme(&mut self, scheme: uri::Scheme) {
- self.scheme = Some(to_string(scheme.into()));
+ self.scheme = Some(unsafe { BytesStr::from_utf8_unchecked(scheme.into()) });
}
- pub fn set_authority(&mut self, authority: String<Bytes>) {
+ pub fn set_authority(&mut self, authority: BytesStr) {
self.authority = Some(authority);
}
}
-fn to_string(src: Bytes) -> String<Bytes> {
- unsafe { String::from_utf8_unchecked(src) }
-}
-
// ===== impl EncodingHeaderBlock =====
impl EncodingHeaderBlock {
@@ -592,20 +601,20 @@ impl EncodingHeaderBlock {
mut self,
head: &Head,
encoder: &mut hpack::Encoder,
- dst: &mut BytesMut,
+ dst: &mut EncodeBuf<'_>,
f: F,
) -> Option<Continuation>
where
- F: FnOnce(&mut BytesMut),
+ F: FnOnce(&mut EncodeBuf<'_>),
{
- let head_pos = dst.len();
+ let head_pos = dst.get_ref().len();
// At this point, we don't know how big the h2 frame will be.
// So, we write the head with length 0, then write the body, and
// finally write the length once we know the size.
head.encode(0, dst);
- let payload_pos = dst.len();
+ let payload_pos = dst.get_ref().len();
f(dst);
@@ -622,19 +631,19 @@ impl EncodingHeaderBlock {
};
// Compute the header block length
- let payload_len = (dst.len() - payload_pos) as u64;
+ let payload_len = (dst.get_ref().len() - payload_pos) as u64;
// Write the frame length
let payload_len_be = payload_len.to_be_bytes();
assert!(payload_len_be[0..5].iter().all(|b| *b == 0));
- (&mut dst[head_pos..head_pos + 3]).copy_from_slice(&payload_len_be[5..]);
+ (dst.get_mut()[head_pos..head_pos + 3]).copy_from_slice(&payload_len_be[5..]);
if continuation.is_some() {
// There will be continuation frames, so the `is_end_headers` flag
// must be unset
- debug_assert!(dst[head_pos + 4] & END_HEADERS == END_HEADERS);
+ debug_assert!(dst.get_ref()[head_pos + 4] & END_HEADERS == END_HEADERS);
- dst[head_pos + 4] -= END_HEADERS;
+ dst.get_mut()[head_pos + 4] -= END_HEADERS;
}
continuation
@@ -962,15 +971,3 @@ impl HeaderBlock {
fn decoded_header_size(name: usize, value: usize) -> usize {
name + value + 32
}
-
-// Stupid hack to make the set_pseudo! macro happy, since all other values
-// have a method `as_str` except for `String<Bytes>`.
-trait AsStr {
- fn as_str(&self) -> &str;
-}
-
-impl AsStr for String<Bytes> {
- fn as_str(&self) -> &str {
- self
- }
-}
diff --git a/src/frame/mod.rs b/src/frame/mod.rs
--- a/src/frame/mod.rs
+++ b/src/frame/mod.rs
@@ -53,6 +53,9 @@ pub use self::settings::Settings;
pub use self::stream_id::{StreamId, StreamIdOverflow};
pub use self::window_update::WindowUpdate;
+#[cfg(feature = "unstable")]
+pub use crate::hpack::BytesStr;
+
// Re-export some constants
pub use self::settings::{
diff --git a/src/frame/ping.rs b/src/frame/ping.rs
--- a/src/frame/ping.rs
+++ b/src/frame/ping.rs
@@ -1,5 +1,5 @@
use crate::frame::{Error, Frame, Head, Kind, StreamId};
-use bytes::{Buf, BufMut, IntoBuf};
+use bytes::BufMut;
const ACK_FLAG: u8 = 0x1;
@@ -71,7 +71,7 @@ impl Ping {
}
let mut payload = [0; 8];
- bytes.into_buf().copy_to_slice(&mut payload);
+ payload.copy_from_slice(bytes);
// The PING frame defines the following flags:
//
diff --git a/src/frame/reset.rs b/src/frame/reset.rs
--- a/src/frame/reset.rs
+++ b/src/frame/reset.rs
@@ -45,7 +45,7 @@ impl Reset {
);
let head = Head::new(Kind::Reset, 0, self.stream_id);
head.encode(4, dst);
- dst.put_u32_be(self.error_code.into());
+ dst.put_u32(self.error_code.into());
}
}
diff --git a/src/frame/settings.rs b/src/frame/settings.rs
--- a/src/frame/settings.rs
+++ b/src/frame/settings.rs
@@ -314,8 +314,8 @@ impl Setting {
MaxHeaderListSize(v) => (6, v),
};
- dst.put_u16_be(kind);
- dst.put_u32_be(val);
+ dst.put_u16(kind);
+ dst.put_u32(val);
}
}
diff --git a/src/frame/window_update.rs b/src/frame/window_update.rs
--- a/src/frame/window_update.rs
+++ b/src/frame/window_update.rs
@@ -51,7 +51,7 @@ impl WindowUpdate {
log::trace!("encoding WINDOW_UPDATE; id={:?}", self.stream_id);
let head = Head::new(Kind::WindowUpdate, 0, self.stream_id);
head.encode(4, dst);
- dst.put_u32_be(self.size_increment);
+ dst.put_u32(self.size_increment);
}
}
diff --git a/src/hpack/decoder.rs b/src/hpack/decoder.rs
--- a/src/hpack/decoder.rs
+++ b/src/hpack/decoder.rs
@@ -1,11 +1,10 @@
-use super::{huffman, Header};
+use super::{header::BytesStr, huffman, Header};
use crate::frame;
use bytes::{Buf, Bytes, BytesMut};
use http::header;
use http::method::{self, Method};
use http::status::{self, StatusCode};
-use string::String;
use std::cmp;
use std::collections::VecDeque;
@@ -314,7 +313,7 @@ impl Decoder {
if huff {
let ret = {
let raw = &buf.bytes()[..len];
- huffman::decode(raw, &mut self.buffer).map(Into::into)
+ huffman::decode(raw, &mut self.buffer).map(BytesMut::freeze)
};
buf.advance(len);
@@ -785,8 +784,8 @@ pub fn get_static(idx: usize) -> Header {
}
}
-fn from_static(s: &'static str) -> String<Bytes> {
- unsafe { String::from_utf8_unchecked(Bytes::from_static(s.as_bytes())) }
+fn from_static(s: &'static str) -> BytesStr {
+ unsafe { BytesStr::from_utf8_unchecked(Bytes::from_static(s.as_bytes())) }
}
#[cfg(test)]
@@ -823,13 +822,12 @@ mod test {
fn test_decode_indexed_larger_than_table() {
let mut de = Decoder::new(0);
- let mut buf = vec![0b01000000, 0x80 | 2];
+ let mut buf = BytesMut::new();
+ buf.extend(&[0b01000000, 0x80 | 2]);
buf.extend(huff_encode(b"foo"));
buf.extend(&[0x80 | 3]);
buf.extend(huff_encode(b"bar"));
- let mut buf = buf.into();
-
let mut res = vec![];
let _ = de
.decode(&mut Cursor::new(&mut buf), |h| {
diff --git a/src/hpack/encoder.rs b/src/hpack/encoder.rs
--- a/src/hpack/encoder.rs
+++ b/src/hpack/encoder.rs
@@ -1,9 +1,11 @@
use super::table::{Index, Table};
use super::{huffman, Header};
-use bytes::{BufMut, BytesMut};
+use bytes::{buf::ext::Limit, BufMut, BytesMut};
use http::header::{HeaderName, HeaderValue};
+type DstBuf<'a> = Limit<&'a mut BytesMut>;
+
#[derive(Debug)]
pub struct Encoder {
table: Table,
@@ -80,16 +82,16 @@ impl Encoder {
&mut self,
resume: Option<EncodeState>,
headers: &mut I,
- dst: &mut BytesMut,
+ dst: &mut DstBuf<'_>,
) -> Encode
where
I: Iterator<Item = Header<Option<HeaderName>>>,
{
- let len = dst.len();
+ let pos = position(dst);
if let Err(e) = self.encode_size_updates(dst) {
if e == EncoderError::BufferOverflow {
- dst.truncate(len);
+ rewind(dst, pos);
}
unreachable!("encode_size_updates errored");
@@ -98,7 +100,7 @@ impl Encoder {
let mut last_index = None;
if let Some(resume) = resume {
- let len = dst.len();
+ let pos = position(dst);
let res = match resume.value {
Some(ref value) => self.encode_header_without_name(&resume.index, value, dst),
@@ -106,14 +108,14 @@ impl Encoder {
};
if res.is_err() {
- dst.truncate(len);
+ rewind(dst, pos);
return Encode::Partial(resume);
}
last_index = Some(resume.index);
}
for header in headers {
- let len = dst.len();
+ let pos = position(dst);
match header.reify() {
// The header has an associated name. In which case, try to
@@ -123,7 +125,7 @@ impl Encoder {
let res = self.encode_header(&index, dst);
if res.is_err() {
- dst.truncate(len);
+ rewind(dst, pos);
return Encode::Partial(EncodeState { index, value: None });
}
@@ -143,7 +145,7 @@ impl Encoder {
);
if res.is_err() {
- dst.truncate(len);
+ rewind(dst, pos);
return Encode::Partial(EncodeState {
index: last_index.unwrap(), // checked just above
value: Some(value),
@@ -156,7 +158,7 @@ impl Encoder {
Encode::Full
}
- fn encode_size_updates(&mut self, dst: &mut BytesMut) -> Result<(), EncoderError> {
+ fn encode_size_updates(&mut self, dst: &mut DstBuf<'_>) -> Result<(), EncoderError> {
match self.size_update.take() {
Some(SizeUpdate::One(val)) => {
self.table.resize(val);
@@ -174,7 +176,7 @@ impl Encoder {
Ok(())
}
- fn encode_header(&mut self, index: &Index, dst: &mut BytesMut) -> Result<(), EncoderError> {
+ fn encode_header(&mut self, index: &Index, dst: &mut DstBuf<'_>) -> Result<(), EncoderError> {
match *index {
Index::Indexed(idx, _) => {
encode_int(idx, 7, 0x80, dst)?;
@@ -225,7 +227,7 @@ impl Encoder {
&mut self,
last: &Index,
value: &HeaderValue,
- dst: &mut BytesMut,
+ dst: &mut DstBuf<'_>,
) -> Result<(), EncoderError> {
match *last {
Index::Indexed(..)
@@ -266,7 +268,7 @@ fn encode_not_indexed(
name: usize,
value: &[u8],
sensitive: bool,
- dst: &mut BytesMut,
+ dst: &mut DstBuf<'_>,
) -> Result<(), EncoderError> {
if sensitive {
encode_int(name, 4, 0b10000, dst)?;
@@ -282,7 +284,7 @@ fn encode_not_indexed2(
name: &[u8],
value: &[u8],
sensitive: bool,
- dst: &mut BytesMut,
+ dst: &mut DstBuf<'_>,
) -> Result<(), EncoderError> {
if !dst.has_remaining_mut() {
return Err(EncoderError::BufferOverflow);
@@ -299,15 +301,13 @@ fn encode_not_indexed2(
Ok(())
}
-fn encode_str(val: &[u8], dst: &mut BytesMut) -> Result<(), EncoderError> {
- use std::io::Cursor;
-
+fn encode_str(val: &[u8], dst: &mut DstBuf<'_>) -> Result<(), EncoderError> {
if !dst.has_remaining_mut() {
return Err(EncoderError::BufferOverflow);
}
if !val.is_empty() {
- let idx = dst.len();
+ let idx = position(dst);
// Push a placeholder byte for the length header
dst.put_u8(0);
@@ -315,19 +315,20 @@ fn encode_str(val: &[u8], dst: &mut BytesMut) -> Result<(), EncoderError> {
// Encode with huffman
huffman::encode(val, dst)?;
- let huff_len = dst.len() - (idx + 1);
+ let huff_len = position(dst) - (idx + 1);
if encode_int_one_byte(huff_len, 7) {
// Write the string head
- dst[idx] = 0x80 | huff_len as u8;
+ dst.get_mut()[idx] = 0x80 | huff_len as u8;
} else {
// Write the head to a placeholer
- let mut buf = [0; 8];
+ const PLACEHOLDER_LEN: usize = 8;
+ let mut buf = [0u8; PLACEHOLDER_LEN];
let head_len = {
- let mut head_dst = Cursor::new(&mut buf);
+ let mut head_dst = &mut buf[..];
encode_int(huff_len, 7, 0x80, &mut head_dst)?;
- head_dst.position() as usize
+ PLACEHOLDER_LEN - head_dst.remaining_mut()
};
if dst.remaining_mut() < head_len {
@@ -337,16 +338,17 @@ fn encode_str(val: &[u8], dst: &mut BytesMut) -> Result<(), EncoderError> {
// This is just done to reserve space in the destination
dst.put_slice(&buf[1..head_len]);
+ let written = dst.get_mut();
// Shift the header forward
for i in 0..huff_len {
let src_i = idx + 1 + (huff_len - (i + 1));
let dst_i = idx + head_len + (huff_len - (i + 1));
- dst[dst_i] = dst[src_i];
+ written[dst_i] = written[src_i];
}
// Copy in the head
for i in 0..head_len {
- dst[idx + i] = buf[i];
+ written[idx + i] = buf[i];
}
}
} else {
@@ -411,10 +413,19 @@ fn encode_int_one_byte(value: usize, prefix_bits: usize) -> bool {
value < (1 << prefix_bits) - 1
}
+fn position(buf: &DstBuf<'_>) -> usize {
+ buf.get_ref().len()
+}
+
+fn rewind(buf: &mut DstBuf<'_>, pos: usize) {
+ buf.get_mut().truncate(pos);
+}
+
#[cfg(test)]
mod test {
use super::*;
use crate::hpack::Header;
+ use bytes::buf::BufMutExt;
use http::*;
#[test]
@@ -794,7 +805,8 @@ mod test {
#[test]
fn test_nameless_header_at_resume() {
let mut encoder = Encoder::default();
- let mut dst = BytesMut::from(Vec::with_capacity(15));
+ let max_len = 15;
+ let mut dst = BytesMut::with_capacity(64);
let mut input = vec![
Header::Field {
@@ -812,9 +824,9 @@ mod test {
]
.into_iter();
- let resume = match encoder.encode(None, &mut input, &mut dst) {
+ let resume = match encoder.encode(None, &mut input, &mut (&mut dst).limit(max_len)) {
Encode::Partial(r) => r,
- _ => panic!(),
+ _ => panic!("encode should be partial"),
};
assert_eq!(&[0x40, 0x80 | 4], &dst[0..2]);
@@ -824,7 +836,7 @@ mod test {
dst.clear();
- match encoder.encode(Some(resume), &mut input, &mut dst) {
+ match encoder.encode(Some(resume), &mut input, &mut (&mut dst).limit(max_len)) {
Encode::Full => {}
unexpected => panic!("resume returned unexpected: {:?}", unexpected),
}
@@ -844,7 +856,7 @@ mod test {
fn encode(e: &mut Encoder, hdrs: Vec<Header<Option<HeaderName>>>) -> BytesMut {
let mut dst = BytesMut::with_capacity(1024);
- e.encode(None, &mut hdrs.into_iter(), &mut dst);
+ e.encode(None, &mut hdrs.into_iter(), &mut (&mut dst).limit(1024));
dst
}
diff --git a/src/hpack/header.rs b/src/hpack/header.rs
--- a/src/hpack/header.rs
+++ b/src/hpack/header.rs
@@ -3,17 +3,17 @@ use super::{DecoderError, NeedMore};
use bytes::Bytes;
use http::header::{HeaderName, HeaderValue};
use http::{Method, StatusCode};
-use string::{String, TryFrom};
+use std::fmt;
/// HTTP/2.0 Header
#[derive(Debug, Clone, Eq, PartialEq)]
pub enum Header<T = HeaderName> {
Field { name: T, value: HeaderValue },
// TODO: Change these types to `http::uri` types.
- Authority(String<Bytes>),
+ Authority(BytesStr),
Method(Method),
- Scheme(String<Bytes>),
- Path(String<Bytes>),
+ Scheme(BytesStr),
+ Path(BytesStr),
Status(StatusCode),
}
@@ -28,6 +28,10 @@ pub enum Name<'a> {
Status,
}
+#[doc(hidden)]
+#[derive(Clone, Eq, PartialEq, Default)]
+pub struct BytesStr(Bytes);
+
pub fn len(name: &HeaderName, value: &HeaderValue) -> usize {
let n: &str = name.as_ref();
32 + n.len() + value.len()
@@ -60,7 +64,7 @@ impl Header {
if name[0] == b':' {
match &name[1..] {
b"authority" => {
- let value = String::try_from(value)?;
+ let value = BytesStr::try_from(value)?;
Ok(Header::Authority(value))
}
b"method" => {
@@ -68,11 +72,11 @@ impl Header {
Ok(Header::Method(method))
}
b"scheme" => {
- let value = String::try_from(value)?;
+ let value = BytesStr::try_from(value)?;
Ok(Header::Scheme(value))
}
b"path" => {
- let value = String::try_from(value)?;
+ let value = BytesStr::try_from(value)?;
Ok(Header::Path(value))
}
b"status" => {
@@ -213,10 +217,10 @@ impl<'a> Name<'a> {
name: name.clone(),
value: HeaderValue::from_bytes(&*value)?,
}),
- Name::Authority => Ok(Header::Authority(String::try_from(value)?)),
+ Name::Authority => Ok(Header::Authority(BytesStr::try_from(value)?)),
Name::Method => Ok(Header::Method(Method::from_bytes(&*value)?)),
- Name::Scheme => Ok(Header::Scheme(String::try_from(value)?)),
- Name::Path => Ok(Header::Path(String::try_from(value)?)),
+ Name::Scheme => Ok(Header::Scheme(BytesStr::try_from(value)?)),
+ Name::Path => Ok(Header::Path(BytesStr::try_from(value)?)),
Name::Status => {
match StatusCode::from_bytes(&value) {
Ok(status) => Ok(Header::Status(status)),
@@ -238,3 +242,45 @@ impl<'a> Name<'a> {
}
}
}
+
+// ===== impl BytesStr =====
+
+impl BytesStr {
+ pub(crate) unsafe fn from_utf8_unchecked(bytes: Bytes) -> Self {
+ BytesStr(bytes)
+ }
+
+ #[doc(hidden)]
+ pub fn try_from(bytes: Bytes) -> Result<Self, std::str::Utf8Error> {
+ std::str::from_utf8(bytes.as_ref())?;
+ Ok(BytesStr(bytes))
+ }
+
+ pub(crate) fn as_str(&self) -> &str {
+ // Safety: check valid utf-8 in constructor
+ unsafe { std::str::from_utf8_unchecked(self.0.as_ref()) }
+ }
+
+ pub(crate) fn into_inner(self) -> Bytes {
+ self.0
+ }
+}
+
+impl std::ops::Deref for BytesStr {
+ type Target = str;
+ fn deref(&self) -> &str {
+ self.as_str()
+ }
+}
+
+impl AsRef<[u8]> for BytesStr {
+ fn as_ref(&self) -> &[u8] {
+ self.0.as_ref()
+ }
+}
+
+impl fmt::Debug for BytesStr {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ self.0.fmt(f)
+ }
+}
diff --git a/src/hpack/huffman/mod.rs b/src/hpack/huffman/mod.rs
--- a/src/hpack/huffman/mod.rs
+++ b/src/hpack/huffman/mod.rs
@@ -37,7 +37,7 @@ pub fn decode(src: &[u8], buf: &mut BytesMut) -> Result<BytesMut, DecoderError>
return Err(DecoderError::InvalidHuffmanCode);
}
- Ok(buf.take())
+ Ok(buf.split())
}
// TODO: return error when there is not enough room to encode the value
diff --git a/src/hpack/mod.rs b/src/hpack/mod.rs
--- a/src/hpack/mod.rs
+++ b/src/hpack/mod.rs
@@ -9,4 +9,4 @@ mod test;
pub use self::decoder::{Decoder, DecoderError, NeedMore};
pub use self::encoder::{Encode, EncodeState, Encoder, EncoderError};
-pub use self::header::Header;
+pub use self::header::{BytesStr, Header};
diff --git a/src/proto/connection.rs b/src/proto/connection.rs
--- a/src/proto/connection.rs
+++ b/src/proto/connection.rs
@@ -5,18 +5,18 @@ use crate::{client, frame, proto, server};
use crate::frame::DEFAULT_INITIAL_WINDOW_SIZE;
use crate::proto::*;
-use bytes::{Bytes, IntoBuf};
+use bytes::{Buf, Bytes};
use futures_core::Stream;
use std::io;
use std::marker::PhantomData;
use std::pin::Pin;
use std::task::{Context, Poll};
use std::time::Duration;
-use tokio_io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncWrite};
/// An H2 connection
#[derive(Debug)]
-pub(crate) struct Connection<T, P, B: IntoBuf = Bytes>
+pub(crate) struct Connection<T, P, B: Buf = Bytes>
where
P: Peer,
{
@@ -30,7 +30,7 @@ where
error: Option<Reason>,
/// Read / write frame values
- codec: Codec<T, Prioritized<B::Buf>>,
+ codec: Codec<T, Prioritized<B>>,
/// Pending GOAWAY frames to write.
go_away: GoAway,
@@ -42,7 +42,7 @@ where
settings: Settings,
/// Stream state handler
- streams: Streams<B::Buf, P>,
+ streams: Streams<B, P>,
/// Client or server
_phantom: PhantomData<P>,
@@ -73,10 +73,9 @@ impl<T, P, B> Connection<T, P, B>
where
T: AsyncRead + AsyncWrite + Unpin,
P: Peer,
- B: IntoBuf + Unpin,
- B::Buf: Unpin,
+ B: Buf + Unpin,
{
- pub fn new(codec: Codec<T, Prioritized<B::Buf>>, config: Config) -> Connection<T, P, B> {
+ pub fn new(codec: Codec<T, Prioritized<B>>, config: Config) -> Connection<T, P, B> {
let streams = Streams::new(streams::Config {
local_init_window_sz: config
.settings
@@ -385,9 +384,9 @@ where
impl<T, B> Connection<T, client::Peer, B>
where
T: AsyncRead + AsyncWrite,
- B: IntoBuf,
+ B: Buf,
{
- pub(crate) fn streams(&self) -> &Streams<B::Buf, client::Peer> {
+ pub(crate) fn streams(&self) -> &Streams<B, client::Peer> {
&self.streams
}
}
@@ -395,10 +394,9 @@ where
impl<T, B> Connection<T, server::Peer, B>
where
T: AsyncRead + AsyncWrite + Unpin,
- B: IntoBuf + Unpin,
- B::Buf: Unpin,
+ B: Buf + Unpin,
{
- pub fn next_incoming(&mut self) -> Option<StreamRef<B::Buf>> {
+ pub fn next_incoming(&mut self) -> Option<StreamRef<B>> {
self.streams.next_incoming()
}
@@ -431,7 +429,7 @@ where
impl<T, P, B> Drop for Connection<T, P, B>
where
P: Peer,
- B: IntoBuf,
+ B: Buf,
{
fn drop(&mut self) {
// Ignore errors as this indicates that the mutex is poisoned.
diff --git a/src/proto/go_away.rs b/src/proto/go_away.rs
--- a/src/proto/go_away.rs
+++ b/src/proto/go_away.rs
@@ -4,7 +4,7 @@ use crate::frame::{self, Reason, StreamId};
use bytes::Buf;
use std::io;
use std::task::{Context, Poll};
-use tokio_io::AsyncWrite;
+use tokio::io::AsyncWrite;
/// Manages our sending of GOAWAY frames.
#[derive(Debug)]
diff --git a/src/proto/mod.rs b/src/proto/mod.rs
--- a/src/proto/mod.rs
+++ b/src/proto/mod.rs
@@ -23,7 +23,7 @@ use crate::frame::{self, Frame};
use bytes::Buf;
-use tokio_io::AsyncWrite;
+use tokio::io::AsyncWrite;
pub type PingPayload = [u8; 8];
diff --git a/src/proto/ping_pong.rs b/src/proto/ping_pong.rs
--- a/src/proto/ping_pong.rs
+++ b/src/proto/ping_pong.rs
@@ -3,12 +3,12 @@ use crate::frame::Ping;
use crate::proto::{self, PingPayload};
use bytes::Buf;
+use futures_util::task::AtomicWaker;
use std::io;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
use std::task::{Context, Poll};
-use tokio_io::AsyncWrite;
-use tokio_sync::AtomicWaker;
+use tokio::io::AsyncWrite;
/// Acknowledges ping requests from the remote.
#[derive(Debug)]
@@ -190,7 +190,7 @@ impl PingPong {
.state
.store(USER_STATE_PENDING_PONG, Ordering::Release);
} else {
- users.0.ping_task.register_by_ref(cx.waker());
+ users.0.ping_task.register(cx.waker());
}
}
@@ -233,7 +233,7 @@ impl UserPings {
pub(crate) fn poll_pong(&self, cx: &mut Context) -> Poll<Result<(), proto::Error>> {
// Must register before checking state, in case state were to change
// before we could register, and then the ping would just be lost.
- self.0.pong_task.register_by_ref(cx.waker());
+ self.0.pong_task.register(cx.waker());
let prev = self.0.state.compare_and_swap(
USER_STATE_RECEIVED_PONG, // current
USER_STATE_EMPTY, // new
diff --git a/src/proto/streams/prioritize.rs b/src/proto/streams/prioritize.rs
--- a/src/proto/streams/prioritize.rs
+++ b/src/proto/streams/prioritize.rs
@@ -6,7 +6,7 @@ use crate::frame::{Reason, StreamId};
use crate::codec::UserError;
use crate::codec::UserError::*;
-use bytes::buf::Take;
+use bytes::buf::ext::{BufExt, Take};
use std::io;
use std::task::{Context, Poll, Waker};
use std::{cmp, fmt, mem};
diff --git a/src/proto/streams/send.rs b/src/proto/streams/send.rs
--- a/src/proto/streams/send.rs
+++ b/src/proto/streams/send.rs
@@ -8,7 +8,7 @@ use crate::frame::{self, Reason};
use bytes::Buf;
use http;
use std::task::{Context, Poll, Waker};
-use tokio_io::AsyncWrite;
+use tokio::io::AsyncWrite;
use std::io;
diff --git a/src/proto/streams/streams.rs b/src/proto/streams/streams.rs
--- a/src/proto/streams/streams.rs
+++ b/src/proto/streams/streams.rs
@@ -9,7 +9,7 @@ use crate::{client, proto, server};
use bytes::{Buf, Bytes};
use http::{HeaderMap, Request, Response};
use std::task::{Context, Poll, Waker};
-use tokio_io::AsyncWrite;
+use tokio::io::AsyncWrite;
use crate::PollExt;
use std::sync::{Arc, Mutex};
diff --git a/src/server.rs b/src/server.rs
--- a/src/server.rs
+++ b/src/server.rs
@@ -120,14 +120,14 @@ use crate::frame::{self, Pseudo, PushPromiseHeaderError, Reason, Settings, Strea
use crate::proto::{self, Config, Prioritized};
use crate::{FlowControl, PingPong, RecvStream, SendStream};
-use bytes::{Buf, Bytes, IntoBuf};
+use bytes::{Buf, Bytes};
use http::{HeaderMap, Request, Response};
use std::future::Future;
use std::pin::Pin;
use std::task::{Context, Poll};
use std::time::Duration;
use std::{convert, fmt, io, mem};
-use tokio_io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncWrite};
/// In progress HTTP/2.0 connection handshake future.
///
@@ -144,7 +144,7 @@ use tokio_io::{AsyncRead, AsyncWrite};
///
/// [module]: index.html
#[must_use = "futures do nothing unless polled"]
-pub struct Handshake<T, B: IntoBuf = Bytes> {
+pub struct Handshake<T, B: Buf = Bytes> {
/// The config to pass to Connection::new after handshake succeeds.
builder: Builder,
/// The current state of the handshake.
@@ -172,7 +172,7 @@ pub struct Handshake<T, B: IntoBuf = Bytes> {
/// # Examples
///
/// ```
-/// # use tokio_io::*;
+/// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server;
/// # use h2::server::*;
/// #
@@ -188,7 +188,7 @@ pub struct Handshake<T, B: IntoBuf = Bytes> {
/// # pub fn main() {}
/// ```
#[must_use = "streams do nothing unless polled"]
-pub struct Connection<T, B: IntoBuf> {
+pub struct Connection<T, B: Buf> {
connection: proto::Connection<T, Peer, B>,
}
@@ -210,7 +210,7 @@ pub struct Connection<T, B: IntoBuf> {
/// # Examples
///
/// ```
-/// # use tokio_io::*;
+/// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server::*;
/// #
/// # fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
@@ -258,8 +258,8 @@ pub struct Builder {
///
/// [module]: index.html
#[derive(Debug)]
-pub struct SendResponse<B: IntoBuf> {
- inner: proto::StreamRef<B::Buf>,
+pub struct SendResponse<B: Buf> {
+ inner: proto::StreamRef<B>,
}
/// Send a response to a promised request
@@ -276,26 +276,23 @@ pub struct SendResponse<B: IntoBuf> {
/// See [module] level docs for more details.
///
/// [module]: index.html
-pub struct SendPushedResponse<B: IntoBuf> {
+pub struct SendPushedResponse<B: Buf> {
inner: SendResponse<B>,
}
// Manual implementation necessary because of rust-lang/rust#26925
-impl<B: IntoBuf + fmt::Debug> fmt::Debug for SendPushedResponse<B>
-where
- <B as bytes::IntoBuf>::Buf: std::fmt::Debug,
-{
+impl<B: Buf + fmt::Debug> fmt::Debug for SendPushedResponse<B> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "SendPushedResponse {{ {:?} }}", self.inner)
}
}
/// Stages of an in-progress handshake.
-enum Handshaking<T, B: IntoBuf> {
+enum Handshaking<T, B: Buf> {
/// State 1. Connection is flushing pending SETTINGS frame.
- Flushing(Flush<T, Prioritized<B::Buf>>),
+ Flushing(Flush<T, Prioritized<B>>),
/// State 2. Connection is waiting for the client preface.
- ReadingPreface(ReadPreface<T, Prioritized<B::Buf>>),
+ ReadingPreface(ReadPreface<T, Prioritized<B>>),
/// Dummy state for `mem::replace`.
Empty,
}
@@ -334,7 +331,7 @@ const PREFACE: [u8; 24] = *b"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n";
/// # Examples
///
/// ```
-/// # use tokio_io::*;
+/// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server;
/// # use h2::server::*;
/// #
@@ -359,8 +356,7 @@ where
impl<T, B> Connection<T, B>
where
T: AsyncRead + AsyncWrite + Unpin,
- B: IntoBuf + Unpin,
- B::Buf: Unpin + 'static,
+ B: Buf + Unpin + 'static,
{
fn handshake2(io: T, builder: Builder) -> Handshake<T, B> {
// Create the codec.
@@ -527,8 +523,7 @@ where
impl<T, B> futures_core::Stream for Connection<T, B>
where
T: AsyncRead + AsyncWrite + Unpin,
- B: IntoBuf + Unpin,
- B::Buf: Unpin + 'static,
+ B: Buf + Unpin + 'static,
{
type Item = Result<(Request<RecvStream>, SendResponse<B>), crate::Error>;
@@ -540,8 +535,7 @@ where
impl<T, B> fmt::Debug for Connection<T, B>
where
T: fmt::Debug,
- B: fmt::Debug + IntoBuf,
- B::Buf: fmt::Debug,
+ B: fmt::Debug + Buf,
{
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
fmt.debug_struct("Connection")
@@ -561,7 +555,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server::*;
/// #
/// # fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
@@ -600,7 +594,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server::*;
/// #
/// # fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
@@ -634,7 +628,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server::*;
/// #
/// # fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
@@ -667,7 +661,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server::*;
/// #
/// # fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
@@ -706,7 +700,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server::*;
/// #
/// # fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
@@ -754,7 +748,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server::*;
/// #
/// # fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
@@ -800,7 +794,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server::*;
/// #
/// # fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
@@ -846,7 +840,7 @@ impl Builder {
/// # Examples
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server::*;
/// # use std::time::Duration;
/// #
@@ -889,7 +883,7 @@ impl Builder {
/// Basic usage:
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server::*;
/// #
/// # fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
@@ -909,7 +903,7 @@ impl Builder {
/// type will be `&'static [u8]`.
///
/// ```
- /// # use tokio_io::*;
+ /// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::server::*;
/// #
/// # fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
@@ -927,8 +921,7 @@ impl Builder {
pub fn handshake<T, B>(&self, io: T) -> Handshake<T, B>
where
T: AsyncRead + AsyncWrite + Unpin,
- B: IntoBuf + Unpin,
- B::Buf: Unpin + 'static,
+ B: Buf + Unpin + 'static,
{
Connection::handshake2(io, self.clone())
}
@@ -942,7 +935,7 @@ impl Default for Builder {
// ===== impl SendResponse =====
-impl<B: IntoBuf> SendResponse<B> {
+impl<B: Buf> SendResponse<B> {
/// Send a response to a client request.
///
/// On success, a [`SendStream`] instance is returned. This instance can be
@@ -1034,7 +1027,7 @@ impl<B: IntoBuf> SendResponse<B> {
// ===== impl SendPushedResponse =====
-impl<B: IntoBuf> SendPushedResponse<B> {
+impl<B: Buf> SendPushedResponse<B> {
/// Send a response to a promised request.
///
/// On success, a [`SendStream`] instance is returned. This instance can be
@@ -1178,11 +1171,10 @@ where
// ===== impl Handshake =====
-impl<T, B: IntoBuf> Future for Handshake<T, B>
+impl<T, B: Buf> Future for Handshake<T, B>
where
T: AsyncRead + AsyncWrite + Unpin,
- B: IntoBuf + Unpin,
- B::Buf: Unpin + 'static,
+ B: Buf + Unpin + 'static,
{
type Output = Result<Connection<T, B>, crate::Error>;
@@ -1250,7 +1242,7 @@ where
impl<T, B> fmt::Debug for Handshake<T, B>
where
T: AsyncRead + AsyncWrite + fmt::Debug,
- B: fmt::Debug + IntoBuf,
+ B: fmt::Debug + Buf,
{
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
write!(fmt, "server::Handshake")
@@ -1363,10 +1355,10 @@ impl proto::Peer for Peer {
}}
};
- b.version(Version::HTTP_2);
+ b = b.version(Version::HTTP_2);
if let Some(method) = pseudo.method {
- b.method(method);
+ b = b.method(method);
} else {
malformed!("malformed headers: missing method");
}
@@ -1426,7 +1418,7 @@ impl proto::Peer for Peer {
})?);
}
- b.uri(parts);
+ b = b.uri(parts);
let mut request = match b.body(()) {
Ok(request) => request,
@@ -1451,7 +1443,7 @@ impl proto::Peer for Peer {
impl<T, B> fmt::Debug for Handshaking<T, B>
where
- B: IntoBuf,
+ B: Buf,
{
#[inline]
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
@@ -1463,35 +1455,35 @@ where
}
}
-impl<T, B> convert::From<Flush<T, Prioritized<B::Buf>>> for Handshaking<T, B>
+impl<T, B> convert::From<Flush<T, Prioritized<B>>> for Handshaking<T, B>
where
T: AsyncRead + AsyncWrite,
- B: IntoBuf,
+ B: Buf,
{
#[inline]
- fn from(flush: Flush<T, Prioritized<B::Buf>>) -> Self {
+ fn from(flush: Flush<T, Prioritized<B>>) -> Self {
Handshaking::Flushing(flush)
}
}
-impl<T, B> convert::From<ReadPreface<T, Prioritized<B::Buf>>> for Handshaking<T, B>
+impl<T, B> convert::From<ReadPreface<T, Prioritized<B>>> for Handshaking<T, B>
where
T: AsyncRead + AsyncWrite,
- B: IntoBuf,
+ B: Buf,
{
#[inline]
- fn from(read: ReadPreface<T, Prioritized<B::Buf>>) -> Self {
+ fn from(read: ReadPreface<T, Prioritized<B>>) -> Self {
Handshaking::ReadingPreface(read)
}
}
-impl<T, B> convert::From<Codec<T, Prioritized<B::Buf>>> for Handshaking<T, B>
+impl<T, B> convert::From<Codec<T, Prioritized<B>>> for Handshaking<T, B>
where
T: AsyncRead + AsyncWrite,
- B: IntoBuf,
+ B: Buf,
{
#[inline]
- fn from(codec: Codec<T, Prioritized<B::Buf>>) -> Self {
+ fn from(codec: Codec<T, Prioritized<B>>) -> Self {
Handshaking::from(Flush::new(codec))
}
}
diff --git a/src/share.rs b/src/share.rs
--- a/src/share.rs
+++ b/src/share.rs
@@ -2,7 +2,7 @@ use crate::codec::UserError;
use crate::frame::Reason;
use crate::proto::{self, WindowSize};
-use bytes::{Bytes, IntoBuf};
+use bytes::{Buf, Bytes};
use http::HeaderMap;
use crate::PollExt;
@@ -95,8 +95,8 @@ use std::task::{Context, Poll};
/// [`send_trailers`]: #method.send_trailers
/// [`send_reset`]: #method.send_reset
#[derive(Debug)]
-pub struct SendStream<B: IntoBuf> {
- inner: proto::StreamRef<B::Buf>,
+pub struct SendStream<B: Buf> {
+ inner: proto::StreamRef<B>,
}
/// A stream identifier, as described in [Section 5.1.1] of RFC 7540.
@@ -219,8 +219,8 @@ pub struct Pong {
// ===== impl SendStream =====
-impl<B: IntoBuf> SendStream<B> {
- pub(crate) fn new(inner: proto::StreamRef<B::Buf>) -> Self {
+impl<B: Buf> SendStream<B> {
+ pub(crate) fn new(inner: proto::StreamRef<B>) -> Self {
SendStream { inner }
}
@@ -333,7 +333,7 @@ impl<B: IntoBuf> SendStream<B> {
/// [`Error`]: struct.Error.html
pub fn send_data(&mut self, data: B, end_of_stream: bool) -> Result<(), crate::Error> {
self.inner
- .send_data(data.into_buf(), end_of_stream)
+ .send_data(data, end_of_stream)
.map_err(Into::into)
}
|
diff --git a/src/hpack/test/fixture.rs b/src/hpack/test/fixture.rs
--- a/src/hpack/test/fixture.rs
+++ b/src/hpack/test/fixture.rs
@@ -1,6 +1,6 @@
use crate::hpack::{Decoder, Encoder, Header};
-use bytes::BytesMut;
+use bytes::{buf::BufMutExt, BytesMut};
use hex::FromHex;
use serde_json::Value;
@@ -71,8 +71,10 @@ fn test_story(story: Value) {
decoder.queue_size_update(size);
}
+ let mut buf = BytesMut::with_capacity(case.wire.len());
+ buf.extend_from_slice(&case.wire);
decoder
- .decode(&mut Cursor::new(&mut case.wire.clone().into()), |e| {
+ .decode(&mut Cursor::new(&mut buf), |e| {
let (name, value) = expect.remove(0);
assert_eq!(name, key_str(&e));
assert_eq!(value, value_str(&e));
@@ -87,7 +89,8 @@ fn test_story(story: Value) {
// Now, encode the headers
for case in &cases {
- let mut buf = BytesMut::with_capacity(64 * 1024);
+ let limit = 64 * 1024;
+ let mut buf = BytesMut::with_capacity(limit);
if let Some(size) = case.header_table_size {
encoder.update_max_size(size);
@@ -104,7 +107,11 @@ fn test_story(story: Value) {
})
.collect();
- encoder.encode(None, &mut input.clone().into_iter(), &mut buf);
+ encoder.encode(
+ None,
+ &mut input.clone().into_iter(),
+ &mut (&mut buf).limit(limit),
+ );
decoder
.decode(&mut Cursor::new(&mut buf), |e| {
diff --git a/src/hpack/test/fuzz.rs b/src/hpack/test/fuzz.rs
--- a/src/hpack/test/fuzz.rs
+++ b/src/hpack/test/fuzz.rs
@@ -2,12 +2,13 @@ use crate::hpack::{Decoder, Encode, Encoder, Header};
use http::header::{HeaderName, HeaderValue};
-use bytes::{Bytes, BytesMut};
+use bytes::{buf::BufMutExt, Bytes, BytesMut};
use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
use rand::{Rng, SeedableRng, StdRng};
use std::io::Cursor;
+const MIN_CHUNK: usize = 16;
const MAX_CHUNK: usize = 2 * 1024;
#[test]
@@ -23,6 +24,16 @@ fn hpack_fuzz() {
.quickcheck(prop as fn(FuzzHpack) -> TestResult)
}
+/*
+// If wanting to test with a specific feed, uncomment and fill in the seed.
+#[test]
+fn hpack_fuzz_seeded() {
+ let _ = env_logger::try_init();
+ let seed = [/* fill me in*/];
+ FuzzHpack::new(seed).run();
+}
+*/
+
#[derive(Debug, Clone)]
struct FuzzHpack {
// The magic seed that makes the test case reproducible
@@ -121,7 +132,7 @@ impl FuzzHpack {
let mut chunks = vec![];
for _ in 0..rng.gen_range(0, 100) {
- chunks.push(rng.gen_range(0, MAX_CHUNK));
+ chunks.push(rng.gen_range(MIN_CHUNK, MAX_CHUNK));
}
FuzzHpack {
@@ -165,7 +176,8 @@ impl FuzzHpack {
let mut input = frame.headers.into_iter();
let mut index = None;
- let mut buf = BytesMut::with_capacity(chunks.pop().unwrap_or(MAX_CHUNK));
+ let mut max_chunk = chunks.pop().unwrap_or(MAX_CHUNK);
+ let mut buf = BytesMut::with_capacity(max_chunk);
if let Some(max) = frame.resizes.iter().max() {
decoder.queue_size_update(*max);
@@ -177,7 +189,7 @@ impl FuzzHpack {
}
loop {
- match encoder.encode(index.take(), &mut input, &mut buf) {
+ match encoder.encode(index.take(), &mut input, &mut (&mut buf).limit(max_chunk)) {
Encode::Full => break,
Encode::Partial(i) => {
index = Some(i);
@@ -190,7 +202,8 @@ impl FuzzHpack {
})
.expect("partial decode");
- buf = BytesMut::with_capacity(chunks.pop().unwrap_or(MAX_CHUNK));
+ max_chunk = chunks.pop().unwrap_or(MAX_CHUNK);
+ buf = BytesMut::with_capacity(max_chunk);
}
}
}
@@ -390,7 +403,7 @@ fn gen_string(g: &mut StdRng, min: usize, max: usize) -> String {
String::from_utf8(bytes).unwrap()
}
-fn to_shared(src: String) -> ::string::String<Bytes> {
+fn to_shared(src: String) -> crate::hpack::BytesStr {
let b: Bytes = src.into();
- unsafe { ::string::String::from_utf8_unchecked(b) }
+ unsafe { crate::hpack::BytesStr::from_utf8_unchecked(b) }
}
diff --git a/tests/h2-fuzz/Cargo.toml b/tests/h2-fuzz/Cargo.toml
--- a/tests/h2-fuzz/Cargo.toml
+++ b/tests/h2-fuzz/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
h2 = { path = "../.." }
env_logger = { version = "0.5.3", default-features = false }
-futures-preview = "=0.3.0-alpha.19"
+futures = { version = "0.3", default-features = false }
honggfuzz = "0.5"
-http = "0.1.3"
-tokio = "=0.2.0-alpha.6"
+http = { git = "https://github.com/hyperium/http" } #"0.1.3"
+tokio = { version = "0.2", features = [] }
diff --git a/tests/h2-support/Cargo.toml b/tests/h2-support/Cargo.toml
--- a/tests/h2-support/Cargo.toml
+++ b/tests/h2-support/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2018"
[dependencies]
h2 = { path = "../..", features = ["unstable-stream", "unstable"] }
-bytes = "0.4.7"
+bytes = "0.5"
env_logger = "0.5.9"
-futures-preview = "=0.3.0-alpha.19"
-http = "0.1.5"
-string = "0.2"
-tokio = "=0.2.0-alpha.6"
+futures = { version = "0.3", default-features = false }
+http = { git = "https://github.com/hyperium/http" } #"0.1.3"
+tokio = { version = "0.2", features = ["time"] }
+tokio-test = "0.2"
diff --git a/tests/h2-support/src/client_ext.rs b/tests/h2-support/src/client_ext.rs
--- a/tests/h2-support/src/client_ext.rs
+++ b/tests/h2-support/src/client_ext.rs
@@ -1,4 +1,4 @@
-use bytes::IntoBuf;
+use bytes::Buf;
use h2::client::{ResponseFuture, SendRequest};
use http::Request;
@@ -11,8 +11,7 @@ pub trait SendRequestExt {
impl<B> SendRequestExt for SendRequest<B>
where
- B: IntoBuf + Unpin,
- B::Buf: Unpin + 'static,
+ B: Buf + Unpin + 'static,
{
fn get(&mut self, uri: &str) -> ResponseFuture {
let req = Request::builder()
diff --git a/tests/h2-support/src/frames.rs b/tests/h2-support/src/frames.rs
--- a/tests/h2-support/src/frames.rs
+++ b/tests/h2-support/src/frames.rs
@@ -1,9 +1,9 @@
+use std::convert::TryInto;
use std::fmt;
-use bytes::{Bytes, IntoBuf};
-use http::{self, HeaderMap, HttpTryFrom};
+use bytes::Bytes;
+use http::{self, HeaderMap};
-use super::SendFrame;
use h2::frame::{self, Frame, StreamId};
pub const SETTINGS: &'static [u8] = &[0, 0, 0, 4, 0, 0, 0, 0, 0];
@@ -25,9 +25,10 @@ where
pub fn data<T, B>(id: T, buf: B) -> Mock<frame::Data>
where
T: Into<StreamId>,
- B: Into<Bytes>,
+ B: AsRef<[u8]>,
{
- Mock(frame::Data::new(id.into(), buf.into()))
+ let buf = Bytes::copy_from_slice(buf.as_ref());
+ Mock(frame::Data::new(id.into(), buf))
}
pub fn push_promise<T1, T2>(id: T1, promised: T2) -> Mock<frame::PushPromise>
@@ -100,8 +101,10 @@ where
impl Mock<frame::Headers> {
pub fn request<M, U>(self, method: M, uri: U) -> Self
where
- M: HttpTryInto<http::Method>,
- U: HttpTryInto<http::Uri>,
+ M: TryInto<http::Method>,
+ M::Error: fmt::Debug,
+ U: TryInto<http::Uri>,
+ U::Error: fmt::Debug,
{
let method = method.try_into().unwrap();
let uri = uri.try_into().unwrap();
@@ -112,7 +115,8 @@ impl Mock<frame::Headers> {
pub fn response<S>(self, status: S) -> Self
where
- S: HttpTryInto<http::StatusCode>,
+ S: TryInto<http::StatusCode>,
+ S::Error: fmt::Debug,
{
let status = status.try_into().unwrap();
let (id, _, fields) = self.into_parts();
@@ -128,8 +132,10 @@ impl Mock<frame::Headers> {
pub fn field<K, V>(self, key: K, value: V) -> Self
where
- K: HttpTryInto<http::header::HeaderName>,
- V: HttpTryInto<http::header::HeaderValue>,
+ K: TryInto<http::header::HeaderName>,
+ K::Error: fmt::Debug,
+ V: TryInto<http::header::HeaderValue>,
+ V::Error: fmt::Debug,
{
let (id, pseudo, mut fields) = self.into_parts();
fields.insert(key.try_into().unwrap(), value.try_into().unwrap());
@@ -170,12 +176,6 @@ impl From<Mock<frame::Headers>> for frame::Headers {
}
}
-impl From<Mock<frame::Headers>> for SendFrame {
- fn from(src: Mock<frame::Headers>) -> Self {
- Frame::Headers(src.0)
- }
-}
-
// Data helpers
impl Mock<frame::Data> {
@@ -190,28 +190,15 @@ impl Mock<frame::Data> {
}
}
-impl From<Mock<frame::Data>> for SendFrame {
- fn from(src: Mock<frame::Data>) -> Self {
- let id = src.0.stream_id();
- let eos = src.0.is_end_stream();
- let is_padded = src.0.is_padded();
- let payload = src.0.into_payload();
- let mut frame = frame::Data::new(id, payload.into_buf());
- frame.set_end_stream(eos);
- if is_padded {
- frame.set_padded();
- }
- Frame::Data(frame)
- }
-}
-
// PushPromise helpers
impl Mock<frame::PushPromise> {
pub fn request<M, U>(self, method: M, uri: U) -> Self
where
- M: HttpTryInto<http::Method>,
- U: HttpTryInto<http::Uri>,
+ M: TryInto<http::Method>,
+ M::Error: fmt::Debug,
+ U: TryInto<http::Uri>,
+ U::Error: fmt::Debug,
{
let method = method.try_into().unwrap();
let uri = uri.try_into().unwrap();
@@ -229,8 +216,10 @@ impl Mock<frame::PushPromise> {
pub fn field<K, V>(self, key: K, value: V) -> Self
where
- K: HttpTryInto<http::header::HeaderName>,
- V: HttpTryInto<http::header::HeaderValue>,
+ K: TryInto<http::header::HeaderName>,
+ K::Error: fmt::Debug,
+ V: TryInto<http::header::HeaderValue>,
+ V::Error: fmt::Debug,
{
let (id, promised, pseudo, mut fields) = self.into_parts();
fields.insert(key.try_into().unwrap(), value.try_into().unwrap());
@@ -247,12 +236,6 @@ impl Mock<frame::PushPromise> {
}
}
-impl From<Mock<frame::PushPromise>> for SendFrame {
- fn from(src: Mock<frame::PushPromise>) -> Self {
- Frame::PushPromise(src.0)
- }
-}
-
// GoAway helpers
impl Mock<frame::GoAway> {
@@ -281,12 +264,6 @@ impl Mock<frame::GoAway> {
}
}
-impl From<Mock<frame::GoAway>> for SendFrame {
- fn from(src: Mock<frame::GoAway>) -> Self {
- Frame::GoAway(src.0)
- }
-}
-
// ==== Reset helpers
impl Mock<frame::Reset> {
@@ -326,12 +303,6 @@ impl Mock<frame::Reset> {
}
}
-impl From<Mock<frame::Reset>> for SendFrame {
- fn from(src: Mock<frame::Reset>) -> Self {
- Frame::Reset(src.0)
- }
-}
-
// ==== Settings helpers
impl Mock<frame::Settings> {
@@ -357,12 +328,6 @@ impl From<Mock<frame::Settings>> for frame::Settings {
}
}
-impl From<Mock<frame::Settings>> for SendFrame {
- fn from(src: Mock<frame::Settings>) -> Self {
- Frame::Settings(src.0)
- }
-}
-
// ==== Ping helpers
impl Mock<frame::Ping> {
@@ -371,29 +336,3 @@ impl Mock<frame::Ping> {
Mock(frame::Ping::pong(payload))
}
}
-
-impl From<Mock<frame::Ping>> for SendFrame {
- fn from(src: Mock<frame::Ping>) -> Self {
- Frame::Ping(src.0)
- }
-}
-
-// ==== "trait alias" for types that are HttpTryFrom and have Debug Errors ====
-
-pub trait HttpTryInto<T> {
- type Error: fmt::Debug;
-
- fn try_into(self) -> Result<T, Self::Error>;
-}
-
-impl<T, U> HttpTryInto<T> for U
-where
- T: HttpTryFrom<U>,
- T::Error: fmt::Debug,
-{
- type Error = T::Error;
-
- fn try_into(self) -> Result<T, Self::Error> {
- T::try_from(self)
- }
-}
diff --git a/tests/h2-support/src/lib.rs b/tests/h2-support/src/lib.rs
--- a/tests/h2-support/src/lib.rs
+++ b/tests/h2-support/src/lib.rs
@@ -7,7 +7,6 @@ pub mod raw;
pub mod frames;
pub mod mock;
-pub mod mock_io;
pub mod prelude;
pub mod util;
@@ -21,7 +20,7 @@ pub type WindowSize = usize;
pub const DEFAULT_WINDOW_SIZE: WindowSize = (1 << 16) - 1;
// This is our test Codec type
-pub type Codec<T> = h2::Codec<T, ::std::io::Cursor<::bytes::Bytes>>;
+pub type Codec<T> = h2::Codec<T, bytes::Bytes>;
// This is the frame type that is sent
-pub type SendFrame = h2::frame::Frame<::std::io::Cursor<::bytes::Bytes>>;
+pub type SendFrame = h2::frame::Frame<bytes::Bytes>;
diff --git a/tests/h2-support/src/mock.rs b/tests/h2-support/src/mock.rs
--- a/tests/h2-support/src/mock.rs
+++ b/tests/h2-support/src/mock.rs
@@ -9,7 +9,6 @@ use futures::{ready, Stream, StreamExt};
use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
use super::assert::assert_frame_eq;
-use futures::executor::block_on;
use std::pin::Pin;
use std::sync::{Arc, Mutex};
use std::task::{Context, Poll, Waker};
@@ -324,20 +323,18 @@ impl AsyncWrite for Handle {
impl Drop for Handle {
fn drop(&mut self) {
- block_on(async {
- poll_fn(|cx| {
- assert!(self.codec.shutdown(cx).is_ready());
+ // Shutdown *shouldn't* need a real Waker...
+ let waker = futures::task::noop_waker();
+ let mut cx = Context::from_waker(&waker);
+ assert!(self.codec.shutdown(&mut cx).is_ready());
- let mut me = self.codec.get_mut().inner.lock().unwrap();
- me.closed = true;
+ if let Ok(mut me) = self.codec.get_mut().inner.lock() {
+ me.closed = true;
- if let Some(task) = me.rx_task.take() {
- task.wake();
- }
- Poll::Ready(())
- })
- .await;
- });
+ if let Some(task) = me.rx_task.take() {
+ task.wake();
+ }
+ }
}
}
@@ -482,5 +479,5 @@ impl AsyncWrite for Pipe {
}
pub async fn idle_ms(ms: u64) {
- tokio::timer::delay(tokio::clock::now() + Duration::from_millis(ms)).await
+ tokio::time::delay_for(Duration::from_millis(ms)).await
}
diff --git a/tests/h2-support/src/mock_io.rs b/tests/h2-support/src/mock_io.rs
deleted file mode 100644
--- a/tests/h2-support/src/mock_io.rs
+++ /dev/null
@@ -1,509 +0,0 @@
-//! A mock type implementing [`Read`] and [`Write`].
-//!
-//! Copied from https://github.com/carllerche/mock-io.
-//!
-//! TODO:
-//! - Either the mock-io crate should be released or this module should be
-//! removed from h2.
-//!
-//! # Overview
-//!
-//! Provides a type that implements [`Read`] + [`Write`] that can be configured
-//! to handle an arbitrary sequence of read and write operations. This is useful
-//! for writing unit tests for networking services as using an actual network
-//! type is fairly non deterministic.
-//!
-//! # Usage
-//!
-//! Add the following to your `Cargo.toml`
-//!
-//! ```toml
-//! [dependencies]
-//! mock-io = { git = "https://github.com/carllerche/mock-io" }
-//! ```
-//!
-//! Then use it in your project. For example, a test could be written:
-//!
-//! ```
-//! use mock_io::{Builder, Mock};
-//! use std::io::{Read, Write};
-//!
-//! # /*
-//! #[test]
-//! # */
-//! fn test_io() {
-//! let mut mock = Builder::new()
-//! .write(b"ping")
-//! .read(b"pong")
-//! .build();
-//!
-//! let n = mock.write(b"ping").unwrap();
-//! assert_eq!(n, 4);
-//!
-//! let mut buf = vec![];
-//! mock.read_to_end(&mut buf).unwrap();
-//!
-//! assert_eq!(buf, b"pong");
-//! }
-//! # pub fn main() {
-//! # test_io();
-//! # }
-//! ```
-//!
-//! Attempting to write data that the mock isn't expected will result in a
-//! panic.
-//!
-//! # Tokio
-//!
-//! `Mock` also supports tokio by implementing `AsyncRead` and `AsyncWrite`.
-//! When using `Mock` in context of a Tokio task, it will automatically switch
-//! to "async" behavior (this can also be set explicitly by calling `set_async`
-//! on `Builder`).
-//!
-//! In async mode, calls to read and write are non-blocking and the task using
-//! the mock is notified when the readiness state changes.
-//!
-//! # `io-dump` dump files
-//!
-//! `Mock` can also be configured from an `io-dump` file. By doing this, the
-//! mock value will replay a previously recorded behavior. This is useful for
-//! collecting a scenario from the real world and replying it as part of a test.
-//!
-//! [`Read`]: https://doc.rust-lang.org/std/io/trait.Read.html
-//! [`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html
-
-#![allow(deprecated)]
-
-use std::collections::VecDeque;
-use std::time::{Duration, Instant};
-use std::{cmp, io};
-
-/// An I/O handle that follows a predefined script.
-///
-/// This value is created by `Builder` and implements `Read + `Write`. It
-/// follows the scenario described by the builder and panics otherwise.
-#[derive(Debug)]
-pub struct Mock {
- inner: Inner,
- tokio: tokio_::Inner,
-}
-
-#[derive(Debug)]
-pub struct Handle {
- inner: tokio_::Handle,
-}
-
-/// Builds `Mock` instances.
-#[derive(Debug, Clone, Default)]
-pub struct Builder {
- // Sequence of actions for the Mock to take
- actions: VecDeque<Action>,
-}
-
-#[derive(Debug, Clone)]
-enum Action {
- Read(Vec<u8>),
- Write(Vec<u8>),
- Wait(Duration),
-}
-
-#[derive(Debug)]
-struct Inner {
- actions: VecDeque<Action>,
- waiting: Option<Instant>,
-}
-
-impl Builder {
- /// Return a new, empty `Builder.
- pub fn new() -> Self {
- Self::default()
- }
-
- /// Sequence a `read` operation.
- ///
- /// The next operation in the mock's script will be to expect a `read` call
- /// and return `buf`.
- pub fn read(&mut self, buf: &[u8]) -> &mut Self {
- self.actions.push_back(Action::Read(buf.into()));
- self
- }
-
- /// Sequence a `write` operation.
- ///
- /// The next operation in the mock's script will be to expect a `write`
- /// call.
- pub fn write(&mut self, buf: &[u8]) -> &mut Self {
- self.actions.push_back(Action::Write(buf.into()));
- self
- }
-
- /// Sequence a wait.
- ///
- /// The next operation in the mock's script will be to wait without doing so
- /// for `duration` amount of time.
- pub fn wait(&mut self, duration: Duration) -> &mut Self {
- let duration = cmp::max(duration, Duration::from_millis(1));
- self.actions.push_back(Action::Wait(duration));
- self
- }
-
- /// Build a `Mock` value according to the defined script.
- pub fn build(&mut self) -> Mock {
- let (mock, _) = self.build_with_handle();
- mock
- }
-
- /// Build a `Mock` value paired with a handle
- pub fn build_with_handle(&mut self) -> (Mock, Handle) {
- let (tokio, handle) = tokio_::Inner::new();
-
- let src = self.clone();
-
- let mock = Mock {
- inner: Inner {
- actions: src.actions,
- waiting: None,
- },
- tokio: tokio,
- };
-
- let handle = Handle { inner: handle };
-
- (mock, handle)
- }
-}
-
-impl Handle {
- /// Sequence a `read` operation.
- ///
- /// The next operation in the mock's script will be to expect a `read` call
- /// and return `buf`.
- pub fn read(&mut self, buf: &[u8]) -> &mut Self {
- self.inner.read(buf);
- self
- }
-
- /// Sequence a `write` operation.
- ///
- /// The next operation in the mock's script will be to expect a `write`
- /// call.
- pub fn write(&mut self, buf: &[u8]) -> &mut Self {
- self.inner.write(buf);
- self
- }
-}
-
-impl Inner {
- fn read(&mut self, dst: &mut [u8]) -> io::Result<usize> {
- match self.action() {
- Some(&mut Action::Read(ref mut data)) => {
- // Figure out how much to copy
- let n = cmp::min(dst.len(), data.len());
-
- // Copy the data into the `dst` slice
- (&mut dst[..n]).copy_from_slice(&data[..n]);
-
- // Drain the data from the source
- data.drain(..n);
-
- // Return the number of bytes read
- Ok(n)
- }
- Some(_) => {
- // Either waiting or expecting a write
- Err(io::ErrorKind::WouldBlock.into())
- }
- None => Ok(0),
- }
- }
-
- fn write(&mut self, mut src: &[u8]) -> io::Result<usize> {
- let mut ret = 0;
-
- if self.actions.is_empty() {
- return Err(io::ErrorKind::BrokenPipe.into());
- }
-
- match self.action() {
- Some(&mut Action::Wait(..)) => {
- return Err(io::ErrorKind::WouldBlock.into());
- }
- _ => {}
- }
-
- for i in 0..self.actions.len() {
- match self.actions[i] {
- Action::Write(ref mut expect) => {
- let n = cmp::min(src.len(), expect.len());
-
- assert_eq!(&src[..n], &expect[..n]);
-
- // Drop data that was matched
- expect.drain(..n);
- src = &src[n..];
-
- ret += n;
-
- if src.is_empty() {
- return Ok(ret);
- }
- }
- Action::Wait(..) => {
- break;
- }
- _ => {}
- }
-
- // TODO: remove write
- }
-
- Ok(ret)
- }
-
- fn remaining_wait(&mut self) -> Option<Duration> {
- match self.action() {
- Some(&mut Action::Wait(dur)) => Some(dur),
- _ => None,
- }
- }
-
- fn action(&mut self) -> Option<&mut Action> {
- loop {
- if self.actions.is_empty() {
- return None;
- }
-
- match self.actions[0] {
- Action::Read(ref mut data) => {
- if !data.is_empty() {
- break;
- }
- }
- Action::Write(ref mut data) => {
- if !data.is_empty() {
- break;
- }
- }
- Action::Wait(ref mut dur) => {
- if let Some(until) = self.waiting {
- let now = Instant::now();
-
- if now < until {
- break;
- }
- } else {
- self.waiting = Some(Instant::now() + *dur);
- break;
- }
- }
- }
-
- let _action = self.actions.pop_front();
- }
-
- self.actions.front_mut()
- }
-}
-
-// use tokio::*;
-
-mod tokio_ {
- use super::*;
-
- use futures::channel::mpsc;
- use futures::{ready, FutureExt, Stream};
- use std::task::{Context, Poll, Waker};
- use tokio::io::{AsyncRead, AsyncWrite};
- use tokio::timer::Delay;
-
- use std::pin::Pin;
-
- use std::io;
-
- #[derive(Debug)]
- pub struct Inner {
- sleep: Option<Delay>,
- read_wait: Option<Waker>,
- rx: mpsc::UnboundedReceiver<Action>,
- }
-
- #[derive(Debug)]
- pub struct Handle {
- tx: mpsc::UnboundedSender<Action>,
- }
-
- // ===== impl Handle =====
-
- impl Handle {
- pub fn read(&mut self, buf: &[u8]) {
- self.tx.unbounded_send(Action::Read(buf.into())).unwrap();
- }
-
- pub fn write(&mut self, buf: &[u8]) {
- self.tx.unbounded_send(Action::Write(buf.into())).unwrap();
- }
- }
-
- // ===== impl Inner =====
-
- impl Inner {
- pub fn new() -> (Inner, Handle) {
- let (tx, rx) = mpsc::unbounded();
-
- let inner = Inner {
- sleep: None,
- read_wait: None,
- rx: rx,
- };
-
- let handle = Handle { tx };
-
- (inner, handle)
- }
-
- pub(super) fn poll_action(&mut self, cx: &mut Context) -> Poll<Option<Action>> {
- Pin::new(&mut self.rx).poll_next(cx)
- }
- }
-
- impl Mock {
- fn maybe_wakeup_reader(&mut self) {
- match self.inner.action() {
- Some(&mut Action::Read(_)) | None => {
- if let Some(task) = self.tokio.read_wait.take() {
- task.wake();
- }
- }
- _ => {}
- }
- }
- }
-
- impl AsyncRead for Mock {
- fn poll_read(
- mut self: Pin<&mut Self>,
- cx: &mut Context<'_>,
- buf: &mut [u8],
- ) -> Poll<io::Result<usize>> {
- loop {
- if let Some(sleep) = &mut self.tokio.sleep {
- ready!(sleep.poll_unpin(cx));
- }
-
- // If a sleep is set, it has already fired
- self.tokio.sleep = None;
-
- match self.inner.read(buf) {
- Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
- if let Some(rem) = self.inner.remaining_wait() {
- self.tokio.sleep = Some(tokio::timer::delay(Instant::now() + rem));
- } else {
- self.tokio.read_wait = Some(cx.waker().clone());
- return Poll::Pending;
- }
- }
- Ok(0) => {
- // TODO: Extract
- match self.tokio.poll_action(cx) {
- Poll::Ready(Some(action)) => {
- self.inner.actions.push_back(action);
- continue;
- }
- Poll::Ready(None) => {
- return Poll::Ready(Ok(0));
- }
- Poll::Pending => {
- return Poll::Pending;
- }
- }
- }
- ret => return Poll::Ready(ret),
- }
- }
- }
- }
-
- impl AsyncWrite for Mock {
- fn poll_write(
- mut self: Pin<&mut Self>,
- cx: &mut Context<'_>,
- buf: &[u8],
- ) -> Poll<Result<usize, io::Error>> {
- loop {
- if let Some(sleep) = &mut self.tokio.sleep {
- ready!(sleep.poll_unpin(cx));
- }
-
- // If a sleep is set, it has already fired
- self.tokio.sleep = None;
-
- match self.inner.write(buf) {
- Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
- if let Some(rem) = self.inner.remaining_wait() {
- self.tokio.sleep = Some(tokio::timer::delay(Instant::now() + rem));
- } else {
- panic!("unexpected WouldBlock");
- }
- }
- Ok(0) => {
- // TODO: Is this correct?
- if !self.inner.actions.is_empty() {
- return Poll::Pending;
- }
-
- // TODO: Extract
- match self.tokio.poll_action(cx) {
- Poll::Ready(Some(action)) => {
- self.inner.actions.push_back(action);
- continue;
- }
- Poll::Ready(None) => {
- panic!("unexpected write");
- }
- Poll::Pending => return Poll::Pending,
- }
- }
- ret => {
- self.maybe_wakeup_reader();
- return Poll::Ready(ret);
- }
- }
- }
- }
-
- fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
- Poll::Ready(Ok(()))
- }
-
- fn poll_shutdown(
- self: Pin<&mut Self>,
- _cx: &mut Context<'_>,
- ) -> Poll<Result<(), io::Error>> {
- Poll::Ready(Ok(()))
- }
- }
-
- /*
- TODO: Is this required?
-
- /// Returns `true` if called from the context of a futures-rs Task
- pub fn is_task_ctx() -> bool {
- use std::panic;
-
- // Save the existing panic hook
- let h = panic::take_hook();
-
- // Install a new one that does nothing
- panic::set_hook(Box::new(|_| {}));
-
- // Attempt to call the fn
- let r = panic::catch_unwind(|| task::current()).is_ok();
-
- // Re-install the old one
- panic::set_hook(h);
-
- // Return the result
- r
- }
- */
-}
diff --git a/tests/h2-support/src/prelude.rs b/tests/h2-support/src/prelude.rs
--- a/tests/h2-support/src/prelude.rs
+++ b/tests/h2-support/src/prelude.rs
@@ -27,7 +27,7 @@ pub use super::{
pub use super::assert::assert_frame_eq;
// Re-export useful crates
-pub use super::mock_io;
+pub use tokio_test::io as mock_io;
pub use {bytes, env_logger, futures, http, tokio::io as tokio_io};
// Re-export primary future types
@@ -42,7 +42,10 @@ pub use super::client_ext::SendRequestExt;
// Re-export HTTP types
pub use http::{uri, HeaderMap, Method, Request, Response, StatusCode, Version};
-pub use bytes::{Buf, BufMut, Bytes, BytesMut, IntoBuf};
+pub use bytes::{
+ buf::{BufExt, BufMutExt},
+ Buf, BufMut, Bytes, BytesMut,
+};
pub use tokio::io::{AsyncRead, AsyncWrite};
@@ -61,7 +64,7 @@ pub trait MockH2 {
fn handshake(&mut self) -> &mut Self;
}
-impl MockH2 for super::mock_io::Builder {
+impl MockH2 for tokio_test::io::Builder {
fn handshake(&mut self) -> &mut Self {
self.write(b"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n")
// Settings frame
@@ -81,8 +84,7 @@ pub trait ClientExt {
impl<T, B> ClientExt for client::Connection<T, B>
where
T: AsyncRead + AsyncWrite + Unpin + 'static,
- B: IntoBuf + Unpin + 'static,
- B::Buf: Unpin,
+ B: Buf + Unpin + 'static,
{
fn run<'a, F: Future + Unpin + 'a>(
&'a mut self,
diff --git a/tests/h2-support/src/raw.rs b/tests/h2-support/src/raw.rs
--- a/tests/h2-support/src/raw.rs
+++ b/tests/h2-support/src/raw.rs
@@ -7,7 +7,7 @@ macro_rules! raw_codec {
$fn:ident => [$($chunk:expr,)+];
)*
) => {{
- let mut b = $crate::mock_io::Builder::new();
+ let mut b = $crate::prelude::mock_io::Builder::new();
$({
let mut chunk = vec![];
diff --git a/tests/h2-support/src/util.rs b/tests/h2-support/src/util.rs
--- a/tests/h2-support/src/util.rs
+++ b/tests/h2-support/src/util.rs
@@ -1,14 +1,21 @@
use h2;
-use bytes::Bytes;
+use bytes::{BufMut, Bytes};
use futures::ready;
use std::future::Future;
use std::pin::Pin;
use std::task::{Context, Poll};
-use string::{String, TryFrom};
-pub fn byte_str(s: &str) -> String<Bytes> {
- String::try_from(Bytes::from(s)).unwrap()
+pub fn byte_str(s: &str) -> h2::frame::BytesStr {
+ h2::frame::BytesStr::try_from(Bytes::copy_from_slice(s.as_bytes())).unwrap()
+}
+
+pub async fn concat(mut body: h2::RecvStream) -> Result<Bytes, h2::Error> {
+ let mut vec = Vec::new();
+ while let Some(chunk) = body.data().await {
+ vec.put(chunk?);
+ }
+ Ok(vec.into())
}
pub async fn yield_once() {
diff --git a/tests/h2-tests/Cargo.toml b/tests/h2-tests/Cargo.toml
--- a/tests/h2-tests/Cargo.toml
+++ b/tests/h2-tests/Cargo.toml
@@ -10,5 +10,5 @@ edition = "2018"
[dev-dependencies]
h2-support = { path = "../h2-support" }
log = "0.4.1"
-futures-preview = "=0.3.0-alpha.19"
-tokio = "=0.2.0-alpha.6"
+futures = { version = "0.3", default-features = false, features = ["alloc"] }
+tokio = { version = "0.2", features = ["macros", "tcp"] }
diff --git a/tests/h2-tests/tests/client_request.rs b/tests/h2-tests/tests/client_request.rs
--- a/tests/h2-tests/tests/client_request.rs
+++ b/tests/h2-tests/tests/client_request.rs
@@ -418,7 +418,7 @@ async fn send_reset_notifies_recv_stream() {
// We don't want a join, since any of the other futures notifying
// will make the rx future polled again, but we are
// specifically testing that rx gets notified on its own.
- let mut unordered = FuturesUnordered::<Pin<Box<dyn Future<Output = ()>>>>::new();
+ let unordered = FuturesUnordered::<Pin<Box<dyn Future<Output = ()>>>>::new();
unordered.push(Box::pin(rx));
unordered.push(Box::pin(tx));
@@ -754,7 +754,7 @@ async fn pending_send_request_gets_reset_by_peer_properly() {
let _ = env_logger::try_init();
let (io, mut srv) = mock::new();
- let payload = vec![0; (frame::DEFAULT_INITIAL_WINDOW_SIZE * 2) as usize];
+ let payload = Bytes::from(vec![0; (frame::DEFAULT_INITIAL_WINDOW_SIZE * 2) as usize]);
let max_frame_size = frame::DEFAULT_MAX_FRAME_SIZE as usize;
let srv = async {
@@ -811,7 +811,7 @@ async fn pending_send_request_gets_reset_by_peer_properly() {
};
// Send the data
- stream.send_data(payload[..].into(), true).unwrap();
+ stream.send_data(payload.clone(), true).unwrap();
conn.drive(response).await;
drop(client);
drop(stream);
@@ -897,7 +897,7 @@ async fn notify_on_send_capacity() {
// This test ensures that the client gets notified when there is additional
// send capacity. In other words, when the server is ready to accept a new
// stream, the client is notified.
- use futures::channel::oneshot;
+ use tokio::sync::oneshot;
let _ = env_logger::try_init();
@@ -1016,13 +1016,14 @@ async fn send_stream_poll_reset() {
async fn drop_pending_open() {
// This test checks that a stream queued for pending open behaves correctly when its
// client drops.
+ use tokio::sync::oneshot;
let _ = env_logger::try_init();
let (io, mut srv) = mock::new();
- let (init_tx, init_rx) = futures::channel::oneshot::channel();
- let (trigger_go_away_tx, trigger_go_away_rx) = futures::channel::oneshot::channel();
- let (sent_go_away_tx, sent_go_away_rx) = futures::channel::oneshot::channel();
- let (drop_tx, drop_rx) = futures::channel::oneshot::channel();
+ let (init_tx, init_rx) = oneshot::channel();
+ let (trigger_go_away_tx, trigger_go_away_rx) = oneshot::channel();
+ let (sent_go_away_tx, sent_go_away_rx) = oneshot::channel();
+ let (drop_tx, drop_rx) = oneshot::channel();
let mut settings = frame::Settings::default();
settings.set_max_concurrent_streams(Some(2));
@@ -1103,11 +1104,12 @@ async fn malformed_response_headers_dont_unlink_stream() {
// This test checks that receiving malformed headers frame on a stream with
// no remaining references correctly resets the stream, without prematurely
// unlinking it.
+ use tokio::sync::oneshot;
let _ = env_logger::try_init();
let (io, mut srv) = mock::new();
- let (drop_tx, drop_rx) = futures::channel::oneshot::channel();
- let (queued_tx, queued_rx) = futures::channel::oneshot::channel();
+ let (drop_tx, drop_rx) = oneshot::channel();
+ let (queued_tx, queued_rx) = oneshot::channel();
let srv = async move {
let settings = srv.assert_client_handshake().await;
diff --git a/tests/h2-tests/tests/codec_read.rs b/tests/h2-tests/tests/codec_read.rs
--- a/tests/h2-tests/tests/codec_read.rs
+++ b/tests/h2-tests/tests/codec_read.rs
@@ -175,8 +175,7 @@ async fn read_continuation_frames() {
let expected = large
.iter()
.fold(HeaderMap::new(), |mut map, &(name, ref value)| {
- use h2_support::frames::HttpTryInto;
- map.append(name, value.as_str().try_into().unwrap());
+ map.append(name, value.parse().unwrap());
map
});
assert_eq!(head.headers, expected);
diff --git a/tests/h2-tests/tests/codec_write.rs b/tests/h2-tests/tests/codec_write.rs
--- a/tests/h2-tests/tests/codec_write.rs
+++ b/tests/h2-tests/tests/codec_write.rs
@@ -27,10 +27,10 @@ async fn write_continuation_frames() {
let (mut client, mut conn) = client::handshake(io).await.expect("handshake");
let mut request = Request::builder();
- request.uri("https://http2.akamai.com/");
+ request = request.uri("https://http2.akamai.com/");
for &(name, ref value) in &large {
- request.header(name, &value[..]);
+ request = request.header(name, &value[..]);
}
let request = request.body(()).unwrap();
diff --git a/tests/h2-tests/tests/flow_control.rs b/tests/h2-tests/tests/flow_control.rs
--- a/tests/h2-tests/tests/flow_control.rs
+++ b/tests/h2-tests/tests/flow_control.rs
@@ -9,7 +9,7 @@ use h2_support::util::yield_once;
async fn send_data_without_requesting_capacity() {
let _ = env_logger::try_init();
- let payload = [0; 1024];
+ let payload = vec![0; 1024];
let mock = mock_io::Builder::new()
.handshake()
@@ -42,7 +42,7 @@ async fn send_data_without_requesting_capacity() {
assert_eq!(stream.capacity(), 0);
// Send the data
- stream.send_data(payload[..].into(), true).unwrap();
+ stream.send_data(payload.into(), true).unwrap();
// Get the response
let resp = h2.run(response).await.unwrap();
@@ -93,17 +93,17 @@ async fn release_capacity_sends_window_update() {
let mut body = resp.into_parts().1;
// read some body to use up window size to below half
- let buf = body.next().await.unwrap().unwrap();
+ let buf = body.data().await.unwrap().unwrap();
assert_eq!(buf.len(), payload_len);
- let buf = body.next().await.unwrap().unwrap();
+ let buf = body.data().await.unwrap().unwrap();
assert_eq!(buf.len(), payload_len);
- let buf = body.next().await.unwrap().unwrap();
+ let buf = body.data().await.unwrap().unwrap();
assert_eq!(buf.len(), payload_len);
body.flow_control().release_capacity(buf.len() * 2).unwrap();
- let buf = body.next().await.unwrap().unwrap();
+ let buf = body.data().await.unwrap().unwrap();
assert_eq!(buf.len(), payload_len);
};
@@ -153,11 +153,11 @@ async fn release_capacity_of_small_amount_does_not_send_window_update() {
assert_eq!(resp.status(), StatusCode::OK);
let mut body = resp.into_parts().1;
assert!(!body.is_end_stream());
- let buf = body.next().await.unwrap().unwrap();
+ let buf = body.data().await.unwrap().unwrap();
// read the small body and then release it
assert_eq!(buf.len(), 16);
body.flow_control().release_capacity(buf.len()).unwrap();
- let buf = body.next().await;
+ let buf = body.data().await;
assert!(buf.is_none());
};
join(async move { h2.await.unwrap() }, req).await;
@@ -213,7 +213,7 @@ async fn recv_data_overflows_connection_window() {
let resp = client.send_request(request, true).unwrap().0.await.unwrap();
assert_eq!(resp.status(), StatusCode::OK);
let body = resp.into_parts().1;
- let res = body.try_concat().await;
+ let res = util::concat(body).await;
let err = res.unwrap_err();
assert_eq!(
err.to_string(),
@@ -274,7 +274,7 @@ async fn recv_data_overflows_stream_window() {
let resp = client.send_request(request, true).unwrap().0.await.unwrap();
assert_eq!(resp.status(), StatusCode::OK);
let body = resp.into_parts().1;
- let res = body.try_concat().await;
+ let res = util::concat(body).await;
let err = res.unwrap_err();
assert_eq!(
err.to_string(),
@@ -685,8 +685,7 @@ async fn reserved_capacity_assigned_in_multi_window_updates() {
#[tokio::test]
async fn connection_notified_on_released_capacity() {
- use futures::channel::mpsc;
- use futures::channel::oneshot;
+ use tokio::sync::{mpsc, oneshot};
let _ = env_logger::try_init();
let (io, mut srv) = mock::new();
@@ -695,7 +694,7 @@ async fn connection_notified_on_released_capacity() {
// notifications. This test is here, in part, to ensure that the connection
// receives the appropriate notifications to send out window updates.
- let (tx, mut rx) = mpsc::unbounded();
+ let (tx, mut rx) = mpsc::unbounded_channel();
// Because threading is fun
let (settings_tx, settings_rx) = oneshot::channel();
@@ -744,11 +743,11 @@ async fn connection_notified_on_released_capacity() {
h2.drive(settings_rx).await.unwrap();
let request = Request::get("https://example.com/a").body(()).unwrap();
- tx.unbounded_send(client.send_request(request, true).unwrap().0)
+ tx.send(client.send_request(request, true).unwrap().0)
.unwrap();
let request = Request::get("https://example.com/b").body(()).unwrap();
- tx.unbounded_send(client.send_request(request, true).unwrap().0)
+ tx.send(client.send_request(request, true).unwrap().0)
.unwrap();
tokio::spawn(async move {
@@ -760,8 +759,8 @@ async fn connection_notified_on_released_capacity() {
});
// Get the two requests
- let a = rx.next().await.unwrap();
- let b = rx.next().await.unwrap();
+ let a = rx.recv().await.unwrap();
+ let b = rx.recv().await.unwrap();
// Get the first response
let response = a.await.unwrap();
@@ -769,7 +768,7 @@ async fn connection_notified_on_released_capacity() {
let (_, mut a) = response.into_parts();
// Get the next chunk
- let chunk = a.next().await.unwrap();
+ let chunk = a.data().await.unwrap();
assert_eq!(16_384, chunk.unwrap().len());
// Get the second response
@@ -778,7 +777,7 @@ async fn connection_notified_on_released_capacity() {
let (_, mut b) = response.into_parts();
// Get the next chunk
- let chunk = b.next().await.unwrap();
+ let chunk = b.data().await.unwrap();
assert_eq!(16_384, chunk.unwrap().len());
// Wait a bit
@@ -944,7 +943,6 @@ async fn recv_no_init_window_then_receive_some_init_window() {
async fn settings_lowered_capacity_returns_capacity_to_connection() {
use futures::channel::oneshot;
use futures::future::{select, Either};
- use std::time::Instant;
let _ = env_logger::try_init();
let (io, mut srv) = mock::new();
@@ -976,11 +974,7 @@ async fn settings_lowered_capacity_returns_capacity_to_connection() {
//
// A timeout is used here to avoid blocking forever if there is a
// failure
- let result = select(
- rx2,
- tokio::timer::delay(Instant::now() + Duration::from_secs(5)),
- )
- .await;
+ let result = select(rx2, tokio::time::delay_for(Duration::from_secs(5))).await;
if let Either::Right((_, _)) = result {
panic!("Timed out");
}
@@ -1012,11 +1006,7 @@ async fn settings_lowered_capacity_returns_capacity_to_connection() {
});
// Wait for server handshake to complete.
- let result = select(
- rx1,
- tokio::timer::delay(Instant::now() + Duration::from_secs(5)),
- )
- .await;
+ let result = select(rx1, tokio::time::delay_for(Duration::from_secs(5))).await;
if let Either::Right((_, _)) = result {
panic!("Timed out");
}
@@ -1113,7 +1103,7 @@ async fn increase_target_window_size_after_using_some() {
// drive an empty future to allow the WINDOW_UPDATE
// to go out while the response capacity is still in use.
conn.drive(yield_once()).await;
- let _res = conn.drive(res.into_body().try_concat()).await;
+ let _res = conn.drive(util::concat(res.into_body())).await;
conn.await.expect("client");
};
@@ -1156,7 +1146,7 @@ async fn decrease_target_window_size() {
let mut body = res.into_parts().1;
let mut cap = body.flow_control().clone();
- let bytes = conn.drive(body.try_concat()).await.expect("concat");
+ let bytes = conn.drive(util::concat(body)).await.expect("concat");
assert_eq!(bytes.len(), 65_535);
cap.release_capacity(bytes.len()).unwrap();
conn.await.expect("conn");
@@ -1568,7 +1558,7 @@ async fn data_padding() {
let resp = response.await.unwrap();
assert_eq!(resp.status(), StatusCode::OK);
let body = resp.into_body();
- let bytes = body.try_concat().await.unwrap();
+ let bytes = util::concat(body).await.unwrap();
assert_eq!(bytes.len(), 100);
};
join(async move { conn.await.expect("client") }, fut).await;
diff --git a/tests/h2-tests/tests/hammer.rs b/tests/h2-tests/tests/hammer.rs
--- a/tests/h2-tests/tests/hammer.rs
+++ b/tests/h2-tests/tests/hammer.rs
@@ -26,8 +26,8 @@ impl Server {
{
let mk_data = Arc::new(mk_data);
- let rt = tokio::runtime::Runtime::new().unwrap();
- let listener = rt
+ let mut rt = tokio::runtime::Runtime::new().unwrap();
+ let mut listener = rt
.block_on(TcpListener::bind(SocketAddr::from(([127, 0, 0, 1], 0))))
.unwrap();
let addr = listener.local_addr().unwrap();
@@ -35,8 +35,8 @@ impl Server {
let reqs2 = reqs.clone();
let join = thread::spawn(move || {
let server = async move {
- let mut incoming = listener.incoming();
- while let Some(socket) = incoming.next().await {
+ loop {
+ let socket = listener.accept().await.map(|(s, _)| s);
let reqs = reqs2.clone();
let mk_data = mk_data.clone();
tokio::spawn(async move {
@@ -140,7 +140,7 @@ fn hammer_client_concurrency() {
})
});
- let rt = tokio::runtime::Runtime::new().unwrap();
+ let mut rt = tokio::runtime::Runtime::new().unwrap();
rt.block_on(tcp);
println!("...done");
}
diff --git a/tests/h2-tests/tests/ping_pong.rs b/tests/h2-tests/tests/ping_pong.rs
--- a/tests/h2-tests/tests/ping_pong.rs
+++ b/tests/h2-tests/tests/ping_pong.rs
@@ -1,6 +1,6 @@
use futures::channel::oneshot;
use futures::future::join;
-use futures::{StreamExt, TryStreamExt};
+use futures::StreamExt;
use h2_support::assert_ping;
use h2_support::prelude::*;
@@ -84,7 +84,7 @@ async fn pong_has_highest_priority() {
assert_eq!(req.method(), "POST");
let body = req.into_parts().1;
- let body = body.try_concat().await.expect("body");
+ let body = util::concat(body).await.expect("body");
assert_eq!(body.len(), data.len());
let res = Response::builder().status(200).body(()).unwrap();
stream.send_response(res, true).expect("response");
diff --git a/tests/h2-tests/tests/prioritization.rs b/tests/h2-tests/tests/prioritization.rs
--- a/tests/h2-tests/tests/prioritization.rs
+++ b/tests/h2-tests/tests/prioritization.rs
@@ -8,7 +8,7 @@ use std::task::Context;
async fn single_stream_send_large_body() {
let _ = env_logger::try_init();
- let payload = [0; 1024];
+ let payload = vec![0; 1024];
let mock = mock_io::Builder::new()
.handshake()
@@ -55,7 +55,7 @@ async fn single_stream_send_large_body() {
assert_eq!(stream.capacity(), payload.len());
// Send the data
- stream.send_data(payload[..].into(), true).unwrap();
+ stream.send_data(payload.into(), true).unwrap();
// Get the response
let resp = h2.run(response).await.unwrap();
@@ -116,7 +116,7 @@ async fn multiple_streams_with_payload_greater_than_default_window() {
stream3.reserve_capacity(payload_clone.len());
assert_eq!(stream3.capacity(), 0);
- stream1.send_data(payload_clone[..].into(), true).unwrap();
+ stream1.send_data(payload_clone.into(), true).unwrap();
// hold onto streams so they don't close
// stream1 doesn't close because response1 is used
diff --git a/tests/h2-tests/tests/push_promise.rs b/tests/h2-tests/tests/push_promise.rs
--- a/tests/h2-tests/tests/push_promise.rs
+++ b/tests/h2-tests/tests/push_promise.rs
@@ -45,7 +45,7 @@ async fn recv_push_works() {
assert_eq!(request.into_parts().0.method, Method::GET);
let resp = response.await.unwrap();
assert_eq!(resp.status(), StatusCode::OK);
- let b = resp.into_body().try_concat().await.unwrap();
+ let b = util::concat(resp.into_body()).await.unwrap();
assert_eq!(b, "promised_data");
Ok(())
}
diff --git a/tests/h2-tests/tests/server.rs b/tests/h2-tests/tests/server.rs
--- a/tests/h2-tests/tests/server.rs
+++ b/tests/h2-tests/tests/server.rs
@@ -1,7 +1,7 @@
#![deny(warnings)]
use futures::future::{join, poll_fn};
-use futures::{StreamExt, TryStreamExt};
+use futures::StreamExt;
use h2_support::prelude::*;
use tokio::io::AsyncWriteExt;
@@ -526,7 +526,7 @@ async fn abrupt_shutdown() {
let (req, tx) = srv.next().await.unwrap().expect("server receives request");
let req_fut = async move {
- let body = req.into_body().try_concat().await;
+ let body = util::concat(req.into_body()).await;
drop(tx);
let err = body.expect_err("request body should error");
assert_eq!(
@@ -608,7 +608,7 @@ async fn graceful_shutdown() {
let body = req.into_parts().1;
let body = async move {
- let buf = body.try_concat().await.unwrap();
+ let buf = util::concat(body).await.unwrap();
assert!(buf.is_empty());
let rsp = http::Response::builder().status(200).body(()).unwrap();
diff --git a/tests/h2-tests/tests/stream_states.rs b/tests/h2-tests/tests/stream_states.rs
--- a/tests/h2-tests/tests/stream_states.rs
+++ b/tests/h2-tests/tests/stream_states.rs
@@ -5,6 +5,7 @@ use futures::{FutureExt, StreamExt, TryStreamExt};
use h2_support::prelude::*;
use h2_support::util::yield_once;
use std::task::Poll;
+use tokio::sync::oneshot;
#[tokio::test]
async fn send_recv_headers_only() {
@@ -80,7 +81,7 @@ async fn send_recv_data() {
assert_eq!(stream.capacity(), 5);
// Send the data
- stream.send_data("hello", true).unwrap();
+ stream.send_data("hello".as_bytes(), true).unwrap();
// Get the response
let resp = h2.run(response).await.unwrap();
@@ -204,7 +205,7 @@ async fn errors_if_recv_frame_exceeds_max_frame_size() {
let resp = client.get("https://example.com/").await.expect("response");
assert_eq!(resp.status(), StatusCode::OK);
let body = resp.into_parts().1;
- let res = body.try_concat().await;
+ let res = util::concat(body).await;
let err = res.unwrap_err();
assert_eq!(err.to_string(), "protocol error: frame with invalid size");
};
@@ -252,7 +253,7 @@ async fn configure_max_frame_size() {
let resp = client.get("https://example.com/").await.expect("response");
assert_eq!(resp.status(), StatusCode::OK);
let body = resp.into_parts().1;
- let buf = body.try_concat().await.expect("body");
+ let buf = util::concat(body).await.expect("body");
assert_eq!(buf.len(), 16_385);
};
@@ -313,7 +314,7 @@ async fn recv_goaway_finishes_processed_streams() {
.expect("response");
assert_eq!(resp.status(), StatusCode::OK);
let body = resp.into_parts().1;
- let buf = body.try_concat().await.expect("body");
+ let buf = util::concat(body).await.expect("body");
assert_eq!(buf.len(), 16_384);
};
@@ -702,7 +703,7 @@ async fn rst_while_closing() {
let (io, mut srv) = mock::new();
// Rendevous when we've queued a trailers frame
- let (tx, rx) = crate::futures::channel::oneshot::channel();
+ let (tx, rx) = oneshot::channel();
let srv = async move {
let settings = srv.assert_client_handshake().await;
@@ -765,7 +766,7 @@ async fn rst_with_buffered_data() {
let (io, mut srv) = mock::new_with_write_capacity(73);
// Synchronize the client / server on response
- let (tx, rx) = crate::futures::channel::oneshot::channel();
+ let (tx, rx) = oneshot::channel();
let srv = async move {
let settings = srv.assert_client_handshake().await;
@@ -817,7 +818,7 @@ async fn err_with_buffered_data() {
let (io, mut srv) = mock::new_with_write_capacity(73);
// Synchronize the client / server on response
- let (tx, rx) = crate::futures::channel::oneshot::channel();
+ let (tx, rx) = oneshot::channel();
let srv = async move {
let settings = srv.assert_client_handshake().await;
@@ -872,7 +873,7 @@ async fn send_err_with_buffered_data() {
let (io, mut srv) = mock::new_with_write_capacity(73);
// Synchronize the client / server on response
- let (tx, rx) = crate::futures::channel::oneshot::channel();
+ let (tx, rx) = oneshot::channel();
let srv = async move {
let settings = srv.assert_client_handshake().await;
|
Update to tokio 0.2
| 2019-11-26T22:43:14
|
rust
|
Hard
|
|
servo/rust-url
| 240
|
servo__rust-url-240
|
[
"160"
] |
1be1b3be4d9d03ddd9b0d342d93f52f618ba4326
|
diff --git a/idna/src/uts46.rs b/idna/src/uts46.rs
--- a/idna/src/uts46.rs
+++ b/idna/src/uts46.rs
@@ -198,12 +198,10 @@ fn validate(label: &str, flags: Flags, errors: &mut Vec<Error>) {
}
// Can not contain '.' since the input is from .split('.')
- if {
- let mut chars = label.chars().skip(2);
- let third = chars.next();
- let fourth = chars.next();
- (third, fourth) == (Some('-'), Some('-'))
- } || label.starts_with("-")
+ // Spec says that the label must not contain a HYPHEN-MINUS character in both the
+ // third and fourth positions. But nobody follows this criteria. See the spec issue below:
+ // https://github.com/whatwg/url/issues/53
+ if label.starts_with("-")
|| label.ends_with("-")
|| label.chars().next().map_or(false, is_combining_mark)
|| label.chars().any(|c| match *find_char(c) {
|
diff --git a/tests/unit.rs b/tests/unit.rs
--- a/tests/unit.rs
+++ b/tests/unit.rs
@@ -192,6 +192,7 @@ fn host_serialization() {
fn test_idna() {
assert!("http://goșu.ro".parse::<Url>().is_ok());
assert_eq!(Url::parse("http://☃.net/").unwrap().host(), Some(Host::Domain("xn--n3h.net")));
+ assert!("https://r2---sn-huoa-cvhl.googlevideo.com/crossdomain.xml".parse::<Url>().is_ok());
}
#[test]
|
Consider ignoring UTS46 validity criteria V2
```
Each of the following criteria must be satisfied for a label:
2. The label must not contain a U+002D HYPHEN-MINUS character in both the third and fourth positions.
```
However, it seems that other UAs don't enforce this, and it matches domains commonly used on youtube. ex: r6---sn-5hne6nee.googlevideo.com
|
In that case, UTS-46 should probably be changed to match reality. It says:
> Please submit corrigenda and other comments with the online reporting form [[Feedback](http://www.unicode.org/reporting.html)].
so please do that. But since Unicode doesn’t have a public bug tracker, it’d be good to also track it in https://github.com/whatwg/url/issues/53.
Just to note, I raised the issue using the reporting form, and they took note of the offending URLs such as http://r6---sn-5hne6nee.googlevideo.com
```
The rule is only included because the IETF wanted to reserve labels of the form XX--... for future use, in case they wanted another signature like "xn--"
```
They will probably address this in the June release of the next version.
| 2016-11-18T21:05:22
|
rust
|
Hard
|
shuttle-hq/synth
| 405
|
shuttle-hq__synth-405
|
[
"271"
] |
1ff5eacff8f0435b5b918d24562e1a97d60d2bf2
|
diff --git a/core/src/graph/number.rs b/core/src/graph/number.rs
--- a/core/src/graph/number.rs
+++ b/core/src/graph/number.rs
@@ -51,6 +51,7 @@ macro_rules! any_range_int_impl {
}
}
+any_range_int_impl! { u16 }
any_range_int_impl! { u32 }
any_range_int_impl! { u64 }
@@ -218,6 +219,7 @@ macro_rules! standard_int_range_step_impl {
}
}
+standard_int_range_step_impl! { i16, i32, u16}
standard_int_range_step_impl! { i32, i64, u32 }
standard_int_range_step_impl! { u32, u32, u32 }
standard_int_range_step_impl! { i64, i128, u64 }
@@ -472,6 +474,12 @@ number_node!(
F32Range<StandardFloatRangeStep<f32>> as range,
F32Constant as constant,,,
) for f32,
+ RandomI16 (
+ I16Range<StandardIntRangeStep<u16, i32>> as range,
+ I16Constant as constant,
+ I16Categorical as categorical,
+ Incrementing as incrementing,
+ ) for i16,
);
#[cfg(test)]
diff --git a/core/src/schema/content/array.rs b/core/src/schema/content/array.rs
--- a/core/src/schema/content/array.rs
+++ b/core/src/schema/content/array.rs
@@ -103,6 +103,15 @@ impl<'de> Deserialize<'de> for ArrayContent {
r.low .unwrap_or_default() .into(),
).map_err(A::Error::custom)?
},
+ Content::Number(NumberContent::I16(number_content::I16::Range(r))) => {
+ if r.high.is_none() {
+ return Err(A::Error::custom("missing high value for array length range"));
+ }
+
+ is_positive(
+ r.low .unwrap_or_default() .into(),
+ ).map_err(A::Error::custom)?
+ },
Content::SameAs(_) => {},
Content::Null(_) => return Err(de::Error::custom("array length is missing. Try adding '\"length\": [number]' to the array type where '[number]' is a positive integer")),
Content::Empty(_) => return Err(de::Error::custom("array length is not a constant or number type. Try replacing the '\"length\": {}' with '\"length\": [number]' where '[number]' is a positive integer")),
diff --git a/core/src/schema/content/number.rs b/core/src/schema/content/number.rs
--- a/core/src/schema/content/number.rs
+++ b/core/src/schema/content/number.rs
@@ -4,7 +4,7 @@ use std::hash::{Hash, Hasher};
use super::Categorical;
-use crate::graph::number::{RandomF32, RandomI32, RandomU32};
+use crate::graph::number::{RandomF32, RandomI16, RandomI32, RandomU32};
use serde::{
de::{Deserialize, Deserializer},
ser::Serializer,
@@ -209,6 +209,7 @@ impl NumberContent {
match self {
NumberContent::U32(_) => Ok(Self::u32_default_id()),
NumberContent::U64(_) => Ok(Self::u64_default_id()),
+ NumberContent::I16(_) => Ok(Self::i16_default_id()),
NumberContent::I32(_) => Ok(Self::i32_default_id()),
NumberContent::I64(_) => Ok(Self::i64_default_id()),
NumberContent::F64(_) => bail!("could not transmute f64 into id"),
@@ -224,6 +225,10 @@ impl NumberContent {
NumberContent::U64(number_content::U64::Id(Id::default()))
}
+ pub fn i16_default_id() -> Self {
+ NumberContent::I16(number_content::I16::Id(Id::default()))
+ }
+
pub fn i32_default_id() -> Self {
NumberContent::I32(number_content::I32::Id(Id::default()))
}
@@ -371,7 +376,7 @@ macro_rules! derive_hash {
};
}
-derive_hash!(i32, u32, i64, u64, f32, f64);
+derive_hash!(i16, i32, u32, i64, u64, f32, f64);
number_content!(
#[derive(PartialEq, Hash)]
@@ -389,6 +394,13 @@ number_content!(
Id(crate::schema::Id<u64>),
},
#[derive(PartialEq, Hash)]
+ i16[is_i16, default_i16_range] as I16 {
+ Range(RangeStep<i16>),
+ Categorical(Categorical<i16>),
+ Constant(i16),
+ Id(crate::schema::Id<i16>),
+ },
+ #[derive(PartialEq, Hash)]
i32[is_i32, default_i32_range] as I32 {
Range(RangeStep<i32>),
Categorical(Categorical<i32>),
@@ -482,6 +494,19 @@ impl Compile for NumberContent {
};
random_f32.into()
}
+ Self::I16(i16_content) => {
+ let random_i16 = match i16_content {
+ number_content::I16::Range(range) => RandomI16::range(*range)?,
+ number_content::I16::Categorical(categorical_content) => {
+ RandomI16::categorical(categorical_content.clone())
+ }
+ number_content::I16::Constant(val) => RandomI16::constant(*val),
+ number_content::I16::Id(id) => {
+ RandomI16::incrementing(Incrementing::new_at(id.start_at.unwrap_or(1)))
+ }
+ };
+ random_i16.into()
+ }
};
Ok(Graph::Number(number_node))
}
diff --git a/core/src/schema/inference/mod.rs b/core/src/schema/inference/mod.rs
--- a/core/src/schema/inference/mod.rs
+++ b/core/src/schema/inference/mod.rs
@@ -15,7 +15,7 @@ use super::{
Content, DateTimeContent, Id, NumberContent, NumberKindExt, ObjectContent, OneOfContent,
RangeStep, StringContent, ValueKindExt,
};
-use crate::graph::prelude::content::number_content::{I32, I64};
+use crate::graph::prelude::content::number_content::{I16, I32, I64};
use crate::schema::UniqueContent;
use num::Zero;
@@ -324,6 +324,17 @@ impl MergeStrategy<number_content::F32, f32> for OptionalMergeStrategy {
}
}
+impl MergeStrategy<number_content::I16, i16> for OptionalMergeStrategy {
+ fn try_merge(self, master: &mut number_content::I16, candidate: &i16) -> Result<()> {
+ match master {
+ number_content::I16::Range(range) => self.try_merge(range, candidate),
+ number_content::I16::Categorical(cat) => self.try_merge(cat, candidate),
+ number_content::I16::Constant(cst) => self.try_merge(cst, candidate),
+ I16::Id(id) => self.try_merge(id, candidate),
+ }
+ }
+}
+
impl MergeStrategy<NumberContent, Number> for OptionalMergeStrategy {
fn try_merge(self, master: &mut NumberContent, value: &Number) -> Result<()> {
match master {
@@ -372,6 +383,13 @@ impl MergeStrategy<NumberContent, Number> for OptionalMergeStrategy {
todo!()
}
}
+ NumberContent::I16(i16_content) => {
+ if let Some(n) = value.as_i64() {
+ self.try_merge(i16_content, &(n as i16))
+ } else {
+ todo!()
+ }
+ }
}
}
}
diff --git a/synth/src/datasource/postgres_datasource.rs b/synth/src/datasource/postgres_datasource.rs
--- a/synth/src/datasource/postgres_datasource.rs
+++ b/synth/src/datasource/postgres_datasource.rs
@@ -12,7 +12,7 @@ use sqlx::postgres::{PgColumn, PgPoolOptions, PgRow, PgTypeInfo, PgTypeKind};
use sqlx::{Column, Executor, Pool, Postgres, Row, TypeInfo};
use std::collections::BTreeMap;
use std::convert::TryFrom;
-use synth_core::schema::number_content::{F32, F64, I32, I64};
+use synth_core::schema::number_content::{F32, F64, I16, I32, I64};
use synth_core::schema::{
ArrayContent, BoolContent, Categorical, ChronoValue, ChronoValueAndFormat, ChronoValueType,
DateTimeContent, NumberContent, ObjectContent, RangeStep, RegexContent, StringContent, Uuid,
@@ -198,7 +198,7 @@ impl SqlxDataSource for PostgresDataSource {
RegexContent::pattern(pattern).context("pattern will always compile")?,
))
}
- "int2" => Content::Number(NumberContent::I32(I32::Range(RangeStep::default()))),
+ "int2" => Content::Number(NumberContent::I16(I16::Range(RangeStep::default()))),
"int4" => Content::Number(NumberContent::I32(I32::Range(RangeStep::default()))),
"int8" => Content::Number(NumberContent::I64(I64::Range(RangeStep::default()))),
"float4" => Content::Number(NumberContent::F32(F32::Range(RangeStep::default()))),
|
diff --git a/synth/testing_harness/postgres/0_complete_schema.sql b/synth/testing_harness/postgres/0_complete_schema.sql
--- a/synth/testing_harness/postgres/0_complete_schema.sql
+++ b/synth/testing_harness/postgres/0_complete_schema.sql
@@ -12,7 +12,7 @@ create table types
string_bpchar bpchar(6) NOT NULL,
string_name name NOT NULL,
/* string_uuid uuid NOT NULL, */
- /* i64_int2 int2 NOT NULL, */
+ i16_int2 int2 NOT NULL,
i32_int4 int4 NOT NULL,
i64_int8 int8 NOT NULL,
f32_float4 float4 NOT NULL,
diff --git a/synth/testing_harness/postgres/arrays_master/arrays.json b/synth/testing_harness/postgres/arrays_master/arrays.json
--- a/synth/testing_harness/postgres/arrays_master/arrays.json
+++ b/synth/testing_harness/postgres/arrays_master/arrays.json
@@ -135,7 +135,7 @@
"low": -30856,
"high": 32726
},
- "subtype": "i32"
+ "subtype": "i16"
}
},
"int4_array": {
@@ -463,7 +463,7 @@
"low": 341,
"high": 32588
},
- "subtype": "i32"
+ "subtype": "i16"
}
},
"uint4_array": {
diff --git a/synth/testing_harness/postgres/arrays_master/unofficial_arrays.json b/synth/testing_harness/postgres/arrays_master/unofficial_arrays.json
--- a/synth/testing_harness/postgres/arrays_master/unofficial_arrays.json
+++ b/synth/testing_harness/postgres/arrays_master/unofficial_arrays.json
@@ -196,7 +196,7 @@
"low": -31803,
"high": 31156
},
- "subtype": "i32"
+ "subtype": "i16"
}
},
"timestamp_with_time_zone_array": {
@@ -295,8 +295,8 @@
"low": 531,
"high": 32717
},
- "subtype": "i32"
+ "subtype": "i16"
}
}
}
-}
\ No newline at end of file
+}
diff --git a/synth/testing_harness/postgres/complete_import_master/types.json b/synth/testing_harness/postgres/complete_import_master/types.json
--- a/synth/testing_harness/postgres/complete_import_master/types.json
+++ b/synth/testing_harness/postgres/complete_import_master/types.json
@@ -86,6 +86,14 @@
"high": 3.141592653589793
}
},
+ "i16_int2": {
+ "type": "number",
+ "subtype": "i16",
+ "range": {
+ "high": -16768,
+ "low": -16768
+ }
+ },
"date_time_timestamptz": {
"type": "one_of",
"variants": [
diff --git a/synth/testing_harness/postgres/complete_import_master/unofficial_types.json b/synth/testing_harness/postgres/complete_import_master/unofficial_types.json
--- a/synth/testing_harness/postgres/complete_import_master/unofficial_types.json
+++ b/synth/testing_harness/postgres/complete_import_master/unofficial_types.json
@@ -80,7 +80,7 @@
},
"id_serial2": {
"type": "number",
- "subtype": "i32",
+ "subtype": "i16",
"range": {
"low": 1,
"high": 10
@@ -88,7 +88,7 @@
},
"id_smallserial": {
"type": "number",
- "subtype": "i32",
+ "subtype": "i16",
"range": {
"low": 1,
"high": 10
diff --git a/synth/testing_harness/postgres/complete_master/types.json b/synth/testing_harness/postgres/complete_master/types.json
--- a/synth/testing_harness/postgres/complete_master/types.json
+++ b/synth/testing_harness/postgres/complete_master/types.json
@@ -65,6 +65,11 @@
"subtype": "f64",
"constant": 3.14159265358979323
},
+ "i16_int2": {
+ "type": "number",
+ "subtype": "i16",
+ "constant": -16768
+ },
"date_time_timestamptz": {
"type": "date_time",
"subtype": "date_time",
|
bug: generating int2 for postgres gives 'incorrect binary data format' error
**Describe the bug**
Trying to generate a number for a postgres `int2` column gives an 'incorrect binary data format' error.
**To Reproduce**
Steps to reproduce the behavior:
1. Schema (postgres)
```sql
CREATE TABLE test
(
age int2
)
```
2. Schema (Synth)
```json
{
"type": "array",
"length": 1,
"content": {
"type": "object",
"age": {
"type": "number",
"subtype": "i64",
"constant": 5
}
}
}
```
3. See error
```
Error: At namespace "int2"
Caused by:
0: Failed to insert data for collection test
1: One or more database inserts failed: error returned from database: incorrect binary data format in bind parameter 1: incorrect binary data format in bind parameter 1
```
4. Error (postgres logs)
```
2021-12-23 07:33:04.840 UTC [89] ERROR: incorrect binary data format in bind parameter 1
2021-12-23 07:33:04.840 UTC [89] CONTEXT: unnamed portal parameter $1
2021-12-23 07:33:04.840 UTC [89] STATEMENT: INSERT INTO test (age) VALUES
($1);
```
**Expected behavior**
According to the [postgres integration](https://www.getsynth.com/docs/integrations/postgres) page the generation should succeed. On a technical level, the integration page is wrong as an `int2` is equivalent to an `i16` which Synth does not have.
**Environment (please complete the following information):**
- OS: Linux
- Version: 0.6.2
**Additional context**
A successful fix should restore this [e2e test](https://github.com/getsynth/synth/pull/268/files#diff-5c7f226dd02b2a0c9d5768d724c00b4eee2bbadef264763ec45e8264e54fcfcfR14) and possibly also update the integration page
| 2022-12-20T00:40:32
|
rust
|
Hard
|
|
kivikakk/comrak
| 86
|
kivikakk__comrak-86
|
[
"52"
] |
8e382ae1b9e1916e974a49706b1a2e657c35eaee
|
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -46,9 +46,9 @@ FLAGS:
OPTIONS:
--default-info-string <INFO> Default value for fenced code block's info strings if none is given
- -e, --extension <EXTENSION>... Specify an extension name to use [values: strikethrough, tagfilter, table,
- autolink, tasklist, superscript, footnotes]
- -t, --to <FORMAT> Specify output format [default: html] [values: html, commonmark]
+ -e, --extension <EXTENSION>... Specify an extension name to use [possible values: strikethrough, tagfilter,
+ table, autolink, tasklist, superscript, footnotes, description-lists]
+ -t, --to <FORMAT> Specify output format [default: html] [possible values: html, commonmark]
--header-ids <PREFIX> Use the Comrak header IDs extension, with the given ID prefix
--width <WIDTH> Specify wrap width (0 = nowrap) [default: 0]
@@ -127,7 +127,7 @@ Comrak supports the five extensions to CommonMark defined in the
* [Autolinks](https://github.github.com/gfm/#autolinks-extension-)
* [Disallowed Raw HTML](https://github.github.com/gfm/#disallowed-raw-html-extension-)
-as well as superscript and footnotes.
+as well as superscript, footnotes, and description lists.
By default none are enabled; they are individually enabled with each parse by
setting the appropriate values in the
diff --git a/examples/s-expr.rs b/examples/s-expr.rs
new file mode 100644
--- /dev/null
+++ b/examples/s-expr.rs
@@ -0,0 +1,115 @@
+// s-expr
+//
+// Parse CommonMark source files and print their AST as S-expressions.
+//
+// # Usage
+//
+// $ cargo run --example s-expr file1.md file2.md ...
+// $ cat file.md | cargo run --example s-expr
+
+extern crate comrak;
+
+/// Spaces to indent nested nodes
+const INDENT: usize = 4;
+
+/// If true, the close parenthesis is printed in its own line.
+const CLOSE_NEWLINE: bool = false;
+
+use comrak::{parse_document, Arena, ComrakOptions};
+use comrak::nodes::{AstNode, NodeValue};
+use std::env;
+use std::error::Error;
+use std::fs::File;
+use std::io::{self, BufWriter, Read, Write};
+
+fn iter_nodes<'a, W: Write>(
+ node: &'a AstNode<'a>,
+ writer: &mut W,
+ indent: usize,
+) -> io::Result<()> {
+
+ use NodeValue::*;
+
+ macro_rules! try_node_inline {
+ ($node:expr, $name:ident) => ({
+ if let $name(t) = $node {
+ return write!(writer, concat!(stringify!($name), "({:?})"), String::from_utf8_lossy(&t));
+ }
+ })
+ }
+
+ match &node.data.borrow().value {
+ Text(t) => write!(writer, "{:?}", String::from_utf8_lossy(&t))?,
+ value => {
+ try_node_inline!(value, Code);
+ try_node_inline!(value, FootnoteDefinition);
+ try_node_inline!(value, FootnoteReference);
+ try_node_inline!(value, HtmlInline);
+
+ let has_blocks = node.children().any(|c| c.data.borrow().value.block());
+
+ write!(writer, "({:?}", value)?;
+ for child in node.children() {
+ if has_blocks {
+ write!(writer, "\n{1:0$}", indent + INDENT, " ")?;
+ } else {
+ write!(writer, " ")?;
+ }
+ iter_nodes(child, writer, indent + INDENT)?;
+ }
+
+ if indent == 0 {
+ write!(writer, "\n)\n")?;
+ } else if CLOSE_NEWLINE && has_blocks {
+ write!(writer, "\n{1:0$})", indent, " ")?;
+ } else {
+ write!(writer, ")")?;
+ }
+ }
+ }
+
+ Ok(())
+}
+
+fn dump(source: &str) -> io::Result<()> {
+
+ let arena = Arena::new();
+
+ let opts = ComrakOptions {
+ ext_strikethrough: true,
+ ext_tagfilter: true,
+ ext_table: true,
+ ext_autolink: true,
+ ext_tasklist: true,
+ ext_superscript: true,
+ ext_footnotes: true,
+ ext_description_lists: true,
+ ..ComrakOptions::default()
+ };
+
+ let doc = parse_document(&arena, source, &opts);
+
+ let mut output = BufWriter::new(io::stdout());
+ iter_nodes(doc, &mut output, 0)
+}
+
+fn main() -> Result<(), Box<Error>> {
+
+ let mut args = env::args_os().skip(1).peekable();
+ let mut body = String::new();
+
+ if args.peek().is_none() {
+ io::stdin().read_to_string(&mut body)?;
+ dump(&body)?;
+ }
+
+ for filename in args {
+ println!("{:?}", filename);
+
+ body.clear();
+ File::open(&filename)?.read_to_string(&mut body)?;
+ dump(&body)?;
+ }
+
+ Ok(())
+}
diff --git a/src/cm.rs b/src/cm.rs
--- a/src/cm.rs
+++ b/src/cm.rs
@@ -335,6 +335,10 @@ impl<'a, 'o> CommonMarkFormatter<'a, 'o> {
self.cr();
}
}
+ NodeValue::DescriptionList => (),
+ NodeValue::DescriptionItem(..) => (),
+ NodeValue::DescriptionTerm => (),
+ NodeValue::DescriptionDetails => if entering { write!(self, ": ").unwrap() },
NodeValue::Heading(ref nch) => if entering {
for _ in 0..nch.level {
write!(self, "#").unwrap();
diff --git a/src/html.rs b/src/html.rs
--- a/src/html.rs
+++ b/src/html.rs
@@ -348,6 +348,23 @@ impl<'o> HtmlFormatter<'o> {
} else {
try!(self.output.write_all(b"</li>\n"));
},
+ NodeValue::DescriptionList => if entering {
+ try!(self.cr());
+ try!(self.output.write_all(b"<dl>"));
+ } else {
+ try!(self.output.write_all(b"</dl>\n"));
+ },
+ NodeValue::DescriptionItem(..) => (),
+ NodeValue::DescriptionTerm => if entering {
+ try!(self.output.write_all(b"<dt>"));
+ } else {
+ try!(self.output.write_all(b"</dt>\n"));
+ },
+ NodeValue::DescriptionDetails => if entering {
+ try!(self.output.write_all(b"<dd>"));
+ } else {
+ try!(self.output.write_all(b"</dd>\n"));
+ },
NodeValue::Heading(ref nch) => {
lazy_static! {
static ref REJECTED_CHARS: Regex = Regex::new(r"[^\p{L}\p{M}\p{N}\p{Pc} -]").unwrap();
diff --git a/src/main.rs b/src/main.rs
--- a/src/main.rs
+++ b/src/main.rs
@@ -64,6 +64,7 @@ fn main() {
"tasklist",
"superscript",
"footnotes",
+ "description-lists",
])
.value_name("EXTENSION")
.help("Specify an extension name to use"),
@@ -125,6 +126,7 @@ fn main() {
ext_superscript: exts.remove("superscript"),
ext_header_ids: matches.value_of("header-ids").map(|s| s.to_string()),
ext_footnotes: matches.is_present("footnotes"),
+ ext_description_lists: exts.remove("description-lists"),
};
assert!(exts.is_empty());
diff --git a/src/nodes.rs b/src/nodes.rs
--- a/src/nodes.rs
+++ b/src/nodes.rs
@@ -33,6 +33,31 @@ pub enum NodeValue {
/// **blocks**.
Item(NodeList),
+ /// **Block**. A description list, enabled with `ext_description_lists` option. Contains
+ /// description items.
+ ///
+ /// It is required to put a blank line between terms and details.
+ ///
+ /// ``` md
+ /// Term 1
+ ///
+ /// : Details 1
+ ///
+ /// Term 2
+ ///
+ /// : Details 2
+ /// ```
+ DescriptionList,
+
+ /// *Block**. An item of a description list. Contains a term and one details block.
+ DescriptionItem(NodeDescriptionItem),
+
+ /// **Block**. Term of an item in a definition list.
+ DescriptionTerm,
+
+ /// **Block**. Details of an item in a definition list.
+ DescriptionDetails,
+
/// **Block**. A code block; may be [fenced](https://github.github.com/gfm/#fenced-code-blocks)
/// or [indented](https://github.github.com/gfm/#indented-code-blocks). Contains raw text
/// which is not parsed as Markdown, although is HTML escaped.
@@ -167,6 +192,16 @@ pub struct NodeList {
pub tight: bool,
}
+/// The metadata of a description list
+#[derive(Debug, Default, Clone, Copy)]
+pub struct NodeDescriptionItem {
+ #[doc(hidden)]
+ pub marker_offset: usize,
+
+ #[doc(hidden)]
+ pub padding: usize,
+}
+
/// The type of list.
#[derive(Debug, Clone, Copy, PartialEq)]
pub enum ListType {
@@ -253,6 +288,10 @@ impl NodeValue {
| NodeValue::BlockQuote
| NodeValue::FootnoteDefinition(_)
| NodeValue::List(..)
+ | NodeValue::DescriptionList
+ | NodeValue::DescriptionItem(_)
+ | NodeValue::DescriptionTerm
+ | NodeValue::DescriptionDetails
| NodeValue::Item(..)
| NodeValue::CodeBlock(..)
| NodeValue::HtmlBlock(..)
@@ -356,6 +395,8 @@ pub fn can_contain_type<'a>(node: &'a AstNode<'a>, child: &NodeValue) -> bool {
NodeValue::Document
| NodeValue::BlockQuote
| NodeValue::FootnoteDefinition(_)
+ | NodeValue::DescriptionTerm
+ | NodeValue::DescriptionDetails
| NodeValue::Item(..) => {
child.block() && match *child {
NodeValue::Item(..) => false,
@@ -368,6 +409,16 @@ pub fn can_contain_type<'a>(node: &'a AstNode<'a>, child: &NodeValue) -> bool {
_ => false,
},
+ NodeValue::DescriptionList => match *child {
+ NodeValue::DescriptionItem(_) => true,
+ _ => false,
+ },
+
+ NodeValue::DescriptionItem(_) => match *child {
+ NodeValue::DescriptionTerm | NodeValue::DescriptionDetails => true,
+ _ => false,
+ },
+
NodeValue::Paragraph
| NodeValue::Heading(..)
| NodeValue::Emph
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -6,8 +6,8 @@ use arena_tree::Node;
use ctype::{isdigit, isspace};
use entity;
use nodes;
-use nodes::{make_block, Ast, AstNode, ListDelimType, ListType, NodeCodeBlock, NodeHeading,
- NodeHtmlBlock, NodeList, NodeValue};
+use nodes::{make_block, Ast, AstNode, ListDelimType, ListType, NodeCodeBlock, NodeDescriptionItem,
+ NodeHeading, NodeHtmlBlock, NodeList, NodeValue};
use regex::bytes::Regex;
use scanners;
use std::cell::RefCell;
@@ -21,6 +21,15 @@ use typed_arena::Arena;
const TAB_STOP: usize = 4;
const CODE_INDENT: usize = 4;
+macro_rules! node_matches {
+ ($node:expr, $pat:pat) => ({
+ match $node.data.borrow().value {
+ $pat => true,
+ _ => false,
+ }
+ })
+}
+
/// Parse a Markdown document to an AST.
///
/// See the documentation of the crate root for an example.
@@ -286,6 +295,34 @@ pub struct ComrakOptions {
/// "<p>Hi<sup class=\"footnote-ref\"><a href=\"#fn1\" id=\"fnref1\">[1]</a></sup>.</p>\n<section class=\"footnotes\">\n<ol>\n<li id=\"fn1\">\n<p>A greeting. <a href=\"#fnref1\" class=\"footnote-backref\">↩</a></p>\n</li>\n</ol>\n</section>\n");
/// ```
pub ext_footnotes: bool,
+
+ /// Enables the description lists extension.
+ ///
+ /// Each term must be defined in one paragraph, followed by a blank line,
+ /// and then by the details. Details begins with a colon.
+ ///
+ /// ``` md
+ /// First term
+ ///
+ /// : Details for the **first term**
+ ///
+ /// Second term
+ ///
+ /// : Details for the **second term**
+ ///
+ /// More details in second paragraph.
+ /// ```
+ ///
+ /// ```
+ /// # use comrak::{markdown_to_html, ComrakOptions};
+ /// let options = ComrakOptions {
+ /// ext_description_lists: true,
+ /// ..ComrakOptions::default()
+ /// };
+ /// assert_eq!(markdown_to_html("Term\n\n: Definition", &options),
+ /// "<dl><dt>\n<p>Term</p>\n</dt>\n<dd>\n<p>Definition</p>\n</dd>\n</dl>\n");
+ /// ```
+ pub ext_description_lists: bool,
}
#[derive(Clone)]
@@ -488,6 +525,9 @@ impl<'a, 'o> Parser<'a, 'o> {
NodeValue::Item(ref nl) => if !self.parse_node_item_prefix(line, container, nl) {
return (false, container, should_continue);
},
+ NodeValue::DescriptionItem(ref di) => if !self.parse_description_item_prefix(line, container, di) {
+ return (false, container, should_continue);
+ },
NodeValue::CodeBlock(..) => {
if !self.parse_code_block_prefix(line, container, ast, &mut should_continue) {
return (false, container, should_continue);
@@ -645,6 +685,15 @@ impl<'a, 'o> Parser<'a, 'o> {
*container,
NodeValue::FootnoteDefinition(c.to_vec()),
);
+ } else if !indented && self.options.ext_description_lists
+ && line[self.first_nonspace] == b':'
+ && self.parse_desc_list_details(container)
+ {
+ let offset = self.first_nonspace + 1 - self.offset;
+ self.advance_offset(line, offset, false);
+ if strings::is_space_or_tab(line[self.offset]) {
+ self.advance_offset(line, 1, true);
+ }
} else if (!indented || match container.data.borrow().value {
NodeValue::List(..) => true,
_ => false,
@@ -803,6 +852,24 @@ impl<'a, 'o> Parser<'a, 'o> {
}
}
+ fn parse_description_item_prefix(
+ &mut self,
+ line: &[u8],
+ container: &'a AstNode<'a>,
+ di: &NodeDescriptionItem,
+ ) -> bool {
+ if self.indent >= di.marker_offset + di.padding {
+ self.advance_offset(line, di.marker_offset + di.padding, true);
+ true
+ } else if self.blank && container.first_child().is_some() {
+ let offset = self.first_nonspace - self.offset;
+ self.advance_offset(line, offset, false);
+ true
+ } else {
+ false
+ }
+ }
+
fn parse_code_block_prefix(
&mut self,
line: &[u8],
@@ -864,6 +931,51 @@ impl<'a, 'o> Parser<'a, 'o> {
}
}
+ fn parse_desc_list_details(&mut self, container: &mut &'a AstNode<'a>) -> bool {
+ let last_child = match container.last_child() {
+ Some(lc) => lc,
+ None => return false,
+ };
+
+ if node_matches!(last_child, NodeValue::Paragraph) {
+ // We have found the details after the paragraph for the term.
+ //
+ // This paragraph is moved as a child of a new DescriptionTerm node.
+ //
+ // If the node before the paragraph is a description list, the item
+ // is added to it. If not, create a new list.
+
+ last_child.detach();
+
+ let list = match container.last_child() {
+ Some(lc) if node_matches!(lc, NodeValue::DescriptionList) => {
+ reopen_ast_nodes(lc);
+ lc
+ }
+ _ => {
+ self.add_child(container, NodeValue::DescriptionList)
+ }
+ };
+
+ let metadata = NodeDescriptionItem {
+ marker_offset: self.indent,
+ padding: 2,
+ };
+
+ let item = self.add_child(list, NodeValue::DescriptionItem(metadata));
+ let term = self.add_child(item, NodeValue::DescriptionTerm);
+ let details = self.add_child(item, NodeValue::DescriptionDetails);
+
+ term.append(last_child);
+
+ *container = details;
+
+ true
+ } else {
+ false
+ }
+ }
+
fn add_child(
&mut self,
mut parent: &'a AstNode<'a>,
@@ -1549,6 +1661,16 @@ fn lists_match(list_data: &NodeList, item_data: &NodeList) -> bool {
&& list_data.bullet_char == item_data.bullet_char
}
+fn reopen_ast_nodes<'a>(mut ast: &'a AstNode<'a>) {
+ loop {
+ ast.data.borrow_mut().open = true;
+ ast = match ast.parent() {
+ Some(p) => p,
+ None => return,
+ }
+ }
+}
+
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum AutolinkType {
URI,
|
diff --git a/src/tests.rs b/src/tests.rs
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -898,3 +898,68 @@ fn nul_replacement_4() {
fn nul_replacement_5() {
html("a\r\n\0b", "<p>a\n\u{fffd}b</p>\n");
}
+
+#[test]
+fn description_lists() {
+ html_opts(
+ concat!(
+ "Term 1\n",
+ "\n",
+ ": Definition 1\n",
+ "\n",
+ "Term 2 with *inline markup*\n",
+ "\n",
+ ": Definition 2\n"
+ ),
+ concat!(
+ "<dl>",
+ "<dt>\n",
+ "<p>Term 1</p>\n",
+ "</dt>\n",
+ "<dd>\n",
+ "<p>Definition 1</p>\n",
+ "</dd>\n",
+ "<dt>\n",
+ "<p>Term 2 with <em>inline markup</em></p>\n",
+ "</dt>\n",
+ "<dd>\n",
+ "<p>Definition 2</p>\n",
+ "</dd>\n",
+ "</dl>\n",
+ ),
+ |opts| opts.ext_description_lists = true,
+ );
+
+ html_opts(
+ concat!(
+ "* Nested\n",
+ "\n",
+ " Term 1\n\n",
+ " : Definition 1\n\n",
+ " Term 2 with *inline markup*\n\n",
+ " : Definition 2\n\n"
+ ),
+ concat!(
+ "<ul>\n",
+ "<li>\n",
+ "<p>Nested</p>\n",
+ "<dl>",
+ "<dt>\n",
+ "<p>Term 1</p>\n",
+ "</dt>\n",
+ "<dd>\n",
+ "<p>Definition 1</p>\n",
+ "</dd>\n",
+ "<dt>\n",
+ "<p>Term 2 with <em>inline markup</em></p>\n",
+ "</dt>\n",
+ "<dd>\n",
+ "<p>Definition 2</p>\n",
+ "</dd>\n",
+ "</dl>\n",
+ "</li>\n",
+ "</ul>\n",
+ ),
+ |opts| opts.ext_description_lists = true,
+ );
+}
|
Description List as an extension
There is an open [thread about description lists](https://talk.commonmark.org/t/description-list/289) in [talk.commonmark.org](https://talk.commonmark.org/). Since comrak has support for [some extensions](https://github.com/kivikakk/comrak/blob/dfe55ae29482c038c0ba2f4adf925421c6709008/src/parser/mod.rs#L136-L254), I think that it would be nice to add support for definition lists.
## Syntax
There is no official syntax for definition list, but it is implemented in many Markdown processors. One of the comments includes [a list of lins](https://talk.commonmark.org/t/description-list/289/11) to the documentation of some of those processors.
The most common syntax is using colon at the beginning of the definition.
term1
: definition1
term2
: definition2
This syntax is used in [Pandoc](https://pandoc.org/MANUAL.html#definition-lists), [PHP Markdown](https://michelf.ca/projects/php-markdown/extra/#def-list), [fletcher/MultiMarkdown-4](https://fletcher.github.io/MultiMarkdown-4/definitionlists), [Python Markdown](https://python-markdown.github.io/extensions/definition_lists/), [kramdown](https://kramdown.gettalong.org/quickref.html#definition-lists), etc.
|
Awesome! I'd happily accept a PR that implemented this. 😊
| 2018-08-19T04:48:33
|
rust
|
Easy
|
sunng87/handlebars-rust
| 185
|
sunng87__handlebars-rust-185
|
[
"178"
] |
8d103041fa420ff522c0f09e76ec77eca010a5df
|
diff --git a/src/context.rs b/src/context.rs
--- a/src/context.rs
+++ b/src/context.rs
@@ -33,6 +33,12 @@ fn parse_json_visitor_inner<'a>(
let mut seg_stack: VecDeque<Pair<Rule, StrInput>> = VecDeque::new();
for seg in parsed_path {
+ if seg.as_str() == "@root" {
+ seg_stack.clear();
+ path_stack.clear();
+ continue;
+ }
+
match seg.as_rule() {
Rule::path_up => {
path_stack.pop_back();
@@ -410,4 +416,23 @@ mod test {
let d = UnserializableType {};
assert!(Context::wraps(&d).is_err());
}
+
+ #[test]
+ fn test_root() {
+ let m = json!({
+ "a" : {
+ "b" : {
+ "c" : {
+ "d" : 1
+ }
+ }
+ },
+ "b": 2
+ });
+ let ctx = Context::wraps(&m).unwrap();
+ assert_eq!(ctx.navigate("a/b", &VecDeque::new(), "@root/b")
+ .unwrap()
+ .render(),
+ "2".to_string());
+ }
}
diff --git a/src/grammar.pest b/src/grammar.pest
--- a/src/grammar.pest
+++ b/src/grammar.pest
@@ -19,7 +19,7 @@ array_literal = { "[" ~ literal? ~ ("," ~ literal)* ~ "]" }
object_literal = { "{" ~ (string_literal ~ ":" ~ literal)?
~ ("," ~ string_literal ~ ":" ~ literal)* ~ "}" }
-symbol_char = _{'a'..'z'|'A'..'Z'|'0'..'9'|"-"|"_"|'\u{80}'..'\u{7ff}'|'\u{800}'..'\u{ffff}'|'\u{10000}'..'\u{10ffff}'}
+symbol_char = _{'a'..'z'|'A'..'Z'|'0'..'9'|"@"|"-"|"_"|'\u{80}'..'\u{7ff}'|'\u{800}'..'\u{ffff}'|'\u{10000}'..'\u{10ffff}'}
path_char = _{ "/" }
identifier = @{ symbol_char+ }
|
diff --git a/tests/root_var.rs b/tests/root_var.rs
new file mode 100644
--- /dev/null
+++ b/tests/root_var.rs
@@ -0,0 +1,18 @@
+extern crate handlebars;
+#[macro_use]
+extern crate serde_json;
+
+use handlebars::Handlebars;
+
+#[test]
+fn test_root_var() {
+ let hbs = Handlebars::new();
+
+ let data = json!({
+ "a": [1, 2, 3, 4],
+ "b": "top"
+ });
+
+ assert_eq!(hbs.template_render("{{#each a}}{{@root/b}}: {{this}};{{/each}}", &data).unwrap(),
+ "top: 1;top: 2;top: 3;top: 4;");
+}
|
@root support?
Howdy,
Is this something easy to add? https://stackoverflow.com/questions/17364897/access-to-root-context-in-handlebar-js-template
In essence, using ``@root`` from any depth should return a reference to the root RenderContext variables.
Also, is it really necessary to clone the variables when invoking a partial? Cloning the map is causing some major performance issues here, it's taking ~5 min to run.
Thanks!
|
Hi @hammett @root is not supported for now and I will definitely support it.
Currently I'm working on pest upgrade #177, which involves lots of changes so I will be working on this right after #177 is done.
For the second question I will look into it and come back to you this weekend.
Thanks @sunng87 I looked at the code, and thought that to implement both root and no clone, the RenderContext would have to have an Option<Rc<RenderContext>> back to the parent RC, but it touches way more than that, so I refrained from trying it for now.
| 2017-09-16T09:33:09
|
rust
|
Hard
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.