beartest-js 3.1.1 → 4.0.0

package/README.md

@@ -27,10 +27,10 @@ _Beartest_ implements the following functions `describe`, `it`, `beforeAll`, `be
 ### Example
 
 ```javascript
-import describe from 'beartest-js';
+import { describe, it } from 'beartest-js';
 import assert from 'assert';
 
-describe('Math Testing', ({ it }) => {
+describe('Math Testing', () => {
   it('should add correctly', async () => {
     assert.strictEqual(1 + 2, 3);
   });
@@ -47,4 +47,4 @@ Additionally, a very basic test runner is included. This test runner accepts a g
 
 ## License
 
-Copyright 2020 OpenJS Foundation and contributors. Licensed under [MIT](./LICENSE).
+Licensed under [MIT](./LICENSE).

package/beartest.cjs

@@ -1,52 +1,93 @@
 const rgb = require('barecolor');
 
-async function describe(headline, fn) {
-  const suite = [];
-  const only = [];
-  let beforeAll = async () => {};
-  let afterAll = async () => {};
-  let beforeEach = async () => {};
-  let afterEach = async () => {};
-  const it = (name, fn) => suite.push({ name: name, fn: fn });
-  it.only = (name, fn) => only.push({ name: name, fn: fn });
-  it.skip = () => {};
+async function RunSerially(fnArray) {
+  for (const fn of fnArray) {
+    await fn();
+  }
+}
+const suiteStack = [];
+const top = () =>
+  suiteStack.length ? suiteStack[suiteStack.length - 1] : undefined;
+
+const registerTest = (suite, name, fn) => async () => {
+  const prefix = '  '.repeat(suite.depth);
+  try {
+    await suite.beforeEach();
+    await fn();
+    rgb.green(prefix + `✓`);
+    rgb.gray(` ${name}\n`);
+  } catch (e) {
+    rgb.red(`\n${prefix}✗ ${name} \n\n`);
+    throw e;
+  } finally {
+    await suite.afterEach();
+  }
+};
 
-  fn({
-    it: it,
-    beforeAll: (fn) => {
-      beforeAll = fn;
+async function runSuite(suite) {
+  const prefix = '  '.repeat(suite.depth);
+  const tests = suite.only.length > 0 ? suite.only : suite.tests;
+  rgb.cyanln(prefix + suite.headline + ' ');
+  try {
+    await suite.beforeAll();
+    await RunSerially(tests);
+  } finally {
+    await suite.afterAll();
+  }
+}
+
+async function suite(headline, fn, only = false) {
+  const parent = top();
+  const self = {
+    depth: parent ? parent.depth + 1 : 0,
+    headline,
+    beforeAllHooks: [],
+    async beforeAll() {
+      await RunSerially(this.beforeAllHooks);
     },
-    afterAll: (fn) => {
-      afterAll = fn;
+    beforeEachHooks: [],
+    async beforeEach() {
+      if (parent) await parent.beforeEach();
+      await RunSerially(this.beforeEachHooks);
     },
-    beforeEach: (fn) => {
-      beforeEach = fn;
+    afterAllHooks: [],
+    async afterAll() {
+      await RunSerially(this.afterAllHooks);
     },
-    afterEach: (fn) => {
-      afterEach = fn;
+    afterEachHooks: [],
+    async afterEach() {
+      await RunSerially(this.afterEachHooks);
+      if (parent) await parent.afterEach();
     },
-  });
-
-  const tests = only.length > 0 ? only : suite;
-  rgb.cyanln(headline + ' ');
-
-  await beforeAll();
-  for (const test of tests) {
-    try {
-      await beforeEach();
-      await test.fn();
-      rgb.green(`✓`);
-      rgb.gray(` ${test.name}\n`);
-    } catch (e) {
-      rgb.red(`\n✗ ${test.name} \n\n`);
-      throw e;
-    } finally {
-      await afterEach();
-    }
+    tests: [],
+    only: [],
+  };
+  if (parent && only) parent.only.push(() => runSuite(self));
+  if (parent && !only) parent.tests.push(() => runSuite(self));
+  suiteStack.push(self);
+  fn();
+  suiteStack.pop();
+  if (self.depth === 0) {
+    await runSuite(self);
   }
-  await afterAll();
 }
 
+const describe = (headline, fn) => suite(headline, fn);
+describe.skip = () => {};
+describe.only = (headline, fn) => suite(headline, fn, true);
+const it = (name, fn) => top().tests.push(registerTest(top(), name, fn));
+it.only = (name, fn) => top().only.push(registerTest(top(), name, fn));
+it.skip = () => {};
+const beforeAll = (fn) => top().beforeAllHooks.push(fn);
+const afterAll = (fn) => top().afterAllHooks.push(fn);
+const beforeEach = (fn) => top().beforeEachHooks.push(fn);
+const afterEach = (fn) => top().afterEachHooks.push(fn);
+
 module.exports = {
   describe,
+  it,
+  beforeAll,
+  afterAll,
+  beforeEach,
+  afterEach,
 };

package/index.cjs

@@ -1,3 +1 @@
-const { describe } = require('./beartest.cjs');
-
-module.exports = describe;
+module.exports = require('./beartest.cjs');

package/index.d.ts

@@ -1,11 +1,12 @@
-type test = (name: string, fn: () => void | Promise<void>) => void
+type test = (name: string, fn: () => void | Promise<void>) => void;
 
-declare function describe(headline: string, fn: (args: {
-  it: test & { only: test, skip: test }
-  beforeAll: (fn: () => void | Promise<void>) => void
-  afterAll: (fn: () => void | Promise<void>) => void
-  beforeEach: (fn: () => void | Promise<void>) => void
-  afterEach: (fn: () => void | Promise<void>) => void
-}) => void): Promise<boolean>
+export declare function describe(
+  headline: string,
+  fn: () => void
+): Promise<boolean>;
 
-export = describe
+export declare const it: test & { only: test; skip: test };
+export declare function beforeAll(fn: () => void | Promise<void>): void;
+export declare function afterAll(fn: () => void | Promise<void>): void;
+export declare function beforeEach(fn: () => void | Promise<void>): void;
+export declare function afterEach(fn: () => void | Promise<void>): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beartest-js",
-  "version": "3.1.1",
+  "version": "4.0.0",
   "description": "Bear Bones Testing",
   "repository": {
     "type": "git",