Skip to content

Update to 2.14.0, testframework changes, singlelinesection updates #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devdinc merged 9 commits into from
Jan 17, 2026
Merged

Update to 2.14.0, testframework changes, singlelinesection updates #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d005a12
remove within script pattern and optionally prefix test with devdinc …
devdinc Jan 17, 2026
735391b
Update testframework.md
devdinc Jan 17, 2026
96bb522
change runtime args, support strings instead, remove hack for importing
devdinc Jan 17, 2026
cea0fd2
use the new single line expression
devdinc Jan 17, 2026
c1ecaa3
Update function java call test to use a different call
devdinc Jan 17, 2026
1ed3cf8
Add multiline section tests
devdinc Jan 17, 2026
4bf9743
Update testframework.sk
devdinc Jan 17, 2026
82d0721
Update functionsv2.sk
devdinc Jan 17, 2026
dc5af52
Update singlinesection.sk
devdinc Jan 17, 2026
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
14 changes: 5 additions & 9 deletions docs/testframework.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ test "<test name>" [when <condition>]:
<test body>
```

* `<test name>` must be unique **within the script**
* Tests are registered automatically when the script is parsed
* The optional `when` condition is evaluated immediately before execution

Expand All @@ -75,7 +74,7 @@ Inside a test, the framework provides:
Fully-qualified test identifier:

```
<script>/<test name>
<test name>
```

* **`event-boolean`**
Expand All @@ -90,11 +89,9 @@ Tests are registered automatically at parse time. No explicit registration step
Internal storage format:

```
-test.sk::tests::<script>::<test name>
-test.sk::tests::<test name>
```

Registration is deterministic and isolated per script.

---

## Running Tests
Expand Down Expand Up @@ -125,7 +122,7 @@ run test(s) %strings%
Identifier format:

```
<script>/<test name>
<test name>
```

---
Expand All @@ -135,13 +132,12 @@ Identifier format:
### Expression

```skript
all tests [with test name %-string%] [within|from %-script%]
all tests [with test name %-string%]
```

### Behavior

* No arguments → all tests from all scripts
* `from <script>` → tests scoped to a script
* `with test name <string>` → exact match only

Returned values are fully-qualified test identifiers.
Expand Down Expand Up @@ -356,7 +352,7 @@ Output is suppressed entirely when `with no error message` is specified.

The framework guarantees that:

* Tests are isolated by identifier
* Tests are isolated by themselves
* Registration is implicit and deterministic
* Autorun and manual execution are distinguishable
* Failures are recorded even in non-halting mode
Expand Down
14 changes: 9 additions & 5 deletions scripts/libs/functionsv2.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ expression build lambda args %objects% body %string% noreturn %boolean% script %
set {_functionsv2.sk::ctx::proxy} to new proxy instance of Runnable using {_functionsv2.sk::ctx::functions::*}
else if {_functionsv2.sk::ctx::arity} is 1:
set {_functionsv2.sk::ctx::proxy} to raw expression of {_this}
set {_functionsv2.sk::ctx::functions::accept} to line section {_functionsv2.sk::ctx::body} with runtime args {_functionsv2.sk::ctx::proxy}, {_functionsv2.sk::ctx::args::1} in {_functionsv2.sk::ctx::script}
set {_functionsv2.sk::ctx::functions::accept} to line section {_functionsv2.sk::ctx::body} with args "%{_functionsv2.sk::ctx::proxy}%", "%{_functionsv2.sk::ctx::args::1}%" in {_functionsv2.sk::ctx::script}
set {_functionsv2.sk::ctx::proxy} to new proxy instance of Consumer using {_functionsv2.sk::ctx::functions::*}
else:
set {_functionsv2.sk::ctx::proxy} to raw expression of {_this}
set {_functionsv2.sk::ctx::functions::accept} to line section {_functionsv2.sk::ctx::body} with runtime args {_functionsv2.sk::ctx::proxy}, {_functionsv2.sk::ctx::args::1}, {_functionsv2.sk::ctx::args::2} in {_functionsv2.sk::ctx::script}
set {_functionsv2.sk::ctx::functions::accept} to line section {_functionsv2.sk::ctx::body} with args "%{_functionsv2.sk::ctx::proxy}%", "%{_functionsv2.sk::ctx::args::1}%", "%{_functionsv2.sk::ctx::args::2}%" in {_functionsv2.sk::ctx::script}
set {_functionsv2.sk::ctx::proxy} to new proxy instance of BiConsumer using {_functionsv2.sk::ctx::functions::*}
else:

Expand All @@ -83,11 +83,11 @@ expression build lambda args %objects% body %string% noreturn %boolean% script %
set {_functionsv2.sk::ctx::proxy} to new proxy instance of Supplier using {_functionsv2.sk::ctx::functions::*}
else if {_functionsv2.sk::ctx::arity} is 1:
set {_functionsv2.sk::ctx::proxy} to raw expression of {_this}
set {_functionsv2.sk::ctx::functions::apply} to line section "return %{_functionsv2.sk::ctx::body}%" with runtime args {_functionsv2.sk::ctx::proxy}, {_functionsv2.sk::ctx::args::1} in {_functionsv2.sk::ctx::script}
set {_functionsv2.sk::ctx::functions::apply} to line section "return %{_functionsv2.sk::ctx::body}%" with args "%{_functionsv2.sk::ctx::proxy}%", "%{_functionsv2.sk::ctx::args::1}%" in {_functionsv2.sk::ctx::script}
set {_functionsv2.sk::ctx::proxy} to new proxy instance of Function using {_functionsv2.sk::ctx::functions::*}
else:
set {_functionsv2.sk::ctx::proxy} to raw expression of {_this}
set {_functionsv2.sk::ctx::functions::apply} to line section "return %{_functionsv2.sk::ctx::body}%" with runtime args {_functionsv2.sk::ctx::proxy}, {_functionsv2.sk::ctx::args::1}, {_functionsv2.sk::ctx::args::2} in {_functionsv2.sk::ctx::script}
set {_functionsv2.sk::ctx::functions::apply} to line section "return %{_functionsv2.sk::ctx::body}%" with args "%{_functionsv2.sk::ctx::proxy}%", "%{_functionsv2.sk::ctx::args::1}%", "%{_functionsv2.sk::ctx::args::2}%" in {_functionsv2.sk::ctx::script}
set {_functionsv2.sk::ctx::proxy} to new proxy instance of BiFunction using {_functionsv2.sk::ctx::functions::*}
return {_functionsv2.sk::ctx::proxy}

Expand All @@ -103,6 +103,8 @@ expression:
set {_functionsv2.sk::ctx::args::*} to FextractArgs({_functionsv2.sk::ctx::vars})
set {_functionsv2.sk::ctx::origin} to SkriptLogger.getNode()
set {_functionsv2.sk::ctx::script} to script ({_functionsv2.sk::ctx::origin}.getConfig().getFileName())
if {_functionsv2.sk::ctx::script} is not set: # likely inner lambda
set {_functionsv2.sk::ctx::script} to current script
continue
get:
return build lambda args {_functionsv2.sk::ctx::args::*} body {_functionsv2.sk::ctx::expr} noreturn {_functionsv2.sk::ctx::noreturn} script {_functionsv2.sk::ctx::script}
Expand Down Expand Up @@ -141,7 +143,9 @@ expression:
if size of {_functionsv2.sk::ctx::args::*} is not 2:
stop
set {_functionsv2.sk::ctx::origin} to SkriptLogger.getNode()
set {_functionsv2.sk::ctx::script} to script ({_origin}.getConfig().getFileName())
set {_functionsv2.sk::ctx::script} to script ({_functionsv2.sk::ctx::origin}.getConfig().getFileName())
if {_functionsv2.sk::ctx::script} is not set: # likely inner lambda
set {_functionsv2.sk::ctx::script} to current script
continue
get:
return build lambda args {_functionsv2.sk::ctx::args::*} body {_functionsv2.sk::ctx::expr} noreturn {_functionsv2.sk::ctx::noreturn} script {_functionsv2.sk::ctx::script}
Expand Down
49 changes: 20 additions & 29 deletions scripts/libs/singlelinesection.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import:
java.util.HashSet
org.skriptlang.reflect.java.elements.structures.StructImport
ch.njol.skript.log.SkriptLogger
java.lang.String
java.lang.Object

local function extractArgs(vars: object) :: objects:
if {_vars} is instance of ExpressionList:
Expand All @@ -33,46 +35,31 @@ local function extractRuntimeArgs(vars: objects) :: objects:

expression compile line %string% with %object% (1:|2:noreturn) in %script%:
get:
set {_section.sk::single::parser} to ParserInstance.get()
set {_section.sk::single::parser}.[ParserInstance]isActive to true
set {_section.sk::single::parserBackup} to {_section.sk::single::parser}.backup()
set {_section.sk::single::parser}.[ParserInstance]isActive to false
{_section.sk::single::parser}.reset()

set {_section.sk::single::code} to "%expr-1%"
set {_section.sk::single::event} to expr-2
set {_section.sk::single::bais} to new ByteArrayInputStream({_section.sk::single::code}.getBytes())
set {_section.sk::single::name} to "section"

set {_section.sk::single::config} to new Config({_section.sk::single::bais},"compiled single line for single line section: %expr-1%",true,false,":")
set {_section.sk::single::node} to {_section.sk::single::config}.getMainNode()

# a hack to use java calls
set {_section.sk::single::imports} to StructImport.[StructImport]imports.get(expr-3)
if {_section.sk::single::imports} is not set:
set {_section.sk::single::imports} to new HashMap()
set {_section.sk::single::importsLocal} to StructImport.[StructImport]imports.getOrDefault(null, new HashMap())
set {_section.sk::single::keys} to new HashSet({_section.sk::single::imports}.keySet())
{_section.sk::single::keys}.removeAll({_section.sk::single::importsLocal}.keySet())
loop ...{_section.sk::single::keys}:
set {_section.sk::single::javatype} to {_section.sk::single::imports}.get(loop-value)
set {_section.sk::single::javatypeSimpleName} to last element of split "%{_section.sk::single::javatype}%" at "."
# simulating effect command !import <import>
if loop-value is {_section.sk::single::javatypeSimpleName}:
StructImport.registerImport("%{_section.sk::single::javatype}%", null)
else:
StructImport.registerImport("%{_section.sk::single::javatype}% as %loop-value%", null)


set {_section.sk::single::parser} to ParserInstance.get()
set {_section.sk::single::isActiveOrig} to {_section.sk::single::parser}.[ParserInstance]isActive
set {_section.sk::single::parser}.[ParserInstance]isActive to true
set {_section.sk::single::parserBackup} to {_section.sk::single::parser}.backup()
{_section.sk::single::parser}.reset()
{_section.sk::single::parser}.setCurrentScript(expr-3)
{_section.sk::single::parser}.setCurrentEvent({_section.sk::single::name}, SectionEvent.class)
{_section.sk::single::parser}.setCurrentStructure({_section.sk::single::event})

set {_section.sk::single::items} to ScriptLoader.loadItems({_section.sk::single::node})

{_section.sk::single::parser}.restoreBackup({_section.sk::single::parserBackup})
set {_section.sk::single::parser}.[ParserInstance]isActive to {_section.sk::single::isActiveOrig}
return new Trigger(current script, {_section.sk::single::name}, {_section.sk::single::event}, {_section.sk::single::items})


expression [new] [single] line section %string%[ with (1:|2:runtime) [arg[ument]s [variables]] %-objects%][in %-script%]:
expression [new] [single] line section %strings%[ with [arg[ument]s [variables]] %-objects%][in %-script%]:
return type: section
parse:
if expr-3 is not set:
Expand All @@ -82,21 +69,25 @@ expression [new] [single] line section %string%[ with (1:|2:runtime) [arg[ument]
get:
if {_section.sk::single::script} is not set:
set {_section.sk::single::script} to expr-3
if parse mark is 2:
set {_section.sk::single::test::*} to expr-2
if expr-2 is instance of String:
set {_section.sk::single::array} to [Object.class]
set {_section.sk::single::expr2::*} to expr-2
loop {_section.sk::single::expr2::*}:
set {_section.sk::single::expr2} to loop-value
replace "{", "}" with "" in {_section.sk::single::expr2}
set {_section.sk::single::test::%loop-index%} to Variable.newInstance({_section.sk::single::expr2}, {_section.sk::single::array})
set {_section.sk::single::args::*} to extractRuntimeArgs({_section.sk::single::test::*})
else:
set {_section.sk::single::test} to raw expression of expr-2
set {_section.sk::single::args::*} to extractArgs({_section.sk::single::test})

set {_section.sk::single::code} to expr-1
set {_section.sk::single::code} to join expr-1 with nl
if {_section.sk::single::code} is not set:
return {_none}

# Compile the line into a trigger
set {_section.sk::single::name} to "section"


set {_section.sk::single::event} to new SectionSkriptEvent({_section.sk::single::name}, null)
set {_section.sk::single::trigger} to compile line {_section.sk::single::code} with {_section.sk::single::event} in {_section.sk::single::script}

Expand Down
Loading
Loading