Added new files and cleaned up

Author: EngoDev

crates/spidermonkey-embedding-splicer/src/splice.rs

@@ -2,17 +2,17 @@ use std::path::PathBuf;
 use std::time::Instant;
 
 use anyhow::Result;
+use wasm_encoder::{Encode, Section};
+use wasmparser::ExternalKind;
+use wasmparser::MemArg;
+use wasmparser::Operator;
 use wirm::ir::function::{FunctionBuilder, FunctionModifier};
 use wirm::ir::id::{ExportsID, FunctionID, LocalID};
 use wirm::ir::module::Module;
 use wirm::ir::types::{BlockType, ElementItems, InstrumentationMode};
 use wirm::module_builder::AddLocal;
 use wirm::opcode::{Inject, InjectAt};
 use wirm::{DataType, Opcode};
-use wasm_encoder::{Encode, Section};
-use wasmparser::ExternalKind;
-use wasmparser::MemArg;
-use wasmparser::Operator;
 use wit_component::metadata::{decode, Bindgen};
 use wit_component::StringEncoding;
 use wit_parser::Resolve;
@@ -312,10 +312,7 @@ pub fn splice_bindings(
     wasm.push(section.id());
     section.encode(&mut wasm);
 
-    eprintln!(
-        "trace(splice:total): {} ms",
-        t_total.elapsed().as_millis()
-    );
+    eprintln!("trace(splice:total): {} ms", t_total.elapsed().as_millis());
     Ok(SpliceResult {
         wasm,
         exports: componentized
@@ -443,7 +440,9 @@ pub fn splice(
                     exports_cnt = s.count();
                     section_sizes.push(("export".into(), range.end - range.start));
                 }
-                Ok(StartSection { range, .. }) => section_sizes.push(("start".into(), range.end - range.start)),
+                Ok(StartSection { range, .. }) => {
+                    section_sizes.push(("start".into(), range.end - range.start))
+                }
                 Ok(ElementSection(s)) => {
                     let range = s.range();
                     section_sizes.push(("element".into(), range.end - range.start));
@@ -461,8 +460,8 @@ pub fn splice(
                     custom_sections += 1;
                     section_sizes.push((format!("custom:{name}"), size));
                 }
-                Ok(Version { .. }) | Ok(End(_)) => {},
-                Ok(_) => {},
+                Ok(Version { .. }) | Ok(End(_)) => {}
+                Ok(_) => {}
                 Err(_) => {}
             }
         }
@@ -479,7 +478,12 @@ pub fn splice(
         // Top 5 largest sections
         section_sizes.sort_by(|a, b| b.1.cmp(&a.1));
         for (i, (name, sz)) in section_sizes.iter().take(5).enumerate() {
-            eprintln!("trace(wasm-splice:scan-top{}): {} bytes [{}]", i + 1, sz, name);
+            eprintln!(
+                "trace(wasm-splice:scan-top{}): {} bytes [{}]",
+                i + 1,
+                sz,
+                name
+            );
         }
     }
 
@@ -992,23 +996,17 @@ fn synthesize_import_functions(
                 .instructions
                 .add_instr(table_instr_idx, Operator::I32Add);
         }
-        builder
-            .body
-            .instructions
-            .add_instr(
-                table_instr_idx,
-                Operator::LocalGet {
-                    local_index: *arg_idx,
-                },
-            );
+        builder.body.instructions.add_instr(
+            table_instr_idx,
+            Operator::LocalGet {
+                local_index: *arg_idx,
+            },
+        );
         builder
             .body
             .instructions
             .add_instr(table_instr_idx, Operator::I32Add);
-        builder
-            .body
-            .instructions
-            .finish_instr(table_instr_idx);
+        builder.body.instructions.finish_instr(table_instr_idx);
         eprintln!(
             "trace(wasm-splice:imports:fixup-get-import): {} ms",
             t_stage.elapsed().as_millis()

src/cli.js

@@ -6,55 +6,60 @@ import { writeFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 
 export async function componentizeCmd(jsSource, opts) {
-  const { component } = await componentize({
-    sourcePath: jsSource,
-    witPath: resolve(opts.wit),
-    worldName: opts.worldName,
-    runtimeArgs: opts.runtimeArgs,
-    disableFeatures: opts.disable,
-    preview2Adapter: opts.preview2Adapter,
-    debugBindings: opts.debugBindings,
-    debugBuild: opts.useDebugBuild,
-    enableWizerLogging: opts.enableWizerLogging,
-  });
-  await writeFile(opts.out, component);
+	const { component } = await componentize({
+		sourcePath: jsSource,
+		witPath: resolve(opts.wit),
+		worldName: opts.worldName,
+		runtimeArgs: opts.runtimeArgs,
+		disableFeatures: opts.disable,
+		preview2Adapter: opts.preview2Adapter,
+		debugBindings: opts.debugBindings,
+		debugBuild: opts.useDebugBuild,
+		enableWizerLogging: opts.enableWizerLogging,
+		splicerBin: opts.splicerBin,
+	});
+	await writeFile(opts.out, component);
 }
 
 program
-  .version('0.19.1')
-  .description('Create a component from a JavaScript module')
-  .usage('<js-source> --wit wit-world.wit -o <component-path>')
-  .argument('<js-source>', 'JS source file to build')
-  .requiredOption('-w, --wit <path>', 'WIT path to build with')
-  .option('-n, --world-name <name>', 'WIT world to build')
-  .option('--runtime-args <string>', 'arguments to pass to the runtime')
-  .addOption(
-    new Option('-d, --disable <feature...>', 'disable WASI features').choices(
-      DEFAULT_FEATURES,
-    ),
-  )
-  .option(
-    '--preview2-adapter <adapter>',
-    'provide a custom preview2 adapter path',
-  )
-  .option('--use-debug-build', 'use a debug build of StarlingMonkey')
-  .option('--debug-bindings', 'enable debug logging for bindings generation')
-  .option(
-    '--enable-wizer-logging',
-    'enable debug logging for calls in the generated component',
-  )
-  .requiredOption('-o, --out <out>', 'output component file')
-  .action(asyncAction(componentizeCmd));
+	.version('0.19.1')
+	.description('Create a component from a JavaScript module')
+	.usage('<js-source> --wit wit-world.wit -o <component-path>')
+	.argument('<js-source>', 'JS source file to build')
+	.requiredOption('-w, --wit <path>', 'WIT path to build with')
+	.option('-n, --world-name <name>', 'WIT world to build')
+	.option('--runtime-args <string>', 'arguments to pass to the runtime')
+	.addOption(
+		new Option('-d, --disable <feature...>', 'disable WASI features').choices(
+			DEFAULT_FEATURES,
+		),
+	)
+	.option(
+		'--preview2-adapter <adapter>',
+		'provide a custom preview2 adapter path',
+	)
+	.option('--use-debug-build', 'use a debug build of StarlingMonkey')
+	.option('--debug-bindings', 'enable debug logging for bindings generation')
+	.option(
+		'--enable-wizer-logging',
+		'enable debug logging for calls in the generated component',
+	)
+	.option(
+		'--splicer-bin <binary_path>',
+		'use native CLI splicer for better performance',
+	)
+	.requiredOption('-o, --out <out>', 'output component file')
+	.action(asyncAction(componentizeCmd));
 
 program.showHelpAfterError();
 
 program.parse();
 
 function asyncAction(cmd) {
-  return function () {
-    const args = [...arguments];
-    (async () => {
-      await cmd.apply(null, args);
-    })();
-  };
+	return function () {
+		const args = [...arguments];
+		(async () => {
+			await cmd.apply(null, args);
+		})();
+	};
 }