release: v0.3.4

CHANGELOG.md

@@ -26,4 +26,5 @@ v0.2.1 - Remove accidental logging
 v0.3.0 - Pass metadata through terminal - Support for multiple files - Better reporting - Timing for suites - Terminal utilities
 v0.3.1 - Add screenshot of completed tests to readme
 v0.3.2 - Add `mockImport` to override imported functions
-v0.3.3 - Allow `mockImport`'s return type to be any
+v0.3.3 - Allow `mockImport`'s return type to be any
+v0.3.4 - Fix: import functions were not received after visitSource()

README.md

@@ -3,7 +3,7 @@
 |  _  ||   __| ___|_   _||   __||   __||_   _|
 |     ||__   ||___| | |  |   __||__   |  | |  
 |__|__||_____|      |_|  |_____||_____|  |_|  
-v0.3.3
+v0.3.4
 </pre>
 </h5>
 

bin/index.js

@@ -7,7 +7,7 @@ const _args = process.argv.slice(2);
 const flags = [];
 const args = [];
 const COMMANDS = ["run", "build", "test", "init"];
-const version = "0.3.3";
+const version = "0.3.4";
 for (const arg of _args) {
   if (arg.startsWith("-")) flags.push(arg);
   else args.push(arg);

bin/init.js

@@ -9,7 +9,7 @@ export async function init(args) {
     input: process.stdin,
     output: process.stdout,
   });
-  console.log(chalk.bold("as-test init v0.3.3") + "\n");
+  console.log(chalk.bold("as-test init v0.3.4") + "\n");
   console.log(chalk.dim("[1/3]") + " select a target [wasi/bindings]");
   const target = await ask(chalk.dim(" -> "), rl);
   if (!TARGETS.includes(target)) {
@@ -174,7 +174,6 @@ const exports = instantiate(module, {});`,
     existsSync(PKG_PATH) ? readFileSync(PKG_PATH).toString() : "{}",
   );
   if (!pkg["scripts"]) pkg["scripts"] = {};
-  if (pkg.scripts["test"]) process.exit(0);
   if (!pkg.scripts["pretest"]) {
     pkg.scripts["pretest"] = "as-test build";
     pkg.scripts["test"] = "as-test run";
@@ -183,7 +182,7 @@ const exports = instantiate(module, {});`,
   }
   if (!pkg["devDependencies"]) pkg["devDependencies"] = {};
   if (!pkg["devDependencies"]["as-test"])
-    pkg["devDependencies"]["as-test"] = "^0.3.3";
+    pkg["devDependencies"]["as-test"] = "^0.3.4";
   if (target == "bindings") {
     pkg["type"] = "module";
   }

bin/run.js

@@ -35,7 +35,7 @@ export async function run() {
       chalk.bold.blueBright(`|__|__||_____|      |_|  |_____||_____|  |_|  `),
     );
     console.log(
-      chalk.dim("\n------------------- v0.3.3 -------------------\n"),
+      chalk.dim("\n------------------- v0.3.4 -------------------\n"),
     );
   }
   for (const plugin of Object.keys(config.plugins)) {

cli/index.ts

@@ -11,7 +11,7 @@ const args: string[] = [];
 
 const COMMANDS: string[] = ["run", "build", "test", "init"];
 
-const version = "0.3.3";
+const version = "0.3.4";
 
 for (const arg of _args) {
   if (arg.startsWith("-")) flags.push(arg);

cli/init.ts

@@ -9,7 +9,7 @@ export async function init(args: string[]) {
     input: process.stdin,
     output: process.stdout,
   });
-  console.log(chalk.bold("as-test init v0.3.3") + "\n");
+  console.log(chalk.bold("as-test init v0.3.4") + "\n");
   console.log(chalk.dim("[1/3]") + " select a target [wasi/bindings]");
   const target = await ask(chalk.dim(" -> "), rl);
   if (!TARGETS.includes(target)) {
@@ -192,7 +192,7 @@ const exports = instantiate(module, {});`,
   }
   if (!pkg["devDependencies"]) pkg["devDependencies"] = {};
   if (!pkg["devDependencies"]["as-test"])
-    pkg["devDependencies"]["as-test"] = "^0.3.3";
+    pkg["devDependencies"]["as-test"] = "^0.3.4";
   if (target == "bindings") {
     pkg["type"] = "module";
   }

cli/run.ts

@@ -42,7 +42,7 @@ export async function run() {
       chalk.bold.blueBright(`|__|__||_____|      |_|  |_____||_____|  |_|  `),
     );
     console.log(
-      chalk.dim("\n------------------- v0.3.3 -------------------\n"),
+      chalk.dim("\n------------------- v0.3.4 -------------------\n"),
     );
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "as-test",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Testing framework for AssemblyScript. Compatible with WASI or Bindings ",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",

run/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@as-test/run",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Testing framework for AssemblyScript. Compatible with WASI or Bindings ",
   "main": "./lib/index.js",
   "author": "Jairus Tanaka",

transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@as-test/transform",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Testing framework for AssemblyScript. Compatible with WASI or Bindings ",
   "main": "./lib/index.js",
   "author": "Jairus Tanaka",

transform/src/mock.ts

@@ -37,6 +37,7 @@ export class MockTransform extends BaseVisitor {
 
     if (name == "mockImport") {
       this.importMocked.add((node.args[0] as StringLiteralExpression).value);
+      return;
     }
     if (name != "mockFn") return;
     const ov = toString(node.args[0]);
@@ -77,21 +78,19 @@ export class MockTransform extends BaseVisitor {
     super.visitFunctionDeclaration(node, isDefault);
   }
   visitSource(node: Source): void {
-    if (node.isLibrary || isStdlib(node)) {
-      if (!node.normalizedPath.startsWith("~lib/as-test")) {
-        return;
-      }
-    }
     this.mocked = new Set<string>();
     this.currentSource = node;
+    this.importFns = [];
     super.visitSource(node);
 
     for (const node of this.importFns) {
       let path = "";
       const dec = node.decorators?.find(
         (v) => (v.name as IdentifierExpression).text == "external",
       );
-      if (dec.args[0] && dec.args[1])
+      if (!dec) {
+        path = "env." + node.name.text;
+      } else if (dec.args[0] && dec.args[1])
         path = dec.args
           .map((v) => (v as StringLiteralExpression).value)
           .join(".");
@@ -101,7 +100,6 @@ export class MockTransform extends BaseVisitor {
           "." +
           (dec.args[0] as StringLiteralExpression).value;
       else path = this.currentSource.simplePath + "." + node.name.text;
-
       if (!this.importMocked.has(path)) return;
 
       let args: Expression[] = [
@@ -147,8 +145,6 @@ export class MockTransform extends BaseVisitor {
         node.range,
       );
 
-      newFn.signature = node.signature;
-
       const stmts = this.currentSource.statements;
       let index = -1;
       for (let i = 0; i < stmts.length; i++) {
@@ -164,6 +160,5 @@ export class MockTransform extends BaseVisitor {
       if (index === -1) return;
       stmts.splice(index, 1, newFn);
     }
-    this.importFns = [];
   }
 }