aboutsummaryrefslogtreecommitdiffstats
path: root/lib/monoucha0
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2025-03-29 18:45:26 +0100
committerbptato <nincsnevem662@gmail.com>2025-03-29 19:10:39 +0100
commit906956d3663fb335440a46ead7e1e4185065ab05 (patch)
treea99cc1176843e68518b4bef392aa05e0374d5fef /lib/monoucha0
parent7d3e035ce70af840805018641d25c5c9dcaa938e (diff)
downloadchawan-906956d3663fb335440a46ead7e1e4185065ab05.tar.gz
jserror: simplify custom error creation
The old API was needlessly complex and suggested that it could only be used for DOMException (which is not the case). (Also optimized out code lookup from the DOMException constructor.)
Diffstat (limited to 'lib/monoucha0')
-rw-r--r--lib/monoucha0/doc/manual.md2
-rw-r--r--lib/monoucha0/monoucha/javascript.nim16
-rw-r--r--lib/monoucha0/monoucha/jserror.nim57
-rw-r--r--lib/monoucha0/monoucha/jsopaque.nim40
-rw-r--r--lib/monoucha0/monoucha/tojs.nim4
5 files changed, 56 insertions, 63 deletions
diff --git a/lib/monoucha0/doc/manual.md b/lib/monoucha0/doc/manual.md
index 30cd9a06..034950ac 100644
--- a/lib/monoucha0/doc/manual.md
+++ b/lib/monoucha0/doc/manual.md
@@ -267,8 +267,6 @@ Following parameters also exist:
define it on the passed JS object. You must use QuickJS APIs to create
this object. `namespace` is not consumed (i.e. you must free it
yourself).
-* `errid`: set the error ID. TODO this is currently pretty useless as a
- public API because JSErrorEnum is not extendable.
### jsget, jsset: basic property reflectors
diff --git a/lib/monoucha0/monoucha/javascript.nim b/lib/monoucha0/monoucha/javascript.nim
index fc04f8fd..a0aac5a1 100644
--- a/lib/monoucha0/monoucha/javascript.nim
+++ b/lib/monoucha0/monoucha/javascript.nim
@@ -205,8 +205,9 @@ proc free*(ctx: JSContext) =
JS_FreeValue(ctx, v)
for classid, v in opaque.ctors:
JS_FreeValue(ctx, v)
- for v in opaque.errCtorRefs:
- JS_FreeValue(ctx, v)
+ for e, v in opaque.errCtorRefs:
+ if e != jeCustom:
+ JS_FreeValue(ctx, v)
if opaque.globalUnref != nil:
opaque.globalUnref()
JS_FreeValue(ctx, opaque.global)
@@ -301,8 +302,7 @@ proc newCtorFunFromParentClass(ctx: JSContext; ctor: JSCFunction;
func newJSClass*(ctx: JSContext; cdef: JSClassDefConst; nimt: pointer;
ctor: JSCFunction; funcs: JSFunctionList; parent: JSClassID;
asglobal, nointerface: bool; finalizer: JSFinalizerFunction;
- namespace: JSValueConst; errid: Opt[JSErrorEnum];
- unforgeable, staticfuns: JSFunctionList): JSClassID
+ namespace: JSValueConst; unforgeable, staticfuns: JSFunctionList): JSClassID
{.discardable.} =
result = 0
let rt = JS_GetRuntime(ctx)
@@ -363,8 +363,6 @@ func newJSClass*(ctx: JSContext; cdef: JSClassDefConst; nimt: pointer;
let fp = cast[ptr UncheckedArray[JSCFunctionListEntry]](fp0)
JS_SetPropertyFunctionList(ctx, jctor, fp, cint(staticfuns.len))
JS_SetConstructor(ctx, jctor, proto)
- if errid.isSome:
- ctxOpaque.errCtorRefs[errid.get] = JS_DupValue(ctx, jctor)
while ctxOpaque.ctors.len <= int(result):
ctxOpaque.ctors.add(JS_UNDEFINED)
ctxOpaque.ctors[result] = JS_DupValue(ctx, jctor)
@@ -1491,8 +1489,8 @@ macro registerType*(ctx: JSContext; t: typed; parent: JSClassID = 0;
asglobal: static bool = false; globalparent: static bool = false;
nointerface = false; name: static string = "";
hasExtraGetSet: static bool = false;
- extraGetSet: static openArray[TabGetSet] = []; namespace = JS_NULL;
- errid = Opt[JSErrorEnum].err()): JSClassID =
+ extraGetSet: static openArray[TabGetSet] = []; namespace = JS_NULL):
+ JSClassID =
var stmts = newStmtList()
var info = BoundFunctions.getOrDefault(t.strVal)
if info == nil:
@@ -1532,7 +1530,7 @@ macro registerType*(ctx: JSContext; t: typed; parent: JSClassID = 0;
let global = asglobal and not globalparent
endstmts.add(quote do:
`ctx`.newJSClass(classDef, getTypePtr(`t`), `sctr`, `tabList`, `parent`,
- `global`, `nointerface`, `finName`, `namespace`, `errid`, `unforgeable`,
+ `global`, `nointerface`, `finName`, `namespace`, `unforgeable`,
`staticfuns`)
)
stmts.add(newBlockStmt(endstmts))
diff --git a/lib/monoucha0/monoucha/jserror.nim b/lib/monoucha0/monoucha/jserror.nim
index ed3fe4f8..d708fea8 100644
--- a/lib/monoucha0/monoucha/jserror.nim
+++ b/lib/monoucha0/monoucha/jserror.nim
@@ -1,3 +1,13 @@
+## JS Error compatibility.
+##
+## This API is strictly less efficient than its QJS counterpart, as it
+## relies on additional heap allocation. It only exists to make it
+## easier to write interfaces that can be used both in Nim and QJS.
+##
+## To add your own custom errors, derive a new type from JS_CLASS_ERROR
+## and set the `e` field to `jeCustom` when initializing it. Typically
+## you'd also add at least a `.jsfget` function for `message`.
+
{.push raises: [].}
import optshim
@@ -17,68 +27,57 @@ type
jeURIError = "URIError"
jeInternalError = "InternalError"
jeAggregateError = "AggregateError"
- # Chawan errors
- jeDOMException = "DOMException"
+ # Custom errors
+ jeCustom = "CustomError"
JSResult*[T] = Result[T, JSError]
-const QuickJSErrors* = [
- jeEvalError,
- jeRangeError,
- jeReferenceError,
- jeSyntaxError,
- jeTypeError,
- jeURIError,
- jeInternalError,
- jeAggregateError
-]
-
-proc newEvalError*(message: string): JSError =
+proc newEvalError*(message: sink string): JSError =
return JSError(e: jeEvalError, message: message)
-proc newRangeError*(message: string): JSError =
+proc newRangeError*(message: sink string): JSError =
return JSError(e: jeRangeError, message: message)
-proc newReferenceError*(message: string): JSError =
+proc newReferenceError*(message: sink string): JSError =
return JSError(e: jeReferenceError, message: message)
-proc newSyntaxError*(message: string): JSError =
+proc newSyntaxError*(message: sink string): JSError =
return JSError(e: jeSyntaxError, message: message)
-proc newTypeError*(message: string): JSError =
+proc newTypeError*(message: sink string): JSError =
return JSError(e: jeTypeError, message: message)
-proc newURIError*(message: string): JSError =
+proc newURIError*(message: sink string): JSError =
return JSError(e: jeURIError, message: message)
-proc newInternalError*(message: string): JSError =
+proc newInternalError*(message: sink string): JSError =
return JSError(e: jeInternalError, message: message)
-proc newAggregateError*(message: string): JSError =
+proc newAggregateError*(message: sink string): JSError =
return JSError(e: jeAggregateError, message: message)
-template errEvalError*(message: string): untyped =
+template errEvalError*(message: sink string): untyped =
err(newEvalError(message))
-template errRangeError*(message: string): untyped =
+template errRangeError*(message: sink string): untyped =
err(newRangeError(message))
-template errReferenceError*(message: string): untyped =
+template errReferenceError*(message: sink string): untyped =
err(newReferenceError(message))
-template errSyntaxError*(message: string): untyped =
+template errSyntaxError*(message: sink string): untyped =
err(newSyntaxError(message))
-template errTypeError*(message: string): untyped =
+template errTypeError*(message: sink string): untyped =
err(newTypeError(message))
-template errURIError*(message: string): untyped =
+template errURIError*(message: sink string): untyped =
err(newURIError(message))
-template errInternalError*(message: string): untyped =
+template errInternalError*(message: sink string): untyped =
err(newInternalError(message))
-template errAggregateError*(message: string): untyped =
+template errAggregateError*(message: sink string): untyped =
err(newAggregateError(message))
{.pop.} # raises
diff --git a/lib/monoucha0/monoucha/jsopaque.nim b/lib/monoucha0/monoucha/jsopaque.nim
index d1dce5a7..e92a9722 100644
--- a/lib/monoucha0/monoucha/jsopaque.nim
+++ b/lib/monoucha0/monoucha/jsopaque.nim
@@ -61,27 +61,25 @@ type
func newJSContextOpaque*(ctx: JSContext): JSContextOpaque =
let opaque = JSContextOpaque(global: JS_GetGlobalObject(ctx))
- block: # get well-known symbols and other functions
- let sym = JS_GetPropertyStr(ctx, opaque.global, "Symbol")
- for s in JSSymbolRef:
- let name = $s
- let val = JS_GetPropertyStr(ctx, sym, cstring(name))
- assert JS_IsSymbol(val)
- opaque.symRefs[s] = JS_ValueToAtom(ctx, val)
- JS_FreeValue(ctx, val)
- JS_FreeValue(ctx, sym)
- for s in JSStrRef:
- let ss = $s
- opaque.strRefs[s] = JS_NewAtomLen(ctx, cstring(ss), csize_t(ss.len))
- for s in JSValueRef:
- let ss = $s
- let ret = JS_Eval(ctx, cstring(ss), csize_t(ss.len), "<init>", 0)
- assert JS_IsFunction(ctx, ret)
- opaque.valRefs[s] = ret
- for e in JSErrorEnum:
- let s = $e
- let err = JS_GetPropertyStr(ctx, opaque.global, cstring(s))
- opaque.errCtorRefs[e] = err
+ let sym = JS_GetPropertyStr(ctx, opaque.global, "Symbol")
+ for s in JSSymbolRef:
+ let name = $s
+ let val = JS_GetPropertyStr(ctx, sym, cstring(name))
+ assert JS_IsSymbol(val)
+ opaque.symRefs[s] = JS_ValueToAtom(ctx, val)
+ JS_FreeValue(ctx, val)
+ JS_FreeValue(ctx, sym)
+ for s in JSStrRef:
+ let ss = $s
+ opaque.strRefs[s] = JS_NewAtomLen(ctx, cstring(ss), csize_t(ss.len))
+ for s in JSValueRef:
+ let ss = $s
+ let ret = JS_Eval(ctx, cstring(ss), csize_t(ss.len), "<init>", 0)
+ assert JS_IsFunction(ctx, ret)
+ opaque.valRefs[s] = ret
+ for e in JSErrorEnum:
+ if e != jeCustom:
+ opaque.errCtorRefs[e] = JS_GetPropertyStr(ctx, opaque.global, cstring($e))
return opaque
func getOpaque*(ctx: JSContext): JSContextOpaque =
diff --git a/lib/monoucha0/monoucha/tojs.nim b/lib/monoucha0/monoucha/tojs.nim
index 97056d6e..2b82116e 100644
--- a/lib/monoucha0/monoucha/tojs.nim
+++ b/lib/monoucha0/monoucha/tojs.nim
@@ -383,8 +383,8 @@ proc toJS(ctx: JSContext; j: JSValue): JSValue =
proc toJS*(ctx: JSContext; err: JSError): JSValue =
if err == nil:
return JS_EXCEPTION
- if err.e notin QuickJSErrors:
- return toJSRefObj(ctx, err)
+ if err.e == jeCustom:
+ return ctx.toJSRefObj(err)
var msg = toJS(ctx, err.message)
if JS_IsException(msg):
return msg