Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion crates/spidermonkey-embedding-splicer/src/bindgen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -587,15 +587,17 @@ impl JsBindgen<'_> {
..
} => {
let iface = &self.resolve.interfaces[*i];
let mut resource_function_groups = BTreeMap::<_, Vec<_>>::new();
for id in iface.types.values() {
if let TypeDefKind::Resource = &self.resolve.types[*id].kind {
self.resource_directions
.insert(*id, AbiVariant::GuestImport);
resource_function_groups.entry(Some(*id)).or_default();
}
}

let by_resource = iface.functions.iter().fold(
BTreeMap::<_, Vec<_>>::new(),
resource_function_groups,
|mut map, (name, func)| {
map.entry(match &func.kind {
FunctionKind::Freestanding | FunctionKind::AsyncFreestanding => {
Expand Down
14 changes: 14 additions & 0 deletions test/cases/opaque-resource-import/opaque-resource-import.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export let drops = 0;

export class Item {
constructor(value) {
this.value = value;
}

[Symbol.dispose]() {
drops += 1;
}
}

export const make = value => new Item(value);
export const value = item => item.value;
10 changes: 10 additions & 0 deletions test/cases/opaque-resource-import/source.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { make, value } from 'test:test/opaque-resource-import';

export function test() {
const item = make(42);
try {
return value(item);
} finally {
item[Symbol.dispose]();
}
}
7 changes: 7 additions & 0 deletions test/cases/opaque-resource-import/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { strictEqual } from 'node:assert';
import { drops } from './opaque-resource-import.js';

export function test(instance) {
strictEqual(instance.test(), 42);
strictEqual(drops, 1);
}
12 changes: 12 additions & 0 deletions test/cases/opaque-resource-import/world.wit
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package test:test;

interface opaque-resource-import {
resource item;
make: func(value: u32) -> item;
value: func(item: borrow<item>) -> u32;
}

world test {
import opaque-resource-import;
export test: func() -> u32;
}