ensureLoaded

Author: pyramation

Makefile

@@ -61,6 +61,7 @@ ifdef EMSCRIPTEN
 		-sEXPORT_NAME="$(WASM_MODULE_NAME)" \
 		-sENVIRONMENT="web,node" \
 		-sMODULARIZE=1 \
+		-sEXPORT_ES6=0 \
 		-sALLOW_MEMORY_GROWTH=1 \
 		-lpg_query \
 		-o $@ \

package.json

@@ -1,9 +1,10 @@
 {
   "name": "libpg-query",
-  "version": "17.3.0",
+  "version": "17.3.1",
   "description": "The real PostgreSQL query parser",
   "homepage": "https://github.com/launchql/libpg-query-node",
   "main": "./wasm/index.cjs",
+  "module": "./wasm/index.js",
   "typings": "./wasm/index.d.ts",
   "publishConfig": {
     "access": "public"
@@ -12,13 +13,6 @@
     "wasm/*",
     "proto.js"
   ],
-  "exports": {
-    ".": {
-      "types": "./wasm/index.d.ts",
-      "import": "./wasm/index.js",
-      "require": "./wasm/index.cjs"
-    }
-  },
   "scripts": {
     "clean": "yarn wasm:clean && rimraf cjs esm",
     "build:js": "node scripts/build.js",

src/index.ts

@@ -43,6 +43,10 @@ const initPromise = PgQueryModule().then((module: WasmModule) => {
   wasmModule = module;
 });
 
+function ensureLoaded() {
+  if (!wasmModule) throw new Error("WASM module not initialized. Call `loadModule()` first.");
+}
+
 export async function loadModule(): Promise<void> {
   if (!wasmModule) {
     await initPromise;
@@ -57,6 +61,7 @@ function awaitInit<T extends (...args: any[]) => Promise<any>>(fn: T): T {
 }
 
 function stringToPtr(str: string): number {
+  ensureLoaded();
   const len = wasmModule.lengthBytesUTF8(str) + 1;
   const ptr = wasmModule._malloc(len);
   try {
@@ -69,6 +74,7 @@ function stringToPtr(str: string): number {
 }
 
 function ptrToString(ptr: number): string {
+  ensureLoaded();
   return wasmModule.UTF8ToString(ptr);
 }
 

wasm/index.cjs

@@ -34,6 +34,10 @@ let wasmModule;
 const initPromise = (0, libpg_query_js_1.default)().then((module) => {
     wasmModule = module;
 });
+function ensureLoaded() {
+    if (!wasmModule)
+        throw new Error("WASM module not initialized. Call `loadModule()` first.");
+}
 async function loadModule() {
     if (!wasmModule) {
         await initPromise;
@@ -46,6 +50,7 @@ function awaitInit(fn) {
     });
 }
 function stringToPtr(str) {
+    ensureLoaded();
     const len = wasmModule.lengthBytesUTF8(str) + 1;
     const ptr = wasmModule._malloc(len);
     try {
@@ -58,6 +63,7 @@ function stringToPtr(str) {
     }
 }
 function ptrToString(ptr) {
+    ensureLoaded();
     return wasmModule.UTF8ToString(ptr);
 }
 exports.parse = awaitInit(async (query) => {

wasm/index.js

@@ -7,6 +7,10 @@ let wasmModule;
 const initPromise = PgQueryModule().then((module) => {
     wasmModule = module;
 });
+function ensureLoaded() {
+    if (!wasmModule)
+        throw new Error("WASM module not initialized. Call `loadModule()` first.");
+}
 export async function loadModule() {
     if (!wasmModule) {
         await initPromise;
@@ -19,6 +23,7 @@ function awaitInit(fn) {
     });
 }
 function stringToPtr(str) {
+    ensureLoaded();
     const len = wasmModule.lengthBytesUTF8(str) + 1;
     const ptr = wasmModule._malloc(len);
     try {
@@ -31,6 +36,7 @@ function stringToPtr(str) {
     }
 }
 function ptrToString(ptr) {
+    ensureLoaded();
     return wasmModule.UTF8ToString(ptr);
 }
 export const parse = awaitInit(async (query) => {