rewrite default test and refactor

Author: meowbmw

.prettierignore

@@ -6,6 +6,5 @@
 /tests/ts/fixture
 /third_party
 /tests/cpp/lit/**/*.json
-/tests/as/default.test.ts
 /.cache
 /.github/CODEOWNERS

src/core/execute.ts

@@ -6,7 +6,8 @@ import { instantiate, Imports as ASImports } from "@assemblyscript/loader";
 import { AssertResult } from "../assertResult.js";
 import { Imports, ImportsArgument } from "../index.js";
 import { IAssertResult, InstrumentResult } from "../interface.js";
-import { mockInstruFunc, covInstruFunc, parseWasmImports } from "../utils/import.js";
+import { mockInstruFunc, covInstruFunc } from "../utils/import.js";
+import { parseWasmImports, supplyDefaultFunction } from "../utils/index.js";
 const readFile = promises.readFile;
 
 function nodeExecutor(wasms: string[], outFolder: string, imports: Imports) {
@@ -32,23 +33,7 @@ function nodeExecutor(wasms: string[], outFolder: string, imports: Imports) {
       const binary = await readFile(wasm);
       const importList = await parseWasmImports(binary);
       // supplying default function here, so no more need to define all of them in as-test.js
-      for (const imp of importList) {
-        if (imp.kind === "function") {
-          const moduleName = imp.module;
-          const funcName = imp.name;
-          if (!importObject[moduleName]?.[funcName]) {
-            if (!importObject[moduleName]) {
-              importObject[moduleName] = {};
-            }
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-            (importObject[moduleName] as any)[funcName] = (...args: any[]): any => {
-              // notify that a default function has been called
-              console.log(`Default stub called for ${moduleName}.${funcName}, args:`, args);
-              return 0;
-            };
-          }
-        }
-      }
+      supplyDefaultFunction(importList, importObject);
       const ins = await instantiate(binary, importObject);
       importsArg.module = ins.module;
       importsArg.instance = ins.instance;

src/utils/import.ts

@@ -87,17 +87,3 @@ export function covInstruFunc(wasm: string) {
   };
   return { covInstrument };
 }
-
-// list imports of a given wasm binary (buffer)
-// importList format should be as follows：
-// [
-//   { module: 'env', name: 'memory', kind: 'memory' },
-//   { module: 'env', name: 'myFunction', kind: 'function' },
-//   ...
-// ]
-export async function parseWasmImports(binary: Buffer) {
-  const mod = await WebAssembly.compile(binary);
-  const importList = WebAssembly.Module.imports(mod);
-
-  return importList;
-}

src/utils/index.ts

@@ -1,3 +1,5 @@
+import { Imports as ASImports } from "@assemblyscript/loader";
+
 export function json2map<V>(json: Record<string, V>): Map<string, V> {
   const res = new Map<string, V>();
   for (const key in json) {
@@ -40,3 +42,37 @@ export function checkGenerics(functionName: string): string | undefined {
   }
   return;
 }
+
+// list imports of a given wasm binary (buffer)
+// importList format should be as follows：
+// [
+//   { module: 'env', name: 'memory', kind: 'memory' },
+//   { module: 'env', name: 'myFunction', kind: 'function' },
+//   ...
+// ]
+export async function parseWasmImports(binary: Buffer) {
+  const mod = await WebAssembly.compile(binary);
+  const importList = WebAssembly.Module.imports(mod);
+
+  return importList;
+}
+
+export function supplyDefaultFunction(importList: WebAssembly.ModuleImportDescriptor[], importObject: ASImports) {
+  for (const imp of importList) {
+    if (imp.kind === "function") {
+      const moduleName = imp.module;
+      const funcName = imp.name;
+      if (!importObject[moduleName]?.[funcName]) {
+        if (!importObject[moduleName]) {
+          importObject[moduleName] = {};
+        }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
+        (importObject[moduleName] as any)[funcName] = (...args: any[]): any => {
+          // notify that a default function has been called
+          console.log(`Default stub called for ${moduleName}.${funcName}, args:`, args);
+          return 0;
+        };
+      }
+    }
+  }
+}

tests/as/default.test.ts

@@ -0,0 +1,36 @@
+import { jest } from "@jest/globals";
+import { Imports as ASImports } from "@assemblyscript/loader";
+
+const mockWriteFile = jest.fn();
+jest.unstable_mockModule("node:fs", () => ({
+    writeFileSync: mockWriteFile,
+}));
+
+const { supplyDefaultFunction } = await import("../../../../src/utils/index.js");
+
+describe("supplyDefaultFunction", () => {
+    test("supplyTest", () => {
+        const mockImportList: WebAssembly.ModuleImportDescriptor[] = [
+            { kind: "function", module: "myenv", name: "processEvent" },
+            { kind: "function", module: "externalMath", name: "add" },
+            { kind: "function", module: "system", name: "getStatus" },
+            { kind: "function", module: "logger", name: "logWarning" },
+            { kind: "function", module: "customOps", name: "combineValues" },
+        ];
+
+        const mockImportObject: ASImports = {
+            myenv: {},
+            externalMath: {},
+            system: {},
+            logger: {},
+            customOps: {},
+        };
+
+        supplyDefaultFunction(mockImportList, mockImportObject);
+
+        expect(typeof mockImportObject["myenv"]?.["processEvent"]).toBe("function");
+        expect(typeof mockImportObject["system"]?.["getStatus"]).toBe("function");
+        expect(typeof mockImportObject["logger"]?.["logWarning"]).toBe("function");
+        expect(typeof mockImportObject["customOps"]?.["combineValues"]).toBe("function");
+    });
+});