as-test 0.1.1 → 0.1.2

package/CHANGELOG.md

@@ -9,4 +9,5 @@ v0.0.8 - Fix readme typo in v0.0.7
 v0.0.9 - Fix type issue
 
 v0.1.0 - Fix more type issues
-v0.1.1 - Add code coverage!
+v0.1.1 - Add code coverage!
+v0.1.2 - Fix bugs with globals and dependencies

package/README.md

@@ -16,7 +16,7 @@ npm install as-test
 Add the transform to your `asc` command (e.g. in package.json)
 
 ```bash
---transform json-as/transform
+--transform as-test/transform
 ```
 
 Alternatively, add it to your `asconfig.json`
@@ -25,7 +25,7 @@ Alternatively, add it to your `asconfig.json`
 {
   // ...
   "options": {
-    "transform": ["json-as/transform"]
+    "transform": ["as-test/transform"]
   }
 }
 ```

package/assembly/coverage.ts

@@ -0,0 +1,31 @@
+export class CoverPoint {
+    public file: string = "";
+    public hash: string = "";
+    public line: i32 = 0;
+    public column: i32 = 0;
+    public type!: string;
+    public executed: boolean = false;
+}
+
+export class Coverage {
+    public hashes: Map<string, CoverPoint> = new Map<string, CoverPoint>();
+    public points: i32 = 0;
+    static SN: Coverage = new Coverage();
+}
+
+export function __REGISTER(point: CoverPoint): void {
+    Coverage.SN.points++;
+    Coverage.SN.hashes.set(point.hash, point);
+}
+
+export function __COVER(hash: string): void {
+    if (Coverage.SN.hashes.has(hash)) Coverage.SN.hashes.delete(hash);
+}
+
+export function __HASHES(): Map<string, CoverPoint> {
+    return Coverage.SN.hashes;
+}
+
+export function __POINTS(): i32 {
+    return Coverage.SN.points;
+}

package/assembly/index.ts

@@ -3,7 +3,7 @@ import { TestGroup } from "./src/group";
 import { Expectation } from "./src/expectation";
 import { formatTime } from "./util";
 import { stringify } from "as-console/assembly";
-import { __COVERAGE } from "./src/coverage";
+import { __COVER, __HASHES, __POINTS } from "as-test/assembly/coverage";
 
 /**
  * Enumeration representing the verdict of a test case.
@@ -21,12 +21,9 @@ let groups: TestGroup[] = [];
 let before_all_callback: (() => void) | null = null;
 let after_all_callback: (() => void) | null = null;
 
-// @ts-ignore
-@global let before_each_callback: (() => void) | null = null;
-// @ts-ignore
-@global let after_each_callback: (() => void) | null = null;
-// @ts-ignore
-@global let __test_options!: RunOptions;
+export let before_each_callback: (() => void) | null = null;
+export let after_each_callback: (() => void) | null = null;
+let __test_options!: RunOptions;
 
 /**
  * Creates a test group containing multiple test cases.
@@ -252,7 +249,7 @@ export function run(options: RunOptions = new RunOptions()): void {
             console.log(txt);
         }
 
-        const report = suite.report();
+        const report = suite.getLogs();
         if (report) {
             if (report.passed) console.log(report.passed!);
             if (report.failed) failed_suite_logs += report.failed!;
@@ -266,14 +263,10 @@ export function run(options: RunOptions = new RunOptions()): void {
         console.log(failed_suite_logs);
     }
 
-    // @ts-ignore
-    const cv = __COVERAGE_STATS();
-    const COVER_POINTS = cv.hashs;
-    const COVER_TOTAL_POINTS = cv.points;
 
-    if (options.coverage && COVER_POINTS.size) {
+    if (options.coverage && __HASHES().size) {
         console.log(rainbow.dimMk("----------------- [COVERAGE] -----------------\n"));
-        const points = COVER_POINTS.values();
+        const points = __HASHES().values();
 
         for (let i = 0; i < points.length; i++) {
             const point = unchecked(points[i]);
@@ -285,10 +278,11 @@ export function run(options: RunOptions = new RunOptions()): void {
     console.log(rainbow.dimMk("----------------- [RESULTS] ------------------\n"));
     const ms = performance.now() - start;
     console.log(rainbow.boldMk("Test Suites: ") + (failed ? rainbow.boldMk(rainbow.red(failed.toString() + " failed")) : rainbow.boldMk(rainbow.green("0 failed"))) + ", " + suites.toString() + " total");
-    console.log(rainbow.boldMk("Tests:       ") + (failed_tests ? rainbow.boldMk(rainbow.red(failed_tests.toString() + " failed")) : rainbow.boldMk(rainbow.green("0 failed"))) + ", " + COVER_TOTAL_POINTS.toString() + " total");
-    if (options.coverage) console.log(rainbow.boldMk("Coverage:    ") + (COVER_POINTS.size ? rainbow.boldMk(rainbow.red(COVER_POINTS.size.toString() + " failed")) : rainbow.boldMk(rainbow.green("0 failed"))) + ", " + COVER_TOTAL_POINTS.toString() + " total");
+    console.log(rainbow.boldMk("Tests:       ") + (failed_tests ? rainbow.boldMk(rainbow.red(failed_tests.toString() + " failed")) : rainbow.boldMk(rainbow.green("0 failed"))) + ", " + tests.toString() + " total");
+    if (options.coverage) console.log(rainbow.boldMk("Coverage:    ") + (__HASHES().size ? rainbow.boldMk(rainbow.red(__HASHES().size.toString() + " failed")) : rainbow.boldMk(rainbow.green("0 failed"))) + ", " + __POINTS().toString() + " total");
     console.log(rainbow.boldMk("Snapshots:   ") + "0 total");
     console.log(rainbow.boldMk("Time:        ") + formatTime(ms));
+    __COVER("joe mom")
     if (failed) {
         process.exit(1);
     }

package/assembly/src/expectation.ts

@@ -1,7 +1,7 @@
 import { rainbow } from "as-rainbow";
 import { diff, visualize } from "../util";
 import { Node } from "./node";
-import { Verdict } from "..";
+import { Verdict, after_each_callback, before_each_callback } from "..";
 
 export class Expectation<T> extends Node {
     public verdict: Verdict = Verdict.Unreachable;

package/assembly/src/group.ts

@@ -21,7 +21,7 @@ export class TestGroup {
         this.results.push(test);
     }
 
-    report(): ReportLogs | null {
+    getLogs(): ReportLogs {
         let passed_logs = "";
         let failed_logs = "";
         for (let i = 0; i < this.results.length; i++) {

package/assembly/test.ts

@@ -63,7 +63,7 @@ describe("Array manipulation", () => {
     });
 });
 
-export function foo(): void {
+function foo(): void {
     
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "as-test",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Testing framework for AssemblyScript. Compatible with WASI or Bindings ",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -21,19 +21,16 @@
     "assemblyscript-prettier": "^3.0.1",
     "jest": "^29.7.0",
     "typescript": "^5.3.3",
-    "visitor-as": "^0.11.4"
+    "visitor-as": "^0.11.4",
+    "json-as": "^0.9.6"
   },
   "dependencies": {
     "as-console": "^6.0.2",
-    "as-convert-seconds": "^1.0.0",
     "as-rainbow": "^0.1.0",
     "as-string-sink": "^0.5.3",
     "as-variant": "^0.4.1",
     "chalk": "^5.3.0",
-    "json-as": "^0.9.6",
-    "line-column": "^1.0.2",
-    "micromatch": "^4.0.7",
-    "yargs": "^17.7.2"
+    "micromatch": "^4.0.7"
   },
   "overrides": {
     "assemblyscript": "$assemblyscript",
@@ -58,4 +55,4 @@
   "publishConfig": {
     "@JairusSW:registry": "https://npm.pkg.github.com"
   }
-}
+}

package/src/cli.ts

@@ -1,10 +0,0 @@
-import yargs, { Arguments } from 'yargs';
-import { hideBin } from 'yargs/helpers'
-
-const cli = yargs(hideBin(process.argv));
-
-cli.command('build <options>', 'options', () => {}, (argv) => {
-    console.info(argv)
-  })
-  .demandCommand(1)
-  .parse()

package/transform/lib/index.js

@@ -1,7 +1,7 @@
 import { Transform } from "assemblyscript/dist/transform.js";
-import { Source, Tokenizer, BlockStatement, ExpressionStatement, Node } from "assemblyscript/dist/assemblyscript.js";
+import { Source, BlockStatement, ExpressionStatement, Node, Tokenizer } from "assemblyscript/dist/assemblyscript.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
-import { isStdlib, toString } from "visitor-as/dist/utils.js";
+import { isStdlib } from "visitor-as/dist/utils.js";
 import { RangeTransform } from "visitor-as/dist/transformRange.js";
 let ENABLED = false;
 var CoverType;
@@ -51,7 +51,7 @@ class CoverageTransform extends BaseVisitor {
                         hash: "${point.hash}",
                         line: ${point.line},
                         column: ${point.column},
-                        type: __COVERTYPES.Expression,
+                        type: "Expression",
                         executed: false
                     });`);
                 replacer.visit(registerStmt);
@@ -91,7 +91,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Function,
+                    type: "Function",
                     executed: false
                 })`);
             replacer.visit(registerStmt);
@@ -129,7 +129,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Expression,
+                    type: "Expression",
                     executed: false
                 })`);
             replacer.visit(registerStmt);
@@ -167,7 +167,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Function,
+                    type: "Function",
                     executed: false
                 })`);
             replacer.visit(registerStmt);
@@ -227,7 +227,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Expression,
+                    type: "Expression",
                     executed: false
                 })`);
             replacer.visit(registerStmt);
@@ -253,7 +253,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Expression,
+                    type: "Expression",
                     executed: false
                 })`);
             replacer.visit(registerStmt);
@@ -311,7 +311,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Expression,
+                    type: "Expression",
                     executed: false
                 })`);
             replacer.visit(registerStmt);
@@ -335,7 +335,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Expression,
+                    type: "Expression",
                     executed: false
                 })`);
             replacer.visit(registerStmt);
@@ -366,7 +366,7 @@ class CoverageTransform extends BaseVisitor {
                 hash: "${point.hash}",
                 line: ${point.line},
                 column: ${point.column},
-                type: __COVERTYPES.Block,
+                type: "Block",
                 executed: false
             })`);
         replacer.visit(registerStmt);
@@ -396,7 +396,7 @@ class CoverageTransform extends BaseVisitor {
                 hash: "${point.hash}",
                 line: ${point.line},
                 column: ${point.column},
-                type: __COVERTYPES.Block,
+                type: "Block",
                 executed: false
             })`);
         replacer.visit(registerStmt);
@@ -463,14 +463,10 @@ export default class Transformer extends Transform {
                 transformer.visit(source);
                 if (transformer.globalStatements.length) {
                     source.statements.unshift(...transformer.globalStatements);
-                    const tokenizer = new Tokenizer(new Source(0 /* SourceKind.User */, source.normalizedPath, "import { __REGISTER, __COVER, __COVERTYPES, __COVERAGE_STATS } from \"as-test/coverage\";"));
+                    const tokenizer = new Tokenizer(new Source(0 /* SourceKind.User */, source.normalizedPath, "import { __REGISTER, __COVER } from \"as-test/assembly/coverage\";"));
                     parser.currentSource = tokenizer.source;
                     source.statements.unshift(parser.parseTopLevelStatement(tokenizer));
                     parser.currentSource = source;
-                    // @ts-ignore
-                    if (process && process.env["TEST_DEBUG"]?.toString().toLowerCase() == "all") {
-                        console.log(toString(source));
-                    }
                 }
             }
             transformer.globalStatements = [];

package/transform/package.json

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

package/transform/src/index.ts

@@ -4,7 +4,6 @@ import {
     Source,
     SourceKind,
     Statement,
-    Tokenizer,
     Token,
 
     BinaryExpression,
@@ -22,10 +21,12 @@ import {
     NodeKind,
     ArrowKind,
     Node,
-    ObjectLiteralExpression
+    ObjectLiteralExpression,
+    Tokenizer
 } from "assemblyscript/dist/assemblyscript.js";
+
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
-import { isStdlib, toString } from "visitor-as/dist/utils.js";
+import { isStdlib } from "visitor-as/dist/utils.js";
 import { RangeTransform } from "visitor-as/dist/transformRange.js";
 
 let ENABLED = false;
@@ -79,7 +80,7 @@ class CoverageTransform extends BaseVisitor {
                         hash: "${point.hash}",
                         line: ${point.line},
                         column: ${point.column},
-                        type: __COVERTYPES.Expression,
+                        type: "Expression",
                         executed: false
                     });`
                 );
@@ -130,7 +131,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Function,
+                    type: "Function",
                     executed: false
                 })`
             );
@@ -178,7 +179,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Expression,
+                    type: "Expression",
                     executed: false
                 })`
             );
@@ -226,7 +227,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Function,
+                    type: "Function",
                     executed: false
                 })`
             );
@@ -305,7 +306,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Expression,
+                    type: "Expression",
                     executed: false
                 })`
             );
@@ -346,7 +347,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Expression,
+                    type: "Expression",
                     executed: false
                 })`
             );
@@ -415,7 +416,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Expression,
+                    type: "Expression",
                     executed: false
                 })`
             );
@@ -450,7 +451,7 @@ class CoverageTransform extends BaseVisitor {
                     hash: "${point.hash}",
                     line: ${point.line},
                     column: ${point.column},
-                    type: __COVERTYPES.Expression,
+                    type: "Expression",
                     executed: false
                 })`
             );
@@ -491,7 +492,7 @@ class CoverageTransform extends BaseVisitor {
                 hash: "${point.hash}",
                 line: ${point.line},
                 column: ${point.column},
-                type: __COVERTYPES.Block,
+                type: "Block",
                 executed: false
             })`
         );
@@ -532,7 +533,7 @@ class CoverageTransform extends BaseVisitor {
                 hash: "${point.hash}",
                 line: ${point.line},
                 column: ${point.column},
-                type: __COVERTYPES.Block,
+                type: "Block",
                 executed: false
             })`
         );
@@ -576,6 +577,7 @@ export default class Transformer extends Transform {
             }
         }
         if (!ENABLED) return;
+
         // Create new transform
         const transformer = new CoverageTransform();
 
@@ -607,16 +609,12 @@ export default class Transformer extends Transform {
                         new Source(
                             SourceKind.User,
                             source.normalizedPath,
-                            "import { __REGISTER, __COVER, __COVERTYPES, __COVERAGE_STATS } from \"as-test/coverage\";"
+                            "import { __REGISTER, __COVER } from \"as-test/assembly/coverage\";"
                         )
                     );
                     parser.currentSource = tokenizer.source;
                     source.statements.unshift(parser.parseTopLevelStatement(tokenizer)!);
                     parser.currentSource = source;
-                    // @ts-ignore
-                    if (process && process.env["TEST_DEBUG"]?.toString().toLowerCase() == "all") {
-                        console.log(toString(source));
-                    }
                 }
             }
             transformer.globalStatements = [];

package/assembly/src/coverage.ts

@@ -1,39 +0,0 @@
-export namespace __COVERTYPES {
-    export const Function = "Function";
-    export const Expression = "Expression";
-    export const Block = "Block";
-}
-
-export class __COVERPOINT {
-    public file: string = "";
-    public hash: string = "";
-    public line: i32 = 0;
-    public column: i32 = 0;
-    public type!: string;
-    public executed: boolean = false;
-}
-
-export class __COVERAGE {
-    public hashs: Map<string, __COVERPOINT> = new Map<string, __COVERPOINT>();
-    public points: i32 = 0;
-    static SN: __COVERAGE | null = null;
-    static init(): __COVERAGE {
-        if (!__COVERAGE.SN) {
-            __COVERAGE.SN = new __COVERAGE();
-        }
-        return __COVERAGE.SN!;
-    }
-}
-
-export function __COVERAGE_STATS(): __COVERAGE {
-    return __COVERAGE.init();
-}
-
-export function __REGISTER(point: __COVERPOINT): void {
-    __COVERAGE.init().points++;
-    __COVERAGE.init().hashs.set(point.hash, point);
-}
-
-export function __COVER(hash: string): void {
-    __COVERAGE.init().hashs.delete(hash);
-}

package/coverage.ts

@@ -1 +0,0 @@
-export * from "./assembly/src/coverage";