Run tests on effection v4

.codesandbox/Dockerfile

@@ -0,0 +1,3 @@
+RUN apt update && apt install -y curl unzip && curl -fsSL https://deno.land/x/install/install.sh | sh
+ENV DENO_INSTALL="/root/.deno"
+ENV PATH="$DENO_INSTALL/bin:$PATH"

.codesandbox/tasks.json

@@ -0,0 +1,13 @@
+{
+  // These tasks will run in order when initializing your CodeSandbox project.
+  "setupTasks": [
+    {
+      "name": "curl -fsSL https://deno.land/install.sh | sh",
+      "command": "curl -fsSL https://deno.land/install.sh | sh"
+    }
+  ],
+
+  // These tasks can be run from CodeSandbox. Running one will open a log in the app.
+  "tasks": {
+  }
+}

.dagger/.gitattributes

@@ -0,0 +1 @@
+/sdk/** linguist-generated

.dagger/.gitignore

@@ -0,0 +1,4 @@
+/sdk
+/**/node_modules/**
+/**/.pnpm-store/**
+/.env

.dagger/package.json

@@ -0,0 +1,7 @@
+{
+  "type": "module",
+  "dependencies": {
+    "typescript": "5.9.3"
+  },
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+}

.dagger/src/index.ts

@@ -0,0 +1,78 @@
+/**
+ * A generated module for Effectionx functions
+ *
+ * This module has been generated via dagger init and serves as a reference to
+ * basic module structure as you get started with Dagger.
+ *
+ * Two functions have been pre-created. You can modify, delete, or add to them,
+ * as needed. They demonstrate usage of arguments and return types using simple
+ * echo and grep commands. The functions can be called from the dagger CLI or
+ * from one of the SDKs.
+ *
+ * The first line in this comment block is a short description line and the
+ * rest is a long description with more detail on the module's purpose or usage,
+ * if appropriate. All modules should have a short description.
+ */
+import { dag, Container, Directory, File, object, func, argument } from "@dagger.io/dagger"
+
+@object()
+export class Effectionx {
+  source: Directory
+
+  constructor(
+    @argument({ defaultPath: ".", ignore: ["**/.dagger/**/*"] })
+    source: Directory,
+  ) {
+    this.source = source
+  }
+
+  @func()
+  ubuntu(): Container {
+    return dag
+      .container()
+      .from("ubuntu:latest")
+      .withExec(["apt-get", "update"])
+      .withExec(["apt-get", "install", "-y", "software-properties-common"])
+      .withExec(["add-apt-repository", "-y", "ppa:colin-king/stress-ng"])
+      .withExec(["apt-get", "update"])
+      .withExec(["apt-get", "install", "-y", "curl", "unzip", "nodejs", "stress-ng"])
+      .withExec(["sh", "-c", "curl -fsSL https://deno.land/install.sh | sh"])
+      .withMountedDirectory("/effectionx", this.source)
+      .withEnvVariable("PATH", "$PATH:/root/.deno/bin", { expand: true })
+      .withWorkdir("/effectionx")
+      .withExec(["deno", "install", "--allow-scripts"])
+      .withExec(["deno", "task", "generate-importmap"])
+  }
+
+  @func()
+  async testV3Stress(
+    @argument({ defaultValue: 100 })
+    rounds: number
+  ): Promise<File> {
+    const container = this.ubuntu()
+      .withExec(["bash", "run-test-v3-stress.sh", rounds.toString()])
+
+    // Get the filename
+    const filename = await container
+      .withExec(["sh", "-c", "ls /effectionx/test-summary-v3_*.log"])
+      .stdout()
+
+    return container.file(filename.trim())
+  }
+
+  @func()
+  async testV4Stress(
+    @argument({ defaultValue: 100 })
+    rounds: number
+  ): Promise<File> {
+    const container = this.ubuntu()
+      .withExec(["bash", "run-test-v4-stress.sh", rounds.toString()])
+
+    // Get the filename
+    const filename = await container
+      .withExec(["sh", "-c", "ls /effectionx/test-summary-v4_*.log"])
+      .stdout()
+
+    return container.file(filename.trim())
+  }
+}

.dagger/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "moduleResolution": "Node",
+    "experimentalDecorators": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "paths": {
+      "@dagger.io/dagger": [
+        "./sdk/index.ts"
+      ],
+      "@dagger.io/dagger/telemetry": [
+        "./sdk/telemetry.ts"
+      ]
+    }
+  }
+}

.dagger/yarn.lock

@@ -0,0 +1,34 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 8
+  cacheKey: 10c0
+
+"root-workspace-0b6124@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "root-workspace-0b6124@workspace:."
+  dependencies:
+    typescript: "npm:5.9.3"
+  languageName: unknown
+  linkType: soft
+
+"typescript@npm:5.9.3":
+  version: 5.9.3
+  resolution: "typescript@npm:5.9.3"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/6bd7552ce39f97e711db5aa048f6f9995b53f1c52f7d8667c1abdc1700c68a76a308f579cd309ce6b53646deb4e9a1be7c813a93baaf0a28ccd536a30270e1c5
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@npm%3A5.9.3#optional!builtin<compat/typescript>":
+  version: 5.9.3
+  resolution: "typescript@patch:typescript@npm%3A5.9.3#optional!builtin<compat/typescript>::version=5.9.3&hash=5786d5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/ad09fdf7a756814dce65bc60c1657b40d44451346858eea230e10f2e95a289d9183b6e32e5c11e95acc0ccc214b4f36289dcad4bf1886b0adb84d711d336a430
+  languageName: node
+  linkType: hard

.github/workflows/verify-posix.yaml

@@ -34,5 +34,10 @@ jobs:
       - run: deno fmt --check
 
       - run: deno lint
+      - run: deno task generate-importmap
 
-      - run: deno test --allow-net --allow-read --allow-write --allow-env --allow-run --allow-ffi
+      - name: V3 Tests
+        run: deno test --allow-net --allow-read --allow-write --allow-env --allow-run --allow-ffi
+
+      - name: V4 Tests
+        run: deno test --import-map v4.importmap.json --allow-net --allow-read --allow-write --allow-env --allow-run --allow-ffi --trace-leaks

.github/workflows/verify-windows.yaml

@@ -41,20 +41,40 @@ jobs:
 
       - run: deno lint
 
-      - name: "Test (${{matrix.shell}})"
+      - run: deno task generate-importmap
+
+      - name: "Test V3 (${{matrix.shell}})"
         if: matrix.shell == 'powershell' || matrix.shell == 'pwsh'
         run: |
           $env:SHELL = "${{matrix.shell}}"
           deno test --allow-net --allow-read --allow-write --allow-env --allow-run --allow-ffi --trace-leaks
 
-      - name: "Test (${{matrix.shell}})"
+      - name: "Test V4 (${{matrix.shell}})"
+        if: matrix.shell == 'powershell' || matrix.shell == 'pwsh'
+        run: |
+          $env:SHELL = "${{matrix.shell}}"
+          deno test --import-map v4.importmap.json --allow-net --allow-read --allow-write --allow-env --allow-run --allow-ffi --trace-leaks
+
+      - name: "Test V3 (${{matrix.shell}})"
         if: matrix.shell == 'cmd'
         run: |
           set SHELL=${{matrix.shell}}
           deno test --allow-net --allow-read --allow-write --allow-env --allow-run --allow-ffi --trace-leaks
 
-      - name: "Test (${{matrix.shell}})"
+      - name: "Test V4 (${{matrix.shell}})"
+        if: matrix.shell == 'cmd'
+        run: |
+          set SHELL=${{matrix.shell}}
+          deno test --import-map v4.importmap.json --allow-net --allow-read --allow-write --allow-env --allow-run --allow-ffi --trace-leaks
+
+      - name: "Test V3 (${{matrix.shell}})"
         if: matrix.shell == 'bash'
         run: |
           export SHELL=${{matrix.shell}}
           deno test --allow-net --allow-read --allow-write --allow-env --allow-run --allow-ffi --trace-leaks
+
+      - name: "Test V4 (${{matrix.shell}})"
+        if: matrix.shell == 'bash'
+        run: |
+          export SHELL=${{matrix.shell}}
+          deno test --import-map v4.importmap.json --allow-net --allow-read --allow-write --allow-env --allow-run --allow-ffi --trace-leaks

.gitignore

@@ -1,4 +1,5 @@
 /deno.lock
 /**/build/
+/v4.importmap.json
 
 .vscode

dagger.json

@@ -0,0 +1,8 @@
+{
+  "name": "effectionx",
+  "engineVersion": "v0.19.4",
+  "sdk": {
+    "source": "typescript"
+  },
+  "source": ".dagger"
+}

deno.json

@@ -3,7 +3,8 @@
     "effection": "npm:effection@^3",
     "@deno/dnt": "jsr:@deno/[email protected]",
     "@std/path": "jsr:@std/path@^1",
-    "zod": "npm:[email protected]"
+    "zod": "npm:[email protected]",
+    "@std/fs": "jsr:@std/fs@^1"
   },
   "compilerOptions": {
     "lib": [
@@ -20,7 +21,10 @@
         "prefer-const",
         "require-yield"
       ]
-    }
+    },
+    "exclude": [
+      "tasks"
+    ]
   },
   "workspace": [
     "./context-api",
@@ -39,5 +43,10 @@
     "./stream-helpers",
     "./signals",
     "./process"
-  ]
+  ],
+  "tasks": {
+    "generate-importmap": "deno run --allow-read --allow-write tasks/generate-importmap.ts",
+    "test": "deno test -A --trace-leaks",
+    "test:v4": "deno test -A --import-map=v4.importmap.json --trace-leaks"
+  }
 }

fx/parallel.test.ts

@@ -1,6 +1,6 @@
 import { describe, it } from "@effectionx/bdd";
 import { expect } from "@std/expect";
-import { each, Err, Ok, sleep, spawn } from "effection";
+import { each, Err, Ok, sleep, spawn, until } from "effection";
 
 import { parallel } from "./parallel.ts";
 
@@ -101,7 +101,8 @@ describe("parallel()", () => {
       yield* sleep(15);
       two.resolve(2);
     });
-    const results = yield* parallel([one, () => two.promise]);
+
+    const results = yield* parallel([one, () => until(two.promise)]);
     expect(yield* results).toEqual([Ok(1), Ok(2)]);
   });
 
@@ -112,7 +113,10 @@ describe("parallel()", () => {
 
     function* genFn() {
       try {
-        const results = yield* parallel([() => one.promise, () => two.promise]);
+        const results = yield* parallel([
+          () => until(one.promise),
+          () => until(two.promise),
+        ]);
         actual = yield* results;
       } catch (_) {
         actual = [Err(new Error("should not get hit"))];

fx/parallel.ts

@@ -1,10 +1,9 @@
-import type { Callable, Channel, Operation, Result } from "effection";
+import type { Channel, Operation, Result, Task } from "effection";
 import { createChannel, resource, spawn } from "effection";
 
 import { safe } from "./safe.ts";
 
-import type { Computation } from "./type.ts";
-export interface ParallelRet<T> extends Computation<Result<T>[]> {
+export interface ParallelRet<T> extends Operation<Result<T>[]> {
   sequence: Channel<Result<T>, void>;
   immediate: Channel<Result<T>, void>;
 }
@@ -61,16 +60,16 @@ export interface ParallelRet<T> extends Computation<Result<T>[]> {
  * }
  * ```
  */
-export function parallel<T>(
-  operations: Callable<T>[],
+export function parallel<T, TArgs extends unknown[] = []>(
+  operations: ((...args: TArgs) => Operation<T>)[],
 ): Operation<ParallelRet<T>> {
   const sequence = createChannel<Result<T>>();
   const immediate = createChannel<Result<T>>();
   const results: Result<T>[] = [];
 
   return resource<ParallelRet<T>>(function* (provide) {
     const task = yield* spawn(function* () {
-      const tasks = [];
+      const tasks = [] as Task<Result<T>>[];
       for (const op of operations) {
         tasks.push(
           yield* spawn(function* () {
@@ -95,7 +94,6 @@ export function parallel<T>(
       yield* task;
       return results;
     }
-
     yield* provide({
       sequence,
       immediate,

fx/race.test.ts

@@ -10,12 +10,12 @@ describe("raceMap()", () => {
     function* () {
       let winner;
       const results = yield* raceMap({
-        first: function* () {
+        *first() {
           yield* sleep(10);
           winner = "first";
           return "first";
         },
-        second: function* () {
+        *second() {
           yield* sleep(20);
           winner = "second";
           return "second";