clean up

packages/functions/src/uninstance.ts

@@ -36,6 +36,9 @@ const UNINSTANCE_DEFAULTS: Required<UninstanceOptions> = {};
 export function uninstance(_options: UninstanceOptions = UNINSTANCE_DEFAULTS): Transform {
 	return createTransform(NAME, async (document: Document): Promise<void> => {
 		const logger = document.getLogger();
+		const root = document.getRoot();
+
+		const instanceAttributes = new Set<Accessor>();
 
 		for (const srcNode of document.getRoot().listNodes()) {
 			const batch = srcNode.getExtension<InstancedMesh>('EXT_mesh_gpu_instancing');
@@ -46,8 +49,19 @@ export function uninstance(_options: UninstanceOptions = UNINSTANCE_DEFAULTS): T
 				srcNode.addChild(instanceNode);
 			}
 
-			// Remove Mesh and Extension from source Node.
-			srcNode.setMesh(null).setExtension('EXT_mesh_gpu_instancing', null);
+			for (const instanceAttribute of batch.listAttributes()) {
+				instanceAttributes.add(instanceAttribute);
+			}
+
+			srcNode.setMesh(null);
+			batch.dispose();
+		}
+
+		// Clean up unused instance attributes.
+		for (const attribute of instanceAttributes) {
+			if (attribute.listParents().every((parent) => parent === root)) {
+				attribute.dispose();
+			}
 		}
 
 		// Remove Extension from Document.

packages/functions/test/uninstance.test.ts

@@ -60,4 +60,6 @@ test('basic', async (t) => {
 		[{ _INSTANCE_ID: 100 }, { _INSTANCE_ID: 101 }, { _INSTANCE_ID: 102 }],
 		'sets instance extras',
 	);
+	t.is(translation.isDisposed(), true, 'disposes translation attribute');
+	t.is(id.isDisposed(), true, 'disposes id attribute');
 });