Rename system library files from library_foo.js to libfoo.js

At the same time, move all the library file into a separate `src/lib` directory. This helps distinguish library files from other files in the `lib` directory, which is currently very overcrowded/overloaded. These files were also includ-able via `-lfoo` and we previously had to use a special case for system libraries where `library_foo.js` could be used in addition to more standed `libfoo.js`. This change removes to special case. This only file that was not renamed using the simple pattern was `library.py` itself which becomes `libcore.py`. I also considered `libemscripten.js`. To some this may seem like needless churn, but for years now the `src` directory (IMHO) has been asking for cleanup. I think having files logically separated into directories helps a lot with understanding the project structure for both newcomers and old timers alike. As a followup, I am also considering moving all the runtime files into `src/include` (since these are all files that get `#included` into the generated code directly. That would leave the `src` directory containing only the JS compiler code itself which I think is another important distinction.
emscripten-core · Jan 17, 2025 · 31a7e36 · 31a7e36
1 parent 186cae3
commit 31a7e36
Show file tree

Hide file tree

Showing 90 changed files with 212 additions and 155 deletions.
diff --git a/emcc.py b/emcc.py
@@ -1310,7 +1310,7 @@ def consume_arg_file():
         options.memory_profiler = True
       newargs[i] = ''
       settings_changes.append('EMSCRIPTEN_TRACING=1')
-      settings.JS_LIBRARIES.append('library_trace.js')
+      settings.JS_LIBRARIES.append('libtrace.js')
     elif check_flag('--emit-symbol-map'):
       options.emit_symbol_map = True
       settings.EMIT_SYMBOL_MAP = 1

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -26,7 +26,7 @@ export default [{
     '**/third_party/',
     '**/test/',
     'src/polyfill/',
-    'src/library*.js',
+    'src/lib/',
     'src/runtime_*.js',
     'src/shell*.js',
     'src/preamble*.js',

diff --git a/src/jsifier.mjs b/src/jsifier.mjs
@@ -585,7 +585,7 @@ function(${args}) {
           return dep();
         }
         // $noExitRuntime is special since there are conditional usages of it
-        // in library.js and library_pthread.js.  These happen before deps are
+        // in libcore.js and libpthread.js.  These happen before deps are
         // processed so depending on it via `__deps` doesn't work.
         if (dep === '$noExitRuntime') {
           error(

diff --git a/src/library_addfunction.js → src/lib/libaddfunction.js b/src/library_addfunction.js → src/lib/libaddfunction.js
diff --git a/src/library_async.js → src/lib/libasync.js b/src/library_async.js → src/lib/libasync.js
diff --git a/src/library_atomic.js → src/lib/libatomic.js b/src/library_atomic.js → src/lib/libatomic.js
diff --git a/src/library_autodebug.js → src/lib/libautodebug.js b/src/library_autodebug.js → src/lib/libautodebug.js
diff --git a/src/library_bootstrap.js → src/lib/libbootstrap.js b/src/library_bootstrap.js → src/lib/libbootstrap.js
@@ -8,7 +8,7 @@
 // it itself depends on the struct info information.
 
 #if !BOOTSTRAPPING_STRUCT_INFO
-assert(false, "library_bootstrap.js only designed for use with BOOTSTRAPPING_STRUCT_INFO")
+assert(false, "libbootstrap.js only designed for use with BOOTSTRAPPING_STRUCT_INFO")
 #endif
 
 assert(Object.keys(LibraryManager.library).length === 0);

diff --git a/src/library_browser.js → src/lib/libbrowser.js b/src/library_browser.js → src/lib/libbrowser.js
@@ -203,7 +203,7 @@ var LibraryBrowser = {
           alpha: false,
 #if MIN_WEBGL_VERSION >= 2
           majorVersion: 2,
-#elif MAX_WEBGL_VERSION >= 2 // library_browser.js defaults: use the WebGL version chosen at compile time (unless overridden below)
+#elif MAX_WEBGL_VERSION >= 2 // libbrowser.js defaults: use the WebGL version chosen at compile time (unless overridden below)
           majorVersion: (typeof WebGL2RenderingContext != 'undefined') ? 2 : 1,
 #else
           majorVersion: 1,

diff --git a/src/library_c_preprocessor.js → src/lib/libc_preprocessor.js b/src/library_c_preprocessor.js → src/lib/libc_preprocessor.js
diff --git a/src/library_ccall.js → src/lib/libccall.js b/src/library_ccall.js → src/lib/libccall.js
diff --git a/src/library.js → src/lib/libcore.js b/src/library.js → src/lib/libcore.js
diff --git a/src/library_dylink.js → src/lib/libdylink.js b/src/library_dylink.js → src/lib/libdylink.js
diff --git a/src/library_egl.js → src/lib/libegl.js b/src/library_egl.js → src/lib/libegl.js
diff --git a/src/embind/embind.js → src/lib/libembind.js b/src/embind/embind.js → src/lib/libembind.js
@@ -25,7 +25,7 @@
 /*global throwInstanceAlreadyDeleted, shallowCopyInternalPointer*/
 /*global RegisteredPointer_fromWireType, constNoSmartPtrRawPointerToWireType, nonConstNoSmartPtrRawPointerToWireType, genericPointerToWireType*/
 
-#include "embind_shared.js"
+#include "libembind_shared.js"
 
 var LibraryEmbind = {
   $UnboundTypeError__postset: "UnboundTypeError = Module['UnboundTypeError'] = extendError(Error, 'UnboundTypeError');",

diff --git a/src/embind/embind_gen.js → src/lib/libembind_gen.js b/src/embind/embind_gen.js → src/lib/libembind_gen.js
@@ -2,7 +2,7 @@
 // Emscripten is available under two separate licenses, the MIT license and the
 // University of Illinois/NCSA Open Source License.  Both these licenses can be
 // found in the LICENSE file.
-#include "embind_shared.js"
+#include "libembind_shared.js"
 
 var LibraryEmbind = {
 

diff --git a/src/embind/embind_shared.js → src/lib/libembind_shared.js b/src/embind/embind_shared.js → src/lib/libembind_shared.js
diff --git a/src/embind/emval.js → src/lib/libemval.js b/src/embind/emval.js → src/lib/libemval.js
diff --git a/src/library_eventloop.js → src/lib/libeventloop.js b/src/library_eventloop.js → src/lib/libeventloop.js
diff --git a/src/library_exceptions.js → src/lib/libexceptions.js b/src/library_exceptions.js → src/lib/libexceptions.js
diff --git a/src/library_exceptions_stub.js → src/lib/libexceptions_stub.js b/src/library_exceptions_stub.js → src/lib/libexceptions_stub.js
diff --git a/src/library_exports.js → src/lib/libexports.js b/src/library_exports.js → src/lib/libexports.js
diff --git a/src/library_fetch.js → src/lib/libfetch.js b/src/library_fetch.js → src/lib/libfetch.js
diff --git a/src/library_fetchfs.js → src/lib/libfetchfs.js b/src/library_fetchfs.js → src/lib/libfetchfs.js
diff --git a/src/library_formatString.js → src/lib/libformatString.js b/src/library_formatString.js → src/lib/libformatString.js
diff --git a/src/library_fs.js → src/lib/libfs.js b/src/library_fs.js → src/lib/libfs.js
@@ -12,19 +12,19 @@ addToLibrary({
     '$intArrayFromString',
     '$stringToUTF8Array',
     '$lengthBytesUTF8',
-#if LibraryManager.has('library_idbfs.js')
+#if LibraryManager.has('libidbfs.js')
     '$IDBFS',
 #endif
-#if LibraryManager.has('library_nodefs.js')
+#if LibraryManager.has('libnodefs.js')
     '$NODEFS',
 #endif
-#if LibraryManager.has('library_workerfs.js')
+#if LibraryManager.has('libworkerfs.js')
     '$WORKERFS',
 #endif
-#if LibraryManager.has('library_noderawfs.js')
+#if LibraryManager.has('libnoderawfs.js')
     '$NODERAWFS',
 #endif
-#if LibraryManager.has('library_proxyfs.js')
+#if LibraryManager.has('libproxyfs.js')
     '$PROXYFS',
 #endif
 #if ASSERTIONS
@@ -1510,16 +1510,16 @@ FS.staticInit();
 
       FS.filesystems = {
         'MEMFS': MEMFS,
-#if LibraryManager.has('library_idbfs.js')
+#if LibraryManager.has('libidbfs.js')
         'IDBFS': IDBFS,
 #endif
-#if LibraryManager.has('library_nodefs.js')
+#if LibraryManager.has('libnodefs.js')
         'NODEFS': NODEFS,
 #endif
-#if LibraryManager.has('library_workerfs.js')
+#if LibraryManager.has('libworkerfs.js')
         'WORKERFS': WORKERFS,
 #endif
-#if LibraryManager.has('library_proxyfs.js')
+#if LibraryManager.has('libproxyfs.js')
         'PROXYFS': PROXYFS,
 #endif
       };

diff --git a/src/library_fs_shared.js → src/lib/libfs_shared.js b/src/library_fs_shared.js → src/lib/libfs_shared.js
@@ -13,7 +13,7 @@ addToLibrary({
   $FS_handledByPreloadPlugin__internal: true,
   $FS_handledByPreloadPlugin__deps: ['$preloadPlugins'],
   $FS_handledByPreloadPlugin: (byteArray, fullname, finish, onerror) => {
-#if LibraryManager.has('library_browser.js')
+#if LibraryManager.has('libbrowser.js')
     // Ensure plugins are ready.
     if (typeof Browser != 'undefined') Browser.init();
 #endif

diff --git a/src/library_getvalue.js → src/lib/libgetvalue.js b/src/library_getvalue.js → src/lib/libgetvalue.js
diff --git a/src/library_glemu.js → src/lib/libglemu.js b/src/library_glemu.js → src/lib/libglemu.js
diff --git a/src/library_glew.js → src/lib/libglew.js b/src/library_glew.js → src/lib/libglew.js
diff --git a/src/library_glfw.js → src/lib/libglfw.js b/src/library_glfw.js → src/lib/libglfw.js
diff --git a/src/library_glut.js → src/lib/libglut.js b/src/library_glut.js → src/lib/libglut.js
diff --git a/src/library_html5.js → src/lib/libhtml5.js b/src/library_html5.js → src/lib/libhtml5.js
diff --git a/src/library_html5_webgl.js → src/lib/libhtml5_webgl.js b/src/library_html5_webgl.js → src/lib/libhtml5_webgl.js
@@ -626,7 +626,7 @@ function handleWebGLProxying(funcs) {
 
 handleWebGLProxying(LibraryHtml5WebGL);
 
-#if LibraryManager.has('library_webgl.js')
+#if LibraryManager.has('libwebgl.js')
 autoAddDeps(LibraryHtml5WebGL, '$GL');
 #endif
 

diff --git a/src/library_html5_webgpu.js → src/lib/libhtml5_webgpu.js b/src/library_html5_webgpu.js → src/lib/libhtml5_webgpu.js
diff --git a/src/library_icasefs.js → src/lib/libicasefs.js b/src/library_icasefs.js → src/lib/libicasefs.js
diff --git a/src/library_idbfs.js → src/lib/libidbfs.js b/src/library_idbfs.js → src/lib/libidbfs.js
diff --git a/src/library_idbstore.js → src/lib/libidbstore.js b/src/library_idbstore.js → src/lib/libidbstore.js
diff --git a/src/library_int53.js → src/lib/libint53.js b/src/library_int53.js → src/lib/libint53.js
diff --git a/src/library_jsfilefs.js → src/lib/libjsfilefs.js b/src/library_jsfilefs.js → src/lib/libjsfilefs.js
diff --git a/src/library_legacy.js → src/lib/liblegacy.js b/src/library_legacy.js → src/lib/liblegacy.js
diff --git a/src/library_little_endian_heap.js → src/lib/liblittle_endian_heap.js b/src/library_little_endian_heap.js → src/lib/liblittle_endian_heap.js
diff --git a/src/library_lz4.js → src/lib/liblz4.js b/src/library_lz4.js → src/lib/liblz4.js
diff --git a/src/library_math.js → src/lib/libmath.js b/src/library_math.js → src/lib/libmath.js
diff --git a/src/library_memfs.js → src/lib/libmemfs.js b/src/library_memfs.js → src/lib/libmemfs.js
diff --git a/src/library_memoryprofiler.js → src/lib/libmemoryprofiler.js b/src/library_memoryprofiler.js → src/lib/libmemoryprofiler.js
diff --git a/src/library_nodefs.js → src/lib/libnodefs.js b/src/library_nodefs.js → src/lib/libnodefs.js
diff --git a/src/library_nodepath.js → src/lib/libnodepath.js b/src/library_nodepath.js → src/lib/libnodepath.js
diff --git a/src/library_noderawfs.js → src/lib/libnoderawfs.js b/src/library_noderawfs.js → src/lib/libnoderawfs.js
diff --git a/src/library_openal.js → src/lib/libopenal.js b/src/library_openal.js → src/lib/libopenal.js
diff --git a/src/library_opfs.js → src/lib/libopfs.js b/src/library_opfs.js → src/lib/libopfs.js
diff --git a/src/library_path.js → src/lib/libpath.js b/src/library_path.js → src/lib/libpath.js
diff --git a/src/library_pipefs.js → src/lib/libpipefs.js b/src/library_pipefs.js → src/lib/libpipefs.js
diff --git a/src/library_promise.js → src/lib/libpromise.js b/src/library_promise.js → src/lib/libpromise.js
diff --git a/src/library_proxyfs.js → src/lib/libproxyfs.js b/src/library_proxyfs.js → src/lib/libproxyfs.js
diff --git a/src/library_pthread.js → src/lib/libpthread.js b/src/library_pthread.js → src/lib/libpthread.js
diff --git a/src/library_pthread_stub.js → src/lib/libpthread_stub.js b/src/library_pthread_stub.js → src/lib/libpthread_stub.js
diff --git a/src/library_sdl.js → src/lib/libsdl.js b/src/library_sdl.js → src/lib/libsdl.js
diff --git a/src/library_sigs.js → src/lib/libsigs.js b/src/library_sigs.js → src/lib/libsigs.js
diff --git a/src/library_sockfs.js → src/lib/libsockfs.js b/src/library_sockfs.js → src/lib/libsockfs.js
diff --git a/src/library_stack_trace.js → src/lib/libstack_trace.js b/src/library_stack_trace.js → src/lib/libstack_trace.js
diff --git a/src/library_strings.js → src/lib/libstrings.js b/src/library_strings.js → src/lib/libstrings.js
diff --git a/src/library_syscall.js → src/lib/libsyscall.js b/src/library_syscall.js → src/lib/libsyscall.js
diff --git a/src/library_time.js → src/lib/libtime.js b/src/library_time.js → src/lib/libtime.js
diff --git a/src/library_trace.js → src/lib/libtrace.js b/src/library_trace.js → src/lib/libtrace.js
diff --git a/src/library_tty.js → src/lib/libtty.js b/src/library_tty.js → src/lib/libtty.js
diff --git a/src/library_uuid.js → src/lib/libuuid.js b/src/library_uuid.js → src/lib/libuuid.js
diff --git a/src/library_wasi.js → src/lib/libwasi.js b/src/library_wasi.js → src/lib/libwasi.js
diff --git a/src/library_wasm_worker.js → src/lib/libwasm_worker.js b/src/library_wasm_worker.js → src/lib/libwasm_worker.js
diff --git a/src/library_wasmfs.js → src/lib/libwasmfs.js b/src/library_wasmfs.js → src/lib/libwasmfs.js
@@ -50,19 +50,19 @@ FS.init();
     '$FS_mkdirTree',
     '$FS_writeFile',
     '$FS_unlink',
-#if LibraryManager.has('library_icasefs.js')
+#if LibraryManager.has('libicasefs.js')
     '$ICASEFS',
 #endif
-#if LibraryManager.has('library_nodefs.js')
+#if LibraryManager.has('libnodefs.js')
     '$NODEFS',
 #endif
-#if LibraryManager.has('library_opfs.js')
+#if LibraryManager.has('libopfs.js')
     '$OPFS',
 #endif
-#if LibraryManager.has('library_jsfilefs.js')
+#if LibraryManager.has('libjsfilefs.js')
     '$JSFILEFS',
 #endif
-#if LibraryManager.has('library_fetchfs.js')
+#if LibraryManager.has('libfetchfs.js')
     '$FETCHFS',
 #endif
     'malloc',
@@ -482,7 +482,7 @@ FS.init();
   // need some specific FS_* operations. When the FS object is present, it calls
   // into those FS_* methods as needed.
   //
-  // In contrast, the old JS FS (library_fs.js) does the opposite: it puts all
+  // In contrast, the old JS FS (libfs.js) does the opposite: it puts all
   // things on the FS object, and copies them to FS_* methods for use from JS
   // library code. Given that the JS FS is implemented entirely in JS, that
   // makes sense there (as almost all that FS object ends up needed anyhow all

diff --git a/src/library_wasmfs_fetch.js → src/lib/libwasmfs_fetch.js b/src/library_wasmfs_fetch.js → src/lib/libwasmfs_fetch.js
diff --git a/src/library_wasmfs_js_file.js → src/lib/libwasmfs_js_file.js b/src/library_wasmfs_js_file.js → src/lib/libwasmfs_js_file.js
diff --git a/src/library_wasmfs_jsimpl.js → src/lib/libwasmfs_jsimpl.js b/src/library_wasmfs_jsimpl.js → src/lib/libwasmfs_jsimpl.js
diff --git a/src/library_wasmfs_node.js → src/lib/libwasmfs_node.js b/src/library_wasmfs_node.js → src/lib/libwasmfs_node.js
diff --git a/src/library_wasmfs_opfs.js → src/lib/libwasmfs_opfs.js b/src/library_wasmfs_opfs.js → src/lib/libwasmfs_opfs.js
diff --git a/src/library_webaudio.js → src/lib/libwebaudio.js b/src/library_webaudio.js → src/lib/libwebaudio.js
diff --git a/src/library_webgl.js → src/lib/libwebgl.js b/src/library_webgl.js → src/lib/libwebgl.js
diff --git a/src/library_webgl2.js → src/lib/libwebgl2.js b/src/library_webgl2.js → src/lib/libwebgl2.js
diff --git a/src/library_webgpu.js → src/lib/libwebgpu.js b/src/library_webgpu.js → src/lib/libwebgpu.js
diff --git a/src/library_websocket.js → src/lib/libwebsocket.js b/src/library_websocket.js → src/lib/libwebsocket.js
diff --git a/src/library_wget.js → src/lib/libwget.js b/src/library_wget.js → src/lib/libwget.js
diff --git a/src/library_workerfs.js → src/lib/libworkerfs.js b/src/library_workerfs.js → src/lib/libworkerfs.js
diff --git a/src/library_xlib.js → src/lib/libxlib.js b/src/library_xlib.js → src/lib/libxlib.js