diff --git a/src/lib/libfetchfs.js b/src/lib/libfetchfs.js index ada91b2ec3860..2cdc9d4961c20 100644 --- a/src/lib/libfetchfs.js +++ b/src/lib/libfetchfs.js @@ -6,6 +6,7 @@ addToLibrary({ $FETCHFS__deps: ['wasmfs_create_fetch_backend'], + $FETCHFS__export: true, $FETCHFS: { createBackend(opts) { return withStackSave( diff --git a/src/lib/libicasefs.js b/src/lib/libicasefs.js index f765bd5a72437..a5a456a267b31 100644 --- a/src/lib/libicasefs.js +++ b/src/lib/libicasefs.js @@ -6,6 +6,7 @@ addToLibrary({ $ICASEFS__deps: ['wasmfs_create_icase_backend'], + $ICASEFS__export: true, $ICASEFS: { createBackend(opts) { if (typeof opts.backend === 'undefined') { diff --git a/src/lib/libidbfs.js b/src/lib/libidbfs.js index ecfc41e25547a..18221a9ebb1bc 100644 --- a/src/lib/libidbfs.js +++ b/src/lib/libidbfs.js @@ -10,6 +10,7 @@ addToLibrary({ $IDBFS_DB_STORE_NAME: 'FILE_DATA', }), $IDBFS__postset: () => addAtExit('IDBFS.quit();'), + $IDBFS__export: true, $IDBFS: { dbs: new Map(), indexedDB: () => { diff --git a/src/lib/libjsfilefs.js b/src/lib/libjsfilefs.js index fb9a18528612a..2abb94624822a 100644 --- a/src/lib/libjsfilefs.js +++ b/src/lib/libjsfilefs.js @@ -6,6 +6,7 @@ addToLibrary({ $JSFILEFS__deps: ['wasmfs_create_js_file_backend'], + $JSFILEFS__export: true, $JSFILEFS: { createBackend(opts) { return _wasmfs_create_js_file_backend(); diff --git a/src/lib/libnodefs.js b/src/lib/libnodefs.js index 55fd7c119990d..0170b2f0d9ae9 100644 --- a/src/lib/libnodefs.js +++ b/src/lib/libnodefs.js @@ -5,6 +5,9 @@ */ addToLibrary({ +#if !LibraryManager.has('libnoderawfs.js') + $NODEFS__export: true, +#endif #if WASMFS $NODEFS__deps: ['wasmfs_create_node_backend'], $NODEFS: { diff --git a/src/lib/libopfs.js b/src/lib/libopfs.js index ada924fa63fb7..325b24bee1b35 100644 --- a/src/lib/libopfs.js +++ b/src/lib/libopfs.js @@ -6,6 +6,7 @@ addToLibrary({ $OPFS__deps: ['wasmfs_create_opfs_backend'], + $OPFS__export: true, $OPFS: { createBackend(opts) { return _wasmfs_create_opfs_backend(); diff --git a/src/lib/libproxyfs.js b/src/lib/libproxyfs.js index 8131e95fdb833..4cf9488167f08 100644 --- a/src/lib/libproxyfs.js +++ b/src/lib/libproxyfs.js @@ -5,6 +5,7 @@ */ addToLibrary({ + $PROXYFS__export: true, $PROXYFS: { mount(mount) { return PROXYFS.createNode(null, '/', mount.opts.fs.lstat(mount.opts.root).mode, 0); diff --git a/src/lib/libworkerfs.js b/src/lib/libworkerfs.js index 2464ec1a630c9..414eec2c1fbc2 100644 --- a/src/lib/libworkerfs.js +++ b/src/lib/libworkerfs.js @@ -14,6 +14,7 @@ addToLibrary({ $WORKERFS_DIR_MODE: cDefs.S_IFDIR | cDefs.S_IRWXUGO, $WORKERFS_FILE_MODE: cDefs.S_IFREG | cDefs.S_IRWXUGO, }), + $WORKERFS__export: true, $WORKERFS: { reader: null, mount(mount) { diff --git a/test/test_core.py b/test/test_core.py index 1326b06395936..5d821e0ba7fe2 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -8712,18 +8712,24 @@ def test_memprof_requirements(self): ''') self.do_runf('hello_world.c', 'able to run memprof', cflags=['--memoryprofiler', '--pre-js=pre.js', '-sINCOMING_MODULE_JS_API=onRuntimeInitialized']) - @no_wasmfs('depends on MEMFS which WASMFS does not have') + @no_modularize_instance('uses Module object directly') + @no_wasmfs('IDBFS is not yet supported in WasmFS') def test_fs_dict(self): - self.set_setting('FORCE_FILESYSTEM') - create_file('pre.js', ''' - Module.preRun = () => { - out(typeof MEMFS); - out(typeof IDBFS); - out(typeof NODEFS); - }; - ''') - self.cflags += ['-lidbfs.js', '-lnodefs.js', '--pre-js', 'pre.js', '-sINCOMING_MODULE_JS_API=preRun'] - self.do_run('int main() { return 0; }', 'object\nobject\nobject') + self.do_run(''' + #include + + int main() { + EM_ASM({ + out(typeof Module['IDBFS']); + out(typeof Module['NODEFS']); + out(typeof Module['PROXYFS']); + out(typeof Module['WORKERFS']); + }); + return 0; + } + ''', 'object\nobject\nobject\nobject', + cflags=['-sFORCE_FILESYSTEM', '-sENVIRONMENT=web,worker,node', + '-lidbfs.js', '-lnodefs.js', '-lproxyfs.js', '-lworkerfs.js']) @no_wasmfs('depends on MEMFS which WASMFS does not have') def test_fs_dict_none(self):