@effectionx/test-adapter 0.4.0 → 0.5.1

package/README.md

@@ -25,9 +25,14 @@ describe("something", () => {
   
   adapter.addSetup(function*() {
     /* do some setup. equivalent of beforeEach() */
-	/* contexts set here will be visible in the test */*
+	/* contexts set here will be visible in the test */
   });
   
+  adapter.addOnetimeSetup(function*() {
+    /* do some setup that will only happen once. equivalent of beforeAll() */
+	/* contexts set here will be visible in the test */
+  });
+
   it("does a thing", async () => {
     await adapter.runTest(function*() {
 	  /* ... the body of the test */

package/esm/box.d.ts

@@ -0,0 +1,4 @@
+import { type Operation, type Result } from "effection";
+export declare function box<T>(content: () => Operation<T>): Operation<Result<T>>;
+export declare function unbox<T>(result: Result<T>): T;
+//# sourceMappingURL=box.d.ts.map

package/esm/box.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"box.d.ts","sourceRoot":"","sources":["../src/box.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAEjE,wBAAiB,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAMzE;AAED,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAK7C"}

package/esm/box.js

@@ -0,0 +1,15 @@
+import { Err, Ok } from "effection";
+export function* box(content) {
+    try {
+        return Ok(yield* content());
+    }
+    catch (error) {
+        return Err(error);
+    }
+}
+export function unbox(result) {
+    if (result.ok) {
+        return result.value;
+    }
+    throw result.error;
+}

package/esm/mod.d.ts

@@ -17,11 +17,6 @@ export interface TestAdapter {
      * ancestors. E.g. `All Tests > File System > write`
      */
     readonly fullname: string;
-    /**
-     * Every test adapter has its own Effection `Scope` which holds the resources necessary
-     * to run this test.
-     */
-    readonly scope: Scope;
     /**
      * A list of this test adapter and every adapter that it descends from.
      */
@@ -30,12 +25,20 @@ export interface TestAdapter {
      * The setup operations that will be run by this test adapter. It only includes those
      * setups that are associated with this adapter, not those of its ancestors.
      */
-    readonly setups: TestOperation[];
+    readonly setup: {
+        all: TestOperation[];
+        each: TestOperation[];
+    };
     /**
      * Add a setup operation to every test that is part of this adapter. In BDD integrations,
      * this is usually called by `beforEach()`
      */
     addSetup(op: TestOperation): void;
+    /**
+     * Add a setup operation that will run exactly once before any tests that are run in this
+     * adapter. In BDD integrations, this is usually called by beforeAll()
+     */
+    addOnetimeSetup(op: TestOperation): void;
     /**
      * Actually run a test. This evaluates all setup operations, and then after those have completed
      * it runs the body of the test itself.
@@ -46,6 +49,12 @@ export interface TestAdapter {
      * This basically destroys the Effection `Scope` associated with this adapter.
      */
     destroy(): Future<void>;
+    /**
+     * Used internally to prepare adapters to run test
+     *
+     * @ignore
+     */
+    ["@@init@@"](): Operation<Result<Scope>>;
 }
 export interface TestAdapterOptions {
     /**

package/esm/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAGlE,MAAM,WAAW,aAAa;IAC5B,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAE9B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IAErC;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC;IAEjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAAC;IAElC;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAEnD;;;OAGG;IACH,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AASD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,GAAE,kBAAuB,GAC/B,WAAW,CA6Cb"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,SAAS,EACT,MAAM,EACN,KAAK,EAEN,MAAM,WAAW,CAAC;AAWnB,MAAM,WAAW,aAAa;IAC5B,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAE9B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IAErC;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,aAAa,EAAE,CAAC;QAAC,IAAI,EAAE,aAAa,EAAE,CAAA;KAAE,CAAC;IAEhE;;;OAGG;IACH,QAAQ,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAAC;IAElC;;;OAGG;IACH,eAAe,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAAC;IAEzC;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAEnD;;;OAGG;IACH,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;IAExB;;;;OAIG;IACH,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,kBAAkB;IACjC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AASD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,GAAE,kBAAuB,GAC/B,WAAW,CA4Fb"}

package/esm/mod.js

@@ -1,4 +1,5 @@
-import { createScope, Err, Ok } from "effection";
+import { createScope, Ok, run, suspend, useScope, withResolvers, } from "effection";
+import { box } from "./box.js";
 const anonymousNames = (function* () {
     let count = 1;
     while (true) {
@@ -9,14 +10,17 @@ const anonymousNames = (function* () {
  * Create a new test adapter with the given options.
  */
 export function createTestAdapter(options = {}) {
-    const setups = [];
+    const setup = {
+        all: [],
+        each: [],
+    };
     const { parent, name = anonymousNames.next().value } = options;
-    const [scope, destroy] = createScope(parent?.scope);
+    let scope = undefined;
+    let destroy = function* () { };
     const adapter = {
         parent,
         name,
-        scope,
-        setups,
+        setup,
         get lineage() {
             const lineage = [adapter];
             for (let current = parent; current; current = current.parent) {
@@ -28,24 +32,58 @@ export function createTestAdapter(options = {}) {
             return adapter.lineage.map((adapter) => adapter.name).join(" > ");
         },
         addSetup(op) {
-            setups.push(op);
+            setup.each.push(op);
+        },
+        addOnetimeSetup(op) {
+            setup.all.push(op);
         },
         runTest(op) {
-            return scope.run(function* () {
-                const allSetups = adapter.lineage.reduce((all, adapter) => all.concat(adapter.setups), []);
-                try {
-                    for (const setup of allSetups) {
-                        yield* setup();
+            return run(function* () {
+                let init = yield* adapter["@@init@@"]();
+                if (!init.ok) {
+                    return init;
+                }
+                let scope = init.value;
+                const setups = adapter.lineage.reduce((all, adapter) => all.concat(adapter.setup.each), []);
+                let test = yield* scope.spawn(() => box(function* () {
+                    for (let fn of setups) {
+                        yield* fn();
                     }
                     yield* op();
-                    return Ok(void 0);
+                }));
+                return yield* test;
+            });
+        },
+        *["@@init@@"]() {
+            if (scope) {
+                return yield* scope.operation;
+            }
+            scope = withResolvers();
+            let parent = adapter.parent
+                ? yield* adapter.parent["@@init@@"]()
+                : Ok(createScope()[0]);
+            if (!parent.ok) {
+                scope.resolve(parent);
+                return yield* scope.operation;
+            }
+            let task = yield* parent.value.spawn(function* () {
+                let init = yield* box(function* () {
+                    for (let initializer of adapter.setup.all) {
+                        yield* initializer();
+                    }
+                });
+                if (!init.ok) {
+                    scope.resolve(init);
                 }
-                catch (error) {
-                    return Err(error);
+                else {
+                    scope.resolve(Ok(yield* useScope()));
+                    yield* suspend();
                 }
             });
+            destroy = task.halt;
+            return yield* scope.operation;
         },
-        destroy,
+        destroy: () => run(destroy),
     };
     return adapter;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectionx/test-adapter",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "author": "engineering@frontside.com",
   "repository": {
     "type": "git",

package/script/box.d.ts

@@ -0,0 +1,4 @@
+import { type Operation, type Result } from "effection";
+export declare function box<T>(content: () => Operation<T>): Operation<Result<T>>;
+export declare function unbox<T>(result: Result<T>): T;
+//# sourceMappingURL=box.d.ts.map

package/script/box.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"box.d.ts","sourceRoot":"","sources":["../src/box.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAEjE,wBAAiB,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAMzE;AAED,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAK7C"}

package/script/box.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.box = box;
+exports.unbox = unbox;
+const effection_1 = require("effection");
+function* box(content) {
+    try {
+        return (0, effection_1.Ok)(yield* content());
+    }
+    catch (error) {
+        return (0, effection_1.Err)(error);
+    }
+}
+function unbox(result) {
+    if (result.ok) {
+        return result.value;
+    }
+    throw result.error;
+}

package/script/mod.d.ts

@@ -17,11 +17,6 @@ export interface TestAdapter {
      * ancestors. E.g. `All Tests > File System > write`
      */
     readonly fullname: string;
-    /**
-     * Every test adapter has its own Effection `Scope` which holds the resources necessary
-     * to run this test.
-     */
-    readonly scope: Scope;
     /**
      * A list of this test adapter and every adapter that it descends from.
      */
@@ -30,12 +25,20 @@ export interface TestAdapter {
      * The setup operations that will be run by this test adapter. It only includes those
      * setups that are associated with this adapter, not those of its ancestors.
      */
-    readonly setups: TestOperation[];
+    readonly setup: {
+        all: TestOperation[];
+        each: TestOperation[];
+    };
     /**
      * Add a setup operation to every test that is part of this adapter. In BDD integrations,
      * this is usually called by `beforEach()`
      */
     addSetup(op: TestOperation): void;
+    /**
+     * Add a setup operation that will run exactly once before any tests that are run in this
+     * adapter. In BDD integrations, this is usually called by beforeAll()
+     */
+    addOnetimeSetup(op: TestOperation): void;
     /**
      * Actually run a test. This evaluates all setup operations, and then after those have completed
      * it runs the body of the test itself.
@@ -46,6 +49,12 @@ export interface TestAdapter {
      * This basically destroys the Effection `Scope` associated with this adapter.
      */
     destroy(): Future<void>;
+    /**
+     * Used internally to prepare adapters to run test
+     *
+     * @ignore
+     */
+    ["@@init@@"](): Operation<Result<Scope>>;
 }
 export interface TestAdapterOptions {
     /**

package/script/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAGlE,MAAM,WAAW,aAAa;IAC5B,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAE9B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IAErC;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC;IAEjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAAC;IAElC;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAEnD;;;OAGG;IACH,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AASD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,GAAE,kBAAuB,GAC/B,WAAW,CA6Cb"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,SAAS,EACT,MAAM,EACN,KAAK,EAEN,MAAM,WAAW,CAAC;AAWnB,MAAM,WAAW,aAAa;IAC5B,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAE9B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IAErC;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,aAAa,EAAE,CAAC;QAAC,IAAI,EAAE,aAAa,EAAE,CAAA;KAAE,CAAC;IAEhE;;;OAGG;IACH,QAAQ,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAAC;IAElC;;;OAGG;IACH,eAAe,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI,CAAC;IAEzC;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAEnD;;;OAGG;IACH,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;IAExB;;;;OAIG;IACH,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,kBAAkB;IACjC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AASD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,GAAE,kBAAuB,GAC/B,WAAW,CA4Fb"}

package/script/mod.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTestAdapter = createTestAdapter;
 const effection_1 = require("effection");
+const box_js_1 = require("./box.js");
 const anonymousNames = (function* () {
     let count = 1;
     while (true) {
@@ -12,14 +13,17 @@ const anonymousNames = (function* () {
  * Create a new test adapter with the given options.
  */
 function createTestAdapter(options = {}) {
-    const setups = [];
+    const setup = {
+        all: [],
+        each: [],
+    };
     const { parent, name = anonymousNames.next().value } = options;
-    const [scope, destroy] = (0, effection_1.createScope)(parent?.scope);
+    let scope = undefined;
+    let destroy = function* () { };
     const adapter = {
         parent,
         name,
-        scope,
-        setups,
+        setup,
         get lineage() {
             const lineage = [adapter];
             for (let current = parent; current; current = current.parent) {
@@ -31,24 +35,58 @@ function createTestAdapter(options = {}) {
             return adapter.lineage.map((adapter) => adapter.name).join(" > ");
         },
         addSetup(op) {
-            setups.push(op);
+            setup.each.push(op);
+        },
+        addOnetimeSetup(op) {
+            setup.all.push(op);
         },
         runTest(op) {
-            return scope.run(function* () {
-                const allSetups = adapter.lineage.reduce((all, adapter) => all.concat(adapter.setups), []);
-                try {
-                    for (const setup of allSetups) {
-                        yield* setup();
+            return (0, effection_1.run)(function* () {
+                let init = yield* adapter["@@init@@"]();
+                if (!init.ok) {
+                    return init;
+                }
+                let scope = init.value;
+                const setups = adapter.lineage.reduce((all, adapter) => all.concat(adapter.setup.each), []);
+                let test = yield* scope.spawn(() => (0, box_js_1.box)(function* () {
+                    for (let fn of setups) {
+                        yield* fn();
                     }
                     yield* op();
-                    return (0, effection_1.Ok)(void 0);
+                }));
+                return yield* test;
+            });
+        },
+        *["@@init@@"]() {
+            if (scope) {
+                return yield* scope.operation;
+            }
+            scope = (0, effection_1.withResolvers)();
+            let parent = adapter.parent
+                ? yield* adapter.parent["@@init@@"]()
+                : (0, effection_1.Ok)((0, effection_1.createScope)()[0]);
+            if (!parent.ok) {
+                scope.resolve(parent);
+                return yield* scope.operation;
+            }
+            let task = yield* parent.value.spawn(function* () {
+                let init = yield* (0, box_js_1.box)(function* () {
+                    for (let initializer of adapter.setup.all) {
+                        yield* initializer();
+                    }
+                });
+                if (!init.ok) {
+                    scope.resolve(init);
                 }
-                catch (error) {
-                    return (0, effection_1.Err)(error);
+                else {
+                    scope.resolve((0, effection_1.Ok)(yield* (0, effection_1.useScope)()));
+                    yield* (0, effection_1.suspend)();
                 }
             });
+            destroy = task.halt;
+            return yield* scope.operation;
         },
-        destroy,
+        destroy: () => (0, effection_1.run)(destroy),
     };
     return adapter;
 }