custom database constructor and export FS api

Author: phiresky

.gitignore

@@ -1,3 +1,3 @@
 /node_modules
 /dist
-/data
+/data

sql.js/Makefile

@@ -21,6 +21,8 @@ CFLAGS = \
 	-O2 \
 	-DSQLITE_OMIT_LOAD_EXTENSION \
 	-DSQLITE_DISABLE_LFS \
+	-DSQLITE_ENABLE_FTS3 \
+	-DSQLITE_ENABLE_FTS3_PARENTHESIS \
 	-DSQLITE_ENABLE_FTS5 \
 	-DSQLITE_ENABLE_JSON1 \
 	-DSQLITE_THREADSAFE=0 \

sql.js/dist/.npmignore

@@ -0,0 +1 @@
+.gitignore

sql.js/src/api.js

@@ -324,7 +324,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
         }
         return true;
     };
-    Statement.prototype["bind2"] = Statement.prototype.bind; // https://github.com/GoogleChromeLabs/comlink/blob/4ba8162f6c28fb1bf53b491565ef9a3ae42b72d3/src/comlink.ts#L432
+    Statement.prototype["bind_"] = Statement.prototype.bind; // work around https://github.com/GoogleChromeLabs/comlink/blob/4ba8162f6c28fb1bf53b491565ef9a3ae42b72d3/src/comlink.ts#L432
 
     /** Execute the statement, fetching the the next line of result,
     that can be retrieved with {@link Statement.get}.
@@ -792,7 +792,6 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
         if (data != null) {
             FS.createDataFile("/", this.filename, data, true, true);
         }
-        const READONLY = 1;
         const ret = sqlite3_open(this.filename, apiTemp);
         this.db = getValue(apiTemp, "i32");
         this.handleError(ret);
@@ -803,24 +802,10 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
         // (created by create_function call)
         this.functions = {};
     }
-    function VfsDatabase(filename, vfs) {
-        this.filename = filename;
-        const READONLY = 1;
-        const ret = sqlite3_open_v2(this.filename, apiTemp, 1, vfs);
-        this.db = getValue(apiTemp, "i32");
-        this.handleError(ret);
-        registerExtensionFunctions(this.db);
-        // A list of all prepared statements of the database
-        this.statements = {};
-        // A list of all user function of the database
-        // (created by create_function call)
-        this.functions = {};
-    }
 
-    function UrlDatabase(filename, lazyFile) {
+    function CustomDatabase(filename) {
         this.filename = filename;
-        this.lazyFile = lazyFile;
-        const ret = sqlite3_open(this.filename, apiTemp, 1, null);
+        const ret = sqlite3_open(this.filename, apiTemp);
         this.db = getValue(apiTemp, "i32");
         this.handleError(ret);
         registerExtensionFunctions(this.db);
@@ -1231,9 +1216,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
 
     // export Database to Module
     Module.Database = Database;
-    Module["VfsDatabase"] = VfsDatabase;
-    Module["UrlDatabase"] = UrlDatabase;
+    Module["CustomDatabase"] = CustomDatabase;
     Module["FS"] = FS;
-    VfsDatabase.prototype = Object.create(Database.prototype);
-    UrlDatabase.prototype = Object.create(Database.prototype);
+    CustomDatabase.prototype = Object.create(Database.prototype);
 };

sql.js/src/exported_functions.json

@@ -2,7 +2,6 @@
 "_malloc",
 "_free",
 "_sqlite3_open",
-"_sqlite3_open_v2",
 "_sqlite3_exec",
 "_sqlite3_free",
 "_sqlite3_errmsg",
@@ -42,6 +41,5 @@
 "_sqlite3_result_int",
 "_sqlite3_result_int64",
 "_sqlite3_result_error",
-"_sqlite3_vfs_register",
 "_RegisterExtensionFunctions"
 ]