Merge pull request #541 from vizzuhq/immediate-detach

Detach immediately frees wasm allocated memory.

Author: simzer

CHANGELOG.md

@@ -5,6 +5,8 @@
 ### Fixed
 
 - Only dimension on size (+ color) wrongly displayed as treemap, not tablechart.
+- Allocated memory is immediately freed after calling detach(), CAnimation and Snapshot
+  also can be released using their new `free()` method.
 
 ## [0.11.1] - 2024-05-31
 

src/apps/weblib/ts-api/chart.ts

@@ -77,6 +77,8 @@ export class Chart implements ChartInterface {
 
 	detach(): void {
 		this._module.unregisterChart(this._cChart)
+		this._cCanvas.free()
+		this._cChart.free()
 	}
 
 	start(): void {

src/apps/weblib/ts-api/module/canimctrl.ts

@@ -1,7 +1,7 @@
-import { CObject } from './cenv.js'
+import { CObject, CManagedObject } from './cenv.js'
 
 /** Stored Animation object. */
-export class CAnimation extends CObject {}
+export class CAnimation extends CManagedObject {}
 
 export class CAnimControl extends CObject {
 	setParam(path: string, value = ''): void {

src/apps/weblib/ts-api/module/ccanvas.ts

@@ -1,9 +1,9 @@
-import { type CEnv, CObject } from './cenv.js'
+import { type CEnv, CManagedObject } from './cenv.js'
 import { type CPointerClosure } from './objregistry.js'
 import { CColorGradient } from './ccolorgradient.js'
 import type { CString, CColorGradientPtr } from '../cvizzu.types'
 
-export class CCanvas extends CObject {
+export class CCanvas extends CManagedObject {
 	constructor(env: CEnv, getId: CPointerClosure) {
 		super(getId, env)
 	}

src/apps/weblib/ts-api/module/cchart.ts

@@ -5,7 +5,7 @@ import * as Config from '../types/config.js'
 import * as Styles from '../types/styles.js'
 import * as Data from '../types/data.js'
 
-import { CObject, CEnv } from './cenv.js'
+import { CManagedObject, CObject, CEnv } from './cenv.js'
 import { CPointerClosure } from './objregistry.js'
 import { CProxy } from './cproxy.js'
 import { CCanvas } from './ccanvas.js'
@@ -14,7 +14,7 @@ import { CAnimation } from './canimctrl.js'
 import { isIterable } from '../utils.js'
 
 /** Stored Chart object. */
-export class Snapshot extends CObject {}
+export class Snapshot extends CManagedObject {}
 
 export class CEvent extends CObject {
 	preventDefault(): void {
@@ -26,7 +26,7 @@ class CConfig extends CProxy<Config.Chart> {}
 class CStyle extends CProxy<Styles.Chart> {}
 class CAnimOptions extends CProxy<Anim.Options> {}
 
-export class CChart extends CObject {
+export class CChart extends CManagedObject {
 	config: CConfig
 	style: CStyle
 	computedStyle: CStyle

src/apps/weblib/ts-api/module/cenv.ts

@@ -1,7 +1,7 @@
 import { CPointer, CVizzu, CString } from '../cvizzu.types'
 
 import { CError } from './cerror.js'
-import { ObjectRegistry, FnGetter, CPointerClosure } from './objregistry.js'
+import { ObjectRegistry, CPointerClosure } from './objregistry.js'
 
 export class CEnv {
 	protected _wasm: CVizzu
@@ -23,8 +23,9 @@ export class CEnv {
 		return this._wasm.UTF8ToString(str)
 	}
 
-	protected _getStatic(getter: FnGetter): CPointerClosure {
-		return this._objectRegistry.get(this._callStatic(getter))
+	protected _getStatic(getter: () => CPointer): CPointerClosure {
+		const cPointer = this._callStatic(getter)()
+		return (): CPointer => cPointer
 	}
 
 	protected _callStatic<T extends unknown[], R>(f: (...params: T) => R): (...params: T) => R {
@@ -55,7 +56,8 @@ export class CObject extends CEnv {
 	}
 
 	protected _get(getter: (self: CPointer) => CPointer): CPointerClosure {
-		return this._objectRegistry.get(this._call(getter))
+		const cPointer = this._call(getter)()
+		return (): CPointer => cPointer
 	}
 
 	protected _call<T extends unknown[], R>(
@@ -64,3 +66,15 @@ export class CObject extends CEnv {
 		return super._callStatic(f).bind(this, this.getId())
 	}
 }
+
+export class CManagedObject extends CObject {
+	constructor(getId: CPointerClosure, cenv: CEnv) {
+		super(getId, cenv)
+		this._objectRegistry.register(this.getId)
+	}
+
+	free(): void {
+		this._objectRegistry.unregister(this.getId)
+		this._wasm._object_free(this.getId())
+	}
+}

src/apps/weblib/ts-api/module/objregistry.ts

@@ -1,7 +1,6 @@
 import { CPointer } from '../cvizzu.types'
 
 export type FnFree = (rawCPointer: CPointer) => void
-export type FnGetter = () => CPointer
 
 export type CPointerClosure = () => CPointer
 
@@ -14,10 +13,11 @@ export class ObjectRegistry {
 		})
 	}
 
-	get(fnGetter: FnGetter): CPointerClosure {
-		const cPointer = fnGetter()
-		const object = (): CPointer => cPointer
-		this._finalizationRegistry.register(object, cPointer)
-		return object
+	register(objectId: CPointerClosure): void {
+		this._finalizationRegistry.register(objectId, objectId())
+	}
+
+	unregister(objectId: CPointerClosure): void {
+		this._finalizationRegistry.unregister(objectId)
 	}
 }