Include wasm in js standalone if dynamically imported.

(cherry picked from commit 8a9ae88)

Author: woess

graal-js/mx.graal-js/mx_graal_js.py

@@ -480,6 +480,9 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
                                         'src', meta_pom.name, meta_pom.maven_group_id(), meta_pom.theLicense,
                                         isolate_build_options=isolate_build_options)
 
+def is_wasm_available():
+    return any(wasm_suite in mx.get_dynamic_imports() for wasm_suite in [('wasm', True), ('wasm-enterprise', True)])
+
 
 mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
     suite=_suite,
@@ -506,21 +509,25 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
     truffle_jars=[
         'graal-js:GRAALJS',
         'sdk:MAVEN_DOWNLOADER',
+        *(['wasm:WASM'] if is_wasm_available() else []),
     ],
     support_distributions=[
         'graal-js:GRAALJS_GRAALVM_SUPPORT',
     ],
     library_configs=[
         mx_sdk.LanguageLibraryConfig(
             launchers=['bin/<exe:js>'],
-            jar_distributions=['graal-js:GRAALJS_LAUNCHER'],
+            jar_distributions=[
+                'graal-js:GRAALJS_LAUNCHER',
+                *(['wasm:WASM'] if is_wasm_available() else [])
+            ],
             main_class='com.oracle.truffle.js.shell.JSLauncher',
             build_args=[],
             build_args_enterprise=[
                 '-H:+AuxiliaryEngineCache',
                 '-H:ReservedAuxiliaryImageBytes=2145482548',
             ] if not mx.is_windows() else [],
-            language='js'
+            language='js',
         )
     ],
     boot_jars=[],

graal-nodejs/mx.graal-nodejs/mx_graal_nodejs.py

@@ -36,7 +36,7 @@
 from mx_gate import Task
 from argparse import ArgumentParser
 from os.path import exists, join, isdir, pathsep, sep
-from mx_graal_js import get_jdk
+from mx_graal_js import get_jdk, is_wasm_available
 
 _suite = mx.suite('graal-nodejs')
 _current_os = mx.get_os()
@@ -616,9 +616,6 @@ def _prepare_svm_env():
 def mx_post_parse_cmd_line(args):
     mx_graal_nodejs_benchmark.register_nodejs_vms()
 
-def _is_wasm_available():
-    return any(wasm_suite in mx.get_dynamic_imports() for wasm_suite in [('wasm', True), ('wasm-enterprise', True)])
-
 mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
     suite=_suite,
     name='Graal.nodejs',
@@ -633,7 +630,7 @@ def _is_wasm_available():
     truffle_jars=[
         'graal-nodejs:TRUFFLENODE',
         'sdk:MAVEN_DOWNLOADER',
-        *(['wasm:WASM'] if _is_wasm_available() else []),
+        *(['wasm:WASM'] if is_wasm_available() else []),
     ],
     support_distributions=[
         'graal-nodejs:TRUFFLENODE_GRAALVM_SUPPORT',
@@ -651,13 +648,13 @@ def _is_wasm_available():
             destination='lib/<lib:graal-nodejs>',
             jar_distributions=[
                 'graal-nodejs:TRUFFLENODE',
-                *(['wasm:WASM'] if _is_wasm_available() else []),
+                *(['wasm:WASM'] if is_wasm_available() else []),
             ],
             build_args=[
                 '--tool:all',
                 '--language:nodejs',
                 '-Dgraalvm.libpolyglot=true',  # `lib:graal-nodejs` should be initialized like `lib:polyglot` (GR-10038)
-                *(['--language:wasm'] if _is_wasm_available() else []),
+                *(['--language:wasm'] if is_wasm_available() else []),
             ],
             build_args_enterprise=[
                 '-H:+AuxiliaryEngineCache',