update sqldef, which now provides getFullVersion()

Author: gfx

Makefile

@@ -13,7 +13,7 @@ format:
 	go fmt .
 .PHONEY: format
 
-update:
+deps:
 	go get -u -t .
 	go mod tidy
 .PHONY: update

README.md

@@ -16,13 +16,13 @@ The Go source (`sqldef-wasm.go`) compiles to WebAssembly and exposes a `diff` fu
 
 ```sh
 # Build the WASM file
-make sqldef.wasm
+make
 
 # Start local dev server at http://localhost:6543
 make dev
 
 # Update Go dependencies
-make update
+make deps
 
 # Format and lint
 make format

app.mjs

@@ -1,4 +1,4 @@
-import { sqldef, getVersion } from "./sqldef_browser.mjs";
+import { sqldef, getFullVersion } from "./sqldef_browser.mjs";
 
 const dbType = document.getElementById("dbType");
 const enableDrop = document.getElementById("enableDrop");
@@ -8,6 +8,7 @@ const outputUp = document.getElementById("outputUp");
 const errorUp = document.getElementById("errorUp");
 const outputDown = document.getElementById("outputDown");
 const errorDown = document.getElementById("errorDown");
+const versionEl = document.getElementById("version");
 
 const schemaExamples = {
   mysql: {
@@ -200,9 +201,6 @@ runDiff();
 
 // Display version info
 (async () => {
-  const version = await getVersion();
-  const versionEl = document.getElementById("version");
-  if (versionEl) {
-    versionEl.textContent = `powered by sqldef v${version}`;
-  }
+  const version = await getFullVersion();
+  versionEl.textContent = `powered by sqldef v${version}`;
 })();

go.mod

@@ -4,7 +4,7 @@ go 1.25
 
 toolchain go1.25.5
 
-require github.com/sqldef/sqldef/v3 v3.8.4
+require github.com/sqldef/sqldef/v3 v3.8.6
 
 require (
 	github.com/goccy/go-yaml v1.19.0 // indirect

go.sum

@@ -10,8 +10,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sqldef/sqldef/v3 v3.8.4 h1:iETP45XJFnlqLDrEv4DY4MoPJ1+dPqgBpUupdIrB2uo=
-github.com/sqldef/sqldef/v3 v3.8.4/go.mod h1:yrTNAMDgx+NNL1Iu7X6eOVA3zxJ7vSt3apkdn1RDHAI=
+github.com/sqldef/sqldef/v3 v3.8.6 h1:21vikbKlUROnOImEM6Uz88Y6v1MBMtsATEAFehx6ii0=
+github.com/sqldef/sqldef/v3 v3.8.6/go.mod h1:elKPijJ6Pouu/S0sn+hSHHcfGERBKvtAAUoewAKjBr8=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=

sqldef-wasm.go

@@ -14,8 +14,12 @@ import (
 	"github.com/sqldef/sqldef/v3/schema"
 )
 
-// diff function (mode: string, desiredDDLs: string, currentDDLs: string, enableDrop: bool, callback: (err: string | null, result: string | null): void)
+// sqldefDiff (mode: string, desiredDDLs: string, currentDDLs: string, enableDrop: bool, callback: (err: string | null, result: string | null) -> void) -> bool
 func sqldefDiff(this js.Value, args []js.Value) any {
+	if len(args) != 5 {
+		panic(fmt.Sprintf("expected 5 arguments, got %d", len(args)))
+	}
+
 	mode := args[0].String()
 	desiredDDLs := args[1].String()
 	currentDDLs := args[2].String()
@@ -61,19 +65,19 @@ func sqldefDiff(this js.Value, args []js.Value) any {
 	}
 }
 
+// sqldefGetFullVersion () -> string
+func sqldefGetFullVersion(this js.Value, args []js.Value) any {
+	return sqldef.GetFullVersion()
+}
+
 func main() {
 	c := make(chan bool)
 
 	exports := map[string]any{
 		"diff": js.FuncOf(sqldefDiff),
-		"getVersion": js.FuncOf(func(this js.Value, args []js.Value) any {
-			return sqldef.GetVersion()
-		}),
-		"getRevision": js.FuncOf(func(this js.Value, args []js.Value) any {
-			return sqldef.GetRevision()
-		}),
+		"getFullVersion": js.FuncOf(sqldefGetFullVersion),
 	}
 	js.Global().Set("_SQLDEF", js.ValueOf(exports))
 
-	<-c
+	<-c // block forever
 }

sqldef.wasm

@@ -6,30 +6,58 @@ if (typeof Go === "undefined") {
 }
 
 let SQLDEF = null;
+let isLoading = false;
 
 const getInstance = async () => {
+  while (isLoading) {
+    await new Promise((resolve) => setTimeout(resolve));
+  }
+
   if (SQLDEF) {
     return SQLDEF;
   }
 
-  const response = await fetch("sqldef.wasm");
-  const wasmBinary = await response.arrayBuffer();
-  const go = new Go();
-  const result = await WebAssembly.instantiate(wasmBinary, go.importObject);
-  go.run(result.instance); // defines globalThis._SQLDEF
-  SQLDEF = globalThis._SQLDEF;
+  isLoading = true;
+  try {
+    const t0 = performance.now();
+    const response = await fetch("sqldef.wasm");
+    const t1 = performance.now();
+    const wasmBinary = await response.arrayBuffer();
+    const t2 = performance.now();
+    const go = new Go();
+    const result = await WebAssembly.instantiate(wasmBinary, go.importObject);
+    go.run(result.instance); // defines globalThis._SQLDEF
+    const t3 = performance.now();
+
+    console.debug(
+      "sqldef.wasm loading time: fetch: %dms, instantiate: %dms, start: %dms",
+      t1 - t0,
+      t2 - t1,
+      t3 - t2
+    );
+
+    SQLDEF = globalThis._SQLDEF;
+  } finally {
+    isLoading = false;
+  }
+
   return SQLDEF;
 };
 
-export async function sqldef(dbType, desiredDDLs, currentDDLs, enableDrop = false) {
+export async function sqldef(
+  dbType,
+  desiredDDLs,
+  currentDDLs,
+  enableDrop = false
+) {
   if (typeof WebAssembly === "undefined") {
     throw new Error("WebAssembly is not supported in your browser");
   }
 
-  const SQLDEF = await getInstance();
+  const sqldef = await getInstance();
 
   return new Promise((resolve, reject) => {
-    SQLDEF.diff(dbType, desiredDDLs, currentDDLs, enableDrop, (err, ret) => {
+    sqldef.diff(dbType, desiredDDLs, currentDDLs, enableDrop, (err, ret) => {
       if (err) {
         return reject(new Error(err));
       }
@@ -38,12 +66,7 @@ export async function sqldef(dbType, desiredDDLs, currentDDLs, enableDrop = fals
   });
 }
 
-export async function getVersion() {
-  const SQLDEF = await getInstance();
-  return SQLDEF.getVersion();
-}
-
-export async function getRevision() {
-  const SQLDEF = await getInstance();
-  return SQLDEF.getRevision();
+export async function getFullVersion() {
+  const sqldef = await getInstance();
+  return sqldef.getFullVersion();
 }