cleanup entry point

Author: pyramation

index.js

@@ -3,28 +3,21 @@
   "version": "17.2.0",
   "description": "The real PostgreSQL query parser",
   "homepage": "https://github.com/launchql/libpg-query-node",
-  "main": "index.js",
-  "typings": "index.d.ts",
+  "main": "./wasm/index.cjs",
+  "typings": "./wasm/index.d.ts",
   "publishConfig": {
     "access": "public"
   },
   "files": [
-    "index.js",
-    "index.d.ts",
+    "wasm/*",
     "libpg_query/*",
-    "script/*",
-    "wasm/*"
+    "script/*"
   ],
   "exports": {
     ".": {
-      "types": "./index.d.ts",
+      "types": "./wasm/index.d.ts",
       "import": "./wasm/index.js",
-      "require": "./index.js",
-      "default": "./index.js"
-    },
-    "./wasm": {
-      "types": "./index.d.ts",
-      "default": "./wasm/index.js"
+      "require": "./wasm/index.cjs"
     }
   },
   "scripts": {

package.json

@@ -6,6 +6,13 @@ const initPromise = PgQueryModule.default().then((module) => {
   wasmModule = module;
 });
 
+async function loadModule() {
+  if (!wasmModule) {
+    await initPromise;
+  }
+  return wasmModule;
+}
+
 function awaitInit(fn) {
   return async (...args) => {
     await initPromise;
@@ -164,8 +171,6 @@ const normalize = awaitInit(async (query) => {
   }
 });
 
-
-
 const parseQueryDetailed = awaitInit(async (query) => {
   const queryPtr = stringToPtr(query);
   let resultPtr;
@@ -208,7 +213,7 @@ const parseQueryDetailed = awaitInit(async (query) => {
 // Sync versions that assume WASM module is already initialized
 function parseQuerySync(query) {
   if (!wasmModule) {
-    throw new Error('WASM module not initialized. Call an async method first to initialize.');
+    throw new Error('WASM module not initialized. Call loadModule() first.');
   }
   const queryPtr = stringToPtr(query);
   let resultPtr;
@@ -253,7 +258,7 @@ function parseQuerySync(query) {
 
 function deparseSync(parseTree) {
   if (!wasmModule) {
-    throw new Error('WASM module not initialized. Call an async method first to initialize.');
+    throw new Error('WASM module not initialized. Call loadModule() first.');
   }
   const protobufData = protobufCache.get(parseTree);
 
@@ -284,7 +289,7 @@ function deparseSync(parseTree) {
 
 function parsePlPgSQLSync(query) {
   if (!wasmModule) {
-    throw new Error('WASM module not initialized. Call an async method first to initialize.');
+    throw new Error('WASM module not initialized. Call loadModule() first.');
   }
   const queryPtr = stringToPtr(query);
   let resultPtr;
@@ -308,7 +313,7 @@ function parsePlPgSQLSync(query) {
 
 function fingerprintSync(query) {
   if (!wasmModule) {
-    throw new Error('WASM module not initialized. Call an async method first to initialize.');
+    throw new Error('WASM module not initialized. Call loadModule() first.');
   }
   const queryPtr = stringToPtr(query);
   let resultPtr;
@@ -332,7 +337,7 @@ function fingerprintSync(query) {
 
 function normalizeSync(query) {
   if (!wasmModule) {
-    throw new Error('WASM module not initialized. Call an async method first to initialize.');
+    throw new Error('WASM module not initialized. Call loadModule() first.');
   }
   const queryPtr = stringToPtr(query);
   let resultPtr;
@@ -356,7 +361,7 @@ function normalizeSync(query) {
 
 function parseQueryDetailedSync(query) {
   if (!wasmModule) {
-    throw new Error('WASM module not initialized. Call an async method first to initialize.');
+    throw new Error('WASM module not initialized. Call loadModule() first.');
   }
   const queryPtr = stringToPtr(query);
   let resultPtr;
@@ -396,13 +401,8 @@ function parseQueryDetailedSync(query) {
   }
 }
 
-
-
-function isReady() {
-  return !!wasmModule;
-}
-
 module.exports = {
+  loadModule,
   parseQuery,
   deparse,
   parsePlPgSQL,
@@ -414,7 +414,5 @@ module.exports = {
   parsePlPgSQLSync,
   fingerprintSync,
   normalizeSync,
-  parseQueryDetailedSync,
-  isReady,
-  initPromise
+  parseQueryDetailedSync
 };

wasm/index.cjs

@@ -1,16 +1,18 @@
 import { ParseResult } from "@pgsql/types";
 
+export async function loadModule(): Promise<void>;
+
 export function parseQuery(sql: string): Promise<ParseResult>;
 export function parsePlPgSQL(funcsSql: string): Promise<any>;
 export function parseQuerySync(sql: string): ParseResult;
 export function parsePlPgSQLSync(funcsSql: string): any;
 export function deparse(parseTree: any): Promise<string>;
-export function deparseSync(parseTree: any): any;
+export function deparseSync(parseTree: any): string;
 export function fingerprint(sql: string): Promise<string>;
 export function fingerprintSync(sql: string): string;
 export function normalize(sql: string): Promise<string>;
 export function normalizeSync(sql: string): string;
 export function parseQueryDetailed(sql: string): Promise<ParseResult>;
 export function parseQueryDetailedSync(sql: string): ParseResult;
-export function isReady(): boolean;
-export * from '@pgsql/types';
+
+export * from '@pgsql/types';