fix: make some method static

Author: ssssota

packages/libraw.wasm/src/index.ts

@@ -40,6 +40,7 @@ export class LibRaw implements Disposable {
 			LibRaw.modulePromise = mod;
 			LibRaw.module = await mod;
 		}
+		return await LibRaw.modulePromise;
 	}
 	async waitUntilReady() {
 		await LibRaw.modulePromise;
@@ -170,18 +171,25 @@ export class LibRaw implements Disposable {
 	setFbddNoiserd(value: Int) {
 		LibRaw.module._libraw_set_fbdd_noiserd(this.lr, value);
 	}
-	version(): string {
-		return this.readString(LibRaw.module._libraw_version(this.lr));
+	static version(): string {
+		if (LibRaw.module === undefined) throw new Error("Not initialized");
+		const ptr = LibRaw.module._libraw_version();
+		return typ
+			.sizedCharArrayAsString(Number.POSITIVE_INFINITY)
+			.read({ buf: LibRaw.module.HEAPU8, offset: ptr }, {});
 	}
-	versionNumber(): number {
-		return LibRaw.module._libraw_versionNumber(this.lr);
+	static versionNumber(): number {
+		if (LibRaw.module === undefined) throw new Error("Not initialized");
+		return LibRaw.module._libraw_versionNumber();
 	}
-	cameraCount(): number {
-		return LibRaw.module._libraw_cameraCount(this.lr);
+	static cameraCount(): number {
+		if (LibRaw.module === undefined) throw new Error("Not initialized");
+		return LibRaw.module._libraw_cameraCount();
 	}
-	cameraList(): string[] {
-		const ptr = LibRaw.module._libraw_cameraList(this.lr);
-		const length = this.cameraCount();
+	static cameraList(): string[] {
+		if (LibRaw.module === undefined) throw new Error("Not initialized");
+		const ptr = LibRaw.module._libraw_cameraList();
+		const length = LibRaw.cameraCount();
 		return typ
 			.sizedArray(typ.charPointerAsString(), length)
 			.read({ buf: LibRaw.module.HEAPU8, offset: ptr }, {});

packages/libraw.wasm/src/types/c-api.ts

@@ -69,11 +69,11 @@ export interface LibRawWasmModule {
 	): LibRawProcessedImageT;
 	_libraw_dcraw_clear_mem(lr: LibRawProcessedImageT): void;
 	_libraw_strerror(error: ErrorCode): CharPtr;
-	_libraw_version(lr: LibRawDataT): CharPtr;
-	_libraw_versionNumber(lr: LibRawDataT): number;
-	_libraw_capabilities(lr: LibRawDataT): void;
-	_libraw_cameraCount(lr: LibRawDataT): number;
-	_libraw_cameraList(lr: LibRawDataT): CharPtrPtr;
+	_libraw_version(): CharPtr;
+	_libraw_versionNumber(): number;
+	_libraw_capabilities(): void;
+	_libraw_cameraCount(): number;
+	_libraw_cameraList(): CharPtrPtr;
 	_libraw_get_decoder_info(info: LibRawDecoderInfo): ErrorCode;
 	_libraw_unpack_function_name(lr: LibRawDataT): CharPtr;
 	_libraw_COLOR(lr: LibRawDataT, row: Int, col: Int): Int;

playground/src/lib/libraw/worker.ts

@@ -1,4 +1,9 @@
 import { LibRaw } from 'libraw.wasm';
 import * as Comlink from 'comlink';
 
+LibRaw.initialize().then(() => {
+  console.log('LibRaw version:', LibRaw.version());
+  console.log('Supported cameras:', LibRaw.cameraList());
+});
+
 Comlink.expose(new LibRaw());

playground/src/routes/+page.svelte

@@ -9,7 +9,6 @@
 	type LibRawReturn<T extends keyof LibRaw> = LibRaw[T] extends (...args: unknown[]) => infer R
 		? R
 		: never;
-	let version = $state<string | undefined>();
 	let iparams = $state<ResolvablePromise<LibRawReturn<'getIParams'>> | undefined>();
 	let thumb = $state<ResolvablePromise<Uint8Array> | undefined>();
 	let raw = $state<ResolvablePromise<LibRawReturn<'dcrawMakeMemImage'>> | undefined>();
@@ -22,8 +21,6 @@
 		raw = resolvable();
 		const libraw = createLibRaw();
 		await libraw.waitUntilReady();
-		libraw.cameraList().then(console.log, console.error);
-		version = await libraw.version();
 		try {
 			const arrayBuffer = await readFile(file);
 			await libraw.open(arrayBuffer);
@@ -49,9 +46,6 @@
 	};
 </script>
 
-{#if version}
-	<p>libraw version: {version}</p>
-{/if}
 <input type="file" onchange={onFileChange} />
 {#if iparams}
 	{#await iparams}

tests/__snapshots__/index.spec.ts.snap

@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`supported cameras 1`] = `
+exports[`meta 3`] = `
 [
   "Adobe Digital Negative (DNG)",
   "AgfaPhoto DC-833m",

tests/index.spec.ts

@@ -8,11 +8,11 @@ const __dirname = path.dirname(__filename);
 const repoRoot = path.join(__dirname, "..");
 const samplesDir = path.join(repoRoot, "raw-samples");
 
-it("supported cameras", async () => {
-	using libraw = new LibRaw();
-	await libraw.waitUntilReady();
-	const cameras = libraw.cameraList();
-	expect(cameras).toMatchSnapshot();
+it("meta", async () => {
+	await LibRaw.initialize();
+	expect(LibRaw.version()).toMatchInlineSnapshot(`"0.22.0-Devel202403"`);
+	expect(LibRaw.versionNumber()).toMatchInlineSnapshot("5632");
+	expect(LibRaw.cameraList()).toMatchSnapshot();
 });
 
 it("ARW", async () => {