Feat/Full text search

Makefile

@@ -104,6 +104,7 @@ WASQLITE_DEFINES = \
 	-DSQLITE_THREADSAFE=0 \
 	-DSQLITE_USE_ALLOCA \
 	-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE \
+	-DSQLITE_ENABLE_FTS5 \
 	$(WASQLITE_EXTRA_DEFINES)
 
 # directories
@@ -112,11 +113,11 @@ all: dist
 
 .PHONY: clean
 clean:
-	rm -rf dist dist-xl debug tmp
+	rm -rf dist debug tmp
 
 .PHONY: spotless
 spotless:
-	rm -rf dist dist-xl debug tmp deps cache
+	rm -rf dist debug tmp deps cache
 
 ## cache
 .PHONY: clean-cache
@@ -194,6 +195,27 @@ debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTION
 		$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
 	  $(OBJ_FILES_DEBUG) *.o -o $@
 
+## Debug FTS builds
+# .PHONY: debug
+# debug: debug/wa-sqlite.mjs debug/wa-sqlite-async.mjs
+
+# debug/wa-sqlite.mjs: $(OBJ_FILES_DEBUG_FTS) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
+# 	mkdir -p debug
+# 	$(EMCC) $(EMFLAGS_DEBUG) \
+# 	  $(EMFLAGS_INTERFACES) \
+# 	  $(EMFLAGS_LIBRARIES) \
+# 		$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
+# 	  $(OBJ_FILES_DEBUG_FTS) *.o -o $@
+
+# debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG_FTS) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
+# 	mkdir -p debug
+# 	$(EMCC) $(EMFLAGS_DEBUG) \
+# 	  $(EMFLAGS_INTERFACES) \
+# 	  $(EMFLAGS_LIBRARIES) \
+# 	  $(EMFLAGS_ASYNCIFY_DEBUG) \
+# 		$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
+# 	  $(OBJ_FILES_DEBUG_FTS) *.o -o $@
+
 ## dist
 .PHONY: clean-dist
 clean-dist:
@@ -220,4 +242,32 @@ dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTION
 		$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
 	  $(OBJ_FILES_DIST)  -o $@
 
-FORCE: ;
+FORCE: ;
+
+# FTS builds
+# .PHONY: clean-dist
+# clean-dist:
+# 	rm -rf dist
+
+# .PHONY: dist
+# dist: dist/wa-sqlite.mjs dist/wa-sqlite-async.mjs
+
+# dist/wa-sqlite.mjs: $(OBJ_FILES_DIST_FTS) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
+# 	mkdir -p dist
+# 	$(EMCC) $(EMFLAGS_DIST) \
+# 	  $(EMFLAGS_INTERFACES) \
+# 	  $(EMFLAGS_LIBRARIES) \
+# 		$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
+# 	  $(OBJ_FILES_DIST_FTS)  -o $@
+
+# dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST_FTS) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
+# 	mkdir -p dist
+# 	$(EMCC) $(EMFLAGS_DIST) \
+# 	  $(EMFLAGS_INTERFACES) \
+# 	  $(EMFLAGS_LIBRARIES) \
+# 	  $(EMFLAGS_ASYNCIFY_DIST) \
+# 		$(CFLAGS_DIST) \
+# 		$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
+# 	  $(OBJ_FILES_DIST_FTS)  -o $@
+
+# FORCE: ;

README.md

@@ -51,7 +51,7 @@ git submodule init
 ```
 
 ```bash
-git submodule update --recursive
+git submodule update --init --recursive
 ```
 
 ```bash

scripts/docker-setup.sh

@@ -1,6 +1,7 @@
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-source ~/.bashrc
-rustup component add rust-src --toolchain nightly-2023-08-28-aarch64-unknown-linux-gnu -y
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
+. $HOME/.cargo/env && \
+rustup toolchain install nightly-2023-08-28-aarch64-unknown-linux-gnu && \
+rustup component add rust-src --toolchain nightly-2023-08-28-aarch64-unknown-linux-gnu
 
 sudo apt-get update -y
 sudo apt-get install -y tclsh

src/types/index.d.ts

@@ -1692,4 +1692,4 @@ declare module 'wa-sqlite/src/examples/tag.js' {
    * @returns {function(TemplateStringsArray, ...any): Promise<object[]>}
    */
   export function tag(sqlite3: any, db: number): (arg0: TemplateStringsArray, ...args: any[]) => Promise<object[]>;
-}
+}