From 52670d068fa69d3ff150450b2d582b64777c8cee Mon Sep 17 00:00:00 2001
From: Roy Hashimoto <roy@shoestringresearch.com>
Date: Wed, 8 Nov 2023 10:02:28 -0800
Subject: [PATCH 01/11] Add CFLAGS_EXTRA, EMFLAGS_EXTRA,
 WASQLITE_EXTRA_DEFINES.

---
 Makefile | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index f662f2de..97f2db28 100644
--- a/Makefile
+++ b/Makefile
@@ -37,29 +37,33 @@ OBJ_FILES_DIST = \
 
 EMCC ?= emcc
 
+CFLAGS_EXTRA=
 CFLAGS_COMMON = \
 	-I'deps/$(SQLITE_AMALGAMATION)' \
-	-Wno-non-literal-null-conversion
-
-CFLAGS_DEBUG = $(CFLAGS_COMMON) -g
-
-CFLAGS_DIST = $(CFLAGS_COMMON) -Oz -flto
+	-Wno-non-literal-null-conversion \
+	$(CFLAGS_EXTRA)
+CFLAGS_DEBUG = -g $(CFLAGS_COMMON)
+CFLAGS_DIST =  -Oz -flto $(CFLAGS_COMMON)
 
+EMFLAGS_EXTRA=
 EMFLAGS_COMMON = \
 	-s ALLOW_MEMORY_GROWTH=1 \
 	-s WASM=1 \
 	-s INVOKE_RUN \
 	-s ENVIRONMENT="web,worker" \
-	-s STACK_SIZE=512KB
+	-s STACK_SIZE=512KB \
+	$(EMFLAGS_EXTRA)
 
-EMFLAGS_DEBUG = $(EMFLAGS_COMMON) \
+EMFLAGS_DEBUG = \
 	-s ASSERTIONS=1 \
-	-g
+	-g \
+	$(EMFLAGS_COMMON)
 
-EMFLAGS_DIST = $(EMFLAGS_COMMON) \
+EMFLAGS_DIST = \
 	-Oz \
 	-flto \
-	--closure 1
+	--closure 1 \
+	$(EMFLAGS_COMMON)
 
 EMFLAGS_INTERFACES = \
 	-s EXPORTED_FUNCTIONS=@$(EXPORTED_FUNCTIONS) \
@@ -85,7 +89,8 @@ EMFLAGS_ASYNCIFY_DIST = \
 	-s ASYNCIFY_STACK_SIZE=16384
 
 # https://www.sqlite.org/compile.html
-WASQLITE_DEFINES ?= \
+WASQLITE_EXTRA_DEFINES=
+WASQLITE_DEFINES = \
 	-DSQLITE_DEFAULT_MEMSTATUS=0 \
 	-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
 	-DSQLITE_DQS=0 \
@@ -98,9 +103,10 @@ WASQLITE_DEFINES ?= \
 	-DSQLITE_OMIT_SHARED_CACHE \
 	-DSQLITE_THREADSAFE=0 \
 	-DSQLITE_USE_ALLOCA \
-	-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE
+	-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE \
+	$(WASQLITE_EXTRA_DEFINES)
 
-WASQLITE_KS_DEFINES ?= $(WASQLITE_DEFINES) \
+WASQLITE_KS_DEFINES = $(WASQLITE_DEFINES) \
   -DSQLITE_ENABLE_FTS5 \
   -DSQLITE_ENABLE_RTREE \
   -DSQLITE_ENABLE_EXPLAIN_COMMENTS \

From 8caaa09b6b1a0714cb4428b38aaaff04b51fe86c Mon Sep 17 00:00:00 2001
From: Roy Hashimoto <roy@shoestringresearch.com>
Date: Wed, 8 Nov 2023 13:23:20 -0800
Subject: [PATCH 02/11] Rework Makefile.

---
 Makefile | 157 +++++++++++--------------------------------------------
 1 file changed, 30 insertions(+), 127 deletions(-)

diff --git a/Makefile b/Makefile
index 97f2db28..109e4101 100644
--- a/Makefile
+++ b/Makefile
@@ -1,51 +1,44 @@
 # dependencies
-
-SQLITE_AMALGAMATION = sqlite-amalgamation-3440000
-SQLITE_AMALGAMATION_ZIP_URL = https://www.sqlite.org/2023/${SQLITE_AMALGAMATION}.zip
-SQLITE_AMALGAMATION_ZIP_SHA3 = 91b5884ad3dd634f84a0096751d6c36812542e1e0042ad7b2ba059e639921d7e
+SQLITE_VERSION = version-3.44.0
+SQLITE_TARBALL_URL = https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=${SQLITE_VERSION}
 
 EXTENSION_FUNCTIONS = extension-functions.c
 EXTENSION_FUNCTIONS_URL = https://www.sqlite.org/contrib/download/extension-functions.c?get=25
 EXTENSION_FUNCTIONS_SHA3 = ee39ddf5eaa21e1d0ebcbceeab42822dd0c4f82d8039ce173fd4814807faabfa
 
 # source files
+CFILES = \
+	sqlite3.c \
+	extension-functions.c \
+	libauthorizer.c \
+	libfunction.c \
+	libmodule.c \
+	libprogress.c \
+	libvfs.c \
+	$(CFILES_EXTRA)
+
+vpath %.c src
+vpath %.c deps
+vpath %.c deps/$(SQLITE_VERSION)
 
-LIBRARY_FILES = src/libauthorizer.js src/libfunction.js src/libmodule.js src/libprogress.js src/libvfs.js
 EXPORTED_FUNCTIONS = src/exported_functions.json
 EXPORTED_RUNTIME_METHODS = src/extra_exported_runtime_methods.json
 ASYNCIFY_IMPORTS = src/asyncify_imports.json
 
 # intermediate files
-
-OBJ_FILES_DEBUG = \
-	tmp/obj/debug/sqlite3.o tmp/obj/debug/extension-functions.o \
-	tmp/obj/debug/libauthorizer.o \
-	tmp/obj/debug/libfunction.o \
-	tmp/obj/debug/libmodule.o \
-	tmp/obj/debug/libprogress.o \
-	tmp/obj/debug/libvfs.o
-
-OBJ_FILES_DIST = \
-	tmp/obj/dist/sqlite3.o tmp/obj/dist/extension-functions.o \
-	tmp/obj/dist/libauthorizer.o \
-	tmp/obj/dist/libfunction.o \
-	tmp/obj/dist/libmodule.o \
-	tmp/obj/dist/libprogress.o \
-	tmp/obj/dist/libvfs.o
+OBJ_FILES_DEBUG = $(patsubst %.c,tmp/obj/debug/%.o,$(CFILES))
+OBJ_FILES_DIST = $(patsubst %.c,tmp/obj/dist/%.o,$(CFILES))
 
 # build options
-
 EMCC ?= emcc
 
-CFLAGS_EXTRA=
 CFLAGS_COMMON = \
-	-I'deps/$(SQLITE_AMALGAMATION)' \
+	-I'deps/$(SQLITE_VERSION)' \
 	-Wno-non-literal-null-conversion \
 	$(CFLAGS_EXTRA)
 CFLAGS_DEBUG = -g $(CFLAGS_COMMON)
 CFLAGS_DIST =  -Oz -flto $(CFLAGS_COMMON)
 
-EMFLAGS_EXTRA=
 EMFLAGS_COMMON = \
 	-s ALLOW_MEMORY_GROWTH=1 \
 	-s WASM=1 \
@@ -89,7 +82,6 @@ EMFLAGS_ASYNCIFY_DIST = \
 	-s ASYNCIFY_STACK_SIZE=16384
 
 # https://www.sqlite.org/compile.html
-WASQLITE_EXTRA_DEFINES=
 WASQLITE_DEFINES = \
 	-DSQLITE_DEFAULT_MEMSTATUS=0 \
 	-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
@@ -106,17 +98,6 @@ WASQLITE_DEFINES = \
 	-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE \
 	$(WASQLITE_EXTRA_DEFINES)
 
-WASQLITE_KS_DEFINES = $(WASQLITE_DEFINES) \
-  -DSQLITE_ENABLE_FTS5 \
-  -DSQLITE_ENABLE_RTREE \
-  -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
-  -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION \
-  -DSQLITE_ENABLE_STMTVTAB \
-  -DSQLITE_ENABLE_DBPAGE_VTAB \
-  -DSQLITE_ENABLE_DBSTAT_VTAB \
-  -DSQLITE_ENABLE_BYTECODE_VTAB \
-  -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
 # directories
 .PHONY: all
 all: dist
@@ -134,10 +115,6 @@ spotless:
 clean-cache:
 	rm -rf cache
 
-cache/$(SQLITE_AMALGAMATION).zip:
-	mkdir -p cache
-	curl -LsSf '$(SQLITE_AMALGAMATION_ZIP_URL)' -o $@
-
 cache/$(EXTENSION_FUNCTIONS):
 	mkdir -p cache
 	curl -LsSf '$(EXTENSION_FUNCTIONS_URL)' -o $@
@@ -148,15 +125,13 @@ clean-deps:
 	rm -rf deps
 
 .PHONY: deps
-deps: deps/$(SQLITE_AMALGAMATION) deps/$(EXTENSION_FUNCTIONS) deps/$(EXPORTED_FUNCTIONS)
+deps: deps/$(SQLITE_AMALGAMATION) deps/$(EXTENSION_FUNCTIONS)
 
-deps/$(SQLITE_AMALGAMATION): cache/$(SQLITE_AMALGAMATION).zip
-	mkdir -p deps
-	openssl dgst -sha3-256 -r cache/$(SQLITE_AMALGAMATION).zip | sed -e 's/\s.*//' > deps/sha3
-	echo $(SQLITE_AMALGAMATION_ZIP_SHA3) | cmp deps/sha3
-	rm -rf deps/sha3 $@
-	unzip 'cache/$(SQLITE_AMALGAMATION).zip' -d deps/
-	touch $@
+deps/$(SQLITE_VERSION)/sqlite3.h deps/$(SQLITE_VERSION)/sqlite3.c:
+	mkdir -p cache/$(SQLITE_VERSION)
+	curl -LsS $(SQLITE_TARBALL_URL) | tar -xzf - -C cache/$(SQLITE_VERSION)/ --strip-components=1
+	mkdir -p deps/$(SQLITE_VERSION)
+	(cd deps/$(SQLITE_VERSION); ../../cache/$(SQLITE_VERSION)/configure --enable-all && make sqlite3.c)
 
 deps/$(EXTENSION_FUNCTIONS): cache/$(EXTENSION_FUNCTIONS)
 	mkdir -p deps
@@ -170,61 +145,14 @@ deps/$(EXTENSION_FUNCTIONS): cache/$(EXTENSION_FUNCTIONS)
 clean-tmp:
 	rm -rf tmp
 
-tmp/obj/debug/sqlite3.o: deps/$(SQLITE_AMALGAMATION)
-	mkdir -p tmp/obj/debug
-	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^/sqlite3.c -c -o $@
-
-tmp/obj/debug/extension-functions.o: deps/$(EXTENSION_FUNCTIONS)
-	mkdir -p tmp/obj/debug
-	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/debug/libfunction.o: src/libfunction.c
-	mkdir -p tmp/obj/debug
-	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/debug/libauthorizer.o: src/libauthorizer.c
-	mkdir -p tmp/obj/debug
-	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/debug/libmodule.o: src/libmodule.c
-	mkdir -p tmp/obj/debug
-	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/debug/libprogress.o: src/libprogress.c
-	mkdir -p tmp/obj/debug
-	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/debug/libvfs.o: src/libvfs.c
+tmp/obj/debug/%.o: %.c
 	mkdir -p tmp/obj/debug
 	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
 
-tmp/obj/dist/sqlite3.o: deps/$(SQLITE_AMALGAMATION)
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^/sqlite3.c -c -o $@
-
-tmp/obj/dist/extension-functions.o: deps/$(EXTENSION_FUNCTIONS)
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/dist/libfunction.o: src/libfunction.c
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/dist/libauthorizer.o: src/libauthorizer.c
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/dist/libmodule.o: src/libmodule.c
+tmp/obj/dist/%.o: %.c
 	mkdir -p tmp/obj/dist
 	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
 
-tmp/obj/dist/libprogress.o: src/libprogress.c
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/dist/libvfs.o: src/libvfs.c
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
 
 ## debug
 .PHONY: clean-debug
@@ -234,14 +162,14 @@ clean-debug:
 .PHONY: debug
 debug: debug/wa-sqlite.mjs debug/wa-sqlite-async.mjs
 
-debug/wa-sqlite.mjs: $(OBJ_FILES_DEBUG) $(LIBRARY_FILES) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
+debug/wa-sqlite.mjs: $(OBJ_FILES_DEBUG) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
 	mkdir -p debug
 	$(EMCC) $(EMFLAGS_DEBUG) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
 	  $(OBJ_FILES_DEBUG) -o $@
 
-debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG) $(LIBRARY_FILES) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
+debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
 	mkdir -p debug
 	$(EMCC) $(EMFLAGS_DEBUG) \
 	  $(EMFLAGS_INTERFACES) \
@@ -257,42 +185,17 @@ clean-dist:
 .PHONY: dist
 dist: dist/wa-sqlite.mjs dist/wa-sqlite-async.mjs
 
-dist/wa-sqlite.mjs: $(OBJ_FILES_DIST) $(LIBRARY_FILES) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
+dist/wa-sqlite.mjs: $(OBJ_FILES_DIST) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
 	mkdir -p dist
 	$(EMCC) $(EMFLAGS_DIST) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
 	  $(OBJ_FILES_DIST) -o $@
 
-dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST) $(LIBRARY_FILES) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
+dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
 	mkdir -p dist
 	$(EMCC) $(EMFLAGS_DIST) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
 	  $(EMFLAGS_ASYNCIFY_DIST) \
 	  $(OBJ_FILES_DIST) -o $@
-
-# dist-xl
-.PHONY: clean-dist-xl
-clean-dist-xl:
-	rm -f dist-xl.zip
-	rm -rf dist-xl
-
-.PHONY: dist-xl
-dist-xl: dist-xl/wa-sqlite.mjs dist-xl/wa-sqlite-async.mjs
-	zip -r dist-xl dist-xl/
-	
-dist-xl/wa-sqlite.mjs: deps/$(SQLITE_AMALGAMATION)/sqlite3.c deps/$(EXTENSION_FUNCTIONS) src/*.c
-	mkdir -p dist-xl
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_KS_DEFINES) $(EMFLAGS_DIST) \
-	  $(EMFLAGS_INTERFACES) \
-	  $(EMFLAGS_LIBRARIES) \
-	  $^ -o $@
-
-dist-xl/wa-sqlite-async.mjs: deps/$(SQLITE_AMALGAMATION)/sqlite3.c deps/$(EXTENSION_FUNCTIONS) src/*.c
-	mkdir -p dist-xl
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_KS_DEFINES) $(EMFLAGS_DIST) \
-	  $(EMFLAGS_INTERFACES) \
-	  $(EMFLAGS_LIBRARIES) \
-	  $(EMFLAGS_ASYNCIFY_DIST) \
-	  $^ -o $@

From 17fae7aaacc50c99d6bb8f8a40a7f25b6b282671 Mon Sep 17 00:00:00 2001
From: Roy Hashimoto <roy@shoestringresearch.com>
Date: Wed, 8 Nov 2023 15:48:26 -0800
Subject: [PATCH 03/11] Update README.md.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 57e74a59..77d833c8 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ If you do want to build - e.g. you want to change build flags, use a specific EM
 * Building on Debian Linux is known to work, compatibility with other platforms is unknown.
 * `yarn` - If you use a different package manager (e.g. `npm`) then file paths in the demo will need adjustment.
 * [Emscripten SDK](https://emscripten.org/docs/getting_started/downloads.html) 3.1.25+.
-* `curl`, `make`, `openssl`, `sed`, `unzip`
+* `curl`, `make`, `openssl`, `sed`, `tclsh`, `unzip`
 
 Here are the build steps:
 * Make sure `emcc` works.

From 76d83eba6ec7f2e73e57a294b1bebd917be6bf30 Mon Sep 17 00:00:00 2001
From: Roy Hashimoto <roy@shoestringresearch.com>
Date: Fri, 10 Nov 2023 13:51:11 -0800
Subject: [PATCH 04/11] Add fetch URL to file demo.

---
 demo/file/index.html | 10 +++++---
 demo/file/index.js   | 56 ++++++++++++++++++++++++++++++++++----------
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/demo/file/index.html b/demo/file/index.html
index b73998bb..02ea8fd7 100644
--- a/demo/file/index.html
+++ b/demo/file/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>Local file transfer</title>
+  <title>wa-sqlite import/export</title>
   <style>
     button { margin-top: 1em; }
     pre { margin: 0 }
@@ -12,10 +12,14 @@
 <body>
   <h1>Sample database import/export</h1>
   <div>
-    <input type="file" id="file-import">
+    Import from local file <input type="file" id="file-import">
   </div>
   <div>
-    <button id="file-export" disabled>Download</button>
+    URL: <input type="text" id="file-url" size="40">
+    <button id="file-fetch">Import from URL</button>
+  </div>
+  <div>
+    <button id="file-export" disabled>Export to local file</button>
     <a id="file-download" hidden></a>
   </div>
   <hr>
diff --git a/demo/file/index.js b/demo/file/index.js
index b2ac3b5e..0a5c6ca7 100644
--- a/demo/file/index.js
+++ b/demo/file/index.js
@@ -39,6 +39,32 @@ document.getElementById('file-export').addEventListener('click', async () => {
   a.click();
 });
 
+document.getElementById('file-fetch').addEventListener('click', async () => {
+  let vfs;
+  try {
+    log(`Importing to IndexedDB ${IDB_NAME}, path ${DB_NAME}`);
+    vfs = new IDBBatchAtomicVFS(IDB_NAME);
+
+    // @ts-ignore
+    const importURL = document.getElementById('file-url').value;
+    const response = await fetch(importURL);
+    await importDatabase(vfs, DB_NAME, response.body);
+
+    log('Import complete');
+
+    // Use a Worker to verify the database with SQLite.
+    log('Verifying database integrity');
+    await verify();
+    log('Verification complete');
+  } catch (e) {
+    log(e.toString());
+    throw e;
+  } finally {
+    vfs?.close();
+  }
+
+});
+
 document.getElementById('file-import').addEventListener('change', async event => {
   let vfs;
   try {
@@ -50,19 +76,7 @@ document.getElementById('file-import').addEventListener('change', async event =>
 
     // Use a Worker to verify the database with SQLite.
     log('Verifying database integrity');
-    const url = new URL('./verifier.js', location.href);
-    url.searchParams.set('idb', IDB_NAME);
-    url.searchParams.set('db', DB_NAME);
-    const worker = new Worker(url, { type: 'module' });
-    await new Promise(resolve => {
-      worker.addEventListener('message', ({data}) => {
-        resolve();
-        for (const row of data) {
-          log(`integrity result: ${row}`);
-        }
-        worker.terminate();
-      });
-    });
+    await verify();
     log('Verification complete');
   } catch (e) {
     log(e.toString());
@@ -186,6 +200,22 @@ async function importDatabase(vfs, path, stream) {
   }
 }
 
+async function verify() {
+  const verifierURL = new URL('./verifier.js', location.href);
+  verifierURL.searchParams.set('idb', IDB_NAME);
+  verifierURL.searchParams.set('db', DB_NAME);
+  const worker = new Worker(verifierURL, { type: 'module' });
+  await new Promise(resolve => {
+    worker.addEventListener('message', ({data}) => {
+      resolve();
+      for (const row of data) {
+        log(`integrity result: ${row}`);
+      }
+      worker.terminate();
+    });
+  });
+}
+
 function log(...args) {
   const timestamp = new Date().toLocaleTimeString(undefined, {
     hour12: false,

From 51e1283314a3b256f106c125de738245cae0953f Mon Sep 17 00:00:00 2001
From: Roy Hashimoto <roy@shoestringresearch.com>
Date: Fri, 10 Nov 2023 16:54:51 -0800
Subject: [PATCH 05/11] Avoid unnecessary buffer copies.

---
 demo/file/index.js | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/demo/file/index.js b/demo/file/index.js
index 0a5c6ca7..dfd60432 100644
--- a/demo/file/index.js
+++ b/demo/file/index.js
@@ -136,21 +136,29 @@ async function importDatabase(vfs, path, stream) {
       }
 
       // Assemble the page into a single Uint8Array.
-      // TODO: Optimize case where first chunk has >= pageSize bytes.
-      let copyOffset = 0;
-      const page = new Uint8Array(pageSize);
-      while (copyOffset < pageSize) {
-        // Copy bytes into the page.
-        const src = chunks[0].subarray(0, pageSize - copyOffset);
-        const dst = new Uint8Array(page.buffer, copyOffset);
-        dst.set(src);
-        copyOffset += src.byteLength;
-
-        if (src.byteLength === chunks[0].byteLength) {
-          // All the bytes in the chunk were consumed.
+      let page;
+      if (chunks[0]?.byteLength >= pageSize) {
+        // The first chunk contains the entire page.
+        page = chunks[0].subarray(0, pageSize);
+        chunks[0] = chunks[0].subarray(pageSize);
+        if (!chunks[0].byteLength) {
           chunks.shift();
-        } else {
+        }
+      } else {
+        // Multiple chunks are needed for the page.
+        let copyOffset = 0;
+        page = new Uint8Array(pageSize);
+        while (copyOffset < pageSize) {
+          // Copy bytes into the page.
+          const src = chunks[0].subarray(0, pageSize - copyOffset);
+          const dst = new Uint8Array(page.buffer, copyOffset);
+          dst.set(src);
+          copyOffset += src.byteLength;
+
           chunks[0] = chunks[0].subarray(src.byteLength);
+          if (!chunks[0].byteLength) {
+            chunks.shift();
+          }
         }
       }
 

From bde246959fa5beeabe0449829e1b60b4397724e2 Mon Sep 17 00:00:00 2001
From: Roy Hashimoto <roy@shoestringresearch.com>
Date: Sat, 11 Nov 2023 09:54:21 -0800
Subject: [PATCH 06/11] Fix #110. Ensure metadata is written on xSync.

---
 src/examples/IDBBatchAtomicVFS.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/examples/IDBBatchAtomicVFS.js b/src/examples/IDBBatchAtomicVFS.js
index ad0d70e7..9b5d6319 100644
--- a/src/examples/IDBBatchAtomicVFS.js
+++ b/src/examples/IDBBatchAtomicVFS.js
@@ -356,6 +356,13 @@ export class IDBBatchAtomicVFS extends VFS.Base {
     const file = this.#mapIdToFile.get(fileId);
     log(`xSync ${file.path} ${flags}`);
     try {
+      if (file.isMetadataChanged) {
+        // Metadata has changed so write block 0 to IndexedDB.
+        this.#idb.run('readwrite', async ({blocks}) => {
+          await blocks.put(file.block0);
+        }); 
+        file.isMetadataChanged = false;
+      }
       await this.#idb.sync();
     } catch (e) {
       console.error(e);
@@ -502,6 +509,7 @@ export class IDBBatchAtomicVFS extends VFS.Base {
             this.#idb.run('readwrite', async ({blocks}) => {
               await blocks.put(file.block0);
             });
+            file.isMetadataChanged = false;
           } catch (e) {
             console.error(e);
             return VFS.SQLITE_IOERR;

From 7a48dd77b34cf75cddf65b9d3fd105be63a214be Mon Sep 17 00:00:00 2001
From: Roy Hashimoto <156154+rhashimoto@users.noreply.github.com>
Date: Mon, 20 Nov 2023 14:17:14 -0800
Subject: [PATCH 07/11] Update README.md

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 77d833c8..a78bb2ca 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,9 @@ The primary motivation for this project is to enable additions to SQLite with on
 Note that earlier versions of the project only provided pre-built artifacts in the
 "buildless" branch; that branch will no longer be maintained.
 
-If you do want to build - e.g. you want to change build flags, use a specific EMSDK version, or modify wa-sqlite itself - here are the prerequisites:
+Minor build customization (e.g. changing build defines or flags) can be done with [make arguments](https://github.com/rhashimoto/wa-sqlite/discussions/128), and the helper project [sqwab](https://github.com/rhashimoto/sqwab) can be used to build without a local build environment.
+
+If you do want to build yourself, here are the prerequisites:
 
 * Building on Debian Linux is known to work, compatibility with other platforms is unknown.
 * `yarn` - If you use a different package manager (e.g. `npm`) then file paths in the demo will need adjustment.
@@ -74,4 +76,4 @@ For convenience, if any text region is selected in the editor, only that region
 ## License
 MIT License as of February 10, 2023, changed by generous sponsors
 [Fleet Device Management](https://fleetdm.com/) and [Reflect](https://reflect.app/).
-Existing licensees may continue under the GPLv3 or switch to the new license.
\ No newline at end of file
+Existing licensees may continue under the GPLv3 or switch to the new license.

From e7cf40297ceccaf72508c2df656114988f9dd9a0 Mon Sep 17 00:00:00 2001
From: Matt <1009003+tantaman@users.noreply.github.com>
Date: Mon, 27 Nov 2023 16:44:28 -0500
Subject: [PATCH 08/11] remove unneeded makefile line

---
 Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile b/Makefile
index babf35c4..92e49140 100644
--- a/Makefile
+++ b/Makefile
@@ -160,8 +160,6 @@ clean-deps:
 
 .PHONY: deps
 
-deps: deps/$(SQLITE_AMALGAMATION) deps/$(EXTENSION_FUNCTIONS)
-
 deps/$(SQLITE_VERSION)/sqlite3.h deps/$(SQLITE_VERSION)/sqlite3.c:
 	mkdir -p cache/$(SQLITE_VERSION)
 	curl -LsS $(SQLITE_TARBALL_URL) | tar -xzf - -C cache/$(SQLITE_VERSION)/ --strip-components=1

From ee2d4bac8c387805dbb244a060825a1341becd86 Mon Sep 17 00:00:00 2001
From: Matt <1009003+tantaman@users.noreply.github.com>
Date: Mon, 27 Nov 2023 16:55:59 -0500
Subject: [PATCH 09/11] add `dir.crsql` to include path

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 92e49140..60779011 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,8 @@ sqlite3.extra.c := deps/$(SQLITE_VERSION)/sqlite3-extra.c
 # build options
 EMCC ?= emcc
 
+CFLAGS_EXTRA = -I'$(dir.crsql)'
+
 CFLAGS_COMMON = \
 	-I'deps/$(SQLITE_VERSION)' \
 	-Wno-non-literal-null-conversion \

From ff8443ec3d17b466790197cffd54f47699dce195 Mon Sep 17 00:00:00 2001
From: Matt <1009003+tantaman@users.noreply.github.com>
Date: Mon, 27 Nov 2023 17:03:03 -0500
Subject: [PATCH 10/11] add `FORCE` palceholder

---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 60779011..c58921a5 100644
--- a/Makefile
+++ b/Makefile
@@ -214,7 +214,7 @@ debug/crsqlite-sync.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS)
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
 		$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
-	  $(OBJ_FILES_DEBUG) *.o -o $@
+	  $(OBJ_FILES_DEBUG) -o $@
 
 debug/crsqlite.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
 	mkdir -p debug
@@ -223,7 +223,7 @@ debug/crsqlite.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EX
 	  $(EMFLAGS_LIBRARIES) \
 	  $(EMFLAGS_ASYNCIFY_DEBUG) \
 		$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
-	  $(OBJ_FILES_DEBUG) *.o -o $@
+	  $(OBJ_FILES_DEBUG) -o $@
 
 ## dist
 .PHONY: clean-dist
@@ -233,13 +233,15 @@ clean-dist:
 .PHONY: dist
 dist: deps dist/crsqlite-sync.mjs dist/crsqlite.mjs
 
+FORCE: ;
+
 dist/crsqlite-sync.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
 	mkdir -p dist
 	$(EMCC) $(EMFLAGS_DIST) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
 		$(RS_WASM_TGT_DIR)/release/deps/*.bc \
-	  $(OBJ_FILES_DIST) *.o -o $@
+	  $(OBJ_FILES_DIST) -o $@
 
 dist/crsqlite.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
 	mkdir -p dist
@@ -248,5 +250,5 @@ dist/crsqlite.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EX
 	  $(EMFLAGS_LIBRARIES) \
 	  $(EMFLAGS_ASYNCIFY_DIST) \
 		$(RS_WASM_TGT_DIR)/release/deps/*.bc \
-	  $(OBJ_FILES_DIST) *.o -o $@
+	  $(OBJ_FILES_DIST) -o $@
 

From 57304906797e1dc05708132e00ad59dc1c83acbb Mon Sep 17 00:00:00 2001
From: Matt <1009003+tantaman@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:25:03 -0500
Subject: [PATCH 11/11] pre-release of next cr-sqlite build

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec097b4d..32b5a983 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @vlcn.io/wa-sqlite
 
+## 0.22.0-next.0
+
+### Minor Changes
+
+- v0.16.0-next
+
 ## 0.21.0
 
 ### Minor Changes
diff --git a/package.json b/package.json
index 4c49dac5..b532a542 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vlcn.io/wa-sqlite",
-  "version": "0.21.0",
+  "version": "0.22.0-next.0",
   "type": "module",
   "main": "src/sqlite-api.js",
   "types": "src/types/index.d.ts",