Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
DEST_DIR="arkanalyzer"
MAX_RETRIES=10
RETRY_DELAY=3 # Delay between retries in seconds
BRANCH="neo/2025-02-24"
BRANCH="neo/2025-03-20"

for ((i=1; i<=MAX_RETRIES; i++)); do
git clone --depth=1 --branch $BRANCH $REPO_URL $DEST_DIR && break
Expand Down
1 change: 1 addition & 0 deletions jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Convert.kt
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,7 @@ fun MethodSignatureDto.toEtsMethodSignature(): EtsMethodSignature {
name = param.name,
type = param.type.toEtsType(),
isOptional = param.isOptional,
isRest = param.isRest,
)
},
returnType = returnType.toEtsType(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ data class MethodParameterDto(
val name: String,
val type: TypeDto,
val isOptional: Boolean = false,
val isRest: Boolean = false,
)

@Serializable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ data class EtsMethodParameter(
val name: String,
override val type: EtsType,
val isOptional: Boolean = false,
val isRest: Boolean = false,
) : CommonMethodParameter {
override fun toString(): String {
return "$name${if (isOptional) "?" else ""}: $type"
Expand Down
10 changes: 10 additions & 0 deletions jacodb-ets/src/test/kotlin/org/jacodb/ets/test/EtsFromJsonTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -472,4 +472,14 @@ class EtsFromJsonTest {
assertEquals("DummyStmt", stmtDto.kind)
assertEquals(42, stmtDto.extra.getValue("value").jsonPrimitive.content.toInt())
}

@Test
fun testVararg() {
val path = "/samples/etsir/ast/lang/vararg.ts.json"
val file = loadEtsFileFromResource(path)
val method = file.classes.flatMap { it.methods }.first { it.name == "f" }
assertEquals(method.parameters.size, 2)
assertEquals(method.parameters[0].isRest, false)
assertEquals(method.parameters[1].isRest, true)
}
}
6 changes: 6 additions & 0 deletions jacodb-ets/src/test/resources/samples/source/lang/vararg.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
function f(x, ...args) {
console.log(x);
console.log(...args);
}

f(42, "hello", "world");
Loading