refactor(bindgen): move resouce scope tracking

Author: vados-cosmonic

crates/js-component-bindgen/src/function_bindgen.rs

@@ -1467,6 +1467,33 @@ impl Bindgen for FunctionBindgen<'_> {
                     uwriteln!(self.src, "const started = task.enterSync();",);
                 }
 
+                // Set up resource scope tracking, if we're in a resource call
+                if self.callee_resource_dynamic {
+                    let resource_borrows =
+                        self.intrinsic(Intrinsic::Resource(ResourceIntrinsic::ResourceCallBorrows));
+                    let handle_tables = self.intrinsic(Intrinsic::HandleTables);
+                    let scope_id = self.intrinsic(Intrinsic::ScopeId);
+                    uwriteln!(
+                        self.src,
+                        r#"
+                          {scope_id}++;
+                          task.registerOnResolveHandler(() => {{
+                              {scope_id}--;
+                              for (const {{ rid, handle }} of {resource_borrows}) {{
+                                  const storedScopeId = {handle_tables}[rid][handle << 1]
+                                  if (storedScopeId === {scope_id}) {{
+                                      throw new TypeError('borrows not dropped for resource call');
+                                  }}
+                              }}
+                              {resource_borrows} = [];
+                          }}
+
+                          }});
+                        "#
+                    );
+                    uwriteln!(self.src, "{scope_id}++;");
+                }
+
                 // Save the memory for this task,
                 // which will be used for any subtasks that might be spawned
                 if let Some(mem_idx) = self.canon_opts.memory() {

crates/js-component-bindgen/src/intrinsics/mod.rs

@@ -1066,7 +1066,7 @@ pub struct RenderIntrinsicsArgs<'a> {
 }
 
 /// Intrinsics that should be rendered as early as possible
-const EARLY_INTRINSICS: [Intrinsic; 36] = [
+const EARLY_INTRINSICS: [Intrinsic; 37] = [
     Intrinsic::PromiseWithResolversPonyfill,
     Intrinsic::SymbolDispose,
     Intrinsic::SymbolAsyncIterator,
@@ -1092,6 +1092,8 @@ const EARLY_INTRINSICS: [Intrinsic; 36] = [
     Intrinsic::Conversion(ConversionIntrinsic::RequireValidNumericPrimitive),
     Intrinsic::TypeCheckValidI32,
     Intrinsic::TypeCheckAsyncFn,
+    // Resources
+    Intrinsic::Resource(ResourceIntrinsic::ResourceCallBorrows),
     // Async helpers
     Intrinsic::AsyncFunctionCtor,
     Intrinsic::AsyncTask(AsyncTaskIntrinsic::ClearCurrentTask),

crates/js-component-bindgen/src/intrinsics/resource.rs

@@ -72,23 +72,24 @@ impl ResourceIntrinsic {
     /// Retrieve global names for
     pub fn get_global_names() -> impl IntoIterator<Item = &'static str> {
         [
-            "resourceCallBorrows",
-            "resourceTransferBorrow",
-            "resourceTransferBorrowValidLifting",
-            "resourceTransferOwn",
-            "rscTableCreateBorrow",
-            "rscTableCreateOwn",
-            "rscTableGet",
-            "rscTableRemove",
-            "rscTableTryGet",
-            "curResourceBorrows",
+            Self::ResourceCallBorrows.name(),
+            Self::ResourceTableFlag.name(),
+            Self::ResourceTableCreateBorrow.name(),
+            Self::ResourceTableCreateOwn.name(),
+            Self::ResourceTableGet.name(),
+            Self::ResourceTableEnsureBorrowDrop.name(),
+            Self::ResourceTableRemove.name(),
+            Self::ResourceTransferBorrow.name(),
+            Self::ResourceTransferBorrowValidLifting.name(),
+            Self::ResourceTransferOwn.name(),
+            Self::CurResourceBorrows.name(),
         ]
     }
 
     /// Get the name for the intrinsic
     pub fn name(&self) -> &'static str {
         match self {
-            Self::ResourceCallBorrows => "resourceCallBorrows",
+            Self::ResourceCallBorrows => "RESOURCE_CALL_BORROWS",
             Self::ResourceTableFlag => "T_FLAG",
             Self::ResourceTableCreateBorrow => "rscTableCreateBorrow",
             Self::ResourceTableCreateOwn => "rscTableCreateOwn",
@@ -247,7 +248,10 @@ impl ResourceIntrinsic {
                 "));
             }
 
-            Self::ResourceCallBorrows => output.push_str("let resourceCallBorrows = [];"),
+            Self::ResourceCallBorrows => {
+                let name = self.name();
+                output.push_str(&format!("let {name} = [];"));
+            }
         }
     }
 }

crates/js-component-bindgen/src/transpile_bindgen.rs

@@ -2316,38 +2316,6 @@ impl<'a> Instantiator<'a, '_> {
                 uwriteln!(self.src.js, "const trampoline{i} = {resource_transfer};");
             }
 
-            // TODO: we need to do this? does this mean we need to start keeping track of when we
-            // enter a call on a resource explicitly?
-
-            // Trampoline::ResourceEnterCall => {
-            //     let scope_id = self.bindgen.intrinsic(Intrinsic::ScopeId);
-            //     uwrite!(self.src.js, "function trampoline{i}() {{ {scope_id}++; }}");
-            // }
-
-            // Trampoline::ResourceExitCall => {
-            //     let scope_id = self.bindgen.intrinsic(Intrinsic::ScopeId);
-            //     let resource_borrows = self
-            //         .bindgen
-            //         .intrinsic(Intrinsic::Resource(ResourceIntrinsic::ResourceCallBorrows));
-            //     let handle_tables = self.bindgen.intrinsic(Intrinsic::HandleTables);
-            //     // To verify that borrows are dropped, it is enough to verify that the handle
-            //     // either no longer exists (part of free list) or belongs to another scope, since
-            //     // the enter call closed off the ability to create new handles in the parent scope
-            //     uwrite!(
-            //         self.src.js,
-            //         r#"function trampoline{i}() {{
-            //             {scope_id}--;
-            //             for (const {{ rid, handle }} of {resource_borrows}) {{
-            //                 const storedScopeId = {handle_tables}[rid][handle << 1]
-            //                 if (storedScopeId === {scope_id}) {{
-            //                     throw new TypeError('borrows not dropped for resource call');
-            //                 }}
-            //             }}
-            //             {resource_borrows} = [];
-            //         }}
-            //         "#,
-            //     );
-            // }
             Trampoline::ContextSet { instance, slot, .. } => {
                 let context_set_fn = self
                     .bindgen