Apply missed rake format

kateinoigakukun · kateinoigakukun · commit b9feebccb15f · 2022-10-01T23:55:34.000+09:00
diff --git a/ext/js/js-core.c b/ext/js/js-core.c
@@ -225,7 +225,8 @@ static VALUE _rb_js_obj_eql(VALUE obj, VALUE other) {
  * :nodoc: all
  */
 static VALUE _rb_js_obj_hash(VALUE obj) {
-  // TODO(katei): Track the JS object id in JS side as Pyodide and Swift JavaScriptKit do.
+  // TODO(katei): Track the JS object id in JS side as Pyodide and Swift
+  // JavaScriptKit do.
   return Qnil;
 }
 
@@ -248,10 +249,11 @@ static VALUE _rb_js_obj_call(int argc, VALUE *argv, VALUE obj) {
 
   rb_js_abi_host_list_js_abi_value_t abi_args;
   int function_arguments_count = argc;
-  if(!rb_block_given_p())
+  if (!rb_block_given_p())
     function_arguments_count -= 1;
 
-  abi_args.ptr = ALLOCA_N(rb_js_abi_host_js_abi_value_t, function_arguments_count);
+  abi_args.ptr =
+      ALLOCA_N(rb_js_abi_host_js_abi_value_t, function_arguments_count);
   abi_args.len = function_arguments_count;
   for (int i = 1; i < argc; i++) {
     VALUE arg = _rb_js_try_convert(rb_mJS, argv[i]);
@@ -262,9 +264,10 @@ static VALUE _rb_js_obj_call(int argc, VALUE *argv, VALUE obj) {
     abi_args.ptr[i - 1] = check_jsvalue(arg)->abi;
   }
 
-  if(rb_block_given_p()) {
+  if (rb_block_given_p()) {
     VALUE proc = rb_block_proc();
-    abi_args.ptr[function_arguments_count - 1] = check_jsvalue(_rb_js_try_convert(rb_mJS, proc))->abi;
+    abi_args.ptr[function_arguments_count - 1] =
+        check_jsvalue(_rb_js_try_convert(rb_mJS, proc))->abi;
   }
 
   return jsvalue_s_new(
@@ -327,7 +330,8 @@ static VALUE _rb_js_import_from_js(VALUE obj) {
  */
 static VALUE _rb_js_obj_wrap(VALUE obj, VALUE wrapping) {
   rb_abi_lend_object(wrapping);
-  return jsvalue_s_new(rb_js_abi_host_rb_object_to_js_rb_value((uint32_t)wrapping));
+  return jsvalue_s_new(
+      rb_js_abi_host_rb_object_to_js_rb_value((uint32_t)wrapping));
 }
 
 /*
@@ -384,7 +388,7 @@ static VALUE _rb_js_false_to_js(VALUE obj) {
  */
 static VALUE _rb_js_proc_to_js(VALUE obj) {
   rb_abi_lend_object(obj);
-  return jsvalue_s_new(rb_js_abi_host_proc_to_js_function((uint32_t) obj));
+  return jsvalue_s_new(rb_js_abi_host_proc_to_js_function((uint32_t)obj));
 }
 
 /*
@@ -409,7 +413,8 @@ void Init_js() {
   rb_define_method(rb_cJS_Object, "call", _rb_js_obj_call, -1);
   rb_define_method(rb_cJS_Object, "typeof", _rb_js_obj_typeof, 0);
   rb_define_method(rb_cJS_Object, "__export_to_js", _rb_js_export_to_js, 0);
-  rb_define_singleton_method(rb_cJS_Object, "__import_from_js", _rb_js_import_from_js, 0);
+  rb_define_singleton_method(rb_cJS_Object, "__import_from_js",
+                             _rb_js_import_from_js, 0);
   rb_define_method(rb_cJS_Object, "inspect", _rb_js_obj_inspect, 0);
   rb_define_method(rb_cJS_Object, "to_s", _rb_js_obj_inspect, 0);
   rb_define_singleton_method(rb_cJS_Object, "wrap", _rb_js_obj_wrap, 1);
diff --git a/packages/npm-packages/ruby-wasm-wasi/rollup.config.js b/packages/npm-packages/ruby-wasm-wasi/rollup.config.js
@@ -1,7 +1,7 @@
 import typescript from "@rollup/plugin-typescript";
 import { nodeResolve } from "@rollup/plugin-node-resolve";
 
-const typescriptOptions = { tsconfig: "./tsconfig.json", declaration: false }
+const typescriptOptions = { tsconfig: "./tsconfig.json", declaration: false };
 
 function variant(basename) {
   return {
@@ -23,10 +23,7 @@ function variant(basename) {
         exports: "named",
       },
     ],
-    plugins: [
-      typescript(typescriptOptions),
-      nodeResolve(),
-    ],
+    plugins: [typescript(typescriptOptions), nodeResolve()],
   };
 }
 
@@ -49,10 +46,7 @@ export default [
         exports: "named",
       },
     ],
-    plugins: [
-      typescript(typescriptOptions),
-      nodeResolve(),
-    ],
+    plugins: [typescript(typescriptOptions), nodeResolve()],
     external: ["wasi"],
   },
 ];
diff --git a/packages/npm-packages/ruby-wasm-wasi/src/browser.script.ts b/packages/npm-packages/ruby-wasm-wasi/src/browser.script.ts
@@ -1,34 +1,32 @@
 import { DefaultRubyVM } from "./browser";
 
-export const main = async (pkg: { name: string, version: string }) => {
-    const response = await fetch(
-        `https://cdn.jsdelivr.net/npm/${pkg.name}@${pkg.version}/dist/ruby+stdlib.wasm`
-    );
-    const buffer = await response.arrayBuffer();
-    const module = await WebAssembly.compile(buffer);
-    const { vm } = await DefaultRubyVM(module);
+export const main = async (pkg: { name: string; version: string }) => {
+  const response = await fetch(
+    `https://cdn.jsdelivr.net/npm/${pkg.name}@${pkg.version}/dist/ruby+stdlib.wasm`
+  );
+  const buffer = await response.arrayBuffer();
+  const module = await WebAssembly.compile(buffer);
+  const { vm } = await DefaultRubyVM(module);
 
-    vm.printVersion();
+  vm.printVersion();
 
-    globalThis.rubyVM = vm;
+  globalThis.rubyVM = vm;
 
-    runRubyScriptsInHtml(vm);
+  runRubyScriptsInHtml(vm);
 };
 
 const runRubyScriptsInHtml = async (vm) => {
-    const tags = document.getElementsByTagName("script");
-    for (var i = 0, len = tags.length; i < len; i++) {
-        const tag = tags[i];
-        if (tag.type === "text/ruby") {
-            if (tag.hasAttribute('src')){
-                const response = await fetch(
-                    tag.getAttribute('src')
-                );
-                const rubyScript = await response.text();
-                vm.eval(rubyScript);
-            } else if (tag.innerHTML) {
-                vm.eval(tag.innerHTML);
-            }
-        }
+  const tags = document.getElementsByTagName("script");
+  for (var i = 0, len = tags.length; i < len; i++) {
+    const tag = tags[i];
+    if (tag.type === "text/ruby") {
+      if (tag.hasAttribute("src")) {
+        const response = await fetch(tag.getAttribute("src"));
+        const rubyScript = await response.text();
+        vm.eval(rubyScript);
+      } else if (tag.innerHTML) {
+        vm.eval(tag.innerHTML);
+      }
     }
+  }
 };
diff --git a/packages/npm-packages/ruby-wasm-wasi/src/index.ts b/packages/npm-packages/ruby-wasm-wasi/src/index.ts
@@ -97,8 +97,8 @@ export class RubyVM {
         procToJsFunction: (rawRbAbiValue) => {
           const rbValue = this.rbValueofPointer(rawRbAbiValue);
           return (...args) => {
-            rbValue.call('call', ...args.map(arg => this.wrap(arg)));
-          }
+            rbValue.call("call", ...args.map((arg) => this.wrap(arg)));
+          };
         },
         rbObjectToJsRbValue: (rawRbAbiValue) => {
           return this.rbValueofPointer(rawRbAbiValue);
diff --git a/packages/npm-packages/ruby-wasm-wasi/test/init.ts b/packages/npm-packages/ruby-wasm-wasi/test/init.ts
@@ -3,7 +3,9 @@ import path from "path";
 import { DefaultRubyVM } from "../dist/node.cjs";
 
 const rubyModule = (async () => {
-  const binary = await fs.readFile(path.join(__dirname, "./../dist/ruby+stdlib.wasm"));
+  const binary = await fs.readFile(
+    path.join(__dirname, "./../dist/ruby+stdlib.wasm")
+  );
   return await WebAssembly.compile(binary.buffer);
 })();
 
diff --git a/packages/npm-packages/ruby-wasm-wasi/test/js_from_rb.test.ts b/packages/npm-packages/ruby-wasm-wasi/test/js_from_rb.test.ts
@@ -64,15 +64,16 @@ describe("Manipulation of JS from Ruby", () => {
     expect(vm.eval(result).toString()).toBe(String(props.result));
   });
 
-  test.each([
-    `24`, `"hello"`, `null`, `undefined`,
-  ])("JS::Object#to_s (%s)", async (value) => {
-    const vm = await initRubyVM();
-    const to_s_result = `require "js"; JS.eval('return ${value}').to_s`;
-    const inspect_result = `require "js"; JS.eval('return ${value}').inspect`;
-    expect(vm.eval(to_s_result).toString()).toBe(String(eval(value)));
-    expect(vm.eval(inspect_result).toString()).toBe(String(eval(value)));
-  });
+  test.each([`24`, `"hello"`, `null`, `undefined`])(
+    "JS::Object#to_s (%s)",
+    async (value) => {
+      const vm = await initRubyVM();
+      const to_s_result = `require "js"; JS.eval('return ${value}').to_s`;
+      const inspect_result = `require "js"; JS.eval('return ${value}').inspect`;
+      expect(vm.eval(to_s_result).toString()).toBe(String(eval(value)));
+      expect(vm.eval(inspect_result).toString()).toBe(String(eval(value)));
+    }
+  );
 
   test.each([
     { self: `24`, calee: "toString", args: [], result: "24" },
@@ -97,12 +98,15 @@ describe("Manipulation of JS from Ruby", () => {
       end
     end
     `);
-    proc.call("call", vm.wrap({
-      take_block: (arg1: string, block: (_: any) => void) => {
-        expect(arg1).toBe("x");
-        block("y");
-      }
-    }))
+    proc.call(
+      "call",
+      vm.wrap({
+        take_block: (arg1: string, block: (_: any) => void) => {
+          expect(arg1).toBe("x");
+          block("y");
+        },
+      })
+    );
     const y = vm.eval(`$y`);
     expect(y.toString()).toBe("y");
   });
@@ -174,7 +178,7 @@ describe("Manipulation of JS from Ruby", () => {
         function_to_call.call(:a, Proc.new { |a| b = a })
         b
       `,
-      result: 1
+      result: 1,
     },
     {
       expr: `
@@ -183,7 +187,7 @@ describe("Manipulation of JS from Ruby", () => {
         function_to_call.call(:a) { |a| b = a }
         b
       `,
-      result: 1
+      result: 1,
     },
     {
       expr: `
@@ -193,8 +197,8 @@ describe("Manipulation of JS from Ruby", () => {
         function_to_call.call(:b)
         b
       `,
-      result: 1
-    }
+      result: 1,
+    },
   ])(`JS::Object#call (%s)`, async (props) => {
     const vm = await initRubyVM();
     const result = vm.eval(`
@@ -291,17 +295,20 @@ describe("Manipulation of JS from Ruby", () => {
       end
     `);
     const livingObjects = new Set<RbValue>();
-    run.call("call", vm.wrap({
-      mark_js_object_live: (object: RbValue) => {
-        livingObjects.add(object);
-      }
-    }));
+    run.call(
+      "call",
+      vm.wrap({
+        mark_js_object_live: (object: RbValue) => {
+          livingObjects.add(object);
+        },
+      })
+    );
     vm.eval("GC.start");
     for (const object of livingObjects) {
       // Ensure that all objects are still alive
-      object.call("itself")
+      object.call("itself");
     }
-  })
+  });
 
   test("Guard null", async () => {
     const vm = await initRubyVM();
