Rework build definition

Author: kasperisager

CMakeLists.txt

@@ -2,76 +2,79 @@ cmake_minimum_required(VERSION 3.25)
 
 find_package(cmake-fetch REQUIRED PATHS node_modules/cmake-fetch)
 
-project(qjs C)
+project(js C)
 
 add_library(v8 INTERFACE)
 add_library(c++ INTERFACE)
+add_library(js OBJECT)
 
 fetch_package("github:holepunchto/libjs" SOURCE_DIR js)
 fetch_package("github:holepunchto/quickjs#master")
 
-add_library(qjs OBJECT)
-
 set_target_properties(
-  qjs
+  js
   PROPERTIES
   C_STANDARD 99
   POSITION_INDEPENDENT_CODE ON
 )
 
 target_sources(
-  qjs
+  js
   PRIVATE
-    src/qjs.c
+    src/js.c
 )
 
 target_include_directories(
-  qjs
+  js
   PUBLIC
     include
-    $<TARGET_PROPERTY:js,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:quickjs,INTERFACE_INCLUDE_DIRECTORIES>
+  PUBLIC
+    ${js}/include
   PRIVATE
+    $<TARGET_PROPERTY:quickjs,INTERFACE_INCLUDE_DIRECTORIES>
+    $<TARGET_PROPERTY:uv,INTERFACE_INCLUDE_DIRECTORIES>
     $<TARGET_PROPERTY:utf,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
-add_library(qjs_shared SHARED)
+add_library(js_shared SHARED)
 
 set_target_properties(
-  qjs_shared
+  js_shared
   PROPERTIES
-  OUTPUT_NAME qjs
+  OUTPUT_NAME js
   WINDOWS_EXPORT_ALL_SYMBOLS ON
 )
 
 target_link_libraries(
-  qjs_shared
+  js_shared
   PUBLIC
-    qjs
     uv
     utf_shared
     quickjs_shared
+  PRIVATE
+    js
 )
 
-add_library(qjs_static STATIC)
+add_library(js_static STATIC)
 
 set_target_properties(
-  qjs_static
+  js_static
   PROPERTIES
-  OUTPUT_NAME qjs
+  OUTPUT_NAME js
   PREFIX lib
 )
 
 target_link_libraries(
-  qjs_static
+  js_static
   PUBLIC
-    qjs
     uv_a
     utf_static
     quickjs_static
+  PRIVATE
+    js
 )
 
-install(TARGETS qjs_shared qjs_static)
+install(TARGETS js_shared js_static)
 
 if(PROJECT_IS_TOP_LEVEL)
   enable_testing()

src/qjs.c src/js.c

@@ -1309,12 +1309,13 @@ int
 js_delete_reference(js_env_t *env, js_ref_t *reference) {
   // Allow continuing even with a pending exception
 
-  if (JS_IsObject(reference->value) || JS_IsFunction(env->context, reference->value)) {
-    if (reference->count == 0) js__clear_weak_reference(env, reference);
+  if (reference->count == 0) {
+    if (JS_IsObject(reference->value) || JS_IsFunction(env->context, reference->value)) {
+      js__clear_weak_reference(env, reference);
+    }
   }
 
   JS_FreeValue(env->context, reference->value);
-
   JS_FreeValue(env->context, reference->symbol);
 
   free(reference);
@@ -1328,8 +1329,10 @@ js_reference_ref(js_env_t *env, js_ref_t *reference, uint32_t *result) {
 
   reference->count++;
 
-  if (JS_IsObject(reference->value) || JS_IsFunction(env->context, reference->value)) {
-    if (reference->count == 1) js__clear_weak_reference(env, reference);
+  if (reference->count == 1) {
+    if (JS_IsObject(reference->value) || JS_IsFunction(env->context, reference->value)) {
+      js__clear_weak_reference(env, reference);
+    }
   }
 
   if (result) *result = reference->count;
@@ -1344,7 +1347,7 @@ js_reference_unref(js_env_t *env, js_ref_t *reference, uint32_t *result) {
   if (reference->count > 0) {
     reference->count--;
 
-    if (reference->count == 1) {
+    if (reference->count == 0) {
       if (JS_IsObject(reference->value) || JS_IsFunction(env->context, reference->value)) {
         js__set_weak_reference(env, reference);
       }
@@ -2986,11 +2989,6 @@ js_release_arraybuffer_backing_store(js_env_t *env, js_arraybuffer_backing_store
   return 0;
 }
 
-int
-js_set_arraybuffer_zero_fill_enabled(bool enabled) {
-  return 0;
-}
-
 int
 js_create_typedarray(js_env_t *env, js_typedarray_type_t type, size_t len, js_value_t *arraybuffer, size_t offset, js_value_t **result) {
   if (JS_HasException(env->context)) return js__error(env);
@@ -4977,6 +4975,7 @@ int
 js_finish_deferred_teardown_callback(js_deferred_teardown_t *handle) {
   return -1;
 }
+
 int
 js_throw(js_env_t *env, js_value_t *error) {
   if (JS_HasException(env->context)) return js__error(env);

test/CMakeLists.txt

@@ -221,7 +221,7 @@ foreach(test IN LISTS tests)
   target_link_libraries(
     ${test}
     PRIVATE
-      qjs_shared
+      js_shared
   )
 
   add_test(