@as-pect/assembly 6.0.0 → 7.0.0

package/assembly/internal/ReflectedValueType.ts

@@ -1,17 +1,17 @@
-export const enum ReflectedValueType {
-  None = 0,
-  Class = 1,
-  String = 2,
-  ArrayBuffer = 3,
-  Map = 4,
-  Set = 5,
-  Function = 6,
-  Integer = 7,
-  Float = 8,
-  Boolean = 9,
-  Array = 10,
-  TypedArray = 11,
-  Finite = 12,
-  Truthy = 13,
-  Falsy = 14,
-}
+export const enum ReflectedValueType {
+  None = 0,
+  Class = 1,
+  String = 2,
+  ArrayBuffer = 3,
+  Map = 4,
+  Set = 5,
+  Function = 6,
+  Integer = 7,
+  Float = 8,
+  Boolean = 9,
+  Array = 10,
+  TypedArray = 11,
+  Finite = 12,
+  Truthy = 13,
+  Falsy = 14,
+}

package/assembly/internal/Test.ts

@@ -1,81 +1,81 @@
-import { noOp } from "./noOp";
-
-// @ts-ignore: Decorators *are* valid here!
-@external("__aspect", "beforeEach")
-@global
-export declare function beforeEach(callback: () => void): void;
-
-// @ts-ignore: Decorators *are* valid here!
-@external("__aspect", "beforeAll")
-@global
-export declare function beforeAll(callback: () => void): void;
-
-// @ts-ignore: Decorators *are* valid here!
-@external("__aspect", "afterEach")
-@global
-export declare function afterEach(callback: () => void): void;
-
-// @ts-ignore: Decorators *are* valid here!
-@external("__aspect", "afterAll")
-@global
-export declare function afterAll(callback: () => void): void;
-
-// @ts-ignore: Decorators *are* valid here!
-@external("__aspect", "reportTodo")
-@global
-export declare function todo(description: string): void;
-
-// @ts-ignore: Decorators *are* valid here!
-@external("__aspect", "debug")
-@global
-export declare function debug(): void;
-
-// @ts-ignore: Decorators *are* valid here!
-@external("__aspect", "reportTodo")
-@global
-export declare function xit(description: string, callback: () => void): void;
-
-// @ts-ignore: Decorators *are* valid here!
-@external("__aspect", "reportTodo")
-@global
-export declare function xtest(description: string, callback: () => void): void;
-
-// @ts-ignore: decorators *are* valid here
-@external("__aspect", "reportTestTypeNode")
-@global
-export declare function it(description: string, runner: () => void): void;
-
-// @ts-ignore: decorators *are* valid here
-@external("__aspect", "reportTestTypeNode")
-@global
-export declare function test(description: string, runner: () => void): void;
-
-// @ts-ignore: decorators *are* valid here
-@external("__aspect", "reportNegatedTestNode")
-@global
-export declare function itThrows(
-  description: string,
-  runner: () => void,
-  // @ts-ignore: this is a valid syntax
-  message: string | null = null,
-): void;
-
-// @ts-ignore: decorators *are* valid here
-@external("__aspect", "reportNegatedTestNode")
-@global
-export declare function throws(
-  description: string,
-  runner: () => void,
-  // @ts-ignore: this is a valid syntax
-  message: string | null = null,
-): void;
-
-// @ts-ignore: Decorators *are* valid here!
-@external("__aspect", "reportGroupTypeNode")
-@global
-export declare function describe(
-  // @ts-ignore: this is a valid syntax
-  description: string = "",
-  // @ts-ignore: this is a valid syntax
-  runner: () => void = noOp,
-): void;
+import { noOp } from "./noOp";
+
+// @ts-ignore: Decorators *are* valid here!
+@external("__aspect", "beforeEach")
+@global
+export declare function beforeEach(callback: () => void): void;
+
+// @ts-ignore: Decorators *are* valid here!
+@external("__aspect", "beforeAll")
+@global
+export declare function beforeAll(callback: () => void): void;
+
+// @ts-ignore: Decorators *are* valid here!
+@external("__aspect", "afterEach")
+@global
+export declare function afterEach(callback: () => void): void;
+
+// @ts-ignore: Decorators *are* valid here!
+@external("__aspect", "afterAll")
+@global
+export declare function afterAll(callback: () => void): void;
+
+// @ts-ignore: Decorators *are* valid here!
+@external("__aspect", "reportTodo")
+@global
+export declare function todo(description: string): void;
+
+// @ts-ignore: Decorators *are* valid here!
+@external("__aspect", "debug")
+@global
+export declare function debug(): void;
+
+// @ts-ignore: Decorators *are* valid here!
+@external("__aspect", "reportTodo")
+@global
+export declare function xit(description: string, callback: () => void): void;
+
+// @ts-ignore: Decorators *are* valid here!
+@external("__aspect", "reportTodo")
+@global
+export declare function xtest(description: string, callback: () => void): void;
+
+// @ts-ignore: decorators *are* valid here
+@external("__aspect", "reportTestTypeNode")
+@global
+export declare function it(description: string, runner: () => void): void;
+
+// @ts-ignore: decorators *are* valid here
+@external("__aspect", "reportTestTypeNode")
+@global
+export declare function test(description: string, runner: () => void): void;
+
+// @ts-ignore: decorators *are* valid here
+@external("__aspect", "reportNegatedTestNode")
+@global
+export declare function itThrows(
+  description: string,
+  runner: () => void,
+  // @ts-ignore: this is a valid syntax
+  message: string | null = null,
+): void;
+
+// @ts-ignore: decorators *are* valid here
+@external("__aspect", "reportNegatedTestNode")
+@global
+export declare function throws(
+  description: string,
+  runner: () => void,
+  // @ts-ignore: this is a valid syntax
+  message: string | null = null,
+): void;
+
+// @ts-ignore: Decorators *are* valid here!
+@external("__aspect", "reportGroupTypeNode")
+@global
+export declare function describe(
+  // @ts-ignore: this is a valid syntax
+  description: string = "",
+  // @ts-ignore: this is a valid syntax
+  runner: () => void = noOp,
+): void;

package/assembly/internal/assert.ts

@@ -1,3 +1,3 @@
-export function assert(condition: i32, message: string): void {
-  if (!condition) throw new Error(message);
-}
+export function assert(condition: i32, message: string): void {
+  if (!condition) throw new Error(message);
+}

package/assembly/internal/call.ts

@@ -1,3 +1,3 @@
-export function __call(func: () => void): void {
-  func();
-}
+export function __call(func: () => void): void {
+  func();
+}

package/assembly/internal/comparison/toIncludeComparison.ts

@@ -1,62 +1,67 @@
-import { Actual } from "../Actual";
-import { Expected } from "../Expected";
-import { assert } from "../assert";
-
-export function toIncludeComparison<T, U>(
-  actual: T,
-  expected: U,
-  negated: i32,
-  message: string,
-): void {
-  // @ts-ignore: checking if a property is defined is compile safe
-  if (!isDefined(actual[0])) {
-    ERROR(
-      "Cannot call toIncludeEquals on actual value of type T where T does not have an index signature.",
-    );
-  }
-
-  // Assert that the actual value is not null.
-  Actual.report(actual);
-  if (isNullable<T>()) {
-    Expected.report("null", 1);
-    assert(i32(actual !== null), "");
-  }
-
-  // We always expect the value to be included
-  Expected.report("Included", negated);
-  // assume it isn't included
-  let includes: bool = false;
-
-  if (actual instanceof Set) {
-    includes = actual.has(expected);
-  } else {
-    // @ts-ignore: typesafe check
-    if (!isDefined(actual.length))
-      ERROR("Can only call toInclude on array-like objects or Sets.");
-    // @ts-ignore: typesafe access
-    let length = <indexof<T>>actual.length;
-    // @ts-ignore: typesafe check
-    if (isDefined(unchecked(actual[0]))) {
-      // @ts-ignore: if T does not have a length property, it will throw a compiler error.
-      for (let i = <indexof<T>>0; i < length; i++) {
-        // @ts-ignore: if this expression does not work, it will throw a compiler error.
-        if (unchecked(actual[i]) === expected) {
-          includes = true;
-          break;
-        }
-      }
-    } else {
-      // @ts-ignore: if T does not have a length property, it will throw a compiler error.
-      for (let i = <indexof<T>>0; i < length; i++) {
-        // @ts-ignore: if this expression does not work, it will throw a compiler error.
-        if (actual[i] === expected) {
-          includes = true;
-          break;
-        }
-      }
-    }
-  }
-
-  Actual.report(includes ? "Included" : "Not Included");
-  assert(negated ^ i32(includes), message);
-}
+import { Actual } from "../Actual";
+import { Expected } from "../Expected";
+import { assert } from "../assert";
+
+export function toIncludeComparison<T, U>(
+  actual: T,
+  expected: U,
+  negated: i32,
+  message: string,
+): void {
+  // @ts-ignore: checking if a property is defined is compile safe
+  if (!isDefined(actual[0]))
+    // @as-covers: ignore because this is a compile time error
+    ERROR(
+      "Cannot call toIncludeEquals on actual value of type T where T does not have an index signature.",
+    );
+
+  // Assert that the actual value is not null.
+  Actual.report(actual);
+  if (isNullable<T>()) {
+    Expected.report("null", 1);
+    assert(i32(actual !== null), "");
+  }
+
+  // We always expect the value to be included
+  Expected.report("Included", negated);
+  // assume it isn't included
+  let includes: bool = false;
+
+  if (actual instanceof Set) {
+    includes = actual.has(expected);
+  } else {
+    if (isNullable(actual)) {
+      includes = includesCheck(actual!, expected);
+    } else {
+      includes = includesCheck(actual, expected);
+    }
+  }
+
+  Actual.report(includes ? "Included" : "Not Included");
+  assert(negated ^ i32(includes), message);
+}
+
+function includesCheck<T, U>(actual: T, expected: U): bool {
+  // @ts-ignore: typesafe check
+  if (!isDefined(actual.length))
+    // @as-covers: ignore because this is a compile time error
+    ERROR("Can only call toInclude on array-like objects or Sets.");
+
+  if (!isDefined(unchecked(actual[0])))
+    // @as-covers: ignore because this is a compile time error
+    ERROR("Can only call toInclude on array-like objects or Sets.");
+
+  // @ts-ignore: typesafe access
+  let length = <indexof<T>>actual.length;
+  // @ts-ignore: typesafe check
+  if (isDefined(unchecked(actual[0]))) {
+    // @ts-ignore: if T does not have a length property, it will throw a compiler error.
+    for (let i = <indexof<T>>0; i < length; i++) {
+      // @ts-ignore: if this expression does not work, it will throw a compiler error.
+      if (unchecked(actual[i]) === expected) {
+        return true;
+      }
+    }
+  }
+  return false;
+}

package/assembly/internal/comparison/toIncludeEqualComparison.ts

@@ -1,78 +1,91 @@
-import { Actual } from "../Actual";
-import { Expected } from "../Expected";
-import { assert } from "../assert";
-
-// @ts-ignore expected is valueof<T> or it will be a compiler error
-export function toIncludeEqualComparison<T, U>(
-  actual: T,
-  expected: U,
-  negated: i32,
-  message: string,
-): void {
-  // @ts-ignore: typesafe check
-  if (!isDefined(actual[0])) {
-    ERROR(
-      "Cannot call toIncludeEquals on actual value of type T where T does not have an index signature.",
-    );
-  }
-
-  // Assert that the actual value is not null.
-  Actual.report(actual);
-  Expected.report("null", 1);
-  assert(i32(changetype<usize>(actual) != 0), "");
-
-  // We always expect the value to be included
-  Expected.report("Included", negated);
-  // assume it isn't included
-  let includes = false;
-
-  if (actual instanceof Set) {
-    if (actual.has(expected)) {
-      includes = true;
-    } else {
-      // if it isn't already in the set, we need to look over each value and inspect it for strict equality
-      // @ts-ignore: type safe .values() method call
-      let values = actual.values();
-      let length = values.length;
-      for (let i = 0; i < length; i++) {
-        let key = unchecked(values[i]);
-        if (Reflect.equals(key, expected) === Reflect.SUCCESSFUL_MATCH) {
-          includes = true;
-          break;
-        }
-      }
-    }
-  } else {
-    // @ts-ignore: typesafe check
-    if (!isDefined(actual.length))
-      ERROR("Can only call toIncludeEquals on array-like objects or Sets.");
-    // @ts-ignore: typesafe access
-    let length = <indexof<T>>actual.length;
-    // @ts-ignore: typesafe check
-    if (isDefined(unchecked(actual[0]))) {
-      // @ts-ignore: if T does not have a length property, it will throw a compiler error.
-      for (let i = <indexof<T>>0; i < length; i++) {
-        if (
-          // @ts-ignore: actual[i] type must match expected, or a compiler error will happen
-          Reflect.equals(unchecked(actual[i]), expected) ==
-          Reflect.SUCCESSFUL_MATCH
-        ) {
-          includes = true;
-          break;
-        }
-      }
-    } else {
-      // @ts-ignore: if T does not have a length property, it will throw a compiler error.
-      for (let i = <indexof<T>>0; i < length; i++) {
-        // @ts-ignore: if this expression does not work, it will throw a compiler error.
-        if (Reflect.equals(actual[i], expected) === Reflect.SUCCESSFUL_MATCH) {
-          includes = true;
-          break;
-        }
-      }
-    }
-  }
-
-  Actual.report(includes ? "Included" : "Not Included");
-  assert(negated ^ i32(includes), message);
-}
+import { Actual } from "../Actual";
+import { Expected } from "../Expected";
+import { assert } from "../assert";
+
+// @ts-ignore expected is valueof<T> or it will be a compiler error
+export function toIncludeEqualComparison<T, U>(
+  actual: T,
+  expected: U,
+  negated: i32,
+  message: string,
+): void {
+  // @ts-ignore: typesafe check
+  if (!isDefined(actual[0]))
+    // @as-covers: ignore beause this is a compile time error
+    ERROR(
+      "Cannot call toIncludeEquals on actual value of type T where T does not have an index signature.",
+    );
+
+  // Assert that the actual value is not null.
+  Actual.report(actual);
+  Expected.report("null", 1);
+  assert(i32(changetype<usize>(actual) != 0), "");
+
+  // We always expect the value to be included
+  Expected.report("Included", negated);
+  // assume it isn't included
+  let includes = false;
+
+  if (actual instanceof Set) {
+    if (actual.has(expected)) {
+      includes = true;
+    } else {
+      // if it isn't already in the set, we need to look over each value and inspect it for strict equality
+      // @ts-ignore: type safe .values() method call
+      let values = actual.values();
+      let length = values.length;
+      for (let i = 0; i < length; i++) {
+        let key = unchecked(values[i]);
+        if (Reflect.equals(key, expected) === Reflect.SUCCESSFUL_MATCH) {
+          includes = true;
+          break;
+        }
+      }
+    }
+  } else {
+    // @ts-ignore: typesafe check
+    if (!isDefined(actual.length))
+      ERROR("Can only call toIncludeEquals on array-like objects or Sets.");
+
+    if (isNullable<T>()) {
+      let actualNotNull = actual!;
+      // @ts-ignore: typesafe check
+      if (isDefined(unchecked(actualNotNull[0]))) {
+        // @ts-ignore: typesafe access
+        let length = <indexof<T>>actualNotNull.length;
+        // @ts-ignore: if T does not have a length property, it will throw a compiler error.
+        for (let i = <indexof<T>>0; i < length; i++) {
+          if (
+            // @ts-ignore: actual[i] type must match expected, or a compiler error will happen
+            Reflect.equals(unchecked(actualNotNull[i]), expected) ==
+            Reflect.SUCCESSFUL_MATCH
+          ) {
+            includes = true;
+            break;
+          }
+        }
+      }
+    } else {
+      // @ts-ignore: typesafe check
+      if (isDefined(unchecked(actual[0]))) {
+        // @ts-ignore: typesafe access
+        let length = <indexof<T>>actual.length;
+        // @ts-ignore: if T does not have a length property, it will throw a compiler error.
+        for (let i = <indexof<T>>0; i < length; i++) {
+          if (
+            // @ts-ignore: actual[i] type must match expected, or a compiler error will happen
+            Reflect.equals(unchecked(actual[i]), expected) ==
+            Reflect.SUCCESSFUL_MATCH
+          ) {
+            includes = true;
+            break;
+          }
+        }
+      }
+    }
+    // unchecked is always defined...
+  }
+
+  Actual.report(includes ? "Included" : "Not Included");
+  assert(negated ^ i32(includes), message);
+}

package/assembly/internal/log.ts

@@ -1,18 +1,19 @@
-// @ts-ignore: decorators *are* valid here
-@external("__aspect", "logReflectedValue")
-declare function logReflectedValue(value: i32): void;
-
-let ignoreLogs: bool = false;
-
-export function __ignoreLogs(value: bool): void {
-  ignoreLogs = value;
-}
-
-// @ts-ignore: decorators *are* valid here
-@global
-export function log<T>(value: T): void {
-  if (ignoreLogs) return;
-  let reflectedId = Reflect.toReflectedValue(value);
-  Reflect.attachStackTrace(reflectedId);
-  logReflectedValue(reflectedId);
-}
+// @ts-ignore: decorators *are* valid here
+@external("__aspect", "logReflectedValue")
+declare function logReflectedValue(value: i32): void;
+
+let ignoreLogs: bool = false;
+
+export function __ignoreLogs(value: bool): void {
+  ignoreLogs = value;
+}
+
+// @ts-ignore: decorators *are* valid here
+@global
+export function log<T>(value: T): void {
+  if (ignoreLogs) return;
+  // The T parameter must be passed directly
+  let reflectedId = Reflect.toReflectedValue<T>(value);
+  Reflect.attachStackTrace(reflectedId);
+  logReflectedValue(reflectedId);
+}

package/assembly/internal/noOp.ts

@@ -1,2 +1,3 @@
-/*  eslint-disable */
-export const noOp = (): void => {};
+/*  eslint-disable */
+// @as-covers: ignore because this is just an empty placeholder function
+export const noOp = (): void => {};

package/package.json

@@ -1,15 +1,20 @@
 {
   "name": "@as-pect/assembly",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "description": "Write AssemblyScript tests at blazing fast speeds",
   "types": "types/as-pect.d.ts",
+  "type": "module",
   "scripts": {
-    "asp:ci": "node ../cli/lib/test --summary",
-    "asp": "node ../cli/lib/test --verbose",
-    "test:ci": "run-s asp:ci",
-    "test": "run-s asp",
+    "asp:ci": "node --experimental-wasi-unstable-preview1 ../cli/lib/test.js --summary",
+    "asp": "node --experimental-wasi-unstable-preview1 ../cli/lib/test.js --verbose",
+    "test:ci": "asp --summary",
+    "test": "asp --verbose",
     "tsc:all": "exit 0",
-    "test:update-snapshots": "exit 0"
+    "test:update-snapshots": "exit 0",
+    "asbuild:debug": "asc assembly/index.ts --target debug",
+    "asbuild:release": "asc assembly/index.ts --target release",
+    "asbuild": "npm run asbuild:debug && npm run asbuild:release",
+    "start": "npx serve ."
   },
   "repository": {
     "type": "git",
@@ -31,8 +36,10 @@
     "assembly/index.ts",
     "types/"
   ],
-  "peerDependencies": {
-    "assemblyscript": "^0.18.7"
-  },
-  "gitHead": "bb36d58b99968691d11bbc0b52dd0cb7f4b68e62"
+  "exports": {
+    ".": {
+      "import": "./build/release.js",
+      "types": "./build/release.d.ts"
+    }
+  }
 }