refactor: accept object as input for wasm generate

Author: ilbertt

Cargo.lock

@@ -99,7 +99,10 @@ export async function generate(options: GenerateOptions) {
   await ensureDir(outDir);
   await ensureDir(resolve(outDir, 'declarations'));
 
-  const result = wasmGenerate(didFilePath, outputFileName);
+  const result = wasmGenerate({
+    did_file_path: didFilePath,
+    service_name: outputFileName,
+  });
 
   await writeBindings({
     bindings: result,

src/core/generate/index.ts

@@ -1,4 +1,4 @@
-import type { GenerateResult } from './rs/dist/icp-js-bindgen.d.ts';
+import type { GenerateOptions, GenerateResult } from './rs/dist/icp-js-bindgen.d.ts';
 import init, { generate, start } from './rs/dist/icp-js-bindgen.js';
 
 let initialized = false;
@@ -14,4 +14,5 @@ export async function wasmInit(...args: Parameters<typeof init>) {
 
 export const wasmStart = start;
 export const wasmGenerate = generate;
+export type WasmGenerateOptions = GenerateOptions;
 export type WasmGenerateResult = GenerateResult;

src/core/generate/rs.ts

@@ -24,4 +24,7 @@ console_error_panic_hook = "0.1"
 wasm-bindgen-console-logger = "0.1"
 log = "0.4"
 pretty = "0.12"
+serde = { version = "1.0", features = ["derive"] }
+serde-wasm-bindgen = "0.6"
+tsify = { version = "0.5", features = ["js"] }
 swc_core = { version = "44.0.0", features = ["common", "ecma_ast", "ecma_codegen"] }

src/core/generate/rs/Cargo.toml

@@ -4,6 +4,8 @@ mod parser;
 
 use std::path::PathBuf;
 
+use serde::Deserialize;
+use tsify::Tsify;
 use wasm_bindgen::prelude::*;
 
 use crate::bindings::{javascript, typescript, typescript_native};
@@ -18,6 +20,13 @@ fn start() {
     log::set_max_level(log::LevelFilter::Trace);
 }
 
+#[derive(Tsify, Deserialize)]
+#[tsify(from_wasm_abi)]
+pub struct GenerateOptions {
+    pub did_file_path: String,
+    pub service_name: String,
+}
+
 #[wasm_bindgen(getter_with_clone)]
 pub struct GenerateResult {
     pub declarations_js: String,
@@ -27,18 +36,23 @@ pub struct GenerateResult {
 }
 
 #[wasm_bindgen]
-pub fn generate(declarations: String, service_name: String) -> Result<GenerateResult, JsError> {
-    let input_path = PathBuf::from(declarations);
+pub fn generate(options: GenerateOptions) -> Result<GenerateResult, JsError> {
+    let input_path = PathBuf::from(options.did_file_path);
     let (env, actor, prog) = parser::check_file(input_path.as_path()).map_err(JsError::from)?;
 
     let declarations_js = javascript::compile(&env, &actor);
     let declarations_ts = typescript::compile(&env, &actor, &prog);
 
-    let interface_ts =
-        typescript_native::compile::compile(&env, &actor, &service_name, "interface", &prog);
+    let interface_ts = typescript_native::compile::compile(
+        &env,
+        &actor,
+        &options.service_name,
+        "interface",
+        &prog,
+    );
 
     let service_ts =
-        typescript_native::compile::compile(&env, &actor, &service_name, "wrapper", &prog);
+        typescript_native::compile::compile(&env, &actor, &options.service_name, "wrapper", &prog);
 
     Ok(GenerateResult {
         declarations_js,

src/core/generate/rs/src/lib.rs

@@ -13,7 +13,10 @@ describe('wasmGenerate', () => {
   it.each(['hello_world', 'example'])('should generate a bindgen', async (serviceName) => {
     const didFile = `${TESTS_ASSETS_DIR}/${serviceName}.did`;
 
-    const result = wasmGenerate(didFile, serviceName);
+    const result = wasmGenerate({
+      did_file_path: didFile,
+      service_name: serviceName,
+    });
     await expect(result.declarations_js).toMatchFileSnapshot(
       `${SNAPSHOTS_DIR}/${serviceName}/declarations/${serviceName}.did.js.snapshot`,
     );