@mikrojs/quickjs 0.17.0 → 0.17.1-next.20260731001908

package/deps/quickjs/quickjs.c

@@ -1598,6 +1598,15 @@ static void js_trigger_gc(JSRuntime *rt, size_t size)
         JS_RunGC(rt);
         rt->malloc_gc_threshold = rt->malloc_state.malloc_size +
             (rt->malloc_state.malloc_size >> 1);
+        /* mikrojs patch: never re-arm the threshold above the memory limit,
+           else a single long job whose live size exceeds ~2/3 of the limit
+           accumulates collectible garbage straight into OOM. */
+        if (rt->malloc_state.malloc_limit &&
+            rt->malloc_gc_threshold >
+                rt->malloc_state.malloc_limit - (rt->malloc_state.malloc_limit >> 3)) {
+            rt->malloc_gc_threshold =
+                rt->malloc_state.malloc_limit - (rt->malloc_state.malloc_limit >> 3);
+        }
     }
 }
 
@@ -31238,9 +31247,19 @@ done:
     goto done;
 }
 
+/* mikrojs patch: once a module reaches EVALUATED its init function can
+   never run again; drop the bytecode so top-level-only code is reclaimed.
+   Live closures and export binding var_refs hold their own references. */
+static void js_module_release_func(JSContext *ctx, JSModuleDef *m)
+{
+    JS_FreeValue(ctx, m->func_obj);
+    m->func_obj = JS_UNDEFINED;
+}
+
 static void js_set_module_evaluated(JSContext *ctx, JSModuleDef *m)
 {
     m->status = JS_MODULE_STATUS_EVALUATED;
+    js_module_release_func(ctx, m);
     if (!JS_IsUndefined(m->promise)) {
         JSValue ret_val;
         assert(m->cycle_root == m);
@@ -31335,6 +31354,7 @@ static JSValue js_async_module_execution_rejected(JSContext *ctx, JSValueConst t
     module->eval_has_exception = true;
     module->eval_exception = js_dup(error);
     module->status = JS_MODULE_STATUS_EVALUATED;
+    js_module_release_func(ctx, module);
 
     for(i = 0; i < module->async_parent_modules_count; i++) {
         JSModuleDef *m = module->async_parent_modules[i];
@@ -31564,6 +31584,7 @@ static int js_inner_module_evaluation(JSContext *ctx, JSModuleDef *m,
             *pstack_top = m1->stack_prev;
             if (!m1->async_evaluation) {
                 m1->status = JS_MODULE_STATUS_EVALUATED;
+                js_module_release_func(ctx, m1);
             } else {
                 m1->status = JS_MODULE_STATUS_EVALUATING_ASYNC;
             }
@@ -31604,6 +31625,7 @@ static JSValue js_evaluate_module(JSContext *ctx, JSModuleDef *m)
             m1 = stack_top;
             assert(m1->status == JS_MODULE_STATUS_EVALUATING);
             m1->status = JS_MODULE_STATUS_EVALUATED;
+            js_module_release_func(ctx, m1);
             m1->eval_has_exception = true;
             m1->eval_exception = js_dup(result);
             m1->cycle_root = m; /* spec bug: should be present */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikrojs/quickjs",
-  "version": "0.17.0",
+  "version": "0.17.1-next.20260731001908",
   "description": "QuickJS-NG engine source, shared CMake module, and qjsc bytecode compiler",
   "keywords": [
     "bytecode",

package/quickjs.cmake

@@ -28,6 +28,31 @@ endif()
 get_filename_component(_QUICKJS_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
 set(QUICKJS_INCLUDE_DIR "${_QUICKJS_CMAKE_DIR}/deps/quickjs")
 
+# Apply the mikrojs patch series before anything compiles QuickJS sources.
+# postinstall covers `pnpm install`, but a patch file added or edited after
+# install was previously a silent no-op: the tree built unpatched and the
+# full test suite ran against code the patch never touched. apply-patches.js
+# is stamp-guarded so this is cheap when nothing changed; the GLOB's
+# CONFIGURE_DEPENDS reruns configure when the patch set changes, and
+# CMAKE_CONFIGURE_DEPENDS reruns it when patch contents change.
+#
+# Guarded for CMake script mode: ESP-IDF's early component-requirements
+# pass includes component CMakeLists (and through them this file) via
+# script-mode CMake, where CONFIGURE_DEPENDS globs and directory
+# properties are hard errors. The real project-mode configure that
+# follows runs the sync; the requirements pass only needs the variables.
+if(NOT CMAKE_SCRIPT_MODE_FILE)
+    file(GLOB _QUICKJS_PATCHES CONFIGURE_DEPENDS "${_QUICKJS_CMAKE_DIR}/patches/*.patch")
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${_QUICKJS_PATCHES})
+    execute_process(
+        COMMAND node "${_QUICKJS_CMAKE_DIR}/apply-patches.js"
+        RESULT_VARIABLE _QUICKJS_PATCH_RC
+    )
+    if(NOT _QUICKJS_PATCH_RC EQUAL 0)
+        message(FATAL_ERROR "quickjs.cmake: applying QuickJS patches failed (see output above)")
+    endif()
+endif()
+
 # Source files
 set(QUICKJS_SOURCES
     "${QUICKJS_INCLUDE_DIR}/quickjs.c"