tokenType = getCurrentContext().getElement();
- tokenType.ifPresent(type -> transformToken(type, context.getStart(), context.getStop()));
- super.enterKeyedElement(context);
- }
-
- @Override
- public void enterArrayType(GoParser.ArrayTypeContext context) {
- // otherwise, it is just a type expression
- if (context.parent.parent instanceof GoParser.CompositeLitContext) {
- enterContext(GoBlockContext.ARRAY_BODY);
- transformToken(ARRAY_CONSTRUCTOR, context.getStart(), context.getStop());
- }
- super.enterArrayType(context);
- }
-
- @Override
- public void enterSliceType(GoParser.SliceTypeContext context) {
- // otherwise, it is just a type expression
- if (context.parent.parent instanceof GoParser.CompositeLitContext) {
- enterContext(GoBlockContext.SLICE_BODY);
- transformToken(SLICE_CONSTRUCTOR, context.getStart(), context.getStop());
- }
- super.enterSliceType(context);
- }
-
- @Override
- public void exitCompositeLit(GoParser.CompositeLitContext context) {
- expectAndLeave(GoBlockContext.MAP_BODY, GoBlockContext.SLICE_BODY, GoBlockContext.ARRAY_BODY, GoBlockContext.NAMED_TYPE_BODY);
- super.exitCompositeLit(context);
- }
-
- @Override
- public void enterMapType(GoParser.MapTypeContext context) {
- // otherwise, it is just a type expression
- if (context.parent.parent instanceof GoParser.CompositeLitContext) {
- enterContext(GoBlockContext.MAP_BODY);
- transformToken(MAP_CONSTRUCTOR, context.getStart(), context.getStop());
- }
- super.enterMapType(context);
- }
-
- @Override
- public void enterTypeName(GoParser.TypeNameContext context) {
- if (context.parent.parent instanceof GoParser.CompositeLitContext) {
- transformToken(NAMED_TYPE_CONSTRUCTOR, context.getStart());
- enterContext(GoBlockContext.NAMED_TYPE_BODY);
- } else if (context.parent instanceof GoParser.InterfaceTypeContext) {
- transformToken(TYPE_CONSTRAINT, context.getStart(), context.getStop());
- }
- super.enterTypeName(context);
- }
-
- @Override
- public void enterTypeAssertion(GoParser.TypeAssertionContext context) {
- transformToken(TYPE_ASSERTION, context.getStart(), context.getStop());
- super.enterTypeAssertion(context);
- }
-
- @Override
- public void enterMethodSpec(GoParser.MethodSpecContext context) {
- transformToken(INTERFACE_METHOD, context.getStart(), context.getStop());
- super.enterMethodSpec(context);
- }
-
- /* CONTROL FLOW KEYWORDS */
-
- @Override
- public void enterReturnStmt(GoParser.ReturnStmtContext context) {
- transformToken(RETURN, context.getStart(), context.getStop());
- super.enterReturnStmt(context);
- }
-
- @Override
- public void enterBreakStmt(GoParser.BreakStmtContext context) {
- transformToken(BREAK, context.getStart(), context.getStop());
- super.enterBreakStmt(context);
- }
-
- @Override
- public void enterContinueStmt(GoParser.ContinueStmtContext context) {
- transformToken(CONTINUE, context.getStart(), context.getStop());
- super.enterContinueStmt(context);
- }
-
- @Override
- public void enterFallthroughStmt(GoParser.FallthroughStmtContext context) {
- transformToken(FALLTHROUGH, context.getStart(), context.getStop());
- super.enterFallthroughStmt(context);
- }
-
- @Override
- public void enterGotoStmt(GoParser.GotoStmtContext context) {
- transformToken(GOTO, context.getStart(), context.getStop());
- super.enterGotoStmt(context);
- }
-
- @Override
- public void enterGoStmt(GoParser.GoStmtContext context) {
- transformToken(GO, context.getStart(), context.getStop());
- super.enterGoStmt(context);
- }
-
- @Override
- public void enterDeferStmt(GoParser.DeferStmtContext context) {
- transformToken(DEFER, context.getStart(), context.getStop());
- super.enterDeferStmt(context);
- }
-
- @Override
- public void enterSendStmt(GoParser.SendStmtContext ctx) {
- transformToken(SEND_STATEMENT, ctx.getStart(), ctx.getStop());
- super.enterSendStmt(ctx);
- }
-
- @Override
- public void enterRecvStmt(GoParser.RecvStmtContext ctx) {
- transformToken(RECEIVE_STATEMENT, ctx.getStart(), ctx.getStop());
- super.enterRecvStmt(ctx);
- }
-
- @Override
- public void visitTerminal(TerminalNode node) {
- Token token = node.getSymbol();
- switch (token.getText()) {
- case "else" -> {
- expectAndLeave(GoBlockContext.IF_BLOCK);
- enterContext(GoBlockContext.ELSE_BLOCK);
- }
- case "{" -> transformToken(getCurrentContext().getBegin(), token);
- case "}" -> transformToken(getCurrentContext().getEnd(), token);
- default -> {
- // do nothing.
- }
- }
- super.visitTerminal(node);
- }
-
- /**
- * This enumeration provides sets of information regarding different types of nesting structures in Go. Each element is
- * a tuple of a token for the beginning of a block, the end of the block, and optionally, for the elements contained.
- *
- * As the Go parser does not differentiate between different kinds of blocks, a stack of these GoBlockContexts is
- * required to be able to assign the correct token types for each block.
- */
- private enum GoBlockContext {
- ARRAY_BODY(ARRAY_BODY_BEGIN, ARRAY_BODY_END, Optional.of(ARRAY_ELEMENT)),
- STRUCT_BODY(STRUCT_BODY_BEGIN, STRUCT_BODY_END, Optional.of(MEMBER_DECLARATION)),
- MAP_BODY(MAP_BODY_BEGIN, MAP_BODY_END, Optional.of(MAP_ELEMENT)),
- SLICE_BODY(SLICE_BODY_BEGIN, SLICE_BODY_END, Optional.of(SLICE_ELEMENT)),
- NAMED_TYPE_BODY(NAMED_TYPE_BODY_BEGIN, NAMED_TYPE_BODY_END, Optional.of(NAMED_TYPE_ELEMENT)),
- FUNCTION_BODY(FUNCTION_BODY_BEGIN, FUNCTION_BODY_END, Optional.empty()),
-
- IF_BLOCK(IF_BLOCK_BEGIN, IF_BLOCK_END, Optional.empty()),
- ELSE_BLOCK(ELSE_BLOCK_BEGIN, ELSE_BLOCK_END, Optional.empty()),
- FOR_BLOCK(FOR_BLOCK_BEGIN, FOR_BLOCK_END, Optional.empty()),
- SWITCH_BLOCK(SWITCH_BLOCK_BEGIN, SWITCH_BLOCK_END, Optional.empty()),
- SELECT_CONTEXT(SELECT_BLOCK_BEGIN, SELECT_BLOCK_END, Optional.empty()),
- STATEMENT_BLOCK(STATEMENT_BLOCK_BEGIN, STATEMENT_BLOCK_END, Optional.empty()),
- CASE_BLOCK(CASE_BLOCK_BEGIN, CASE_BLOCK_END, Optional.empty()),
- INTERFACE_BODY(INTERFACE_BLOCK_BEGIN, INTERFACE_BLOCK_END, Optional.empty());
-
- private final GoTokenType beginTokenType;
- private final GoTokenType endTokenType;
- private final Optional elementTokenType;
-
- GoBlockContext(GoTokenType beginTokenType, GoTokenType endTokenType, Optional elementTokenType) {
- this.beginTokenType = beginTokenType;
- this.endTokenType = endTokenType;
- this.elementTokenType = elementTokenType;
- }
-
- GoTokenType getBegin() {
- return this.beginTokenType;
- }
-
- GoTokenType getEnd() {
- return this.endTokenType;
- }
-
- public Optional getElement() {
- return this.elementTokenType;
- }
- }
-}
diff --git a/languages/golang/src/test/java/de/jplag/golang/GoLanguageTest.java b/languages/golang/src/test/java/de/jplag/golang/GoLanguageTest.java
index 0feafc7bc0..68d3553e63 100644
--- a/languages/golang/src/test/java/de/jplag/golang/GoLanguageTest.java
+++ b/languages/golang/src/test/java/de/jplag/golang/GoLanguageTest.java
@@ -1,156 +1,48 @@
package de.jplag.golang;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.OptionalInt;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import de.jplag.ParsingException;
-import de.jplag.SharedTokenType;
-import de.jplag.Token;
-import de.jplag.TokenPrinter;
-
-class GoLanguageTest {
- /**
- * Test source file that is supposed to produce a complete set of tokens, i.e. all types of tokens.
- */
+import static de.jplag.golang.GoTokenType.ARGUMENT;
+import static de.jplag.golang.GoTokenType.ASSIGNMENT;
+import static de.jplag.golang.GoTokenType.FUNCTION_BODY_BEGIN;
+import static de.jplag.golang.GoTokenType.FUNCTION_BODY_END;
+import static de.jplag.golang.GoTokenType.FUNCTION_DECLARATION;
+import static de.jplag.golang.GoTokenType.IMPORT_CLAUSE;
+import static de.jplag.golang.GoTokenType.IMPORT_CLAUSE_BEGIN;
+import static de.jplag.golang.GoTokenType.IMPORT_CLAUSE_END;
+import static de.jplag.golang.GoTokenType.IMPORT_DECLARATION;
+import static de.jplag.golang.GoTokenType.INVOCATION;
+import static de.jplag.golang.GoTokenType.MEMBER_DECLARATION;
+import static de.jplag.golang.GoTokenType.PACKAGE;
+import static de.jplag.golang.GoTokenType.STRUCT_BODY_BEGIN;
+import static de.jplag.golang.GoTokenType.STRUCT_BODY_END;
+import static de.jplag.golang.GoTokenType.STRUCT_DECLARATION;
+import static de.jplag.golang.GoTokenType.VARIABLE_DECLARATION;
+
+import de.jplag.testutils.LanguageModuleTest;
+import de.jplag.testutils.datacollector.TestDataCollector;
+import de.jplag.testutils.datacollector.TestSourceIgnoredLinesCollector;
+
+class GoLanguageTest extends LanguageModuleTest {
private static final String COMPLETE_TEST_FILE = "Complete.go";
+ // example files taken from antlr repo
+ private static final String CONSTANTS_TEST_FILE = "Constants.go";
+ private static final String ARRAY_ELLIPSIS_DECLS_FILE = "ArrayEllipsisDecls.go";
- /**
- * Regular expression that describes lines consisting only of whitespace and optionally a line comment.
- */
- private static final String EMPTY_OR_SINGLE_LINE_COMMENT = "\\s*(//.*|/\\*.*\\*/)?";
-
- /**
- * Regular expression that describes lines containing the start of a multiline comment and no code before it.
- */
- private static final String DELIMITED_COMMENT_START = "\\s*/\\*(?:(?!\\*/).)*$";
-
- /**
- * Regular expression that describes lines containing the end of a multiline comment and no more code after that.
- */
- private static final String DELIMITED_COMMENT_END = ".*\\*/\\s*$";
-
- private final Logger logger = LoggerFactory.getLogger(GoLanguageTest.class);
- private final String[] testFiles = new String[] {COMPLETE_TEST_FILE};
- private final File testFileLocation = Path.of("src", "test", "resources", "de", "jplag", "golang").toFile();
- private GoLanguage language;
-
- @BeforeEach
- void setup() {
- language = new GoLanguage();
+ public GoLanguageTest() {
+ super(new GoLanguage(), GoTokenType.class);
}
- @Test
- void parseTestFiles() throws ParsingException {
- for (String fileName : testFiles) {
- List tokens = language.parse(Set.of(new File(testFileLocation, fileName)));
- String output = TokenPrinter.printTokens(tokens, testFileLocation);
- logger.info(output);
+ @Override
+ protected void collectTestData(TestDataCollector collector) {
+ collector.testFile(COMPLETE_TEST_FILE).testCoverages();
- testSourceCoverage(fileName, tokens);
- if (fileName.equals(COMPLETE_TEST_FILE)) {
- testTokenCoverage(tokens, fileName);
- }
- }
+ // Some basic tests, so we have at least some idea if the listener was changed
+ collector.testFile(CONSTANTS_TEST_FILE).testTokenSequence(PACKAGE, VARIABLE_DECLARATION, VARIABLE_DECLARATION);
+ collector.testFile(ARRAY_ELLIPSIS_DECLS_FILE).testSourceCoverage().testTokenSequence(PACKAGE, IMPORT_DECLARATION, IMPORT_CLAUSE_BEGIN,
+ IMPORT_CLAUSE, IMPORT_CLAUSE_END, STRUCT_DECLARATION, STRUCT_BODY_BEGIN, MEMBER_DECLARATION, STRUCT_BODY_END, FUNCTION_DECLARATION,
+ FUNCTION_BODY_BEGIN, VARIABLE_DECLARATION, ASSIGNMENT, INVOCATION, ARGUMENT, ARGUMENT, FUNCTION_BODY_END);
}
- /**
- * Confirms that the code is covered to a basic extent, i.e. each line of code contains at least one token.
- * @param fileName a code sample file name
- * @param tokens the list of tokens generated from the sample
- */
- private void testSourceCoverage(String fileName, List tokens) {
- File testFile = new File(testFileLocation, fileName);
-
- List lines = null;
- try {
- lines = Files.readAllLines(testFile.toPath());
- } catch (IOException exception) {
- logger.info("Error while reading test file %s".formatted(fileName), exception);
- fail();
- }
-
- // All lines that contain code
- var codeLines = getCodeLines(lines);
- // All lines that contain a token
- var tokenLines = tokens.stream().mapToInt(Token::getLine).distinct().boxed().toList();
-
- if (codeLines.size() > tokenLines.size()) {
- List missedLinesIndices = new ArrayList<>(codeLines);
- missedLinesIndices.removeAll(tokenLines);
- var missedLines = missedLinesIndices.stream().map(Object::toString).collect(Collectors.joining(", "));
- if (!missedLines.isBlank()) {
- fail("Found lines in file '%s' that are not represented in the token list. \n\tMissed lines: %s".formatted(fileName, missedLines));
- }
- }
- OptionalInt differingLine = IntStream.range(0, codeLines.size())
- .dropWhile(index -> Objects.equals(codeLines.get(index), tokenLines.get(index))).findAny();
- differingLine.ifPresent(
- i -> fail("Not all lines of code in '%s' are represented in tokens, starting with line %d.".formatted(fileName, codeLines.get(i))));
+ @Override
+ protected void configureIgnoredLines(TestSourceIgnoredLinesCollector collector) {
}
-
- /**
- * Gets the line numbers of lines containing actual code, omitting empty lines and comment lines.
- * @param lines lines of a code file
- * @return a list of the line numbers of code lines
- */
- private List getCodeLines(List lines) {
- // This boxed boolean can be accessed from within the lambda method below
- var state = new Object() {
- boolean insideComment = false;
- };
-
- var codeLines = IntStream.rangeClosed(1, lines.size()).sequential().filter(idx -> {
- String line = lines.get(idx - 1);
- if (line.matches(EMPTY_OR_SINGLE_LINE_COMMENT)) {
- return false;
- } else if (line.matches(DELIMITED_COMMENT_START)) {
- state.insideComment = true;
- return false;
- } else if (state.insideComment) {
- // This fails if code follows after '*/'. If the code is formatted well, this should not happen.
- if (line.matches(DELIMITED_COMMENT_END)) {
- state.insideComment = false;
- }
- return false;
- }
- return true;
- });
-
- return codeLines.boxed().toList();
-
- }
-
- /**
- * Confirms that all Token types are 'reachable' with a complete code example.
- * @param tokens list of tokens which is supposed to contain all types of tokens
- * @param fileName The file name of the complete code example
- */
- private void testTokenCoverage(List tokens, String fileName) {
- var annotatedTokens = tokens.stream().map(Token::getType).collect(Collectors.toSet());
- assertTrue(annotatedTokens.contains(SharedTokenType.FILE_END));
- var annotatedGoTokens = annotatedTokens.stream().filter(GoTokenType.class::isInstance).collect(Collectors.toSet());
- var allGoTokens = GoTokenType.values();
- var missingGoTokens = Arrays.stream(allGoTokens).filter(token -> !annotatedGoTokens.contains(token)).toList();
- assertTrue(missingGoTokens.isEmpty(), "The following go tokens are missing in the code example '%s':\n".formatted(fileName)
- + String.join("\n", missingGoTokens.stream().map(GoTokenType::getDescription).toList()));
- }
-
}
diff --git a/languages/golang/src/test/resources/de/jplag/go/ArrayEllipsisDecls.go b/languages/golang/src/test/resources/de/jplag/go/ArrayEllipsisDecls.go
new file mode 100644
index 0000000000..0a9b83bec5
--- /dev/null
+++ b/languages/golang/src/test/resources/de/jplag/go/ArrayEllipsisDecls.go
@@ -0,0 +1,14 @@
+package samples
+
+import (
+ "fmt"
+)
+
+type Custom struct {
+ string
+}
+
+func ArrayEllipsisDecls() {
+ stooges := [...]Custom{{"Moe"}, {"Larry"}, {"Curly"}} // len(stooges) == 3
+ fmt.Println("Stooges: ", stooges)
+}
\ No newline at end of file
diff --git a/languages/golang/src/test/resources/de/jplag/golang/Complete.go b/languages/golang/src/test/resources/de/jplag/go/Complete.go
similarity index 100%
rename from languages/golang/src/test/resources/de/jplag/golang/Complete.go
rename to languages/golang/src/test/resources/de/jplag/go/Complete.go
diff --git a/languages/golang/src/test/resources/de/jplag/go/Constants.go b/languages/golang/src/test/resources/de/jplag/go/Constants.go
new file mode 100644
index 0000000000..1a3dab2879
--- /dev/null
+++ b/languages/golang/src/test/resources/de/jplag/go/Constants.go
@@ -0,0 +1,6 @@
+package A
+
+const (
+ /*A*/ T = 1 << 0
+ /*B*/ Ta = 1 << 1
+)
\ No newline at end of file
diff --git a/languages/java/src/main/java/de/jplag/java/JavacAdapter.java b/languages/java/src/main/java/de/jplag/java/JavacAdapter.java
index f1c5c2dc93..65f5ab89c8 100644
--- a/languages/java/src/main/java/de/jplag/java/JavacAdapter.java
+++ b/languages/java/src/main/java/de/jplag/java/JavacAdapter.java
@@ -52,7 +52,7 @@ public void parseFiles(Set files, final Parser parser) throws ParsingExcep
ast.accept(scanner, null);
parser.add(Token.semanticFileEnd(file));
}
- } catch (IOException exception) {
+ } catch (Exception exception) {
throw new ParsingException(null, exception.getMessage(), exception);
}
parsingExceptions.addAll(processErrors(listener));
diff --git a/languages/python-3/pom.xml b/languages/python-3/pom.xml
index 92712c0b1a..fb6865e696 100644
--- a/languages/python-3/pom.xml
+++ b/languages/python-3/pom.xml
@@ -13,6 +13,11 @@
org.antlr
antlr4-runtime
+
+ de.jplag
+ language-antlr-utils
+ ${revision}
+
diff --git a/languages/python-3/src/main/antlr4/de/jplag/python3/grammar/Python3Lexer.g4 b/languages/python-3/src/main/antlr4/de/jplag/python3/grammar/Python3Lexer.g4
index 9b5fee1dc4..8b36564b96 100644
--- a/languages/python-3/src/main/antlr4/de/jplag/python3/grammar/Python3Lexer.g4
+++ b/languages/python-3/src/main/antlr4/de/jplag/python3/grammar/Python3Lexer.g4
@@ -28,190 +28,159 @@
* https://github.com/bkiers/python3-parser
* Developed by : Bart Kiers, bart@big-o.nl
*/
+
+// $antlr-format alignTrailingComments true, columnLimit 150, maxEmptyLinesToKeep 1, reflowComments false, useTab false
+// $antlr-format allowShortRulesOnASingleLine true, allowShortBlocksOnASingleLine true, minEmptyLines 0, alignSemicolons ownLine
+// $antlr-format alignColons trailing, singleLineOverrulesHangingColon true, alignLexerCommands true, alignLabels true, alignTrailers true
+
lexer grammar Python3Lexer;
// All comments that start with "///" are copy-pasted from
// The Python Language Reference
-tokens { INDENT, DEDENT }
+tokens {
+ INDENT,
+ DEDENT
+}
options {
- superClass=Python3LexerBase;
+ superClass = Python3LexerBase;
}
+// Insert here @header for C++ lexer.
+
/*
* lexer rules
*/
-STRING
- : STRING_LITERAL
- | BYTES_LITERAL
- ;
-
-NUMBER
- : INTEGER
- | FLOAT_NUMBER
- | IMAG_NUMBER
- ;
-
-INTEGER
- : DECIMAL_INTEGER
- | OCT_INTEGER
- | HEX_INTEGER
- | BIN_INTEGER
- ;
-
-AND : 'and';
-AS : 'as';
-ASSERT : 'assert';
-ASYNC : 'async';
-AWAIT : 'await';
-BREAK : 'break';
-CASE : 'case' ;
-CLASS : 'class';
-CONTINUE : 'continue';
-DEF : 'def';
-DEL : 'del';
-ELIF : 'elif';
-ELSE : 'else';
-EXCEPT : 'except';
-FALSE : 'False';
-FINALLY : 'finally';
-FOR : 'for';
-FROM : 'from';
-GLOBAL : 'global';
-IF : 'if';
-IMPORT : 'import';
-IN : 'in';
-IS : 'is';
-LAMBDA : 'lambda';
-MATCH : 'match' ;
-NONE : 'None';
-NONLOCAL : 'nonlocal';
-NOT : 'not';
-OR : 'or';
-PASS : 'pass';
-RAISE : 'raise';
-RETURN : 'return';
-TRUE : 'True';
-TRY : 'try';
-UNDERSCORE : '_' ;
-WHILE : 'while';
-WITH : 'with';
-YIELD : 'yield';
-
-NEWLINE
- : ( {this.atStartOfInput()}? SPACES
- | ( '\r'? '\n' | '\r' | '\f' ) SPACES?
- )
- {this.onNewLine();}
- ;
+STRING: STRING_LITERAL | BYTES_LITERAL;
+
+NUMBER: INTEGER | FLOAT_NUMBER | IMAG_NUMBER;
+
+INTEGER: DECIMAL_INTEGER | OCT_INTEGER | HEX_INTEGER | BIN_INTEGER;
+
+AND : 'and';
+AS : 'as';
+ASSERT : 'assert';
+ASYNC : 'async';
+AWAIT : 'await';
+BREAK : 'break';
+CASE : 'case';
+CLASS : 'class';
+CONTINUE : 'continue';
+DEF : 'def';
+DEL : 'del';
+ELIF : 'elif';
+ELSE : 'else';
+EXCEPT : 'except';
+FALSE : 'False';
+FINALLY : 'finally';
+FOR : 'for';
+FROM : 'from';
+GLOBAL : 'global';
+IF : 'if';
+IMPORT : 'import';
+IN : 'in';
+IS : 'is';
+LAMBDA : 'lambda';
+MATCH : 'match';
+NONE : 'None';
+NONLOCAL : 'nonlocal';
+NOT : 'not';
+OR : 'or';
+PASS : 'pass';
+RAISE : 'raise';
+RETURN : 'return';
+TRUE : 'True';
+TRY : 'try';
+UNDERSCORE : '_';
+WHILE : 'while';
+WITH : 'with';
+YIELD : 'yield';
+
+NEWLINE: ({this.atStartOfInput()}? SPACES | ( '\r'? '\n' | '\r' | '\f') SPACES?) {this.onNewLine();};
/// identifier ::= id_start id_continue*
-NAME
- : ID_START ID_CONTINUE*
- ;
+NAME: ID_START ID_CONTINUE*;
/// stringliteral ::= [stringprefix](shortstring | longstring)
/// stringprefix ::= "r" | "u" | "R" | "U" | "f" | "F"
/// | "fr" | "Fr" | "fR" | "FR" | "rf" | "rF" | "Rf" | "RF"
-STRING_LITERAL
- : ( [rR] | [uU] | [fF] | ( [fF] [rR] ) | ( [rR] [fF] ) )? ( SHORT_STRING | LONG_STRING )
- ;
+STRING_LITERAL: ( [rR] | [uU] | [fF] | ( [fF] [rR]) | ( [rR] [fF]))? ( SHORT_STRING | LONG_STRING);
/// bytesliteral ::= bytesprefix(shortbytes | longbytes)
/// bytesprefix ::= "b" | "B" | "br" | "Br" | "bR" | "BR" | "rb" | "rB" | "Rb" | "RB"
-BYTES_LITERAL
- : ( [bB] | ( [bB] [rR] ) | ( [rR] [bB] ) ) ( SHORT_BYTES | LONG_BYTES )
- ;
+BYTES_LITERAL: ( [bB] | ( [bB] [rR]) | ( [rR] [bB])) ( SHORT_BYTES | LONG_BYTES);
/// decimalinteger ::= nonzerodigit digit* | "0"+
-DECIMAL_INTEGER
- : NON_ZERO_DIGIT DIGIT*
- | '0'+
- ;
+DECIMAL_INTEGER: NON_ZERO_DIGIT DIGIT* | '0'+;
/// octinteger ::= "0" ("o" | "O") octdigit+
-OCT_INTEGER
- : '0' [oO] OCT_DIGIT+
- ;
+OCT_INTEGER: '0' [oO] OCT_DIGIT+;
/// hexinteger ::= "0" ("x" | "X") hexdigit+
-HEX_INTEGER
- : '0' [xX] HEX_DIGIT+
- ;
+HEX_INTEGER: '0' [xX] HEX_DIGIT+;
/// bininteger ::= "0" ("b" | "B") bindigit+
-BIN_INTEGER
- : '0' [bB] BIN_DIGIT+
- ;
+BIN_INTEGER: '0' [bB] BIN_DIGIT+;
/// floatnumber ::= pointfloat | exponentfloat
-FLOAT_NUMBER
- : POINT_FLOAT
- | EXPONENT_FLOAT
- ;
+FLOAT_NUMBER: POINT_FLOAT | EXPONENT_FLOAT;
/// imagnumber ::= (floatnumber | intpart) ("j" | "J")
-IMAG_NUMBER
- : ( FLOAT_NUMBER | INT_PART ) [jJ]
- ;
-
-DOT : '.';
-ELLIPSIS : '...';
-STAR : '*';
-OPEN_PAREN : '(' {this.openBrace();};
-CLOSE_PAREN : ')' {this.closeBrace();};
-COMMA : ',';
-COLON : ':';
-SEMI_COLON : ';';
-POWER : '**';
-ASSIGN : '=';
-OPEN_BRACK : '[' {this.openBrace();};
-CLOSE_BRACK : ']' {this.closeBrace();};
-OR_OP : '|';
-XOR : '^';
-AND_OP : '&';
-LEFT_SHIFT : '<<';
-RIGHT_SHIFT : '>>';
-ADD : '+';
-MINUS : '-';
-DIV : '/';
-MOD : '%';
-IDIV : '//';
-NOT_OP : '~';
-OPEN_BRACE : '{' {this.openBrace();};
-CLOSE_BRACE : '}' {this.closeBrace();};
-LESS_THAN : '<';
-GREATER_THAN : '>';
-EQUALS : '==';
-GT_EQ : '>=';
-LT_EQ : '<=';
-NOT_EQ_1 : '<>';
-NOT_EQ_2 : '!=';
-AT : '@';
-ARROW : '->';
-ADD_ASSIGN : '+=';
-SUB_ASSIGN : '-=';
-MULT_ASSIGN : '*=';
-AT_ASSIGN : '@=';
-DIV_ASSIGN : '/=';
-MOD_ASSIGN : '%=';
-AND_ASSIGN : '&=';
-OR_ASSIGN : '|=';
-XOR_ASSIGN : '^=';
-LEFT_SHIFT_ASSIGN : '<<=';
+IMAG_NUMBER: ( FLOAT_NUMBER | INT_PART) [jJ];
+
+DOT : '.';
+ELLIPSIS : '...';
+STAR : '*';
+OPEN_PAREN : '(' {this.openBrace();};
+CLOSE_PAREN : ')' {this.closeBrace();};
+COMMA : ',';
+COLON : ':';
+SEMI_COLON : ';';
+POWER : '**';
+ASSIGN : '=';
+OPEN_BRACK : '[' {this.openBrace();};
+CLOSE_BRACK : ']' {this.closeBrace();};
+OR_OP : '|';
+XOR : '^';
+AND_OP : '&';
+LEFT_SHIFT : '<<';
+RIGHT_SHIFT : '>>';
+ADD : '+';
+MINUS : '-';
+DIV : '/';
+MOD : '%';
+IDIV : '//';
+NOT_OP : '~';
+OPEN_BRACE : '{' {this.openBrace();};
+CLOSE_BRACE : '}' {this.closeBrace();};
+LESS_THAN : '<';
+GREATER_THAN : '>';
+EQUALS : '==';
+GT_EQ : '>=';
+LT_EQ : '<=';
+NOT_EQ_1 : '<>';
+NOT_EQ_2 : '!=';
+AT : '@';
+ARROW : '->';
+ADD_ASSIGN : '+=';
+SUB_ASSIGN : '-=';
+MULT_ASSIGN : '*=';
+AT_ASSIGN : '@=';
+DIV_ASSIGN : '/=';
+MOD_ASSIGN : '%=';
+AND_ASSIGN : '&=';
+OR_ASSIGN : '|=';
+XOR_ASSIGN : '^=';
+LEFT_SHIFT_ASSIGN : '<<=';
RIGHT_SHIFT_ASSIGN : '>>=';
-POWER_ASSIGN : '**=';
-IDIV_ASSIGN : '//=';
+POWER_ASSIGN : '**=';
+IDIV_ASSIGN : '//=';
-SKIP_
- : ( SPACES | COMMENT | LINE_JOINING ) -> skip
- ;
+SKIP_: ( SPACES | COMMENT | LINE_JOINING) -> skip;
-UNKNOWN_CHAR
- : .
- ;
+UNKNOWN_CHAR: .;
/*
* fragments
@@ -220,143 +189,93 @@ UNKNOWN_CHAR
/// shortstring ::= "'" shortstringitem* "'" | '"' shortstringitem* '"'
/// shortstringitem ::= shortstringchar | stringescapeseq
/// shortstringchar ::=
-fragment SHORT_STRING
- : '\'' ( STRING_ESCAPE_SEQ | ~[\\\r\n\f'] )* '\''
- | '"' ( STRING_ESCAPE_SEQ | ~[\\\r\n\f"] )* '"'
- ;
+fragment SHORT_STRING:
+ '\'' (STRING_ESCAPE_SEQ | ~[\\\r\n\f'])* '\''
+ | '"' ( STRING_ESCAPE_SEQ | ~[\\\r\n\f"])* '"'
+;
/// longstring ::= "'''" longstringitem* "'''" | '"""' longstringitem* '"""'
-fragment LONG_STRING
- : '\'\'\'' LONG_STRING_ITEM*? '\'\'\''
- | '"""' LONG_STRING_ITEM*? '"""'
- ;
+fragment LONG_STRING: '\'\'\'' LONG_STRING_ITEM*? '\'\'\'' | '"""' LONG_STRING_ITEM*? '"""';
/// longstringitem ::= longstringchar | stringescapeseq
-fragment LONG_STRING_ITEM
- : LONG_STRING_CHAR
- | STRING_ESCAPE_SEQ
- ;
+fragment LONG_STRING_ITEM: LONG_STRING_CHAR | STRING_ESCAPE_SEQ;
/// longstringchar ::=
-fragment LONG_STRING_CHAR
- : ~'\\'
- ;
+fragment LONG_STRING_CHAR: ~'\\';
/// stringescapeseq ::= "\"
-fragment STRING_ESCAPE_SEQ
- : '\\' .
- | '\\' NEWLINE
- ;
+fragment STRING_ESCAPE_SEQ: '\\' . | '\\' NEWLINE;
/// nonzerodigit ::= "1"..."9"
-fragment NON_ZERO_DIGIT
- : [1-9]
- ;
+fragment NON_ZERO_DIGIT: [1-9];
/// digit ::= "0"..."9"
-fragment DIGIT
- : [0-9]
- ;
+fragment DIGIT: [0-9];
/// octdigit ::= "0"..."7"
-fragment OCT_DIGIT
- : [0-7]
- ;
+fragment OCT_DIGIT: [0-7];
/// hexdigit ::= digit | "a"..."f" | "A"..."F"
-fragment HEX_DIGIT
- : [0-9a-fA-F]
- ;
+fragment HEX_DIGIT: [0-9a-fA-F];
/// bindigit ::= "0" | "1"
-fragment BIN_DIGIT
- : [01]
- ;
+fragment BIN_DIGIT: [01];
/// pointfloat ::= [intpart] fraction | intpart "."
-fragment POINT_FLOAT
- : INT_PART? FRACTION
- | INT_PART '.'
- ;
+fragment POINT_FLOAT: INT_PART? FRACTION | INT_PART '.';
/// exponentfloat ::= (intpart | pointfloat) exponent
-fragment EXPONENT_FLOAT
- : ( INT_PART | POINT_FLOAT ) EXPONENT
- ;
+fragment EXPONENT_FLOAT: ( INT_PART | POINT_FLOAT) EXPONENT;
/// intpart ::= digit+
-fragment INT_PART
- : DIGIT+
- ;
+fragment INT_PART: DIGIT+;
/// fraction ::= "." digit+
-fragment FRACTION
- : '.' DIGIT+
- ;
+fragment FRACTION: '.' DIGIT+;
/// exponent ::= ("e" | "E") ["+" | "-"] digit+
-fragment EXPONENT
- : [eE] [+-]? DIGIT+
- ;
+fragment EXPONENT: [eE] [+-]? DIGIT+;
/// shortbytes ::= "'" shortbytesitem* "'" | '"' shortbytesitem* '"'
/// shortbytesitem ::= shortbyteschar | bytesescapeseq
-fragment SHORT_BYTES
- : '\'' ( SHORT_BYTES_CHAR_NO_SINGLE_QUOTE | BYTES_ESCAPE_SEQ )* '\''
- | '"' ( SHORT_BYTES_CHAR_NO_DOUBLE_QUOTE | BYTES_ESCAPE_SEQ )* '"'
- ;
+fragment SHORT_BYTES:
+ '\'' (SHORT_BYTES_CHAR_NO_SINGLE_QUOTE | BYTES_ESCAPE_SEQ)* '\''
+ | '"' ( SHORT_BYTES_CHAR_NO_DOUBLE_QUOTE | BYTES_ESCAPE_SEQ)* '"'
+;
/// longbytes ::= "'''" longbytesitem* "'''" | '"""' longbytesitem* '"""'
-fragment LONG_BYTES
- : '\'\'\'' LONG_BYTES_ITEM*? '\'\'\''
- | '"""' LONG_BYTES_ITEM*? '"""'
- ;
+fragment LONG_BYTES: '\'\'\'' LONG_BYTES_ITEM*? '\'\'\'' | '"""' LONG_BYTES_ITEM*? '"""';
/// longbytesitem ::= longbyteschar | bytesescapeseq
-fragment LONG_BYTES_ITEM
- : LONG_BYTES_CHAR
- | BYTES_ESCAPE_SEQ
- ;
+fragment LONG_BYTES_ITEM: LONG_BYTES_CHAR | BYTES_ESCAPE_SEQ;
/// shortbyteschar ::=
-fragment SHORT_BYTES_CHAR_NO_SINGLE_QUOTE
- : [\u0000-\u0009]
- | [\u000B-\u000C]
- | [\u000E-\u0026]
- | [\u0028-\u005B]
- | [\u005D-\u007F]
- ;
-
-fragment SHORT_BYTES_CHAR_NO_DOUBLE_QUOTE
- : [\u0000-\u0009]
- | [\u000B-\u000C]
- | [\u000E-\u0021]
- | [\u0023-\u005B]
- | [\u005D-\u007F]
- ;
+fragment SHORT_BYTES_CHAR_NO_SINGLE_QUOTE:
+ [\u0000-\u0009]
+ | [\u000B-\u000C]
+ | [\u000E-\u0026]
+ | [\u0028-\u005B]
+ | [\u005D-\u007F]
+;
+
+fragment SHORT_BYTES_CHAR_NO_DOUBLE_QUOTE:
+ [\u0000-\u0009]
+ | [\u000B-\u000C]
+ | [\u000E-\u0021]
+ | [\u0023-\u005B]
+ | [\u005D-\u007F]
+;
/// longbyteschar ::=
-fragment LONG_BYTES_CHAR
- : [\u0000-\u005B]
- | [\u005D-\u007F]
- ;
+fragment LONG_BYTES_CHAR: [\u0000-\u005B] | [\u005D-\u007F];
/// bytesescapeseq ::= "\"
-fragment BYTES_ESCAPE_SEQ
- : '\\' [\u0000-\u007F]
- ;
-
-fragment SPACES
- : [ \t]+
- ;
+fragment BYTES_ESCAPE_SEQ: '\\' [\u0000-\u007F];
-fragment COMMENT
- : '#' ~[\r\n\f]*
- ;
+fragment SPACES: [ \t]+;
-fragment LINE_JOINING
- : '\\' SPACES? ( '\r'? '\n' | '\r' | '\f')
- ;
+fragment COMMENT: '#' ~[\r\n\f]*;
+fragment LINE_JOINING: '\\' SPACES? ( '\r'? '\n' | '\r' | '\f');
// TODO: ANTLR seems lack of some Unicode property support...
//$ curl https://www.unicode.org/Public/13.0.0/ucd/PropList.txt | grep Other_ID_
@@ -369,36 +288,26 @@ fragment LINE_JOINING
//1369..1371 ; Other_ID_Continue # No [9] ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE
//19DA ; Other_ID_Continue # No NEW TAI LUE THAM DIGIT ONE
-fragment UNICODE_OIDS
- : '\u1885'..'\u1886'
- | '\u2118'
- | '\u212e'
- | '\u309b'..'\u309c'
- ;
+fragment UNICODE_OIDS: '\u1885' ..'\u1886' | '\u2118' | '\u212e' | '\u309b' ..'\u309c';
-fragment UNICODE_OIDC
- : '\u00b7'
- | '\u0387'
- | '\u1369'..'\u1371'
- | '\u19da'
- ;
+fragment UNICODE_OIDC: '\u00b7' | '\u0387' | '\u1369' ..'\u1371' | '\u19da';
/// id_start ::=
-fragment ID_START
- : '_'
- | [\p{L}]
- | [\p{Nl}]
- //| [\p{Other_ID_Start}]
- | UNICODE_OIDS
- ;
+fragment ID_START:
+ '_'
+ | [\p{L}]
+ | [\p{Nl}]
+ //| [\p{Other_ID_Start}]
+ | UNICODE_OIDS
+;
/// id_continue ::=
-fragment ID_CONTINUE
- : ID_START
- | [\p{Mn}]
- | [\p{Mc}]
- | [\p{Nd}]
- | [\p{Pc}]
- //| [\p{Other_ID_Continue}]
- | UNICODE_OIDC
- ;
+fragment ID_CONTINUE:
+ ID_START
+ | [\p{Mn}]
+ | [\p{Mc}]
+ | [\p{Nd}]
+ | [\p{Pc}]
+ //| [\p{Other_ID_Continue}]
+ | UNICODE_OIDC
+;
\ No newline at end of file
diff --git a/languages/python-3/src/main/antlr4/de/jplag/python3/grammar/Python3Parser.g4 b/languages/python-3/src/main/antlr4/de/jplag/python3/grammar/Python3Parser.g4
index 8b0143de64..4c5a27cf2a 100644
--- a/languages/python-3/src/main/antlr4/de/jplag/python3/grammar/Python3Parser.g4
+++ b/languages/python-3/src/main/antlr4/de/jplag/python3/grammar/Python3Parser.g4
@@ -31,186 +31,623 @@
// Scraping from https://docs.python.org/3/reference/grammar.html
+// $antlr-format alignTrailingComments true, columnLimit 150, minEmptyLines 1, maxEmptyLinesToKeep 1, reflowComments false, useTab false
+// $antlr-format allowShortRulesOnASingleLine false, allowShortBlocksOnASingleLine true, alignSemicolons hanging, alignColons hanging
+
parser grammar Python3Parser;
options {
superClass = Python3ParserBase;
- tokenVocab=Python3Lexer;
+ tokenVocab = Python3Lexer;
}
+// Insert here @header for C++ parser.
+
// All comments that start with "///" are copy-pasted from
// The Python Language Reference
-single_input: NEWLINE | simple_stmts | compound_stmt NEWLINE;
-file_input: (NEWLINE | stmt)* EOF;
-eval_input: testlist NEWLINE* EOF;
-
-decorator: '@' dotted_name ( '(' arglist? ')' )? NEWLINE;
-decorators: decorator+;
-decorated: decorators (classdef | funcdef | async_funcdef);
-
-async_funcdef: ASYNC funcdef;
-funcdef: 'def' name parameters ('->' test)? ':' block;
-
-parameters: '(' typedargslist? ')';
-typedargslist: (tfpdef ('=' test)? (',' tfpdef ('=' test)?)* (',' (
- '*' tfpdef? (',' tfpdef ('=' test)?)* (',' ('**' tfpdef ','? )? )?
- | '**' tfpdef ','? )? )?
- | '*' tfpdef? (',' tfpdef ('=' test)?)* (',' ('**' tfpdef ','? )? )?
- | '**' tfpdef ','?);
-tfpdef: name (':' test)?;
-varargslist: (vfpdef ('=' test)? (',' vfpdef ('=' test)?)* (',' (
- '*' vfpdef? (',' vfpdef ('=' test)?)* (',' ('**' vfpdef ','? )? )?
- | '**' vfpdef (',')?)?)?
- | '*' vfpdef? (',' vfpdef ('=' test)?)* (',' ('**' vfpdef ','? )? )?
- | '**' vfpdef ','?
-);
-vfpdef: name;
-
-stmt: simple_stmts | compound_stmt;
-simple_stmts: simple_stmt (';' simple_stmt)* ';'? NEWLINE;
-simple_stmt: (expr_stmt | del_stmt | pass_stmt | flow_stmt |
- import_stmt | global_stmt | nonlocal_stmt | assert_stmt);
-expr_stmt: testlist_star_expr (annassign | augassign (yield_expr|testlist) |
- ('=' (yield_expr|testlist_star_expr))*);
-annassign: ':' test ('=' test)?;
-testlist_star_expr: (test|star_expr) (',' (test|star_expr))* ','?;
-augassign: ('+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' |
- '<<=' | '>>=' | '**=' | '//=');
+single_input
+ : NEWLINE
+ | simple_stmts
+ | compound_stmt NEWLINE
+ ;
+
+file_input
+ : (NEWLINE | stmt)* EOF
+ ;
+
+eval_input
+ : testlist NEWLINE* EOF
+ ;
+
+decorator
+ : '@' dotted_name ('(' arglist? ')')? NEWLINE
+ ;
+
+decorators
+ : decorator+
+ ;
+
+decorated
+ : decorators (classdef | funcdef | async_funcdef)
+ ;
+
+async_funcdef
+ : ASYNC funcdef
+ ;
+
+funcdef
+ : 'def' name parameters ('->' test)? ':' block
+ ;
+
+parameters
+ : '(' typedargslist? ')'
+ ;
+
+typedargslist
+ : (
+ tfpdef ('=' test)? (',' tfpdef ('=' test)?)* (
+ ',' (
+ '*' tfpdef? (',' tfpdef ('=' test)?)* (',' ('**' tfpdef ','?)?)?
+ | '**' tfpdef ','?
+ )?
+ )?
+ | '*' tfpdef? (',' tfpdef ('=' test)?)* (',' ('**' tfpdef ','?)?)?
+ | '**' tfpdef ','?
+ )
+ ;
+
+tfpdef
+ : name (':' test)?
+ ;
+
+varargslist
+ : (
+ vfpdef ('=' test)? (',' vfpdef ('=' test)?)* (
+ ',' (
+ '*' vfpdef? (',' vfpdef ('=' test)?)* (',' ('**' vfpdef ','?)?)?
+ | '**' vfpdef (',')?
+ )?
+ )?
+ | '*' vfpdef? (',' vfpdef ('=' test)?)* (',' ('**' vfpdef ','?)?)?
+ | '**' vfpdef ','?
+ )
+ ;
+
+vfpdef
+ : name
+ ;
+
+stmt
+ : simple_stmts
+ | compound_stmt
+ ;
+
+simple_stmts
+ : simple_stmt (';' simple_stmt)* ';'? NEWLINE
+ ;
+
+simple_stmt
+ : (
+ expr_stmt
+ | del_stmt
+ | pass_stmt
+ | flow_stmt
+ | import_stmt
+ | global_stmt
+ | nonlocal_stmt
+ | assert_stmt
+ )
+ ;
+
+expr_stmt
+ : testlist_star_expr (
+ annassign
+ | augassign (yield_expr | testlist)
+ | ('=' (yield_expr | testlist_star_expr))*
+ )
+ ;
+
+annassign
+ : ':' test ('=' test)?
+ ;
+
+testlist_star_expr
+ : (test | star_expr) (',' (test | star_expr))* ','?
+ ;
+
+augassign
+ : (
+ '+='
+ | '-='
+ | '*='
+ | '@='
+ | '/='
+ | '%='
+ | '&='
+ | '|='
+ | '^='
+ | '<<='
+ | '>>='
+ | '**='
+ | '//='
+ )
+ ;
+
// For normal and annotated assignments, additional restrictions enforced by the interpreter
-del_stmt: 'del' exprlist;
-pass_stmt: 'pass';
-flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt;
-break_stmt: 'break';
-continue_stmt: 'continue';
-return_stmt: 'return' testlist?;
-yield_stmt: yield_expr;
-raise_stmt: 'raise' (test ('from' test)?)?;
-import_stmt: import_name | import_from;
-import_name: 'import' dotted_as_names;
+del_stmt
+ : 'del' exprlist
+ ;
+
+pass_stmt
+ : 'pass'
+ ;
+
+flow_stmt
+ : break_stmt
+ | continue_stmt
+ | return_stmt
+ | raise_stmt
+ | yield_stmt
+ ;
+
+break_stmt
+ : 'break'
+ ;
+
+continue_stmt
+ : 'continue'
+ ;
+
+return_stmt
+ : 'return' testlist?
+ ;
+
+yield_stmt
+ : yield_expr
+ ;
+
+raise_stmt
+ : 'raise' (test ('from' test)?)?
+ ;
+
+import_stmt
+ : import_name
+ | import_from
+ ;
+
+import_name
+ : 'import' dotted_as_names
+ ;
+
// note below: the ('.' | '...') is necessary because '...' is tokenized as ELLIPSIS
-import_from: ('from' (('.' | '...')* dotted_name | ('.' | '...')+)
- 'import' ('*' | '(' import_as_names ')' | import_as_names));
-import_as_name: name ('as' name)?;
-dotted_as_name: dotted_name ('as' name)?;
-import_as_names: import_as_name (',' import_as_name)* ','?;
-dotted_as_names: dotted_as_name (',' dotted_as_name)*;
-dotted_name: name ('.' name)*;
-global_stmt: 'global' name (',' name)*;
-nonlocal_stmt: 'nonlocal' name (',' name)*;
-assert_stmt: 'assert' test (',' test)?;
-
-compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated | async_stmt | match_stmt;
-async_stmt: ASYNC (funcdef | with_stmt | for_stmt);
-if_stmt: 'if' test ':' block ('elif' test ':' block)* ('else' ':' block)?;
-while_stmt: 'while' test ':' block ('else' ':' block)?;
-for_stmt: 'for' exprlist 'in' testlist ':' block ('else' ':' block)?;
-try_stmt: ('try' ':' block
- ((except_clause ':' block)+
- ('else' ':' block)?
- ('finally' ':' block)? |
- 'finally' ':' block));
-with_stmt: 'with' with_item (',' with_item)* ':' block;
-with_item: test ('as' expr)?;
+import_from
+ : (
+ 'from' (('.' | '...')* dotted_name | ('.' | '...')+) 'import' (
+ '*'
+ | '(' import_as_names ')'
+ | import_as_names
+ )
+ )
+ ;
+
+import_as_name
+ : name ('as' name)?
+ ;
+
+dotted_as_name
+ : dotted_name ('as' name)?
+ ;
+
+import_as_names
+ : import_as_name (',' import_as_name)* ','?
+ ;
+
+dotted_as_names
+ : dotted_as_name (',' dotted_as_name)*
+ ;
+
+dotted_name
+ : name ('.' name)*
+ ;
+
+global_stmt
+ : 'global' name (',' name)*
+ ;
+
+nonlocal_stmt
+ : 'nonlocal' name (',' name)*
+ ;
+
+assert_stmt
+ : 'assert' test (',' test)?
+ ;
+
+compound_stmt
+ : if_stmt
+ | while_stmt
+ | for_stmt
+ | try_stmt
+ | with_stmt
+ | funcdef
+ | classdef
+ | decorated
+ | async_stmt
+ | match_stmt
+ ;
+
+async_stmt
+ : ASYNC (funcdef | with_stmt | for_stmt)
+ ;
+
+if_stmt
+ : 'if' test ':' block ('elif' test ':' block)* ('else' ':' block)?
+ ;
+
+while_stmt
+ : 'while' test ':' block ('else' ':' block)?
+ ;
+
+for_stmt
+ : 'for' exprlist 'in' testlist ':' block ('else' ':' block)?
+ ;
+
+try_stmt
+ : (
+ 'try' ':' block (
+ (except_clause ':' block)+ ('else' ':' block)? ('finally' ':' block)?
+ | 'finally' ':' block
+ )
+ )
+ ;
+
+with_stmt
+ : 'with' with_item (',' with_item)* ':' block
+ ;
+
+with_item
+ : test ('as' expr)?
+ ;
+
// NB compile.c makes sure that the default except clause is last
-except_clause: 'except' (test ('as' name)?)?;
-block: simple_stmts | NEWLINE INDENT stmt+ DEDENT;
-match_stmt: 'match' subject_expr ':' NEWLINE INDENT case_block+ DEDENT ;
-subject_expr: star_named_expression ',' star_named_expressions? | test ;
-star_named_expressions: ',' star_named_expression+ ','? ;
-star_named_expression: '*' expr | test ;
-case_block: 'case' patterns guard? ':' block ;
-guard: 'if' test ;
-patterns: open_sequence_pattern | pattern ;
-pattern: as_pattern | or_pattern ;
-as_pattern: or_pattern 'as' pattern_capture_target ;
-or_pattern: closed_pattern ('|' closed_pattern)* ;
-closed_pattern: literal_pattern | capture_pattern | wildcard_pattern | value_pattern | group_pattern | sequence_pattern | mapping_pattern | class_pattern ;
-literal_pattern: signed_number { this.cannotBePlusMinus() }? | complex_number | strings | 'None' | 'True' | 'False' ;
-literal_expr: signed_number { this.cannotBePlusMinus() }? | complex_number | strings | 'None' | 'True' | 'False' ;
-complex_number: signed_real_number '+' imaginary_number
+except_clause
+ : 'except' (test ('as' name)?)?
+ ;
+
+block
+ : simple_stmts
+ | NEWLINE INDENT stmt+ DEDENT
+ ;
+
+match_stmt
+ : 'match' subject_expr ':' NEWLINE INDENT case_block+ DEDENT
+ ;
+
+subject_expr
+ : star_named_expression ',' star_named_expressions?
+ | test
+ ;
+
+star_named_expressions
+ : ',' star_named_expression+ ','?
+ ;
+
+star_named_expression
+ : '*' expr
+ | test
+ ;
+
+case_block
+ : 'case' patterns guard? ':' block
+ ;
+
+guard
+ : 'if' test
+ ;
+
+patterns
+ : open_sequence_pattern
+ | pattern
+ ;
+
+pattern
+ : as_pattern
+ | or_pattern
+ ;
+
+as_pattern
+ : or_pattern 'as' pattern_capture_target
+ ;
+
+or_pattern
+ : closed_pattern ('|' closed_pattern)*
+ ;
+
+closed_pattern
+ : literal_pattern
+ | capture_pattern
+ | wildcard_pattern
+ | value_pattern
+ | group_pattern
+ | sequence_pattern
+ | mapping_pattern
+ | class_pattern
+ ;
+
+literal_pattern
+ : signed_number { this.CannotBePlusMinus() }?
+ | complex_number
+ | strings
+ | 'None'
+ | 'True'
+ | 'False'
+ ;
+
+literal_expr
+ : signed_number { this.CannotBePlusMinus() }?
+ | complex_number
+ | strings
+ | 'None'
+ | 'True'
+ | 'False'
+ ;
+
+complex_number
+ : signed_real_number '+' imaginary_number
| signed_real_number '-' imaginary_number
;
-signed_number: NUMBER | '-' NUMBER ;
-signed_real_number: real_number | '-' real_number ;
-real_number: NUMBER ;
-imaginary_number: NUMBER ;
-capture_pattern: pattern_capture_target ;
-pattern_capture_target: /* cannot be '_' */ name { this.cannotBeDotLpEq() }? ;
-wildcard_pattern: '_' ;
-value_pattern: attr { this.cannotBeDotLpEq() }? ;
-attr: name ('.' name)+ ;
-name_or_attr: attr | name ;
-group_pattern: '(' pattern ')' ;
-sequence_pattern:
- '[' maybe_sequence_pattern? ']'
+
+signed_number
+ : NUMBER
+ | '-' NUMBER
+ ;
+
+signed_real_number
+ : real_number
+ | '-' real_number
+ ;
+
+real_number
+ : NUMBER
+ ;
+
+imaginary_number
+ : NUMBER
+ ;
+
+capture_pattern
+ : pattern_capture_target
+ ;
+
+pattern_capture_target
+ : /* cannot be '_' */ name { this.CannotBeDotLpEq() }?
+ ;
+
+wildcard_pattern
+ : '_'
+ ;
+
+value_pattern
+ : attr { this.CannotBeDotLpEq() }?
+ ;
+
+attr
+ : name ('.' name)+
+ ;
+
+name_or_attr
+ : attr
+ | name
+ ;
+
+group_pattern
+ : '(' pattern ')'
+ ;
+
+sequence_pattern
+ : '[' maybe_sequence_pattern? ']'
| '(' open_sequence_pattern? ')'
;
-open_sequence_pattern: maybe_star_pattern ',' maybe_sequence_pattern? ;
-maybe_sequence_pattern: maybe_star_pattern (',' maybe_star_pattern)* ','? ;
-maybe_star_pattern: star_pattern | pattern ;
-star_pattern:
- '*' pattern_capture_target
+
+open_sequence_pattern
+ : maybe_star_pattern ',' maybe_sequence_pattern?
+ ;
+
+maybe_sequence_pattern
+ : maybe_star_pattern (',' maybe_star_pattern)* ','?
+ ;
+
+maybe_star_pattern
+ : star_pattern
+ | pattern
+ ;
+
+star_pattern
+ : '*' pattern_capture_target
| '*' wildcard_pattern
;
-mapping_pattern: '{' '}'
+
+mapping_pattern
+ : '{' '}'
| '{' double_star_pattern ','? '}'
| '{' items_pattern ',' double_star_pattern ','? '}'
| '{' items_pattern ','? '}'
;
-items_pattern: key_value_pattern (',' key_value_pattern)* ;
-key_value_pattern: (literal_expr | attr) ':' pattern ;
-double_star_pattern: '**' pattern_capture_target ;
-class_pattern: name_or_attr '(' ')'
+
+items_pattern
+ : key_value_pattern (',' key_value_pattern)*
+ ;
+
+key_value_pattern
+ : (literal_expr | attr) ':' pattern
+ ;
+
+double_star_pattern
+ : '**' pattern_capture_target
+ ;
+
+class_pattern
+ : name_or_attr '(' ')'
| name_or_attr '(' positional_patterns ','? ')'
| name_or_attr '(' keyword_patterns ','? ')'
| name_or_attr '(' positional_patterns ',' keyword_patterns ','? ')'
;
-positional_patterns: pattern (',' pattern)* ;
-keyword_patterns: keyword_pattern (',' keyword_pattern)* ;
-keyword_pattern: name '=' pattern ;
-
-test: or_test ('if' or_test 'else' test)? | lambdef;
-test_nocond: or_test | lambdef_nocond;
-lambdef: 'lambda' varargslist? ':' test;
-lambdef_nocond: 'lambda' varargslist? ':' test_nocond;
-or_test: and_test ('or' and_test)*;
-and_test: not_test ('and' not_test)*;
-not_test: 'not' not_test | comparison;
-comparison: expr (comp_op expr)*;
+
+positional_patterns
+ : pattern (',' pattern)*
+ ;
+
+keyword_patterns
+ : keyword_pattern (',' keyword_pattern)*
+ ;
+
+keyword_pattern
+ : name '=' pattern
+ ;
+
+test
+ : or_test ('if' or_test 'else' test)?
+ | lambdef
+ ;
+
+test_nocond
+ : or_test
+ | lambdef_nocond
+ ;
+
+lambdef
+ : 'lambda' varargslist? ':' test
+ ;
+
+lambdef_nocond
+ : 'lambda' varargslist? ':' test_nocond
+ ;
+
+or_test
+ : and_test ('or' and_test)*
+ ;
+
+and_test
+ : not_test ('and' not_test)*
+ ;
+
+not_test
+ : 'not' not_test
+ | comparison
+ ;
+
+comparison
+ : expr (comp_op expr)*
+ ;
+
// <> isn't actually a valid comparison operator in Python. It's here for the
// sake of a __future__ import described in PEP 401 (which really works :-)
-comp_op: '<'|'>'|'=='|'>='|'<='|'<>'|'!='|'in'|'not' 'in'|'is'|'is' 'not';
-star_expr: '*' expr;
-expr: xor_expr ('|' xor_expr)*;
-xor_expr: and_expr ('^' and_expr)*;
-and_expr: shift_expr ('&' shift_expr)*;
-shift_expr: arith_expr (('<<'|'>>') arith_expr)*;
-arith_expr: term (('+'|'-') term)*;
-term: factor (('*'|'@'|'/'|'%'|'//') factor)*;
-factor: ('+'|'-'|'~') factor | power;
-power: atom_expr ('**' factor)?;
-atom_expr: AWAIT? atom trailer*;
-atom: '(' (yield_expr|testlist_comp)? ')'
- | '[' testlist_comp? ']'
- | '{' dictorsetmaker? '}'
- | name | NUMBER | STRING+ | '...' | 'None' | 'True' | 'False' ;
-name : NAME | '_' | 'match' ;
-testlist_comp: (test|star_expr) ( comp_for | (',' (test|star_expr))* ','? );
-trailer: '(' arglist? ')' | '[' subscriptlist ']' | '.' name ;
-subscriptlist: subscript_ (',' subscript_)* ','?;
-subscript_: test | test? ':' test? sliceop?;
-sliceop: ':' test?;
-exprlist: (expr|star_expr) (',' (expr|star_expr))* ','?;
-testlist: test (',' test)* ','?;
-dictorsetmaker: ( ((test ':' test | '**' expr)
- (comp_for | (',' (test ':' test | '**' expr))* ','?)) |
- ((test | star_expr)
- (comp_for | (',' (test | star_expr))* ','?)) );
-
-classdef: 'class' name ('(' arglist? ')')? ':' block;
-
-arglist: argument (',' argument)* ','?;
+comp_op
+ : '<'
+ | '>'
+ | '=='
+ | '>='
+ | '<='
+ | '<>'
+ | '!='
+ | 'in'
+ | 'not' 'in'
+ | 'is'
+ | 'is' 'not'
+ ;
+
+star_expr
+ : '*' expr
+ ;
+
+expr
+ : atom_expr
+ | expr '**' expr
+ | ('+' | '-' | '~')+ expr
+ | expr ('*' | '@' | '/' | '%' | '//') expr
+ | expr ('+' | '-') expr
+ | expr ('<<' | '>>') expr
+ | expr '&' expr
+ | expr '^' expr
+ | expr '|' expr
+ ;
+
+//expr: xor_expr ('|' xor_expr)*;
+//xor_expr: and_expr ('^' and_expr)*;
+//and_expr: shift_expr ('&' shift_expr)*;
+//shift_expr: arith_expr (('<<'|'>>') arith_expr)*;
+//arith_expr: term (('+'|'-') term)*;
+//term: factor (('*'|'@'|'/'|'%'|'//') factor)*;
+//factor: ('+'|'-'|'~') factor | power;
+//power: atom_expr ('**' factor)?;
+atom_expr
+ : AWAIT? atom trailer*
+ ;
+
+atom
+ : '(' (yield_expr | testlist_comp)? ')'
+ | '[' testlist_comp? ']'
+ | '{' dictorsetmaker? '}'
+ | name
+ | NUMBER
+ | STRING+
+ | '...'
+ | 'None'
+ | 'True'
+ | 'False'
+ ;
+
+name
+ : NAME
+ | '_'
+ | 'match'
+ ;
+
+testlist_comp
+ : (test | star_expr) (comp_for | (',' (test | star_expr))* ','?)
+ ;
+
+trailer
+ : '(' arglist? ')'
+ | '[' subscriptlist ']'
+ | '.' name
+ ;
+
+subscriptlist
+ : subscript_ (',' subscript_)* ','?
+ ;
+
+subscript_
+ : test
+ | test? ':' test? sliceop?
+ ;
+
+sliceop
+ : ':' test?
+ ;
+
+exprlist
+ : (expr | star_expr) (',' (expr | star_expr))* ','?
+ ;
+
+testlist
+ : test (',' test)* ','?
+ ;
+
+dictorsetmaker
+ : (
+ ((test ':' test | '**' expr) (comp_for | (',' (test ':' test | '**' expr))* ','?))
+ | ((test | star_expr) (comp_for | (',' (test | star_expr))* ','?))
+ )
+ ;
+
+classdef
+ : 'class' name ('(' arglist? ')')? ':' block
+ ;
+
+arglist
+ : argument (',' argument)* ','?
+ ;
// The reason that keywords are test nodes instead of NAME is that using NAME
// results in an ambiguity. ast.c makes sure it's a NAME.
@@ -221,19 +658,37 @@ arglist: argument (',' argument)* ','?;
// Illegal combinations and orderings are blocked in ast.c:
// multiple (test comp_for) arguments are blocked; keyword unpackings
// that precede iterable unpackings are blocked; etc.
-argument: ( test comp_for? |
- test '=' test |
- '**' test |
- '*' test );
+argument
+ : (test comp_for? | test '=' test | '**' test | '*' test)
+ ;
+
+comp_iter
+ : comp_for
+ | comp_if
+ ;
-comp_iter: comp_for | comp_if;
-comp_for: ASYNC? 'for' exprlist 'in' or_test comp_iter?;
-comp_if: 'if' test_nocond comp_iter?;
+comp_for
+ : ASYNC? 'for' exprlist 'in' or_test comp_iter?
+ ;
+
+comp_if
+ : 'if' test_nocond comp_iter?
+ ;
// not used in grammar, but may appear in "node" passed from Parser to Compiler
-encoding_decl: name;
+encoding_decl
+ : name
+ ;
-yield_expr: 'yield' yield_arg?;
-yield_arg: 'from' test | testlist;
+yield_expr
+ : 'yield' yield_arg?
+ ;
+
+yield_arg
+ : 'from' test
+ | testlist
+ ;
-strings: STRING+ ;
+strings
+ : STRING+
+ ;
\ No newline at end of file
diff --git a/languages/python-3/src/main/java/de/jplag/python3/JplagPython3Listener.java b/languages/python-3/src/main/java/de/jplag/python3/JplagPython3Listener.java
deleted file mode 100644
index 695d07e40d..0000000000
--- a/languages/python-3/src/main/java/de/jplag/python3/JplagPython3Listener.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package de.jplag.python3;
-
-import static de.jplag.python3.Python3TokenType.APPLY;
-import static de.jplag.python3.Python3TokenType.ARRAY;
-import static de.jplag.python3.Python3TokenType.ASSERT;
-import static de.jplag.python3.Python3TokenType.ASSIGN;
-import static de.jplag.python3.Python3TokenType.BREAK;
-import static de.jplag.python3.Python3TokenType.CLASS_BEGIN;
-import static de.jplag.python3.Python3TokenType.CLASS_END;
-import static de.jplag.python3.Python3TokenType.CONTINUE;
-import static de.jplag.python3.Python3TokenType.DEC_BEGIN;
-import static de.jplag.python3.Python3TokenType.DEC_END;
-import static de.jplag.python3.Python3TokenType.DEL;
-import static de.jplag.python3.Python3TokenType.EXCEPT_BEGIN;
-import static de.jplag.python3.Python3TokenType.EXCEPT_END;
-import static de.jplag.python3.Python3TokenType.FINALLY;
-import static de.jplag.python3.Python3TokenType.FOR_BEGIN;
-import static de.jplag.python3.Python3TokenType.FOR_END;
-import static de.jplag.python3.Python3TokenType.IF_BEGIN;
-import static de.jplag.python3.Python3TokenType.IF_END;
-import static de.jplag.python3.Python3TokenType.IMPORT;
-import static de.jplag.python3.Python3TokenType.LAMBDA;
-import static de.jplag.python3.Python3TokenType.METHOD_BEGIN;
-import static de.jplag.python3.Python3TokenType.METHOD_END;
-import static de.jplag.python3.Python3TokenType.RAISE;
-import static de.jplag.python3.Python3TokenType.RETURN;
-import static de.jplag.python3.Python3TokenType.TRY_BEGIN;
-import static de.jplag.python3.Python3TokenType.WHILE_BEGIN;
-import static de.jplag.python3.Python3TokenType.WHILE_END;
-import static de.jplag.python3.Python3TokenType.WITH_BEGIN;
-import static de.jplag.python3.Python3TokenType.WITH_END;
-import static de.jplag.python3.Python3TokenType.YIELD;
-
-import org.antlr.v4.runtime.tree.TerminalNode;
-
-import de.jplag.python3.grammar.Python3Parser;
-import de.jplag.python3.grammar.Python3ParserBaseListener;
-
-public class JplagPython3Listener extends Python3ParserBaseListener {
-
- private final Parser parser;
-
- public JplagPython3Listener(Parser parser) {
- this.parser = parser;
- }
-
- @Override
- public void enterAssert_stmt(Python3Parser.Assert_stmtContext ctx) {
- parser.add(ASSERT, ctx.getStart());
- }
-
- @Override
- public void enterDecorated(Python3Parser.DecoratedContext ctx) {
- parser.add(DEC_BEGIN, ctx.getStart());
- }
-
- @Override
- public void exitDecorated(Python3Parser.DecoratedContext ctx) {
- parser.addEnd(DEC_END, ctx.getStop());
- }
-
- @Override
- public void enterRaise_stmt(Python3Parser.Raise_stmtContext ctx) {
- parser.add(RAISE, ctx.getStart());
- }
-
- @Override
- public void enterExcept_clause(Python3Parser.Except_clauseContext ctx) {
- parser.add(EXCEPT_BEGIN, ctx.getStart());
- }
-
- @Override
- public void exitExcept_clause(Python3Parser.Except_clauseContext ctx) {
- parser.addEnd(EXCEPT_END, ctx.getStop());
- }
-
- @Override
- public void enterDictorsetmaker(Python3Parser.DictorsetmakerContext ctx) {
- parser.add(ARRAY, ctx.getStart());
- }
-
- @Override
- public void enterReturn_stmt(Python3Parser.Return_stmtContext ctx) {
- parser.add(RETURN, ctx.getStart());
- }
-
- @Override
- public void enterWhile_stmt(Python3Parser.While_stmtContext ctx) {
- parser.add(WHILE_BEGIN, ctx.getStart());
- }
-
- @Override
- public void exitWhile_stmt(Python3Parser.While_stmtContext ctx) {
- parser.addEnd(WHILE_END, ctx.getStop());
- }
-
- @Override
- public void enterYield_arg(Python3Parser.Yield_argContext ctx) {
- parser.add(YIELD, ctx.getStart());
- }
-
- @Override
- public void enterImport_stmt(Python3Parser.Import_stmtContext ctx) {
- parser.add(IMPORT, ctx.getStart());
- }
-
- @Override
- public void enterLambdef(Python3Parser.LambdefContext ctx) {
- parser.add(LAMBDA, ctx.getStart());
- }
-
- @Override
- public void enterTry_stmt(Python3Parser.Try_stmtContext ctx) {
- parser.add(TRY_BEGIN, ctx.getStart());
- }
-
- @Override
- public void enterBreak_stmt(Python3Parser.Break_stmtContext ctx) {
- parser.add(BREAK, ctx.getStart());
- }
-
- @Override
- public void enterTestlist_comp(Python3Parser.Testlist_compContext ctx) {
- if (ctx.getText().contains(",")) {
- parser.add(ARRAY, ctx.getStart());
- }
- }
-
- @Override
- public void enterIf_stmt(Python3Parser.If_stmtContext ctx) {
- parser.add(IF_BEGIN, ctx.getStart());
- }
-
- @Override
- public void exitIf_stmt(Python3Parser.If_stmtContext ctx) {
- parser.addEnd(IF_END, ctx.getStop());
- }
-
- @Override
- public void enterWith_stmt(Python3Parser.With_stmtContext ctx) {
- parser.add(WITH_BEGIN, ctx.getStart());
- }
-
- @Override
- public void exitWith_stmt(Python3Parser.With_stmtContext ctx) {
- parser.addEnd(WITH_END, ctx.getStop());
- }
-
- @Override
- public void enterClassdef(Python3Parser.ClassdefContext ctx) {
- parser.add(CLASS_BEGIN, ctx.getStart());
- }
-
- @Override
- public void exitClassdef(Python3Parser.ClassdefContext ctx) {
- parser.addEnd(CLASS_END, ctx.getStop());
- }
-
- @Override
- public void enterTrailer(Python3Parser.TrailerContext ctx) {
- if (ctx.getText().charAt(0) == '(') {
- parser.add(APPLY, ctx.getStart());
- } else {
- parser.add(ARRAY, ctx.getStart());
- }
- }
-
- @Override
- public void enterFuncdef(Python3Parser.FuncdefContext ctx) {
- parser.add(METHOD_BEGIN, ctx.getStart());
- }
-
- @Override
- public void exitFuncdef(Python3Parser.FuncdefContext ctx) {
- parser.addEnd(METHOD_END, ctx.getStop());
- }
-
- @Override
- public void enterAugassign(Python3Parser.AugassignContext ctx) {
- parser.add(ASSIGN, ctx.getStart());
- }
-
- @Override
- public void enterYield_stmt(Python3Parser.Yield_stmtContext ctx) {
- parser.add(YIELD, ctx.getStart());
- }
-
- @Override
- public void enterContinue_stmt(Python3Parser.Continue_stmtContext ctx) {
- parser.add(CONTINUE, ctx.getStart());
- }
-
- @Override
- public void enterFor_stmt(Python3Parser.For_stmtContext ctx) {
- parser.add(FOR_BEGIN, ctx.getStart());
- }
-
- @Override
- public void exitFor_stmt(Python3Parser.For_stmtContext ctx) {
- parser.addEnd(FOR_END, ctx.getStop());
- }
-
- @Override
- public void enterDel_stmt(Python3Parser.Del_stmtContext ctx) {
- parser.add(DEL, ctx.getStart());
- }
-
- @Override
- public void visitTerminal(TerminalNode node) {
- if (node.getText().equals("=")) {
- parser.add(ASSIGN, node.getSymbol());
- } else if (node.getText().equals("finally")) {
- parser.add(FINALLY, node.getSymbol());
- }
- }
-}
diff --git a/languages/python-3/src/main/java/de/jplag/python3/Parser.java b/languages/python-3/src/main/java/de/jplag/python3/Parser.java
deleted file mode 100644
index 2dc352bfe2..0000000000
--- a/languages/python-3/src/main/java/de/jplag/python3/Parser.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package de.jplag.python3;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
-
-import de.jplag.AbstractParser;
-import de.jplag.ParsingException;
-import de.jplag.Token;
-import de.jplag.TokenType;
-import de.jplag.python3.grammar.Python3Lexer;
-import de.jplag.python3.grammar.Python3Parser;
-import de.jplag.python3.grammar.Python3Parser.File_inputContext;
-import de.jplag.util.FileUtils;
-
-public class Parser extends AbstractParser {
-
- private List tokens;
- private File currentFile;
-
- /**
- * Creates the parser.
- */
- public Parser() {
- super();
- }
-
- public List parse(Set files) throws ParsingException {
- tokens = new ArrayList<>();
- for (File file : files) {
- logger.trace("Parsing file {}", file.getName());
- parseFile(file);
- tokens.add(Token.fileEnd(file));
- }
- return tokens;
- }
-
- private void parseFile(File file) throws ParsingException {
- try (BufferedReader reader = FileUtils.openFileReader(file)) {
- currentFile = file;
-
- // create a lexer that feeds off of input CharStream
- Python3Lexer lexer = new Python3Lexer(CharStreams.fromReader(reader));
-
- // create a buffer of tokens pulled from the lexer
- CommonTokenStream tokens = new CommonTokenStream(lexer);
-
- // create a parser that feeds off the tokens buffer
- Python3Parser parser = new Python3Parser(tokens);
- File_inputContext in = parser.file_input();
-
- ParseTreeWalker ptw = new ParseTreeWalker();
- for (int i = 0; i < in.getChildCount(); i++) {
- ParseTree pt = in.getChild(i);
- ptw.walk(new JplagPython3Listener(this), pt);
- }
-
- } catch (IOException e) {
- throw new ParsingException(file, e.getMessage(), e);
- }
- }
-
- public void add(TokenType type, org.antlr.v4.runtime.Token token) {
- tokens.add(new Token(type, currentFile, token.getLine(), token.getCharPositionInLine() + 1, token.getText().length()));
- }
-
- public void addEnd(TokenType type, org.antlr.v4.runtime.Token token) {
- tokens.add(new Token(type, currentFile, token.getLine(), tokens.get(tokens.size() - 1).getColumn() + 1, 0));
- }
-}
diff --git a/languages/python-3/src/main/java/de/jplag/python3/Python3TokenType.java b/languages/python-3/src/main/java/de/jplag/python3/Python3TokenType.java
index e4a684c9b9..8505224702 100644
--- a/languages/python-3/src/main/java/de/jplag/python3/Python3TokenType.java
+++ b/languages/python-3/src/main/java/de/jplag/python3/Python3TokenType.java
@@ -32,7 +32,9 @@ public enum Python3TokenType implements TokenType {
YIELD("YIELD"),
DEL("DEL"),
WITH_BEGIN("WITH}"),
- WITH_END("}WITH");
+ WITH_END("}WITH"),
+ ASYNC("ASYNC"),
+ AWAIT("AWAIT");
private final String description;
diff --git a/languages/python-3/src/main/java/de/jplag/python3/PythonLanguage.java b/languages/python-3/src/main/java/de/jplag/python3/PythonLanguage.java
index b5a8fd73f4..3df6587284 100644
--- a/languages/python-3/src/main/java/de/jplag/python3/PythonLanguage.java
+++ b/languages/python-3/src/main/java/de/jplag/python3/PythonLanguage.java
@@ -1,23 +1,16 @@
package de.jplag.python3;
-import java.io.File;
-import java.util.List;
-import java.util.Set;
-
import org.kohsuke.MetaInfServices;
-import de.jplag.ParsingException;
-import de.jplag.Token;
+import de.jplag.antlr.AbstractAntlrLanguage;
@MetaInfServices(de.jplag.Language.class)
-public class PythonLanguage implements de.jplag.Language {
+public class PythonLanguage extends AbstractAntlrLanguage {
private static final String IDENTIFIER = "python3";
- private final Parser parser;
-
public PythonLanguage() {
- parser = new Parser();
+ super(new PythonParserAdapter());
}
@Override
@@ -39,9 +32,4 @@ public String getIdentifier() {
public int minimumTokenMatch() {
return 12;
}
-
- @Override
- public List parse(Set files, boolean normalize) throws ParsingException {
- return this.parser.parse(files);
- }
}
diff --git a/languages/python-3/src/main/java/de/jplag/python3/PythonListener.java b/languages/python-3/src/main/java/de/jplag/python3/PythonListener.java
new file mode 100644
index 0000000000..aa0dabb18f
--- /dev/null
+++ b/languages/python-3/src/main/java/de/jplag/python3/PythonListener.java
@@ -0,0 +1,81 @@
+package de.jplag.python3;
+
+import static de.jplag.python3.Python3TokenType.*;
+
+import de.jplag.antlr.AbstractAntlrListener;
+import de.jplag.python3.grammar.Python3Parser;
+import de.jplag.python3.grammar.Python3Parser.Assert_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.AugassignContext;
+import de.jplag.python3.grammar.Python3Parser.Break_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.ClassdefContext;
+import de.jplag.python3.grammar.Python3Parser.Continue_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.DecoratedContext;
+import de.jplag.python3.grammar.Python3Parser.Del_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.DictorsetmakerContext;
+import de.jplag.python3.grammar.Python3Parser.Except_clauseContext;
+import de.jplag.python3.grammar.Python3Parser.For_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.FuncdefContext;
+import de.jplag.python3.grammar.Python3Parser.If_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.Import_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.LambdefContext;
+import de.jplag.python3.grammar.Python3Parser.Raise_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.Return_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.Testlist_compContext;
+import de.jplag.python3.grammar.Python3Parser.TrailerContext;
+import de.jplag.python3.grammar.Python3Parser.Try_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.While_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.With_stmtContext;
+import de.jplag.python3.grammar.Python3Parser.Yield_argContext;
+import de.jplag.python3.grammar.Python3Parser.Yield_stmtContext;
+
+public class PythonListener extends AbstractAntlrListener {
+ public PythonListener() {
+ statements();
+ controlStructures();
+ contexts();
+ values();
+ }
+
+ private void statements() {
+ visit(Assert_stmtContext.class).map(ASSERT);
+ visit(Raise_stmtContext.class).map(RAISE);
+ visit(Return_stmtContext.class).map(RETURN);
+ visit(Yield_argContext.class).map(YIELD);
+ visit(Yield_stmtContext.class).map(YIELD);
+ visit(Import_stmtContext.class).map(IMPORT);
+ visit(Break_stmtContext.class).map(BREAK);
+ visit(Continue_stmtContext.class).map(CONTINUE);
+ visit(Del_stmtContext.class).map(DEL);
+ visit(Python3Parser.FINALLY).map(FINALLY);
+
+ visit(Python3Parser.ASYNC).map(ASYNC);
+ visit(Python3Parser.AWAIT).map(AWAIT);
+
+ visit(Except_clauseContext.class).map(EXCEPT_BEGIN, EXCEPT_END);
+ }
+
+ private void controlStructures() {
+ visit(While_stmtContext.class).map(WHILE_BEGIN, WHILE_END);
+ visit(Try_stmtContext.class).map(TRY_BEGIN);
+ visit(If_stmtContext.class).map(IF_BEGIN, IF_END);
+ visit(With_stmtContext.class).map(WITH_BEGIN, WITH_END);
+ visit(For_stmtContext.class).map(FOR_BEGIN, FOR_END);
+ }
+
+ private void contexts() {
+ visit(DecoratedContext.class).map(DEC_BEGIN, DEC_END);
+ visit(LambdefContext.class).map(LAMBDA);
+ visit(ClassdefContext.class).map(CLASS_BEGIN, CLASS_END);
+ visit(FuncdefContext.class).map(METHOD_BEGIN, METHOD_END);
+ }
+
+ private void values() {
+ visit(DictorsetmakerContext.class).map(ARRAY);
+ visit(Testlist_compContext.class, context -> context.getText().contains(",")).map(ARRAY);
+ visit(AugassignContext.class).map(ASSIGN);
+ visit(Python3Parser.ASSIGN).map(ASSIGN);
+
+ visit(TrailerContext.class, ctx -> ctx.getText().charAt(0) == '(').map(APPLY);
+ visit(TrailerContext.class, ctx -> ctx.getText().charAt(0) != '(').map(ARRAY);
+ }
+}
diff --git a/languages/python-3/src/main/java/de/jplag/python3/PythonParserAdapter.java b/languages/python-3/src/main/java/de/jplag/python3/PythonParserAdapter.java
new file mode 100644
index 0000000000..8d99920f05
--- /dev/null
+++ b/languages/python-3/src/main/java/de/jplag/python3/PythonParserAdapter.java
@@ -0,0 +1,33 @@
+package de.jplag.python3;
+
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.ParserRuleContext;
+
+import de.jplag.antlr.AbstractAntlrListener;
+import de.jplag.antlr.AbstractAntlrParserAdapter;
+import de.jplag.python3.grammar.Python3Lexer;
+import de.jplag.python3.grammar.Python3Parser;
+
+public class PythonParserAdapter extends AbstractAntlrParserAdapter {
+ @Override
+ protected Lexer createLexer(CharStream input) {
+ return new Python3Lexer(input);
+ }
+
+ @Override
+ protected Python3Parser createParser(CommonTokenStream tokenStream) {
+ return new Python3Parser(tokenStream);
+ }
+
+ @Override
+ protected ParserRuleContext getEntryContext(Python3Parser parser) {
+ return parser.file_input();
+ }
+
+ @Override
+ protected AbstractAntlrListener getListener() {
+ return new PythonListener();
+ }
+}
diff --git a/languages/python-3/src/main/java/de/jplag/python3/grammar/Python3LexerBase.java b/languages/python-3/src/main/java/de/jplag/python3/grammar/Python3LexerBase.java
index 0e24adf203..b5a0e55011 100644
--- a/languages/python-3/src/main/java/de/jplag/python3/grammar/Python3LexerBase.java
+++ b/languages/python-3/src/main/java/de/jplag/python3/grammar/Python3LexerBase.java
@@ -1,17 +1,18 @@
package de.jplag.python3.grammar;
+import java.util.ArrayDeque;
import java.util.Deque;
-import java.util.LinkedList;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CommonToken;
-import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.*;
abstract class Python3LexerBase extends Lexer {
- private LinkedList tokens = new LinkedList<>();
- private Deque indents = new LinkedList<>();
+ // A queue where extra tokens are pushed on (see the NEWLINE lexer rule).
+ private java.util.LinkedList tokens = new java.util.LinkedList<>();
+ // The stack that keeps track of the indentation level.
+ private Deque indents = new ArrayDeque<>();
+ // The amount of opened braces, brackets and parenthesis.
private int opened = 0;
+ // The most recently produced token.
private Token lastToken = null;
protected Python3LexerBase(CharStream input) {
@@ -26,35 +27,38 @@ public void emit(Token t) {
@Override
public Token nextToken() {
+ // Check if the end-of-file is ahead and there are still some DEDENTS expected.
if (_input.LA(1) == EOF && !this.indents.isEmpty()) {
+ // Remove any trailing EOF tokens from our buffer.
+ for (int i = tokens.size() - 1; i >= 0; i--) {
+ if (tokens.get(i).getType() == EOF) {
+ tokens.remove(i);
+ }
+ }
+
+ // First emit an extra line break that serves as the end of the statement.
this.emit(commonToken(Python3Lexer.NEWLINE, "\n"));
- this.removeTrailingEofTokens();
+ // Now emit as much DEDENT tokens as needed.
while (!indents.isEmpty()) {
this.emit(createDedent());
indents.pop();
}
- this.emit(commonToken(EOF, ""));
+ // Put the EOF back on the token stream.
+ this.emit(commonToken(Python3Lexer.EOF, ""));
}
Token next = super.nextToken();
if (next.getChannel() == Token.DEFAULT_CHANNEL) {
+ // Keep track of the last token on the default channel.
this.lastToken = next;
}
return tokens.isEmpty() ? next : tokens.poll();
}
- private void removeTrailingEofTokens() {
- for (int i = tokens.size() - 1; i >= 0; i--) {
- if (tokens.get(i).getType() == EOF) {
- tokens.remove(i);
- }
- }
- }
-
private Token createDedent() {
CommonToken dedent = commonToken(Python3Lexer.DEDENT, "");
dedent.setLine(this.lastToken.getLine());
@@ -67,21 +71,24 @@ private CommonToken commonToken(int type, String text) {
return new CommonToken(this._tokenFactorySourcePair, type, DEFAULT_TOKEN_CHANNEL, start, stop);
}
- /**
- * Calculates the indentation of the provided spaces, taking the following rules into account:
- *
- * "Tabs are replaced (from left to right) by one to eight spaces such that the total number of characters up to and
- * including the replacement is a multiple of eight [...]"
- *
- * -- https://docs.python.org/3.1/reference/lexical_analysis.html#indentation
- **/
+ // Calculates the indentation of the provided spaces, taking the
+ // following rules into account:
+ //
+ // "Tabs are replaced (from left to right) by one to eight spaces
+ // such that the total number of characters up to and including
+ // the replacement is a multiple of eight [...]"
+ //
+ // -- https://docs.python.org/3.1/reference/lexical_analysis.html#indentation
static int getIndentationCount(String spaces) {
int count = 0;
for (char ch : spaces.toCharArray()) {
- if (ch == '\t') {
- count += 8 - (count % 8);
- } else {
- count++;
+ switch (ch) {
+ case '\t':
+ count += 8 - (count % 8);
+ break;
+ default:
+ // A normal space char.
+ count++;
}
}
@@ -104,21 +111,26 @@ void onNewLine() {
String newLine = getText().replaceAll("[^\r\n\f]+", "");
String spaces = getText().replaceAll("[\r\n\f]+", "");
+ // Strip newlines inside open clauses except if we are near EOF. We keep NEWLINEs near EOF to
+ // satisfy the final newline needed by the single_put rule used by the REPL.
int next = _input.LA(1);
int nextnext = _input.LA(2);
if (opened > 0 || (nextnext != -1 && (next == '\r' || next == '\n' || next == '\f' || next == '#'))) {
+ // If we're inside a list or on a blank line, ignore all indents,
+ // dedents and line breaks.
skip();
} else {
emit(commonToken(Python3Lexer.NEWLINE, newLine));
int indent = getIndentationCount(spaces);
int previous = indents.isEmpty() ? 0 : indents.peek();
-
if (indent == previous) {
+ // skip indents of the same size as the present indent-size
skip();
} else if (indent > previous) {
indents.push(indent);
emit(commonToken(Python3Lexer.INDENT, spaces));
} else {
+ // Possibly emit more than 1 DEDENT token.
while (!indents.isEmpty() && indents.peek() > indent) {
this.emit(createDedent());
indents.pop();
@@ -129,10 +141,10 @@ void onNewLine() {
@Override
public void reset() {
- tokens = new LinkedList<>();
- indents = new LinkedList<>();
+ tokens = new java.util.LinkedList<>();
+ indents = new ArrayDeque<>();
opened = 0;
lastToken = null;
super.reset();
}
-}
+}
\ No newline at end of file
diff --git a/languages/python-3/src/main/java/de/jplag/python3/grammar/Python3ParserBase.java b/languages/python-3/src/main/java/de/jplag/python3/grammar/Python3ParserBase.java
index 44b5926a45..713af92c1e 100644
--- a/languages/python-3/src/main/java/de/jplag/python3/grammar/Python3ParserBase.java
+++ b/languages/python-3/src/main/java/de/jplag/python3/grammar/Python3ParserBase.java
@@ -1,18 +1,17 @@
package de.jplag.python3.grammar;
-import org.antlr.v4.runtime.Parser;
-import org.antlr.v4.runtime.TokenStream;
+import org.antlr.v4.runtime.*;
public abstract class Python3ParserBase extends Parser {
protected Python3ParserBase(TokenStream input) {
super(input);
}
- public boolean cannotBePlusMinus() {
+ public boolean CannotBePlusMinus() {
return true;
}
- public boolean cannotBeDotLpEq() {
+ public boolean CannotBeDotLpEq() {
return true;
}
-}
+}
\ No newline at end of file
diff --git a/languages/python-3/src/test/resources/de/jplag/python3/test_utils.py b/languages/python-3/src/test/resources/de/jplag/python3/test_utils.py
index 34d92252cc..bfd3e8bf46 100644
--- a/languages/python-3/src/test/resources/de/jplag/python3/test_utils.py
+++ b/languages/python-3/src/test/resources/de/jplag/python3/test_utils.py
@@ -500,4 +500,9 @@ def force_legacy_ssl_support():
def switchWithBreak():
while True:
- break
\ No newline at end of file
+ break
+
+async def x():
+ return ""
+
+x = await x()
\ No newline at end of file
diff --git a/languages/scala/pom.xml b/languages/scala/pom.xml
index 7c43463dc5..b9300f543c 100644
--- a/languages/scala/pom.xml
+++ b/languages/scala/pom.xml
@@ -10,7 +10,7 @@
scala
- 2.13.12
+ 2.13.14
2.13
@@ -25,7 +25,7 @@
org.scalameta
scalameta_${scala.compat.version}
- 4.8.15
+ 4.9.5
@@ -35,7 +35,7 @@
net.alchim31.maven
scala-maven-plugin
- 4.8.1
+ 4.9.1
diff --git a/pom.xml b/pom.xml
index dba35b8c0e..2209f238ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,18 +75,18 @@
21
21
2.43.0
- 2.0.12
+ 2.0.13
5.10.2
2.7.7
4.13.1
- 2.35.0
- 2.29.0
- 2.36.0
+ 2.36.0
+ 2.30.0
+ 2.37.0
1.0.0
- 5.0.0
+ 5.1.0
@@ -117,7 +117,7 @@
edu.stanford.nlp
stanford-corenlp
- 4.5.6
+ 4.5.7
@@ -140,7 +140,7 @@
com.fasterxml.jackson.core
jackson-databind
- 2.16.1
+ 2.17.1
@@ -167,7 +167,7 @@
org.mockito
mockito-core
- 5.10.0
+ 5.12.0
test
@@ -203,7 +203,7 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.3.0
+ 3.4.1
@@ -223,7 +223,7 @@
org.apache.maven.plugins
maven-assembly-plugin
- 3.6.0
+ 3.7.1
jar-with-dependencies
@@ -244,7 +244,7 @@
org.jacoco
jacoco-maven-plugin
- 0.8.11
+ 0.8.12
prepare-agent
@@ -268,12 +268,12 @@
org.apache.maven.plugins
maven-gpg-plugin
- 3.1.0
+ 3.2.4
org.apache.maven.plugins
maven-deploy-plugin
- 3.1.1
+ 3.1.2
@@ -310,7 +310,7 @@
org.codehaus.mojo
build-helper-maven-plugin
- 3.5.0
+ 3.6.0
add-source
@@ -343,7 +343,7 @@
org.apache.maven.plugins
maven-source-plugin
- 3.3.0
+ 3.3.1
attach-sources
diff --git a/report-viewer/.gitignore b/report-viewer/.gitignore
index 719bf30c14..9d12524399 100644
--- a/report-viewer/.gitignore
+++ b/report-viewer/.gitignore
@@ -29,3 +29,4 @@ coverage
test-results/
playwright-report/
+tests/e2e/assets
\ No newline at end of file
diff --git a/report-viewer/index.html b/report-viewer/index.html
index f4fedd2bd1..24ca69e3c6 100644
--- a/report-viewer/index.html
+++ b/report-viewer/index.html
@@ -6,7 +6,7 @@
JPlag Report Viewer
-
+
We're sorry but the JPlag Report Viewer does not work properly without JavaScript enabled.
diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index b28adb6c27..63b67c6b1a 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -8,49 +8,48 @@
"name": "report-viewer",
"version": "0.0.0",
"dependencies": {
- "@fortawesome/fontawesome-svg-core": "^6.5.1",
- "@fortawesome/free-brands-svg-icons": "^6.5.1",
- "@fortawesome/free-regular-svg-icons": "^6.5.1",
- "@fortawesome/free-solid-svg-icons": "^6.5.1",
+ "@fortawesome/fontawesome-svg-core": "^6.5.2",
+ "@fortawesome/free-brands-svg-icons": "^6.5.2",
+ "@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/vue-fontawesome": "^3.0.5",
- "chart.js": "^4.4.1",
- "chartjs-chart-graph": "^4.2.8",
+ "chart.js": "^4.4.2",
+ "chartjs-chart-graph": "^4.3.0",
"chartjs-plugin-datalabels": "^2.2.0",
"highlight.js": "^11.9.0",
"jszip": "^3.10.0",
"pinia": "^2.1.7",
"slash": "^5.1.0",
- "vue": "^3.3.4",
- "vue-chartjs": "^5.3.0",
+ "vue": "^3.4.27",
+ "vue-chartjs": "^5.3.1",
"vue-draggable-next": "^2.2.1",
- "vue-router": "^4.2.5",
+ "vue-router": "^4.3.2",
"vue-virtual-scroller": "^2.0.0-beta.8"
},
"devDependencies": {
- "@playwright/test": "^1.40.1",
- "@rushstack/eslint-patch": "^1.7.2",
+ "@playwright/test": "^1.44.0",
+ "@rushstack/eslint-patch": "^1.10.2",
"@types/jsdom": "^21.1.6",
- "@types/node": "^18.19.15",
+ "@types/node": "^18.19.33",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-prettier": "^9.0.0",
- "@vue/eslint-config-typescript": "^12.0.0",
- "@vue/test-utils": "^2.4.3",
+ "@vue/eslint-config-typescript": "^13.0.0",
+ "@vue/test-utils": "^2.4.6",
"@vue/tsconfig": "^0.5.1",
- "autoprefixer": "^10.4.16",
- "eslint": "^8.56.0",
- "eslint-plugin-vue": "^9.20.1",
+ "autoprefixer": "^10.4.19",
+ "eslint": "^8.57.0",
+ "eslint-plugin-vue": "^9.26.0",
"husky": "^9.0.11",
"jsdom": "^24.0.0",
"lint-staged": "^15.2.2",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.35",
"prettier": "^3.2.5",
- "prettier-plugin-tailwindcss": "^0.5.11",
- "tailwindcss": "^3.4.1",
- "typescript": "^5.3.3",
- "vite": "^5.1.7",
- "vitest": "^1.2.2",
- "vue-tsc": "^1.8.27"
+ "prettier-plugin-tailwindcss": "^0.5.14",
+ "tailwindcss": "^3.4.3",
+ "typescript": "^5.4.5",
+ "vite": "^5.2.11",
+ "vitest": "^1.6.0",
+ "vue-tsc": "^2.0.17"
}
},
"node_modules/@aashutoshrathi/word-wrap": {
@@ -75,9 +74,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.23.9",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
- "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==",
+ "version": "7.24.5",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.5.tgz",
+ "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==",
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -86,9 +85,9 @@
}
},
"node_modules/@esbuild/aix-ppc64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
- "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
+ "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
"cpu": [
"ppc64"
],
@@ -102,9 +101,9 @@
}
},
"node_modules/@esbuild/android-arm": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
- "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
+ "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
"cpu": [
"arm"
],
@@ -118,9 +117,9 @@
}
},
"node_modules/@esbuild/android-arm64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
- "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
+ "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
"cpu": [
"arm64"
],
@@ -134,9 +133,9 @@
}
},
"node_modules/@esbuild/android-x64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
- "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
+ "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
"cpu": [
"x64"
],
@@ -150,9 +149,9 @@
}
},
"node_modules/@esbuild/darwin-arm64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
- "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
+ "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
"cpu": [
"arm64"
],
@@ -166,9 +165,9 @@
}
},
"node_modules/@esbuild/darwin-x64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
- "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
+ "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
"cpu": [
"x64"
],
@@ -182,9 +181,9 @@
}
},
"node_modules/@esbuild/freebsd-arm64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
- "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
+ "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
"cpu": [
"arm64"
],
@@ -198,9 +197,9 @@
}
},
"node_modules/@esbuild/freebsd-x64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
- "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
+ "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
"cpu": [
"x64"
],
@@ -214,9 +213,9 @@
}
},
"node_modules/@esbuild/linux-arm": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
- "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
+ "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
"cpu": [
"arm"
],
@@ -230,9 +229,9 @@
}
},
"node_modules/@esbuild/linux-arm64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
- "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
+ "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
"cpu": [
"arm64"
],
@@ -246,9 +245,9 @@
}
},
"node_modules/@esbuild/linux-ia32": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
- "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
+ "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
"cpu": [
"ia32"
],
@@ -262,9 +261,9 @@
}
},
"node_modules/@esbuild/linux-loong64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
- "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
+ "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
"cpu": [
"loong64"
],
@@ -278,9 +277,9 @@
}
},
"node_modules/@esbuild/linux-mips64el": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
- "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
+ "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
"cpu": [
"mips64el"
],
@@ -294,9 +293,9 @@
}
},
"node_modules/@esbuild/linux-ppc64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
- "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
+ "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
"cpu": [
"ppc64"
],
@@ -310,9 +309,9 @@
}
},
"node_modules/@esbuild/linux-riscv64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
- "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
+ "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
"cpu": [
"riscv64"
],
@@ -326,9 +325,9 @@
}
},
"node_modules/@esbuild/linux-s390x": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
- "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
+ "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
"cpu": [
"s390x"
],
@@ -342,9 +341,9 @@
}
},
"node_modules/@esbuild/linux-x64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
- "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+ "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
"cpu": [
"x64"
],
@@ -358,9 +357,9 @@
}
},
"node_modules/@esbuild/netbsd-x64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
- "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
+ "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
"cpu": [
"x64"
],
@@ -374,9 +373,9 @@
}
},
"node_modules/@esbuild/openbsd-x64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
- "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
+ "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
"cpu": [
"x64"
],
@@ -390,9 +389,9 @@
}
},
"node_modules/@esbuild/sunos-x64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
- "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
+ "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
"cpu": [
"x64"
],
@@ -406,9 +405,9 @@
}
},
"node_modules/@esbuild/win32-arm64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
- "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
+ "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
"cpu": [
"arm64"
],
@@ -422,9 +421,9 @@
}
},
"node_modules/@esbuild/win32-ia32": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
- "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
+ "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
"cpu": [
"ia32"
],
@@ -438,9 +437,9 @@
}
},
"node_modules/@esbuild/win32-x64": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
- "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
+ "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
"cpu": [
"x64"
],
@@ -523,71 +522,77 @@
}
},
"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==",
+ "version": "8.57.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+ "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
}
},
- "node_modules/@fortawesome/fontawesome-common-types": {
- "version": "6.5.1",
- "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz",
- "integrity": "sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==",
+ "node_modules/@fortawesome/fontawesome-svg-core": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.2.tgz",
+ "integrity": "sha512-5CdaCBGl8Rh9ohNdxeeTMxIj8oc3KNBgIeLMvJosBMdslK/UnEB8rzyDRrbKdL1kDweqBPo4GT9wvnakHWucZw==",
"hasInstallScript": true,
+ "dependencies": {
+ "@fortawesome/fontawesome-common-types": "6.5.2"
+ },
"engines": {
"node": ">=6"
}
},
- "node_modules/@fortawesome/fontawesome-svg-core": {
- "version": "6.5.1",
- "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.1.tgz",
- "integrity": "sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==",
+ "node_modules/@fortawesome/fontawesome-svg-core/node_modules/@fortawesome/fontawesome-common-types": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz",
+ "integrity": "sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw==",
"hasInstallScript": true,
- "dependencies": {
- "@fortawesome/fontawesome-common-types": "6.5.1"
- },
"engines": {
"node": ">=6"
}
},
"node_modules/@fortawesome/free-brands-svg-icons": {
- "version": "6.5.1",
- "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.1.tgz",
- "integrity": "sha512-093l7DAkx0aEtBq66Sf19MgoZewv1zeY9/4C7vSKPO4qMwEsW/2VYTUTpBtLwfb9T2R73tXaRDPmE4UqLCYHfg==",
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.2.tgz",
+ "integrity": "sha512-zi5FNYdmKLnEc0jc0uuHH17kz/hfYTg4Uei0wMGzcoCL/4d3WM3u1VMc0iGGa31HuhV5i7ZK8ZlTCQrHqRHSGQ==",
"hasInstallScript": true,
"dependencies": {
- "@fortawesome/fontawesome-common-types": "6.5.1"
+ "@fortawesome/fontawesome-common-types": "6.5.2"
},
"engines": {
"node": ">=6"
}
},
- "node_modules/@fortawesome/free-regular-svg-icons": {
- "version": "6.5.1",
- "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.5.1.tgz",
- "integrity": "sha512-m6ShXn+wvqEU69wSP84coxLbNl7sGVZb+Ca+XZq6k30SzuP3X4TfPqtycgUh9ASwlNh5OfQCd8pDIWxl+O+LlQ==",
+ "node_modules/@fortawesome/free-brands-svg-icons/node_modules/@fortawesome/fontawesome-common-types": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz",
+ "integrity": "sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw==",
"hasInstallScript": true,
- "dependencies": {
- "@fortawesome/fontawesome-common-types": "6.5.1"
- },
"engines": {
"node": ">=6"
}
},
"node_modules/@fortawesome/free-solid-svg-icons": {
- "version": "6.5.1",
- "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.1.tgz",
- "integrity": "sha512-S1PPfU3mIJa59biTtXJz1oI0+KAXW6bkAb31XKhxdxtuXDiUIFsih4JR1v5BbxY7hVHsD1RKq+jRkVRaf773NQ==",
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.2.tgz",
+ "integrity": "sha512-QWFZYXFE7O1Gr1dTIp+D6UcFUF0qElOnZptpi7PBUMylJh+vFmIedVe1Ir6RM1t2tEQLLSV1k7bR4o92M+uqlw==",
"hasInstallScript": true,
"dependencies": {
- "@fortawesome/fontawesome-common-types": "6.5.1"
+ "@fortawesome/fontawesome-common-types": "6.5.2"
},
"engines": {
"node": ">=6"
}
},
+ "node_modules/@fortawesome/free-solid-svg-icons/node_modules/@fortawesome/fontawesome-common-types": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz",
+ "integrity": "sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw==",
+ "hasInstallScript": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/@fortawesome/vue-fontawesome": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.6.tgz",
@@ -824,12 +829,12 @@
}
},
"node_modules/@playwright/test": {
- "version": "1.41.2",
- "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.41.2.tgz",
- "integrity": "sha512-qQB9h7KbibJzrDpkXkYvsmiDJK14FULCCZgEcoe2AvFAS64oCirWTwzTlAYEbKaRxWs5TFesE1Na6izMv3HfGg==",
+ "version": "1.44.0",
+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.44.0.tgz",
+ "integrity": "sha512-rNX5lbNidamSUorBhB4XZ9SQTjAqfe5M+p37Z8ic0jPFBMo5iCtQz1kRWkEMg+rYOKSlVycpQmpqjSFq7LXOfg==",
"dev": true,
"dependencies": {
- "playwright": "1.41.2"
+ "playwright": "1.44.0"
},
"bin": {
"playwright": "cli.js"
@@ -839,9 +844,9 @@
}
},
"node_modules/@rollup/rollup-android-arm-eabi": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.6.tgz",
- "integrity": "sha512-MVNXSSYN6QXOulbHpLMKYi60ppyO13W9my1qogeiAqtjb2yR4LSmfU2+POvDkLzhjYLXz9Rf9+9a3zFHW1Lecg==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.2.tgz",
+ "integrity": "sha512-3XFIDKWMFZrMnao1mJhnOT1h2g0169Os848NhhmGweEcfJ4rCi+3yMCOLG4zA61rbJdkcrM/DjVZm9Hg5p5w7g==",
"cpu": [
"arm"
],
@@ -852,9 +857,9 @@
]
},
"node_modules/@rollup/rollup-android-arm64": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.6.tgz",
- "integrity": "sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.2.tgz",
+ "integrity": "sha512-GdxxXbAuM7Y/YQM9/TwwP+L0omeE/lJAR1J+olu36c3LqqZEBdsIWeQ91KBe6nxwOnb06Xh7JS2U5ooWU5/LgQ==",
"cpu": [
"arm64"
],
@@ -865,9 +870,9 @@
]
},
"node_modules/@rollup/rollup-darwin-arm64": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.6.tgz",
- "integrity": "sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.2.tgz",
+ "integrity": "sha512-mCMlpzlBgOTdaFs83I4XRr8wNPveJiJX1RLfv4hggyIVhfB5mJfN4P8Z6yKh+oE4Luz+qq1P3kVdWrCKcMYrrA==",
"cpu": [
"arm64"
],
@@ -878,9 +883,9 @@
]
},
"node_modules/@rollup/rollup-darwin-x64": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.6.tgz",
- "integrity": "sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.2.tgz",
+ "integrity": "sha512-yUoEvnH0FBef/NbB1u6d3HNGyruAKnN74LrPAfDQL3O32e3k3OSfLrPgSJmgb3PJrBZWfPyt6m4ZhAFa2nZp2A==",
"cpu": [
"x64"
],
@@ -891,9 +896,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.6.tgz",
- "integrity": "sha512-oNk8YXDDnNyG4qlNb6is1ojTOGL/tRhbbKeE/YuccItzerEZT68Z9gHrY3ROh7axDc974+zYAPxK5SH0j/G+QQ==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.2.tgz",
+ "integrity": "sha512-GYbLs5ErswU/Xs7aGXqzc3RrdEjKdmoCrgzhJWyFL0r5fL3qd1NPcDKDowDnmcoSiGJeU68/Vy+OMUluRxPiLQ==",
"cpu": [
"arm"
],
@@ -904,9 +909,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-gnu": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.6.tgz",
- "integrity": "sha512-Z3O60yxPtuCYobrtzjo0wlmvDdx2qZfeAWTyfOjEDqd08kthDKexLpV97KfAeUXPosENKd8uyJMRDfFMxcYkDQ==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.2.tgz",
+ "integrity": "sha512-L1+D8/wqGnKQIlh4Zre9i4R4b4noxzH5DDciyahX4oOz62CphY7WDWqJoQ66zNR4oScLNOqQJfNSIAe/6TPUmQ==",
"cpu": [
"arm64"
],
@@ -917,9 +922,9 @@
]
},
"node_modules/@rollup/rollup-linux-arm64-musl": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.6.tgz",
- "integrity": "sha512-gpiG0qQJNdYEVad+1iAsGAbgAnZ8j07FapmnIAQgODKcOTjLEWM9sRb+MbQyVsYCnA0Im6M6QIq6ax7liws6eQ==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.2.tgz",
+ "integrity": "sha512-tK5eoKFkXdz6vjfkSTCupUzCo40xueTOiOO6PeEIadlNBkadH1wNOH8ILCPIl8by/Gmb5AGAeQOFeLev7iZDOA==",
"cpu": [
"arm64"
],
@@ -929,10 +934,23 @@
"linux"
]
},
+ "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.13.2.tgz",
+ "integrity": "sha512-zvXvAUGGEYi6tYhcDmb9wlOckVbuD+7z3mzInCSTACJ4DQrdSLPNUeDIcAQW39M3q6PDquqLWu7pnO39uSMRzQ==",
+ "cpu": [
+ "ppc64le"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
"node_modules/@rollup/rollup-linux-riscv64-gnu": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.6.tgz",
- "integrity": "sha512-+uCOcvVmFUYvVDr27aiyun9WgZk0tXe7ThuzoUTAukZJOwS5MrGbmSlNOhx1j80GdpqbOty05XqSl5w4dQvcOA==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.2.tgz",
+ "integrity": "sha512-C3GSKvMtdudHCN5HdmAMSRYR2kkhgdOfye4w0xzyii7lebVr4riCgmM6lRiSCnJn2w1Xz7ZZzHKuLrjx5620kw==",
"cpu": [
"riscv64"
],
@@ -942,10 +960,23 @@
"linux"
]
},
+ "node_modules/@rollup/rollup-linux-s390x-gnu": {
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.13.2.tgz",
+ "integrity": "sha512-l4U0KDFwzD36j7HdfJ5/TveEQ1fUTjFFQP5qIt9gBqBgu1G8/kCaq5Ok05kd5TG9F8Lltf3MoYsUMw3rNlJ0Yg==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
"node_modules/@rollup/rollup-linux-x64-gnu": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.6.tgz",
- "integrity": "sha512-HUNqM32dGzfBKuaDUBqFB7tP6VMN74eLZ33Q9Y1TBqRDn+qDonkAUyKWwF9BR9unV7QUzffLnz9GrnKvMqC/fw==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.2.tgz",
+ "integrity": "sha512-xXMLUAMzrtsvh3cZ448vbXqlUa7ZL8z0MwHp63K2IIID2+DeP5iWIT6g1SN7hg1VxPzqx0xZdiDM9l4n9LRU1A==",
"cpu": [
"x64"
],
@@ -956,9 +987,9 @@
]
},
"node_modules/@rollup/rollup-linux-x64-musl": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.6.tgz",
- "integrity": "sha512-ch7M+9Tr5R4FK40FHQk8VnML0Szi2KRujUgHXd/HjuH9ifH72GUmw6lStZBo3c3GB82vHa0ZoUfjfcM7JiiMrQ==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.2.tgz",
+ "integrity": "sha512-M/JYAWickafUijWPai4ehrjzVPKRCyDb1SLuO+ZyPfoXgeCEAlgPkNXewFZx0zcnoIe3ay4UjXIMdXQXOZXWqA==",
"cpu": [
"x64"
],
@@ -969,9 +1000,9 @@
]
},
"node_modules/@rollup/rollup-win32-arm64-msvc": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.6.tgz",
- "integrity": "sha512-VD6qnR99dhmTQ1mJhIzXsRcTBvTjbfbGGwKAHcu+52cVl15AC/kplkhxzW/uT0Xl62Y/meBKDZvoJSJN+vTeGA==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.2.tgz",
+ "integrity": "sha512-2YWwoVg9KRkIKaXSh0mz3NmfurpmYoBBTAXA9qt7VXk0Xy12PoOP40EFuau+ajgALbbhi4uTj3tSG3tVseCjuA==",
"cpu": [
"arm64"
],
@@ -982,9 +1013,9 @@
]
},
"node_modules/@rollup/rollup-win32-ia32-msvc": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.6.tgz",
- "integrity": "sha512-J9AFDq/xiRI58eR2NIDfyVmTYGyIZmRcvcAoJ48oDld/NTR8wyiPUu2X/v1navJ+N/FGg68LEbX3Ejd6l8B7MQ==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.2.tgz",
+ "integrity": "sha512-2FSsE9aQ6OWD20E498NYKEQLneShWes0NGMPQwxWOdws35qQXH+FplabOSP5zEe1pVjurSDOGEVCE2agFwSEsw==",
"cpu": [
"ia32"
],
@@ -995,9 +1026,9 @@
]
},
"node_modules/@rollup/rollup-win32-x64-msvc": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.6.tgz",
- "integrity": "sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.2.tgz",
+ "integrity": "sha512-7h7J2nokcdPePdKykd8wtc8QqqkqxIrUz7MHj6aNr8waBRU//NLDVnNjQnqQO6fqtjrtCdftpbTuOKAyrAQETQ==",
"cpu": [
"x64"
],
@@ -1008,9 +1039,9 @@
]
},
"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==",
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.10.2.tgz",
+ "integrity": "sha512-hw437iINopmQuxWPSUEvqE56NCPsiU8N4AYtfHmJFckclktzK9YQJieD3XkDCDH4OjL+C7zgPUh73R/nrcHrqw==",
"dev": true
},
"node_modules/@sinclair/typebox": {
@@ -1053,18 +1084,18 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "18.19.15",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.15.tgz",
- "integrity": "sha512-AMZ2UWx+woHNfM11PyAEQmfSxi05jm9OlkxczuHeEqmvwPkYj6MWv44gbzDPefYOLysTOFyI3ziiy2ONmUZfpA==",
+ "version": "18.19.33",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.33.tgz",
+ "integrity": "sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A==",
"dev": true,
"dependencies": {
"undici-types": "~5.26.4"
}
},
"node_modules/@types/semver": {
- "version": "7.5.6",
- "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
- "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
+ "version": "7.5.8",
+ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+ "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
"dev": true
},
"node_modules/@types/tough-cookie": {
@@ -1074,16 +1105,16 @@
"dev": true
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "6.20.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz",
- "integrity": "sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.2.0.tgz",
+ "integrity": "sha512-mdekAHOqS9UjlmyF/LSs6AIEvfceV749GFxoBAjwAv0nkevfKHWQFDMcBZWUiIC5ft6ePWivXoS36aKQ0Cy3sw==",
"dev": true,
"dependencies": {
"@eslint-community/regexpp": "^4.5.1",
- "@typescript-eslint/scope-manager": "6.20.0",
- "@typescript-eslint/type-utils": "6.20.0",
- "@typescript-eslint/utils": "6.20.0",
- "@typescript-eslint/visitor-keys": "6.20.0",
+ "@typescript-eslint/scope-manager": "7.2.0",
+ "@typescript-eslint/type-utils": "7.2.0",
+ "@typescript-eslint/utils": "7.2.0",
+ "@typescript-eslint/visitor-keys": "7.2.0",
"debug": "^4.3.4",
"graphemer": "^1.4.0",
"ignore": "^5.2.4",
@@ -1099,8 +1130,8 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
- "eslint": "^7.0.0 || ^8.0.0"
+ "@typescript-eslint/parser": "^7.0.0",
+ "eslint": "^8.56.0"
},
"peerDependenciesMeta": {
"typescript": {
@@ -1109,15 +1140,15 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "6.20.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.20.0.tgz",
- "integrity": "sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.2.0.tgz",
+ "integrity": "sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==",
"dev": true,
"dependencies": {
- "@typescript-eslint/scope-manager": "6.20.0",
- "@typescript-eslint/types": "6.20.0",
- "@typescript-eslint/typescript-estree": "6.20.0",
- "@typescript-eslint/visitor-keys": "6.20.0",
+ "@typescript-eslint/scope-manager": "7.2.0",
+ "@typescript-eslint/types": "7.2.0",
+ "@typescript-eslint/typescript-estree": "7.2.0",
+ "@typescript-eslint/visitor-keys": "7.2.0",
"debug": "^4.3.4"
},
"engines": {
@@ -1128,7 +1159,7 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "eslint": "^7.0.0 || ^8.0.0"
+ "eslint": "^8.56.0"
},
"peerDependenciesMeta": {
"typescript": {
@@ -1137,13 +1168,13 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "6.20.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz",
- "integrity": "sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz",
+ "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "6.20.0",
- "@typescript-eslint/visitor-keys": "6.20.0"
+ "@typescript-eslint/types": "7.2.0",
+ "@typescript-eslint/visitor-keys": "7.2.0"
},
"engines": {
"node": "^16.0.0 || >=18.0.0"
@@ -1154,13 +1185,13 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "6.20.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz",
- "integrity": "sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.2.0.tgz",
+ "integrity": "sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==",
"dev": true,
"dependencies": {
- "@typescript-eslint/typescript-estree": "6.20.0",
- "@typescript-eslint/utils": "6.20.0",
+ "@typescript-eslint/typescript-estree": "7.2.0",
+ "@typescript-eslint/utils": "7.2.0",
"debug": "^4.3.4",
"ts-api-utils": "^1.0.1"
},
@@ -1172,7 +1203,7 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "eslint": "^7.0.0 || ^8.0.0"
+ "eslint": "^8.56.0"
},
"peerDependenciesMeta": {
"typescript": {
@@ -1181,9 +1212,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "6.20.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.20.0.tgz",
- "integrity": "sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz",
+ "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==",
"dev": true,
"engines": {
"node": "^16.0.0 || >=18.0.0"
@@ -1194,13 +1225,13 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "6.20.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz",
- "integrity": "sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz",
+ "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "6.20.0",
- "@typescript-eslint/visitor-keys": "6.20.0",
+ "@typescript-eslint/types": "7.2.0",
+ "@typescript-eslint/visitor-keys": "7.2.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -1222,17 +1253,17 @@
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "6.20.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.20.0.tgz",
- "integrity": "sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz",
+ "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==",
"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.20.0",
- "@typescript-eslint/types": "6.20.0",
- "@typescript-eslint/typescript-estree": "6.20.0",
+ "@typescript-eslint/scope-manager": "7.2.0",
+ "@typescript-eslint/types": "7.2.0",
+ "@typescript-eslint/typescript-estree": "7.2.0",
"semver": "^7.5.4"
},
"engines": {
@@ -1243,16 +1274,16 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "eslint": "^7.0.0 || ^8.0.0"
+ "eslint": "^8.56.0"
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "6.20.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz",
- "integrity": "sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz",
+ "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "6.20.0",
+ "@typescript-eslint/types": "7.2.0",
"eslint-visitor-keys": "^3.4.1"
},
"engines": {
@@ -1283,13 +1314,13 @@
}
},
"node_modules/@vitest/expect": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.2.2.tgz",
- "integrity": "sha512-3jpcdPAD7LwHUUiT2pZTj2U82I2Tcgg2oVPvKxhn6mDI2On6tfvPQTjAI4628GUGDZrCm4Zna9iQHm5cEexOAg==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.6.0.tgz",
+ "integrity": "sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==",
"dev": true,
"dependencies": {
- "@vitest/spy": "1.2.2",
- "@vitest/utils": "1.2.2",
+ "@vitest/spy": "1.6.0",
+ "@vitest/utils": "1.6.0",
"chai": "^4.3.10"
},
"funding": {
@@ -1297,12 +1328,12 @@
}
},
"node_modules/@vitest/runner": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.2.2.tgz",
- "integrity": "sha512-JctG7QZ4LSDXr5CsUweFgcpEvrcxOV1Gft7uHrvkQ+fsAVylmWQvnaAr/HDp3LAH1fztGMQZugIheTWjaGzYIg==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.6.0.tgz",
+ "integrity": "sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==",
"dev": true,
"dependencies": {
- "@vitest/utils": "1.2.2",
+ "@vitest/utils": "1.6.0",
"p-limit": "^5.0.0",
"pathe": "^1.1.1"
},
@@ -1338,9 +1369,9 @@
}
},
"node_modules/@vitest/snapshot": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.2.2.tgz",
- "integrity": "sha512-SmGY4saEw1+bwE1th6S/cZmPxz/Q4JWsl7LvbQIky2tKE35US4gd0Mjzqfr84/4OD0tikGWaWdMja/nWL5NIPA==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.6.0.tgz",
+ "integrity": "sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==",
"dev": true,
"dependencies": {
"magic-string": "^0.30.5",
@@ -1352,9 +1383,9 @@
}
},
"node_modules/@vitest/spy": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.2.2.tgz",
- "integrity": "sha512-k9Gcahssw8d7X3pSLq3e3XEu/0L78mUkCjivUqCQeXJm9clfXR/Td8+AP+VC1O6fKPIDLcHDTAmBOINVuv6+7g==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.6.0.tgz",
+ "integrity": "sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==",
"dev": true,
"dependencies": {
"tinyspy": "^2.2.0"
@@ -1364,9 +1395,9 @@
}
},
"node_modules/@vitest/utils": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.2.2.tgz",
- "integrity": "sha512-WKITBHLsBHlpjnDQahr+XK6RE7MiAsgrIkr0pGhQ9ygoxBfUeG0lUG5iLlzqjmKSlBv3+j5EGsriBzh+C3Tq9g==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.6.0.tgz",
+ "integrity": "sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==",
"dev": true,
"dependencies": {
"diff-sequences": "^29.6.3",
@@ -1379,43 +1410,43 @@
}
},
"node_modules/@volar/language-core": {
- "version": "1.11.1",
- "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-1.11.1.tgz",
- "integrity": "sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.2.2.tgz",
+ "integrity": "sha512-GuvEL4JdxbnLVhPLICncCGT+tVW4cIz9GxXNeDofNnJ4iNTKhr5suGVsA1GLOne9PbraSjn8PlLt+pvLxuRVeQ==",
"dev": true,
"dependencies": {
- "@volar/source-map": "1.11.1"
+ "@volar/source-map": "2.2.2"
}
},
"node_modules/@volar/source-map": {
- "version": "1.11.1",
- "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-1.11.1.tgz",
- "integrity": "sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.2.2.tgz",
+ "integrity": "sha512-vUwvZuSW6iN4JI9QRinh9EjFasx1TUtnaWMKwgWx08xz1PyYuNkLlWlrZXBZ5GGBhML0u230M/7X+AHY2h9yKg==",
"dev": true,
"dependencies": {
- "muggle-string": "^0.3.1"
+ "muggle-string": "^0.4.0"
}
},
"node_modules/@volar/typescript": {
- "version": "1.11.1",
- "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-1.11.1.tgz",
- "integrity": "sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.2.2.tgz",
+ "integrity": "sha512-WcwOREz7+uOrpjUrKhOMaOKKmyPdtqF95HWX7SE0d9hhBB1KkfahxhaAex5U9Bn43LfINHlycLoYCNEtfeKm0g==",
"dev": true,
"dependencies": {
- "@volar/language-core": "1.11.1",
+ "@volar/language-core": "2.2.2",
"path-browserify": "^1.0.1"
}
},
"node_modules/@vue/compiler-core": {
- "version": "3.4.15",
- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.15.tgz",
- "integrity": "sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==",
+ "version": "3.4.27",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+ "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
"dependencies": {
- "@babel/parser": "^7.23.6",
- "@vue/shared": "3.4.15",
+ "@babel/parser": "^7.24.4",
+ "@vue/shared": "3.4.27",
"entities": "^4.5.0",
"estree-walker": "^2.0.2",
- "source-map-js": "^1.0.2"
+ "source-map-js": "^1.2.0"
}
},
"node_modules/@vue/compiler-core/node_modules/estree-walker": {
@@ -1424,28 +1455,28 @@
"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
},
"node_modules/@vue/compiler-dom": {
- "version": "3.4.15",
- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.15.tgz",
- "integrity": "sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==",
+ "version": "3.4.27",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+ "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
"dependencies": {
- "@vue/compiler-core": "3.4.15",
- "@vue/shared": "3.4.15"
+ "@vue/compiler-core": "3.4.27",
+ "@vue/shared": "3.4.27"
}
},
"node_modules/@vue/compiler-sfc": {
- "version": "3.4.15",
- "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.15.tgz",
- "integrity": "sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA==",
- "dependencies": {
- "@babel/parser": "^7.23.6",
- "@vue/compiler-core": "3.4.15",
- "@vue/compiler-dom": "3.4.15",
- "@vue/compiler-ssr": "3.4.15",
- "@vue/shared": "3.4.15",
+ "version": "3.4.27",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz",
+ "integrity": "sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==",
+ "dependencies": {
+ "@babel/parser": "^7.24.4",
+ "@vue/compiler-core": "3.4.27",
+ "@vue/compiler-dom": "3.4.27",
+ "@vue/compiler-ssr": "3.4.27",
+ "@vue/shared": "3.4.27",
"estree-walker": "^2.0.2",
- "magic-string": "^0.30.5",
- "postcss": "^8.4.33",
- "source-map-js": "^1.0.2"
+ "magic-string": "^0.30.10",
+ "postcss": "^8.4.38",
+ "source-map-js": "^1.2.0"
}
},
"node_modules/@vue/compiler-sfc/node_modules/estree-walker": {
@@ -1454,12 +1485,12 @@
"integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
},
"node_modules/@vue/compiler-ssr": {
- "version": "3.4.15",
- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.15.tgz",
- "integrity": "sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==",
+ "version": "3.4.27",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+ "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
"dependencies": {
- "@vue/compiler-dom": "3.4.15",
- "@vue/shared": "3.4.15"
+ "@vue/compiler-dom": "3.4.27",
+ "@vue/shared": "3.4.27"
}
},
"node_modules/@vue/devtools-api": {
@@ -1482,22 +1513,22 @@
}
},
"node_modules/@vue/eslint-config-typescript": {
- "version": "12.0.0",
- "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-12.0.0.tgz",
- "integrity": "sha512-StxLFet2Qe97T8+7L8pGlhYBBr8Eg05LPuTDVopQV6il+SK6qqom59BA/rcFipUef2jD8P2X44Vd8tMFytfvlg==",
+ "version": "13.0.0",
+ "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-13.0.0.tgz",
+ "integrity": "sha512-MHh9SncG/sfqjVqjcuFLOLD6Ed4dRAis4HNt0dXASeAuLqIAx4YMB1/m2o4pUKK1vCt8fUvYG8KKX2Ot3BVZTg==",
"dev": true,
"dependencies": {
- "@typescript-eslint/eslint-plugin": "^6.7.0",
- "@typescript-eslint/parser": "^6.7.0",
+ "@typescript-eslint/eslint-plugin": "^7.1.1",
+ "@typescript-eslint/parser": "^7.1.1",
"vue-eslint-parser": "^9.3.1"
},
"engines": {
- "node": "^14.17.0 || >=16.0.0"
+ "node": "^18.18.0 || >=20.0.0"
},
"peerDependencies": {
- "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0",
+ "eslint": "^8.56.0",
"eslint-plugin-vue": "^9.0.0",
- "typescript": "*"
+ "typescript": ">=4.7.4"
},
"peerDependenciesMeta": {
"typescript": {
@@ -1506,18 +1537,16 @@
}
},
"node_modules/@vue/language-core": {
- "version": "1.8.27",
- "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.27.tgz",
- "integrity": "sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==",
+ "version": "2.0.17",
+ "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.17.tgz",
+ "integrity": "sha512-tHw2J6G9yL4kn3jN5MftOHEq86Y6qnuohBQ1OHkJ73fAv3OYgwDI1cfX7ds0OEJEycOMG64BA3ql5bDgDa41zw==",
"dev": true,
"dependencies": {
- "@volar/language-core": "~1.11.1",
- "@volar/source-map": "~1.11.1",
- "@vue/compiler-dom": "^3.3.0",
- "@vue/shared": "^3.3.0",
+ "@volar/language-core": "~2.2.2",
+ "@vue/compiler-dom": "^3.4.0",
+ "@vue/shared": "^3.4.0",
"computeds": "^0.0.1",
"minimatch": "^9.0.3",
- "muggle-string": "^0.3.1",
"path-browserify": "^1.0.1",
"vue-template-compiler": "^2.7.14"
},
@@ -1531,66 +1560,57 @@
}
},
"node_modules/@vue/reactivity": {
- "version": "3.4.15",
- "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.15.tgz",
- "integrity": "sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w==",
+ "version": "3.4.27",
+ "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.27.tgz",
+ "integrity": "sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==",
"dependencies": {
- "@vue/shared": "3.4.15"
+ "@vue/shared": "3.4.27"
}
},
"node_modules/@vue/runtime-core": {
- "version": "3.4.15",
- "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.15.tgz",
- "integrity": "sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw==",
+ "version": "3.4.27",
+ "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.27.tgz",
+ "integrity": "sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==",
"dependencies": {
- "@vue/reactivity": "3.4.15",
- "@vue/shared": "3.4.15"
+ "@vue/reactivity": "3.4.27",
+ "@vue/shared": "3.4.27"
}
},
"node_modules/@vue/runtime-dom": {
- "version": "3.4.15",
- "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.15.tgz",
- "integrity": "sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw==",
+ "version": "3.4.27",
+ "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz",
+ "integrity": "sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==",
"dependencies": {
- "@vue/runtime-core": "3.4.15",
- "@vue/shared": "3.4.15",
+ "@vue/runtime-core": "3.4.27",
+ "@vue/shared": "3.4.27",
"csstype": "^3.1.3"
}
},
"node_modules/@vue/server-renderer": {
- "version": "3.4.15",
- "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.15.tgz",
- "integrity": "sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw==",
+ "version": "3.4.27",
+ "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.27.tgz",
+ "integrity": "sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==",
"dependencies": {
- "@vue/compiler-ssr": "3.4.15",
- "@vue/shared": "3.4.15"
+ "@vue/compiler-ssr": "3.4.27",
+ "@vue/shared": "3.4.27"
},
"peerDependencies": {
- "vue": "3.4.15"
+ "vue": "3.4.27"
}
},
"node_modules/@vue/shared": {
- "version": "3.4.15",
- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
- "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g=="
+ "version": "3.4.27",
+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz",
+ "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
},
"node_modules/@vue/test-utils": {
- "version": "2.4.4",
- "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-2.4.4.tgz",
- "integrity": "sha512-8jkRxz8pNhClAf4Co4ZrpAoFISdvT3nuSkUlY6Ys6rmTpw3DMWG/X3mw3gQ7QJzgCZO9f+zuE2kW57fi09MW7Q==",
+ "version": "2.4.6",
+ "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-2.4.6.tgz",
+ "integrity": "sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==",
"dev": true,
"dependencies": {
"js-beautify": "^1.14.9",
- "vue-component-type-helpers": "^1.8.21"
- },
- "peerDependencies": {
- "@vue/server-renderer": "^3.0.1",
- "vue": "^3.0.1"
- },
- "peerDependenciesMeta": {
- "@vue/server-renderer": {
- "optional": true
- }
+ "vue-component-type-helpers": "^2.0.0"
}
},
"node_modules/@vue/tsconfig": {
@@ -1807,9 +1827,9 @@
"dev": true
},
"node_modules/autoprefixer": {
- "version": "10.4.17",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.17.tgz",
- "integrity": "sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==",
+ "version": "10.4.19",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
+ "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
"dev": true,
"funding": [
{
@@ -1826,8 +1846,8 @@
}
],
"dependencies": {
- "browserslist": "^4.22.2",
- "caniuse-lite": "^1.0.30001578",
+ "browserslist": "^4.23.0",
+ "caniuse-lite": "^1.0.30001599",
"fraction.js": "^4.3.7",
"normalize-range": "^0.1.2",
"picocolors": "^1.0.0",
@@ -1898,9 +1918,9 @@
}
},
"node_modules/browserslist": {
- "version": "4.22.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz",
- "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==",
+ "version": "4.23.0",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
+ "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
"dev": true,
"funding": [
{
@@ -1917,8 +1937,8 @@
}
],
"dependencies": {
- "caniuse-lite": "^1.0.30001580",
- "electron-to-chromium": "^1.4.648",
+ "caniuse-lite": "^1.0.30001587",
+ "electron-to-chromium": "^1.4.668",
"node-releases": "^2.0.14",
"update-browserslist-db": "^1.0.13"
},
@@ -1971,9 +1991,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001583",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001583.tgz",
- "integrity": "sha512-acWTYaha8xfhA/Du/z4sNZjHUWjkiuoAi2LM+T/aL+kemKQgPT1xBb/YKjlQ0Qo8gvbHsGNplrEJ+9G3gL7i4Q==",
+ "version": "1.0.30001605",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001605.tgz",
+ "integrity": "sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ==",
"dev": true,
"funding": [
{
@@ -2025,20 +2045,20 @@
}
},
"node_modules/chart.js": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz",
- "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==",
+ "version": "4.4.2",
+ "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz",
+ "integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==",
"dependencies": {
"@kurkle/color": "^0.3.0"
},
"engines": {
- "pnpm": ">=7"
+ "pnpm": ">=8"
}
},
"node_modules/chartjs-chart-graph": {
- "version": "4.2.8",
- "resolved": "https://registry.npmjs.org/chartjs-chart-graph/-/chartjs-chart-graph-4.2.8.tgz",
- "integrity": "sha512-BVymOBPF5QufeAKT9pi7kJj4PYZIH492WPJ7/a7Pt6BAFv4Viuk9LgLVn7P2n1zd3O+N1F3f6fIqkp41VAzHKw==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/chartjs-chart-graph/-/chartjs-chart-graph-4.3.0.tgz",
+ "integrity": "sha512-eDa7mRL2Lq61kyu5gmtMOc/LUflIKhsC+i277bmSFTg9+Bp5VetAKwaDZUd2N14KXyBrBjCAB7rJSVjnkbMEdA==",
"dependencies": {
"@types/d3-force": "^3.0.9",
"@types/d3-hierarchy": "^3.1.6",
@@ -2537,9 +2557,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.4.655",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.655.tgz",
- "integrity": "sha512-2yszojF7vIZ68adIOvzV4bku8OZad9w5H9xF3ZAMZjPuOjBarlflUkjN6DggdV+L71WZuKUfKUhov/34+G5QHg==",
+ "version": "1.4.693",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.693.tgz",
+ "integrity": "sha512-/if4Ueg0GUQlhCrW2ZlXwDAm40ipuKo+OgeHInlL8sbjt+hzISxZK949fZeJaVsheamrzANXvw1zQTvbxTvSHw==",
"dev": true
},
"node_modules/emoji-regex": {
@@ -2653,9 +2673,9 @@
}
},
"node_modules/esbuild": {
- "version": "0.19.12",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
- "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
+ "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
"dev": true,
"hasInstallScript": true,
"bin": {
@@ -2665,35 +2685,35 @@
"node": ">=12"
},
"optionalDependencies": {
- "@esbuild/aix-ppc64": "0.19.12",
- "@esbuild/android-arm": "0.19.12",
- "@esbuild/android-arm64": "0.19.12",
- "@esbuild/android-x64": "0.19.12",
- "@esbuild/darwin-arm64": "0.19.12",
- "@esbuild/darwin-x64": "0.19.12",
- "@esbuild/freebsd-arm64": "0.19.12",
- "@esbuild/freebsd-x64": "0.19.12",
- "@esbuild/linux-arm": "0.19.12",
- "@esbuild/linux-arm64": "0.19.12",
- "@esbuild/linux-ia32": "0.19.12",
- "@esbuild/linux-loong64": "0.19.12",
- "@esbuild/linux-mips64el": "0.19.12",
- "@esbuild/linux-ppc64": "0.19.12",
- "@esbuild/linux-riscv64": "0.19.12",
- "@esbuild/linux-s390x": "0.19.12",
- "@esbuild/linux-x64": "0.19.12",
- "@esbuild/netbsd-x64": "0.19.12",
- "@esbuild/openbsd-x64": "0.19.12",
- "@esbuild/sunos-x64": "0.19.12",
- "@esbuild/win32-arm64": "0.19.12",
- "@esbuild/win32-ia32": "0.19.12",
- "@esbuild/win32-x64": "0.19.12"
+ "@esbuild/aix-ppc64": "0.20.2",
+ "@esbuild/android-arm": "0.20.2",
+ "@esbuild/android-arm64": "0.20.2",
+ "@esbuild/android-x64": "0.20.2",
+ "@esbuild/darwin-arm64": "0.20.2",
+ "@esbuild/darwin-x64": "0.20.2",
+ "@esbuild/freebsd-arm64": "0.20.2",
+ "@esbuild/freebsd-x64": "0.20.2",
+ "@esbuild/linux-arm": "0.20.2",
+ "@esbuild/linux-arm64": "0.20.2",
+ "@esbuild/linux-ia32": "0.20.2",
+ "@esbuild/linux-loong64": "0.20.2",
+ "@esbuild/linux-mips64el": "0.20.2",
+ "@esbuild/linux-ppc64": "0.20.2",
+ "@esbuild/linux-riscv64": "0.20.2",
+ "@esbuild/linux-s390x": "0.20.2",
+ "@esbuild/linux-x64": "0.20.2",
+ "@esbuild/netbsd-x64": "0.20.2",
+ "@esbuild/openbsd-x64": "0.20.2",
+ "@esbuild/sunos-x64": "0.20.2",
+ "@esbuild/win32-arm64": "0.20.2",
+ "@esbuild/win32-ia32": "0.20.2",
+ "@esbuild/win32-x64": "0.20.2"
}
},
"node_modules/escalade": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
- "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+ "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
"dev": true,
"engines": {
"node": ">=6"
@@ -2712,16 +2732,16 @@
}
},
"node_modules/eslint": {
- "version": "8.56.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
- "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+ "version": "8.57.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+ "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
"dev": 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",
+ "@eslint/js": "8.57.0",
+ "@humanwhocodes/config-array": "^0.11.14",
"@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8",
"@ungap/structured-clone": "^1.2.0",
@@ -2809,16 +2829,17 @@
}
},
"node_modules/eslint-plugin-vue": {
- "version": "9.21.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.21.1.tgz",
- "integrity": "sha512-XVtI7z39yOVBFJyi8Ljbn7kY9yHzznKXL02qQYn+ta63Iy4A9JFBw6o4OSB9hyD2++tVT+su9kQqetUyCCwhjw==",
+ "version": "9.26.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.26.0.tgz",
+ "integrity": "sha512-eTvlxXgd4ijE1cdur850G6KalZqk65k1JKoOI2d1kT3hr8sPD07j1q98FRFdNnpxBELGPWxZmInxeHGF/GxtqQ==",
"dev": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.4.0",
+ "globals": "^13.24.0",
"natural-compare": "^1.4.0",
"nth-check": "^2.1.1",
- "postcss-selector-parser": "^6.0.13",
- "semver": "^7.5.4",
+ "postcss-selector-parser": "^6.0.15",
+ "semver": "^7.6.0",
"vue-eslint-parser": "^9.4.2",
"xml-name-validator": "^4.0.0"
},
@@ -2826,7 +2847,7 @@
"node": "^14.17.0 || >=16.0.0"
},
"peerDependencies": {
- "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
+ "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0"
}
},
"node_modules/eslint-scope": {
@@ -3976,6 +3997,12 @@
"node": ">=14"
}
},
+ "node_modules/js-tokens": {
+ "version": "8.0.3",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-8.0.3.tgz",
+ "integrity": "sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==",
+ "dev": true
+ },
"node_modules/js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -4473,14 +4500,11 @@
}
},
"node_modules/magic-string": {
- "version": "0.30.6",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.6.tgz",
- "integrity": "sha512-n62qCLbPjNjyo+owKtveQxZFZTBm+Ms6YoGD23Wew6Vw337PElFNifQpknPruVRQV57kVShPnLGo9vWxVhpPvA==",
+ "version": "0.30.10",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
+ "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
"dependencies": {
"@jridgewell/sourcemap-codec": "^1.4.15"
- },
- "engines": {
- "node": ">=12"
}
},
"node_modules/memorystream": {
@@ -4601,9 +4625,9 @@
"dev": true
},
"node_modules/muggle-string": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.3.1.tgz",
- "integrity": "sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==",
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
+ "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
"dev": true
},
"node_modules/mz": {
@@ -5303,12 +5327,12 @@
}
},
"node_modules/playwright": {
- "version": "1.41.2",
- "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.41.2.tgz",
- "integrity": "sha512-v0bOa6H2GJChDL8pAeLa/LZC4feoAMbSQm1/jF/ySsWWoaNItvrMP7GEkvEEFyCTUYKMxjQKaTSg5up7nR6/8A==",
+ "version": "1.44.0",
+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.44.0.tgz",
+ "integrity": "sha512-F9b3GUCLQ3Nffrfb6dunPOkE5Mh68tR7zN32L4jCk4FjQamgesGay7/dAAe1WaMEGV04DkdJfcJzjoCKygUaRQ==",
"dev": true,
"dependencies": {
- "playwright-core": "1.41.2"
+ "playwright-core": "1.44.0"
},
"bin": {
"playwright": "cli.js"
@@ -5321,9 +5345,9 @@
}
},
"node_modules/playwright-core": {
- "version": "1.41.2",
- "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.41.2.tgz",
- "integrity": "sha512-VaTvwCA4Y8kxEe+kfm2+uUUw5Lubf38RxF7FpBxLPmGe5sdNkSg5e3ChEigaGrX7qdqT3pt2m/98LiyvU2x6CA==",
+ "version": "1.44.0",
+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.44.0.tgz",
+ "integrity": "sha512-ZTbkNpFfYcGWohvTTl+xewITm7EOuqIqex0c7dNZ+aXsbrLj0qI8XlGKfPpipjm0Wny/4Lt4CJsWJk1stVS5qQ==",
"dev": true,
"bin": {
"playwright-core": "cli.js"
@@ -5333,9 +5357,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.35",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
- "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
+ "version": "8.4.38",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+ "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
"funding": [
{
"type": "opencollective",
@@ -5353,7 +5377,7 @@
"dependencies": {
"nanoid": "^3.3.7",
"picocolors": "^1.0.0",
- "source-map-js": "^1.0.2"
+ "source-map-js": "^1.2.0"
},
"engines": {
"node": "^10 || ^12 || >=14"
@@ -5505,9 +5529,9 @@
}
},
"node_modules/prettier-plugin-tailwindcss": {
- "version": "0.5.11",
- "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.11.tgz",
- "integrity": "sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==",
+ "version": "0.5.14",
+ "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.14.tgz",
+ "integrity": "sha512-Puaz+wPUAhFp8Lo9HuciYKM2Y2XExESjeT+9NQoVFXZsPPnc9VYss2SpxdQ6vbatmt8/4+SN0oe0I1cPDABg9Q==",
"dev": true,
"engines": {
"node": ">=14.21.3"
@@ -5517,6 +5541,7 @@
"@prettier/plugin-pug": "*",
"@shopify/prettier-plugin-liquid": "*",
"@trivago/prettier-plugin-sort-imports": "*",
+ "@zackad/prettier-plugin-twig-melody": "*",
"prettier": "^3.0",
"prettier-plugin-astro": "*",
"prettier-plugin-css-order": "*",
@@ -5525,6 +5550,7 @@
"prettier-plugin-marko": "*",
"prettier-plugin-organize-attributes": "*",
"prettier-plugin-organize-imports": "*",
+ "prettier-plugin-sort-imports": "*",
"prettier-plugin-style-order": "*",
"prettier-plugin-svelte": "*"
},
@@ -5541,6 +5567,9 @@
"@trivago/prettier-plugin-sort-imports": {
"optional": true
},
+ "@zackad/prettier-plugin-twig-melody": {
+ "optional": true
+ },
"prettier-plugin-astro": {
"optional": true
},
@@ -5562,13 +5591,13 @@
"prettier-plugin-organize-imports": {
"optional": true
},
- "prettier-plugin-style-order": {
+ "prettier-plugin-sort-imports": {
"optional": true
},
- "prettier-plugin-svelte": {
+ "prettier-plugin-style-order": {
"optional": true
},
- "prettier-plugin-twig-melody": {
+ "prettier-plugin-svelte": {
"optional": true
}
}
@@ -5652,9 +5681,9 @@
]
},
"node_modules/react-is": {
- "version": "18.2.0",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
- "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+ "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-cache": {
@@ -5896,9 +5925,9 @@
}
},
"node_modules/rollup": {
- "version": "4.9.6",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.6.tgz",
- "integrity": "sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==",
+ "version": "4.13.2",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.2.tgz",
+ "integrity": "sha512-MIlLgsdMprDBXC+4hsPgzWUasLO9CE4zOkj/u6j+Z6j5A4zRY+CtiXAdJyPtgCsc42g658Aeh1DlrdVEJhsL2g==",
"dev": true,
"dependencies": {
"@types/estree": "1.0.5"
@@ -5911,19 +5940,21 @@
"npm": ">=8.0.0"
},
"optionalDependencies": {
- "@rollup/rollup-android-arm-eabi": "4.9.6",
- "@rollup/rollup-android-arm64": "4.9.6",
- "@rollup/rollup-darwin-arm64": "4.9.6",
- "@rollup/rollup-darwin-x64": "4.9.6",
- "@rollup/rollup-linux-arm-gnueabihf": "4.9.6",
- "@rollup/rollup-linux-arm64-gnu": "4.9.6",
- "@rollup/rollup-linux-arm64-musl": "4.9.6",
- "@rollup/rollup-linux-riscv64-gnu": "4.9.6",
- "@rollup/rollup-linux-x64-gnu": "4.9.6",
- "@rollup/rollup-linux-x64-musl": "4.9.6",
- "@rollup/rollup-win32-arm64-msvc": "4.9.6",
- "@rollup/rollup-win32-ia32-msvc": "4.9.6",
- "@rollup/rollup-win32-x64-msvc": "4.9.6",
+ "@rollup/rollup-android-arm-eabi": "4.13.2",
+ "@rollup/rollup-android-arm64": "4.13.2",
+ "@rollup/rollup-darwin-arm64": "4.13.2",
+ "@rollup/rollup-darwin-x64": "4.13.2",
+ "@rollup/rollup-linux-arm-gnueabihf": "4.13.2",
+ "@rollup/rollup-linux-arm64-gnu": "4.13.2",
+ "@rollup/rollup-linux-arm64-musl": "4.13.2",
+ "@rollup/rollup-linux-powerpc64le-gnu": "4.13.2",
+ "@rollup/rollup-linux-riscv64-gnu": "4.13.2",
+ "@rollup/rollup-linux-s390x-gnu": "4.13.2",
+ "@rollup/rollup-linux-x64-gnu": "4.13.2",
+ "@rollup/rollup-linux-x64-musl": "4.13.2",
+ "@rollup/rollup-win32-arm64-msvc": "4.13.2",
+ "@rollup/rollup-win32-ia32-msvc": "4.13.2",
+ "@rollup/rollup-win32-x64-msvc": "4.13.2",
"fsevents": "~2.3.2"
}
},
@@ -6021,9 +6052,9 @@
}
},
"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==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+ "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
@@ -6190,9 +6221,9 @@
"peer": true
},
"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==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+ "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
"engines": {
"node": ">=0.10.0"
}
@@ -6453,12 +6484,12 @@
}
},
"node_modules/strip-literal": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz",
- "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.0.0.tgz",
+ "integrity": "sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==",
"dev": true,
"dependencies": {
- "acorn": "^8.10.0"
+ "js-tokens": "^8.0.2"
},
"funding": {
"url": "https://github.com/sponsors/antfu"
@@ -6542,9 +6573,9 @@
}
},
"node_modules/tailwindcss": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz",
- "integrity": "sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==",
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz",
+ "integrity": "sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==",
"dev": true,
"dependencies": {
"@alloc/quick-lru": "^5.2.0",
@@ -6555,7 +6586,7 @@
"fast-glob": "^3.3.0",
"glob-parent": "^6.0.2",
"is-glob": "^4.0.3",
- "jiti": "^1.19.1",
+ "jiti": "^1.21.0",
"lilconfig": "^2.1.0",
"micromatch": "^4.0.5",
"normalize-path": "^3.0.0",
@@ -6621,18 +6652,18 @@
"dev": true
},
"node_modules/tinypool": {
- "version": "0.8.2",
- "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.2.tgz",
- "integrity": "sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==",
+ "version": "0.8.4",
+ "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.4.tgz",
+ "integrity": "sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==",
"dev": true,
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/tinyspy": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.0.tgz",
- "integrity": "sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz",
+ "integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==",
"dev": true,
"engines": {
"node": ">=14.0.0"
@@ -6678,12 +6709,12 @@
}
},
"node_modules/ts-api-utils": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
- "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
+ "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
"dev": true,
"engines": {
- "node": ">=16.13.0"
+ "node": ">=16"
},
"peerDependencies": {
"typescript": ">=4.2.0"
@@ -6800,9 +6831,9 @@
}
},
"node_modules/typescript": {
- "version": "5.3.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
- "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+ "version": "5.4.5",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+ "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
"devOptional": true,
"bin": {
"tsc": "bin/tsc",
@@ -6913,14 +6944,14 @@
}
},
"node_modules/vite": {
- "version": "5.1.7",
- "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.7.tgz",
- "integrity": "sha512-sgnEEFTZYMui/sTlH1/XEnVNHMujOahPLGMxn1+5sIT45Xjng1Ec1K78jRP15dSmVgg5WBin9yO81j3o9OxofA==",
+ "version": "5.2.11",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.11.tgz",
+ "integrity": "sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==",
"dev": true,
"dependencies": {
- "esbuild": "^0.19.3",
- "postcss": "^8.4.35",
- "rollup": "^4.2.0"
+ "esbuild": "^0.20.1",
+ "postcss": "^8.4.38",
+ "rollup": "^4.13.0"
},
"bin": {
"vite": "bin/vite.js"
@@ -6968,9 +6999,9 @@
}
},
"node_modules/vite-node": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.2.2.tgz",
- "integrity": "sha512-1as4rDTgVWJO3n1uHmUYqq7nsFgINQ9u+mRcXpjeOMJUmviqNKjcZB7UfRZrlM7MjYXMKpuWp5oGkjaFLnjawg==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.6.0.tgz",
+ "integrity": "sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==",
"dev": true,
"dependencies": {
"cac": "^6.7.14",
@@ -7004,18 +7035,17 @@
}
},
"node_modules/vitest": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.2.2.tgz",
- "integrity": "sha512-d5Ouvrnms3GD9USIK36KG8OZ5bEvKEkITFtnGv56HFaSlbItJuYr7hv2Lkn903+AvRAgSixiamozUVfORUekjw==",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.6.0.tgz",
+ "integrity": "sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==",
"dev": true,
"dependencies": {
- "@vitest/expect": "1.2.2",
- "@vitest/runner": "1.2.2",
- "@vitest/snapshot": "1.2.2",
- "@vitest/spy": "1.2.2",
- "@vitest/utils": "1.2.2",
+ "@vitest/expect": "1.6.0",
+ "@vitest/runner": "1.6.0",
+ "@vitest/snapshot": "1.6.0",
+ "@vitest/spy": "1.6.0",
+ "@vitest/utils": "1.6.0",
"acorn-walk": "^8.3.2",
- "cac": "^6.7.14",
"chai": "^4.3.10",
"debug": "^4.3.4",
"execa": "^8.0.1",
@@ -7024,11 +7054,11 @@
"pathe": "^1.1.1",
"picocolors": "^1.0.0",
"std-env": "^3.5.0",
- "strip-literal": "^1.3.0",
+ "strip-literal": "^2.0.0",
"tinybench": "^2.5.1",
- "tinypool": "^0.8.2",
+ "tinypool": "^0.8.3",
"vite": "^5.0.0",
- "vite-node": "1.2.2",
+ "vite-node": "1.6.0",
"why-is-node-running": "^2.2.2"
},
"bin": {
@@ -7043,8 +7073,8 @@
"peerDependencies": {
"@edge-runtime/vm": "*",
"@types/node": "^18.0.0 || >=20.0.0",
- "@vitest/browser": "^1.0.0",
- "@vitest/ui": "^1.0.0",
+ "@vitest/browser": "1.6.0",
+ "@vitest/ui": "1.6.0",
"happy-dom": "*",
"jsdom": "*"
},
@@ -7070,15 +7100,15 @@
}
},
"node_modules/vue": {
- "version": "3.4.15",
- "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.15.tgz",
- "integrity": "sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ==",
+ "version": "3.4.27",
+ "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.27.tgz",
+ "integrity": "sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==",
"dependencies": {
- "@vue/compiler-dom": "3.4.15",
- "@vue/compiler-sfc": "3.4.15",
- "@vue/runtime-dom": "3.4.15",
- "@vue/server-renderer": "3.4.15",
- "@vue/shared": "3.4.15"
+ "@vue/compiler-dom": "3.4.27",
+ "@vue/compiler-sfc": "3.4.27",
+ "@vue/runtime-dom": "3.4.27",
+ "@vue/server-renderer": "3.4.27",
+ "@vue/shared": "3.4.27"
},
"peerDependencies": {
"typescript": "*"
@@ -7090,18 +7120,18 @@
}
},
"node_modules/vue-chartjs": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/vue-chartjs/-/vue-chartjs-5.3.0.tgz",
- "integrity": "sha512-8XqX0JU8vFZ+WA2/knz4z3ThClduni2Nm0BMe2u0mXgTfd9pXrmJ07QBI+WAij5P/aPmPMX54HCE1seWL37ZdQ==",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/vue-chartjs/-/vue-chartjs-5.3.1.tgz",
+ "integrity": "sha512-rZjqcHBxKiHrBl0CIvcOlVEBwRhpWAVf6rDU3vUfa7HuSRmGtCslc0Oc8m16oAVuk0erzc1FCtH1VCriHsrz+A==",
"peerDependencies": {
"chart.js": "^4.1.1",
"vue": "^3.0.0-0 || ^2.7.0"
}
},
"node_modules/vue-component-type-helpers": {
- "version": "1.8.27",
- "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-1.8.27.tgz",
- "integrity": "sha512-0vOfAtI67UjeO1G6UiX5Kd76CqaQ67wrRZiOe7UAb9Jm6GzlUr/fC7CV90XfwapJRjpCMaZFhv1V0ajWRmE9Dg==",
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.0.6.tgz",
+ "integrity": "sha512-qdGXCtoBrwqk1BT6r2+1Wcvl583ZVkuSZ3or7Y1O2w5AvWtlvvxwjGhmz5DdPJS9xqRdDlgTJ/38ehWnEi0tFA==",
"dev": true
},
"node_modules/vue-draggable-next": {
@@ -7154,11 +7184,11 @@
}
},
"node_modules/vue-router": {
- "version": "4.2.5",
- "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.5.tgz",
- "integrity": "sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==",
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.3.2.tgz",
+ "integrity": "sha512-hKQJ1vDAZ5LVkKEnHhmm1f9pMiWIBNGF5AwU67PdH7TyXCj/a4hTccuUuYCAMgJK6rO/NVYtQIEN3yL8CECa7Q==",
"dependencies": {
- "@vue/devtools-api": "^6.5.0"
+ "@vue/devtools-api": "^6.5.1"
},
"funding": {
"url": "https://github.com/sponsors/posva"
@@ -7178,13 +7208,13 @@
}
},
"node_modules/vue-tsc": {
- "version": "1.8.27",
- "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.27.tgz",
- "integrity": "sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==",
+ "version": "2.0.17",
+ "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.0.17.tgz",
+ "integrity": "sha512-RRZsiCBD1hvATQb321xV+SkRDKsK5hgFQ4WXy5wuYsyyjz8xAK4DjxHkpH7PFoJKUbZTbeW8KzhejzXZS49Tzw==",
"dev": true,
"dependencies": {
- "@volar/typescript": "~1.11.1",
- "@vue/language-core": "1.8.27",
+ "@volar/typescript": "~2.2.2",
+ "@vue/language-core": "2.0.17",
"semver": "^7.5.4"
},
"bin": {
diff --git a/report-viewer/package.json b/report-viewer/package.json
index af8ca9a04e..2f2e9bdfd6 100644
--- a/report-viewer/package.json
+++ b/report-viewer/package.json
@@ -19,48 +19,47 @@
"prepare": "cd .. && husky report-viewer/.husky"
},
"dependencies": {
- "@fortawesome/fontawesome-svg-core": "^6.5.1",
- "@fortawesome/free-brands-svg-icons": "^6.5.1",
- "@fortawesome/free-regular-svg-icons": "^6.5.1",
- "@fortawesome/free-solid-svg-icons": "^6.5.1",
+ "@fortawesome/fontawesome-svg-core": "^6.5.2",
+ "@fortawesome/free-brands-svg-icons": "^6.5.2",
+ "@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/vue-fontawesome": "^3.0.5",
- "chart.js": "^4.4.1",
- "chartjs-chart-graph": "^4.2.8",
+ "chart.js": "^4.4.2",
+ "chartjs-chart-graph": "^4.3.0",
"chartjs-plugin-datalabels": "^2.2.0",
"highlight.js": "^11.9.0",
"jszip": "^3.10.0",
"pinia": "^2.1.7",
"slash": "^5.1.0",
- "vue": "^3.3.4",
- "vue-chartjs": "^5.3.0",
+ "vue": "^3.4.27",
+ "vue-chartjs": "^5.3.1",
"vue-draggable-next": "^2.2.1",
- "vue-router": "^4.2.5",
+ "vue-router": "^4.3.2",
"vue-virtual-scroller": "^2.0.0-beta.8"
},
"devDependencies": {
- "@playwright/test": "^1.40.1",
- "@rushstack/eslint-patch": "^1.7.2",
+ "@playwright/test": "^1.44.0",
+ "@rushstack/eslint-patch": "^1.10.2",
"@types/jsdom": "^21.1.6",
- "@types/node": "^18.19.15",
+ "@types/node": "^18.19.33",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-prettier": "^9.0.0",
- "@vue/eslint-config-typescript": "^12.0.0",
- "@vue/test-utils": "^2.4.3",
+ "@vue/eslint-config-typescript": "^13.0.0",
+ "@vue/test-utils": "^2.4.6",
"@vue/tsconfig": "^0.5.1",
- "autoprefixer": "^10.4.16",
- "eslint": "^8.56.0",
- "eslint-plugin-vue": "^9.20.1",
+ "autoprefixer": "^10.4.19",
+ "eslint": "^8.57.0",
+ "eslint-plugin-vue": "^9.26.0",
"husky": "^9.0.11",
"jsdom": "^24.0.0",
"lint-staged": "^15.2.2",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.35",
"prettier": "^3.2.5",
- "prettier-plugin-tailwindcss": "^0.5.11",
- "tailwindcss": "^3.4.1",
- "typescript": "^5.3.3",
- "vite": "^5.1.7",
- "vitest": "^1.2.2",
- "vue-tsc": "^1.8.27"
+ "prettier-plugin-tailwindcss": "^0.5.14",
+ "tailwindcss": "^3.4.3",
+ "typescript": "^5.4.5",
+ "vite": "^5.2.11",
+ "vitest": "^1.6.0",
+ "vue-tsc": "^2.0.17"
}
}
diff --git a/report-viewer/src/components/ClusterGraph.vue b/report-viewer/src/components/ClusterGraph.vue
index 60713892fc..b20d02b674 100644
--- a/report-viewer/src/components/ClusterGraph.vue
+++ b/report-viewer/src/components/ClusterGraph.vue
@@ -1,13 +1,13 @@
-
-
-
-
+
+
+
+
Hover over an edge to highlight it in the table.
-
+
Not all comparisons of this cluster are present. These comparisons are indicated by the
dashed lines.
-
+
This Chart shows the average similarity of the selected submission to the other
submissions in the cluster.
+
{{ clusters?.[item.clusterIndex].members?.length }}
+
+
+
+
+
+ {{ tabNames[index] }}
+
+
+ {{ toolTips[index] }}
+
+
+
{{ tabNames[index] }}
+
+
+
+
+
+
+
+
diff --git a/report-viewer/src/components/ToolTipComponent.vue b/report-viewer/src/components/ToolTipComponent.vue
index 954084024d..f80c29fce6 100644
--- a/report-viewer/src/components/ToolTipComponent.vue
+++ b/report-viewer/src/components/ToolTipComponent.vue
@@ -1,76 +1,97 @@
-
+
+
diff --git a/report-viewer/src/components/fileDisplaying/CodeLine.vue b/report-viewer/src/components/fileDisplaying/CodeLine.vue
new file mode 100644
index 0000000000..6d2b2ab99e
--- /dev/null
+++ b/report-viewer/src/components/fileDisplaying/CodeLine.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
diff --git a/report-viewer/src/components/fileDisplaying/CodePanel.vue b/report-viewer/src/components/fileDisplaying/CodePanel.vue
index 938b45f829..75010c1eac 100644
--- a/report-viewer/src/components/fileDisplaying/CodePanel.vue
+++ b/report-viewer/src/components/fileDisplaying/CodePanel.vue
@@ -22,39 +22,31 @@
-
+
+ {{ index + 1 }}
+
-
-
- {{ index + 1 }}
-
-
-
-
-
+ ref="lineRefs"
+ :line="line.line"
+ :lineNumber="index + 1"
+ :matches="line.matches"
+ @matchSelected="(match) => matchSelected(match)"
+ />
+
Empty File
@@ -68,12 +60,12 @@
import type { MatchInSingleFile } from '@/model/MatchInSingleFile'
import { ref, nextTick, type PropType, computed, type Ref } from 'vue'
import Interactable from '../InteractableComponent.vue'
-import type { Match } from '@/model/Match'
import type { SubmissionFile } from '@/model/File'
import { highlight } from '@/utils/CodeHighlighter'
-import type { ParserLanguage } from '@/model/Language'
-import { getMatchColor } from '@/utils/ColorUtils'
+import type { Language } from '@/model/Language'
import ToolTipComponent from '../ToolTipComponent.vue'
+import CodeLine from './CodeLine.vue'
+import type { Match } from '@/model/Match'
const props = defineProps({
/**
@@ -94,29 +86,27 @@ const props = defineProps({
* Language of the file.
*/
highlightLanguage: {
- type: String as PropType
,
+ type: String as PropType,
required: true
}
})
-const emit = defineEmits(['lineSelected'])
+const emit = defineEmits(['matchSelected'])
const collapsed = ref(true)
-const lineRefs = ref([])
+const lineRefs = ref<(typeof CodeLine)[]>([])
-const codeLines: Ref<{ line: string; match: null | Match }[]> = computed(() =>
+const codeLines: Ref<{ line: string; matches: MatchInSingleFile[] }[]> = computed(() =>
highlight(props.file.data, props.highlightLanguage).map((line, index) => {
return {
line,
- match: props.matches?.find((m) => m.start <= index + 1 && index + 1 <= m.end)?.match ?? null
+ matches: props.matches?.filter((m) => m.start <= index + 1 && index + 1 <= m.end) ?? []
}
})
)
-function lineSelected(lineIndex: number) {
- if (codeLines.value[lineIndex].match !== null) {
- emit('lineSelected', codeLines.value[lineIndex].match)
- }
+function matchSelected(match: Match) {
+ emit('matchSelected', match)
}
/**
@@ -126,7 +116,7 @@ function lineSelected(lineIndex: number) {
function scrollTo(lineNumber: number) {
collapsed.value = false
nextTick(function () {
- lineRefs.value[lineNumber - 1].scrollIntoView({ block: 'center' })
+ lineRefs.value[lineNumber - 1].scrollTo()
})
}
@@ -154,16 +144,3 @@ function getFileDisplayName(file: SubmissionFile): string {
: file.fileName
}
-
-
diff --git a/report-viewer/src/components/fileDisplaying/FilesContainer.vue b/report-viewer/src/components/fileDisplaying/FilesContainer.vue
index eb1ce11ffa..1e9b2365e4 100644
--- a/report-viewer/src/components/fileDisplaying/FilesContainer.vue
+++ b/report-viewer/src/components/fileDisplaying/FilesContainer.vue
@@ -28,7 +28,7 @@
!matches.get(file.fileName) ? [] : (matches.get(file.fileName) as MatchInSingleFile[])
"
:highlight-language="highlightLanguage"
- @line-selected="(match) => $emit('lineSelected', match)"
+ @match-selected="(match) => $emit('matchSelected', match)"
class="mt-1 first:mt-0"
/>
@@ -48,7 +48,7 @@ import type { MatchInSingleFile } from '@/model/MatchInSingleFile'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
import { faCompressAlt } from '@fortawesome/free-solid-svg-icons'
import { library } from '@fortawesome/fontawesome-svg-core'
-import type { ParserLanguage } from '@/model/Language'
+import type { Language } from '@/model/Language'
library.add(faCompressAlt)
@@ -78,12 +78,12 @@ const props = defineProps({
* Language of the files.
*/
highlightLanguage: {
- type: String as PropType,
+ type: String as PropType,
required: true
}
})
-defineEmits(['lineSelected'])
+defineEmits(['matchSelected'])
const codePanels: Ref<(typeof CodePanel)[]> = ref([])
diff --git a/report-viewer/src/components/fileDisplaying/MatchList.vue b/report-viewer/src/components/fileDisplaying/MatchList.vue
index 760906d47b..1001952774 100644
--- a/report-viewer/src/components/fileDisplaying/MatchList.vue
+++ b/report-viewer/src/components/fileDisplaying/MatchList.vue
@@ -16,16 +16,48 @@
-
+ :key="index"
+ :scrollOffsetX="scrollOffsetX"
+ >
+
+
+
+
+ Match between {{ getFileName(match.firstFile) }} (Line {{ match.startInFirst.line }}-{{
+ match.endInFirst.line
+ }}) and {{ getFileName(match.secondFile) }} (Line {{ match.startInSecond.line }}-{{
+ match.endInSecond.line
+ }})
+ Token indeces of match: {{ match.startInFirst.tokenListIndex }}-{{
+ match.endInFirst.tokenListIndex
+ }}
+ and {{ match.startInSecond.tokenListIndex }}-{{ match.endInSecond.tokenListIndex }}.
+
+
+ Click to show in code view.
+
+
+
@@ -59,8 +91,10 @@ import type { Match } from '@/model/Match'
import OptionComponent from '../optionsSelectors/OptionComponent.vue'
import ToolTipComponent from '@/components/ToolTipComponent.vue'
import { getMatchColor } from '@/utils/ColorUtils'
+import type { ToolTipDirection } from '@/model/ui/ToolTip'
+import { ref, type Ref } from 'vue'
-defineProps({
+const props = defineProps({
/**
* Matches of the comparison.
* type: Array
@@ -87,4 +121,30 @@ defineEmits(['matchSelected'])
function getFileName(fullPath: string) {
return fullPath.split(/[/\\]/g).pop() || ''
}
+
+function getTooltipDirection(index: number): ToolTipDirection {
+ if (index == 0) return 'right'
+ if (index >= 2 && index + 2 >= (props.matches?.length ?? Infinity)) {
+ return 'left'
+ }
+ return 'bottom'
+}
+
+function showTokenRanges(match: Match) {
+ return (
+ !isNaN(match.startInFirst.tokenListIndex) &&
+ !isNaN(match.startInSecond.tokenListIndex) &&
+ !isNaN(match.endInFirst.tokenListIndex) &&
+ !isNaN(match.endInSecond.tokenListIndex)
+ )
+}
+
+const scrollableList: Ref = ref(null)
+const scrollOffsetX = ref(0)
+
+function updateScrollOffset() {
+ if (scrollableList.value) {
+ scrollOffsetX.value = scrollableList.value.scrollLeft
+ }
+}
diff --git a/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue b/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
index 1e825d587f..6be436228b 100644
--- a/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
+++ b/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
@@ -7,7 +7,11 @@
{{ title }}
-
+
private readonly _baseCodeFolderPath: string
- private readonly _language: ParserLanguage
+ private readonly _language: Language
private readonly _fileExtensions: Array
private readonly _matchSensitivity: number
private readonly _dateOfExecution: string
@@ -23,7 +23,7 @@ export class Overview {
constructor(
submissionFolderPath: Array,
baseCodeFolderPath: string,
- language: ParserLanguage,
+ language: Language,
fileExtensions: Array,
matchSensitivity: number,
dateOfExecution: string,
diff --git a/report-viewer/src/model/factories/BaseFactory.ts b/report-viewer/src/model/factories/BaseFactory.ts
index 4a01d60c92..238d9b65f8 100644
--- a/report-viewer/src/model/factories/BaseFactory.ts
+++ b/report-viewer/src/model/factories/BaseFactory.ts
@@ -55,7 +55,7 @@ export class BaseFactory {
if (request.status == 200) {
const blob = await request.blob()
// Check that file is not the index.html
- if (blob.type == 'text/html') {
+ if (blob.type.includes('text/html')) {
throw new Error(`Could not find ${path} in local files.`)
}
return blob
diff --git a/report-viewer/src/model/factories/ComparisonFactory.ts b/report-viewer/src/model/factories/ComparisonFactory.ts
index d6257e93e1..4e2b07e0b9 100644
--- a/report-viewer/src/model/factories/ComparisonFactory.ts
+++ b/report-viewer/src/model/factories/ComparisonFactory.ts
@@ -32,14 +32,20 @@ export class ComparisonFactory extends BaseFactory {
const matches = json.matches as Array>
matches.forEach((match) => {
- store().getSubmissionFile(
- firstSubmissionId,
- slash(match.file1 as string)
- ).matchedTokenCount += match.tokens as number
- store().getSubmissionFile(
+ const fileOfFirst = store().getSubmissionFile(firstSubmissionId, slash(match.file1 as string))
+ const fileOfSecond = store().getSubmissionFile(
secondSubmissionId,
slash(match.file2 as string)
- ).matchedTokenCount += match.tokens as number
+ )
+
+ if (fileOfFirst == undefined || fileOfSecond == undefined) {
+ throw new Error(
+ `The report viewer expected to find the file ${fileOfFirst == undefined ? match.file1 : match.file2} in the submissions, but did not find it.`
+ )
+ }
+
+ fileOfFirst.matchedTokenCount += match.tokens as number
+ fileOfSecond.matchedTokenCount += match.tokens as number
})
const unColoredMatches = matches.map((match) => this.getMatch(match))
@@ -115,17 +121,39 @@ export class ComparisonFactory extends BaseFactory {
if (store().state.localModeUsed && !store().state.zipModeUsed) {
return await this.getLocalFile('files/' + fileName).then((file) => file.text())
}
- return store().getSubmissionFile(submissionId, fileName).data
+ const file = store().getSubmissionFile(submissionId, fileName)
+ if (file == undefined) {
+ throw new Error(
+ `The report viewer expected to find the file ${fileName} in the submissions, but did not find it.`
+ )
+ }
+ return file.data
}
private static getMatch(match: Record): Match {
return {
firstFile: slash(match.file1 as string),
secondFile: slash(match.file2 as string),
- startInFirst: match.start1 as number,
- endInFirst: match.end1 as number,
- startInSecond: match.start2 as number,
- endInSecond: match.end2 as number,
+ startInFirst: {
+ line: match.start1 as number,
+ column: ((match['start1_col'] as number) || 1) - 1,
+ tokenListIndex: (match.startToken1 as number) ?? NaN
+ },
+ endInFirst: {
+ line: match.end1 as number,
+ column: ((match['end1_col'] as number) || Infinity) - 1,
+ tokenListIndex: (match.endToken1 as number) ?? NaN
+ },
+ startInSecond: {
+ line: match.start2 as number,
+ column: ((match['start2_col'] as number) || 1) - 1,
+ tokenListIndex: (match.startToken2 as number) ?? NaN
+ },
+ endInSecond: {
+ line: match.end2 as number,
+ column: ((match['end2_col'] as number) || Infinity) - 1,
+ tokenListIndex: (match.endToken2 as number) ?? NaN
+ },
tokens: match.tokens as number
}
}
@@ -134,10 +162,10 @@ export class ComparisonFactory extends BaseFactory {
const maxColorCount = getMatchColorCount()
let currentColorIndex = 0
const matchesFirst = Array.from(matches)
- .sort((a, b) => a.startInFirst - b.startInFirst)
+ .sort((a, b) => a.startInFirst.line - b.startInFirst.line)
.sort((a, b) => (a.firstFile > b.firstFile ? 1 : -1))
const matchesSecond = Array.from(matches)
- .sort((a, b) => a.startInSecond - b.startInSecond)
+ .sort((a, b) => a.startInSecond.line - b.startInSecond.line)
.sort((a, b) => (a.secondFile > b.secondFile ? 1 : -1))
const sortedSize = Array.from(matches).sort((a, b) => b.tokens - a.tokens)
diff --git a/report-viewer/src/model/fileHandling/ZipFileHandler.ts b/report-viewer/src/model/fileHandling/ZipFileHandler.ts
index 2e4d67d5f0..5957621790 100644
--- a/report-viewer/src/model/fileHandling/ZipFileHandler.ts
+++ b/report-viewer/src/model/fileHandling/ZipFileHandler.ts
@@ -12,10 +12,7 @@ export class ZipFileHandler extends FileHandler {
return jszip.loadAsync(file).then(async (zip) => {
for (const originalFileName of Object.keys(zip.files)) {
const unixFileName = slash(originalFileName)
- if (
- /((.+\/)*)(files|submissions)\/(.+)\/(.+)/.test(unixFileName) &&
- !/^__MACOSX\//.test(unixFileName)
- ) {
+ if (/\/?(files)\//.test(unixFileName) && !/\/?__MACOSX\//.test(unixFileName)) {
const directoryPath = unixFileName.substring(0, unixFileName.lastIndexOf('/'))
const fileBase = unixFileName.substring(unixFileName.lastIndexOf('/') + 1)
diff --git a/report-viewer/src/stores/store.ts b/report-viewer/src/stores/store.ts
index 9829d33d4b..9943e4ec22 100644
--- a/report-viewer/src/stores/store.ts
+++ b/report-viewer/src/stores/store.ts
@@ -49,8 +49,8 @@ const store = defineStore('store', {
*/
getSubmissionFile:
(state) =>
- (submissionId: string, fileName: string): SubmissionFile => {
- return state.state.submissions[submissionId].get(fileName) as SubmissionFile
+ (submissionId: string, fileName: string): SubmissionFile | undefined => {
+ return state.state.submissions[submissionId].get(fileName)
},
/**
* @param name the name of the submission
diff --git a/report-viewer/src/utils/CodeHighlighter.ts b/report-viewer/src/utils/CodeHighlighter.ts
index 913e6d9598..54caa2a76f 100644
--- a/report-viewer/src/utils/CodeHighlighter.ts
+++ b/report-viewer/src/utils/CodeHighlighter.ts
@@ -1,4 +1,4 @@
-import { ParserLanguage } from '@/model/Language'
+import { type Language, ParserLanguage } from '@/model/Language'
import hljs from 'highlight.js'
import scheme from 'highlight.js/lib/languages/scheme'
import llvm from 'highlight.js/lib/languages/llvm'
@@ -13,7 +13,7 @@ import typescript from 'highlight.js/lib/languages/typescript'
* @param lang Language to highlight the code with
* @returns
*/
-export function highlight(code: string, lang: ParserLanguage) {
+export function highlight(code: string, lang: Language) {
const highlightedCode = hljs.highlight(code, { language: getHighlightLanguage(lang) }).value
const openTags: string[] = []
const formattedCode = highlightedCode
@@ -34,7 +34,7 @@ export function highlight(code: string, lang: ParserLanguage) {
return formattedCode
}
-function getHighlightLanguage(lang: ParserLanguage) {
+function getHighlightLanguage(lang: Language) {
switch (lang) {
case ParserLanguage.PYTHON:
return 'python'
diff --git a/report-viewer/src/version.json b/report-viewer/src/version.json
index ed3b025ad2..ff2076fac6 100644
--- a/report-viewer/src/version.json
+++ b/report-viewer/src/version.json
@@ -1,6 +1,6 @@
{
"report_viewer_version": {
- "major": 5,
+ "major": 0,
"minor": 0,
"patch": 0
},
diff --git a/report-viewer/src/viewWrapper/ClusterViewWrapper.vue b/report-viewer/src/viewWrapper/ClusterViewWrapper.vue
index 6c3e2bbdec..234569c676 100644
--- a/report-viewer/src/viewWrapper/ClusterViewWrapper.vue
+++ b/report-viewer/src/viewWrapper/ClusterViewWrapper.vue
@@ -1,13 +1,15 @@
-
-
+