refactor: abstract runtime Isolate class (#158)

Author: toyobayashi

eslint.config.js

@@ -80,7 +80,7 @@ export default tseslint.config(
       }],
       '@stylistic/spaced-comment': ['error', 'always', {
         line: {
-          markers: ['/'],
+          markers: ['/', '#region', '#endregion'],
         },
         block: {
           markers: ['#__PURE__'],

packages/emnapi/src/core/init.ts

@@ -101,18 +101,18 @@ export var napiModule: INapiModule = {
       const NODE_MODULE_VERSION = Version.NODE_MODULE_VERSION
       const nodeRegisterModuleSymbol = `node_register_module_v${NODE_MODULE_VERSION}`
       if (typeof instance.exports[nodeRegisterModuleSymbol] === 'function') {
-        const scope = emnapiCtx.openScopeRaw()
+        const scope = emnapiCtx.isolate.openScope()
         try {
           const exports = napiModule.exports
 
           const exportsHandle = scope.add(exports)
           const moduleHandle = scope.add(napiModule)
           instance.exports[nodeRegisterModuleSymbol](to64('exportsHandle'), to64('moduleHandle'), to64('5'))
         } catch (err) {
-          emnapiCtx.closeScopeRaw(scope)
+          emnapiCtx.isolate.closeScope(scope)
           throw err
         }
-        emnapiCtx.closeScopeRaw(scope)
+        emnapiCtx.isolate.closeScope(scope)
         napiModule.loaded = true
         delete napiModule.envObject
         return napiModule.exports

packages/emnapi/src/emscripten/init.ts

@@ -72,18 +72,18 @@ export function emnapiInit (options: InitOptions): any {
   const nodeRegisterModuleSymbol = `node_register_module_v${NODE_MODULE_VERSION}`
   const emscriptenExportedSymbol = `_${nodeRegisterModuleSymbol}`
   if (typeof Module[emscriptenExportedSymbol] === 'function') {
-    const scope = emnapiCtx.openScopeRaw()
+    const scope = emnapiCtx.isolate.openScope()
     try {
       const exports = emnapiModule.exports
 
       const exportsHandle = scope.add(exports)
       const moduleHandle = scope.add(emnapiModule)
       Module[emscriptenExportedSymbol](to64('exportsHandle'), to64('moduleHandle'), to64('5'))
     } catch (err) {
-      emnapiCtx.closeScopeRaw(scope)
+      emnapiCtx.isolate.closeScope(scope)
       throw err
     }
-    emnapiCtx.closeScopeRaw(scope)
+    emnapiCtx.isolate.closeScope(scope)
     emnapiModule.loaded = true
     delete emnapiModule.envObject
     return emnapiModule.exports

packages/emnapi/src/promise.ts

@@ -11,7 +11,7 @@ export function napi_create_promise (env: napi_env, deferred: Pointer<napi_defer
     $CHECK_ARG!(envObject, promise)
 
     const resolver = emnapiCtx.createResolver()
-    deferredObjectId = emnapiCtx.createReference(undefined, resolver, 1, ReferenceOwnership.kUserland as any).id
+    deferredObjectId = emnapiCtx.isolate.createReference(resolver).id
 
     from64('deferred')
     makeSetValue('deferred', 0, 'deferredObjectId', '*')

packages/emnapi/src/v8/external.ts

@@ -6,7 +6,7 @@ export function _v8_external_new (
   isolate: Ptr,
   data: number
 ): Ptr {
-  const external = emnapiCtx.createExternal(data)
+  const external = emnapiCtx.isolate.createExternal(data)
   return emnapiCtx.napiValueFromJsValue(external)
 }
 
@@ -18,5 +18,5 @@ export function _v8_external_value (
   external: Ptr
 ): Ptr {
   const obj = emnapiCtx.jsValueFromNapiValue(external)
-  return emnapiCtx.getExternalValue(obj)
+  return emnapiCtx.isolate.getExternalValue(obj)
 }

packages/emnapi/src/v8/function.ts

@@ -42,7 +42,7 @@ export function _v8_function_new_instance (fn: Ptr, ctx: Ptr, argc: number, argv
       ret = new BoundCtor()
     }
   } catch (err) {
-    emnapiCtx.throwException(err)
+    emnapiCtx.isolate.throwException(err)
     return 1
   }
 

packages/emnapi/src/v8/handle_scope.ts

@@ -5,15 +5,15 @@ import { from64 } from 'emscripten:parse-tools'
  * @__sig pp
  */
 export function _v8_open_handle_scope (_isolate: Pointer<unknown>): napi_handle_scope {
-  return emnapiCtx.openScopeRaw().id
+  return emnapiCtx.isolate.openScope().id
 }
 
 /**
  * @__deps $emnapiCtx
  * @__sig v
  */
 export function _v8_close_handle_scope (): void {
-  return emnapiCtx.closeScopeRaw()
+  return emnapiCtx.isolate.closeScope()
 }
 
 /**

packages/emnapi/src/v8/internal.ts

@@ -7,7 +7,7 @@ import { from64, makeDynCall } from 'emscripten:parse-tools'
 export function _v8_local_from_global_reference (ref: Ptr): Ptr {
   const reference = emnapiCtx.getRef(ref)
   if (reference === undefined) return 1
-  const id = reference.get(emnapiCtx)
+  const id = reference.get(emnapiCtx.isolate)
   return id || 1
 }
 
@@ -18,7 +18,7 @@ export function _v8_local_from_global_reference (ref: Ptr): Ptr {
 export function _v8_globalize_reference (isolate: Ptr, value: Ptr): Ptr {
   const jsValue = emnapiCtx.jsValueFromNapiValue(value)
   if (jsValue === undefined) return 0
-  return emnapiCtx.createReference(undefined, jsValue, 1, ReferenceOwnership.kUserland as any).id
+  return emnapiCtx.isolate.createReference(jsValue).id
 }
 
 /**
@@ -64,11 +64,11 @@ export function _v8_make_weak (ref: Ptr, data: Ptr, callback: Ptr, weak_callback
     let field0 = 0
     let field1 = 0
     if (type === 1) {
-      const id = refValue.get(emnapiCtx)
+      const id = refValue.get(emnapiCtx.isolate)
       if (id) {
         const value = emnapiCtx.jsValueFromNapiValue(id)
-        field0 = emnapiCtx.getInternalField(value, 0)
-        field1 = emnapiCtx.getInternalField(value, 1)
+        field0 = emnapiCtx.isolate.getInternalField(value, 0)
+        field1 = emnapiCtx.isolate.getInternalField(value, 1)
         if ((typeof field0 !== 'number' && typeof field0 !== 'bigint') ||
             (typeof field1 !== 'number' && typeof field1 !== 'bigint')) {
           throw new Error('Internal field is not a number')

packages/emnapi/src/v8/isolate.ts

@@ -10,6 +10,6 @@ export function _v8_isolate_get_current_context (): number {
  * @__sig pp
  */
 export function _v8_isolate_throw_exception (error: Ptr): Ptr {
-  emnapiCtx.throwException(emnapiCtx.jsValueFromNapiValue(error))
+  emnapiCtx.isolate.throwException(emnapiCtx.jsValueFromNapiValue(error))
   return error
 }

packages/emnapi/src/v8/object.ts

@@ -27,7 +27,7 @@ export function _v8_object_internal_field_count (
   obj: Ptr
 ): number {
   const objValue = emnapiCtx.jsValueFromNapiValue(obj)
-  return emnapiCtx.getInternalFieldCount(objValue)
+  return emnapiCtx.isolate.getInternalFieldCount(objValue)
 }
 
 /**
@@ -41,7 +41,7 @@ export function _v8_object_set_internal_field (
 ): void {
   const objValue = emnapiCtx.jsValueFromNapiValue(obj)
   const dataValue = emnapiCtx.jsValueFromNapiValue(data)
-  emnapiCtx.setInternalField(objValue, index, dataValue)
+  emnapiCtx.isolate.setInternalField(objValue, index, dataValue)
 }
 
 /**
@@ -54,7 +54,7 @@ export function _v8_object_set_aligned_pointer_in_internal_field (
   data: Ptr
 ): void {
   const objValue = emnapiCtx.jsValueFromNapiValue(obj)
-  emnapiCtx.setInternalField(objValue, index, data)
+  emnapiCtx.isolate.setInternalField(objValue, index, data)
 }
 
 /**
@@ -66,7 +66,7 @@ export function _v8_object_get_internal_field (
   index: number
 ): Ptr {
   const objValue = emnapiCtx.jsValueFromNapiValue(obj)
-  return emnapiCtx.napiValueFromJsValue(emnapiCtx.getInternalField(objValue, index))
+  return emnapiCtx.isolate.napiValueFromJsValue(emnapiCtx.isolate.getInternalField(objValue, index))
 }
 
 /**
@@ -78,7 +78,7 @@ export function _v8_object_get_aligned_pointer_in_internal_field (
   index: number
 ): Ptr {
   const objValue = emnapiCtx.jsValueFromNapiValue(obj)
-  return emnapiCtx.getInternalField(objValue, index)
+  return emnapiCtx.isolate.getInternalField(objValue, index)
 }
 
 /**