as-test 0.1.8 → 0.1.9

package/CHANGELOG.md

@@ -17,3 +17,6 @@ v0.1.5 - Add skeleton cli and custom config
 v0.1.6 - Fix: args should be prefixed with a space
 v0.1.7 - Fix: remove warning about wasi-shim not being included when it is included
 v0.1.8 - Feat: function mocking
+v0.1.9 - Fix: mocks were not being applied to declared functions, only property accesses
+
+v0.1.10 [UNRELEASED] - Feat: snapshotting

package/README.md

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

package/assembly/index.ts

@@ -1,7 +1,7 @@
 import { rainbow } from "as-rainbow";
 import { TestGroup } from "./src/group";
 import { Expectation } from "./src/expectation";
-import { formatTime } from "./util";
+import { formatTime } from "./util/helpers";
 import { stringify } from "as-console/stringify";
 import { __COVER, __HASHES, __POINTS } from "as-test/assembly/coverage";
 import { createTable } from "table-as";
@@ -235,7 +235,7 @@ export function run(options: RunOptions = new RunOptions()): void {
     ),
   );
   console.log(
-    rainbow.dimMk("\n------------------- v0.1.8 -------------------\n"),
+    rainbow.dimMk("\n------------------- v0.1.9 -------------------\n"),
   );
   // @ts-ignore
   if (isDefined(COVERAGE_USE)) {

package/assembly/src/expectation.ts

@@ -1,5 +1,5 @@
 import { rainbow } from "as-rainbow";
-import { diff, visualize } from "../util";
+import { diff, visualize } from "../util/helpers";
 import { Node } from "./node";
 import { Verdict, after_each_callback, before_each_callback } from "..";
 

package/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.1.8";
+const version = "0.1.9";
 for (const arg of _args) {
     if (arg.startsWith("-"))
         flags.push(arg);

package/cli/index.ts

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

package/package.json

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

package/transform/lib/mock.js

@@ -1,4 +1,4 @@
-import { IdentifierExpression, Node, PropertyAccessExpression, } from "assemblyscript/dist/assemblyscript.js";
+import { Node, } from "assemblyscript/dist/assemblyscript.js";
 import { BaseVisitor } from "visitor-as/dist/index.js";
 import { toString } from "visitor-as/dist/utils.js";
 export class MockTransform extends BaseVisitor {
@@ -8,19 +8,15 @@ export class MockTransform extends BaseVisitor {
     mocked = new Set();
     visitCallExpression(node) {
         super.visitCallExpression(node);
-        if (node.expression instanceof PropertyAccessExpression) {
-            const name = toString(node.expression)
-                .replaceAll(".", "_")
-                .replaceAll("[", "_")
-                .replaceAll("]", "_");
-            if (this.mocked.has(name + "_mock")) {
-                node.expression = Node.createIdentifierExpression(name + "_mock", node.expression.range);
-                return;
-            }
-        }
-        if (!(node.expression instanceof IdentifierExpression))
+        const name = toString(node.expression)
+            .replaceAll(".", "_")
+            .replaceAll("[", "_")
+            .replaceAll("]", "_");
+        if (this.mocked.has(name + "_mock")) {
+            node.expression = Node.createIdentifierExpression(name + "_mock", node.expression.range);
             return;
-        if (node.expression.text != "mock")
+        }
+        if (name != "mock")
             return;
         const ov = node.args[0];
         const cb = node.args[1];
@@ -33,7 +29,7 @@ export class MockTransform extends BaseVisitor {
         let index = -1;
         for (let i = 0; i < stmts.length; i++) {
             const stmt = stmts[i];
-            if (toString(stmt) != toString(node))
+            if (stmt.range.start != node.range.start)
                 continue;
             index = i;
             break;

package/transform/lib/mock.js.map

@@ -1 +1 @@
-{"version":3,"file":"mock.js","sourceRoot":"","sources":["../src/mock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mock.js","sourceRoot":"","sources":["../src/mock.ts"],"names":[],"mappings":"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"}

package/transform/package.json

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

package/transform/src/mock.ts

@@ -21,23 +21,20 @@ export class MockTransform extends BaseVisitor {
   public mocked = new Set<string>();
   visitCallExpression(node: CallExpression): void {
     super.visitCallExpression(node);
-    if (node.expression instanceof PropertyAccessExpression) {
-      const name = toString(node.expression)
-        .replaceAll(".", "_")
-        .replaceAll("[", "_")
-        .replaceAll("]", "_");
-      if (this.mocked.has(name + "_mock")) {
-        //console.log("fn rn " + name + " -> " + name + "_mock");
-        node.expression = Node.createIdentifierExpression(
-          name + "_mock",
-          node.expression.range,
-        );
-        //console.log(toString(node.expression))
-        return;
-      }
+    const name = toString(node.expression)
+      .replaceAll(".", "_")
+      .replaceAll("[", "_")
+      .replaceAll("]", "_");
+
+    if (this.mocked.has(name + "_mock")) {
+      node.expression = Node.createIdentifierExpression(
+        name + "_mock",
+        node.expression.range,
+      );
+      return;
     }
-    if (!(node.expression instanceof IdentifierExpression)) return;
-    if (node.expression.text != "mock") return;
+
+    if (name != "mock") return;
     const ov = node.args[0] as StringLiteralExpression;
     const cb = node.args[1] as FunctionExpression;
 
@@ -45,6 +42,7 @@ export class MockTransform extends BaseVisitor {
       .replaceAll(".", "_")
       .replaceAll("[", "_")
       .replaceAll("]", "_");
+
     const newFn = Node.createFunctionDeclaration(
       Node.createIdentifierExpression(newName + "_mock", cb.range),
       cb.declaration.decorators,
@@ -55,16 +53,16 @@ export class MockTransform extends BaseVisitor {
       cb.declaration.arrowKind,
       cb.range,
     );
+
     const stmts = this.currentSource.statements;
     let index = -1;
     for (let i = 0; i < stmts.length; i++) {
       const stmt = stmts[i];
-      if (toString(stmt) != toString(node)) continue;
+      if (stmt.range.start != node.range.start) continue;
       index = i;
       break;
     }
     if (index === -1) return;
-    //console.log("fn mock " + newName + "_mock" + " at index " + index.toString());
     stmts.splice(index, 1, newFn);
     this.mocked.add(newFn.name.text);
   }

package/utils.ts

@@ -0,0 +1 @@
+export * from "./assembly/util/index.ts";