Skip to content

Always use convince wrappers, make class itself private #504

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
Luna712 merged 3 commits into from
May 29, 2026
+7 −5
Merged

Always use convince wrappers, make class itself private #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
218f8fb
Always use convince wrappers, make class itself private
Luna712 May 29, 2026
4a2bb68
-
Luna712 May 29, 2026
d8cbc68
order
Luna712 May 29, 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
8 changes: 5 additions & 3 deletions library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsInterpreter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,16 @@ import kotlin.math.*
* - typeof
*
* Usage:
* val result = JsInterpreter().eval("var x = 1+2; x")
* val result = evalJs("var x = 1+2; x")
* // result == 3.0 (numbers are always Double internally)
*
* // Drop-in replacement for the old Rhino-based evaluateString pattern:
* val ctx = JsContext()
* ctx.eval("var url = 'https:' + computeSuffix()")
* val url = ctx["url"] // retrieves the variable as a String
*
* // Or simpler:
* val url = evalJs("var url = 'https:' + computeSuffix()", "url")
*/

/**
Expand Down Expand Up @@ -695,8 +698,7 @@ private class Scope(val parent: Scope? = null) {
if (vars.containsKey(name)) this else parent?.findOwner(name)
}

@Prerelease
class JsInterpreter {
private class JsInterpreter {
private val globalScope = Scope()

init { installGlobals() }
Expand Down
4 changes: 2 additions & 2 deletions library/src/commonTest/kotlin/com/lagradost/cloudstream3/utils/JsInterpreterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import kotlin.test.assertFalse

class JsInterpreterTest {

private fun num(code: String, variable: String? = null) = (evalJs(code, variable) as? Double) ?: Double.NaN
private fun str(code: String, variable: String? = null) = jsValueToString(evalJs(code, variable))
private fun bool(code: String, variable: String? = null) = evalJs(code, variable) as? Boolean ?: false
private fun num(code: String, variable: String? = null) = evalJs(code, variable) as? Double ?: Double.NaN
private fun str(code: String, variable: String? = null) = jsValueToString(evalJs(code, variable))

private fun assertApprox(expected: Double, actual: Double, tol: Double = 1e-9) {
assertTrue(abs(actual - expected) <= tol, "Expected $expected ± $tol but was $actual")
Expand Down