@effectionx/process 0.7.0 → 0.7.2

package/LICENSE

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright 2024 The Frontside Software, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@effectionx/process",
-  "version": "0.7.0",
+  "description": "Spawn and manage child processes with structured concurrency",
+  "version": "0.7.2",
   "type": "module",
   "main": "./dist/mod.js",
   "types": "./dist/mod.d.ts",
@@ -27,14 +28,14 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@effectionx/node": "workspace:*",
     "cross-spawn": "^7",
     "ctrlc-windows": "^2",
-    "shellwords-ts": "^3.0.1"
+    "shellwords-ts": "^3.0.1",
+    "@effectionx/node": "0.2.1"
   },
   "devDependencies": {
-    "@effectionx/bdd": "workspace:*",
-    "@effectionx/stream-helpers": "workspace:*",
-    "@types/cross-spawn": "^6"
+    "@types/cross-spawn": "^6",
+    "@effectionx/bdd": "0.4.2",
+    "@effectionx/stream-helpers": "0.7.2"
   }
-}
+}

package/test/exec.test.ts

@@ -1,14 +1,9 @@
 import process from "node:process";
 import { beforeEach, describe, it } from "@effectionx/bdd";
-import { type Task, spawn } from "effection";
+import { type Task, spawn, withResolvers } from "effection";
 import { expect } from "expect";
 
-import {
-  captureError,
-  expectMatch,
-  fetchText,
-  streamClose,
-} from "./helpers.ts";
+import { captureError, fetchText } from "./helpers.ts";
 
 import { lines } from "@effectionx/stream-helpers";
 import { type Process, type ProcessResult, exec } from "../mod.ts";
@@ -122,10 +117,12 @@ describe("exec", () => {
   });
   describe("successfully", () => {
     let proc: Process;
-    let joinStdout: Task<unknown>;
-    let joinStderr: Task<unknown>;
+    let stdoutTask: Task<{ sawData: boolean; matched: boolean }>;
+    let stderrTask: Task<{ sawData: boolean }>;
 
     beforeEach(function* () {
+      const stdoutReady = withResolvers<boolean>();
+
       proc = yield* exec(
         "node --experimental-strip-types './fixtures/echo-server.ts'",
         {
@@ -138,10 +135,44 @@ describe("exec", () => {
         },
       );
 
-      joinStdout = yield* spawn(streamClose(proc.stdout));
-      joinStderr = yield* spawn(streamClose(proc.stderr));
+      stdoutTask = yield* spawn(function* () {
+        const subscription = yield* lines()(proc.stdout);
+        let sawData = false;
+        let matched = false;
+        let resolved = false;
+        let next = yield* subscription.next();
+        while (!next.done) {
+          sawData = true;
+          if (!matched && /listening/.test(next.value)) {
+            matched = true;
+            if (!resolved) {
+              stdoutReady.resolve(true);
+              resolved = true;
+            }
+          }
+          next = yield* subscription.next();
+        }
+        if (!resolved) {
+          stdoutReady.resolve(false);
+        }
+        return { sawData, matched };
+      });
 
-      yield* expectMatch(/listening/, lines()(proc.stdout));
+      stderrTask = yield* spawn(function* () {
+        const subscription = yield* proc.stderr;
+        let sawData = false;
+        let next = yield* subscription.next();
+        while (!next.done) {
+          sawData = true;
+          next = yield* subscription.next();
+        }
+        return { sawData };
+      });
+
+      const listening = yield* stdoutReady.operation;
+      if (!listening) {
+        throw new Error("Expected echo server to log listening.");
+      }
     });
 
     describe("when it succeeds", () => {
@@ -170,10 +201,14 @@ describe("exec", () => {
       });
 
       it("closes stdout and stderr", function* () {
-        expect.assertions(2);
         yield* proc.expect();
-        expect(yield* joinStdout).toEqual(undefined);
-        expect(yield* joinStderr).toEqual(undefined);
+
+        const stdoutResult = yield* stdoutTask;
+        const stderrResult = yield* stderrTask;
+
+        expect(stdoutResult.matched).toEqual(true);
+        expect(stdoutResult.sawData).toEqual(true);
+        expect(stderrResult.sawData).toEqual(true);
       });
     });
 
@@ -198,11 +233,19 @@ describe("exec", () => {
           error = e as Error;
         }
         expect(error).toBeDefined();
+
+        const stdoutResult = yield* stdoutTask;
+        expect(stdoutResult.matched).toEqual(true);
+        expect(stdoutResult.sawData).toEqual(true);
       });
 
       it("closes stdout and stderr", function* () {
-        expect(yield* joinStdout).toEqual(undefined);
-        expect(yield* joinStderr).toEqual(undefined);
+        const stdoutResult = yield* stdoutTask;
+        const stderrResult = yield* stderrTask;
+
+        expect(stdoutResult.matched).toEqual(true);
+        expect(stdoutResult.sawData).toEqual(true);
+        expect(stderrResult.sawData).toEqual(true);
       });
     });
   });

package/test/helpers.ts

@@ -58,12 +58,10 @@ export function* expectMatch(pattern: RegExp, stream: Stream<string, unknown>) {
   let next = yield* subscription.next();
   while (!next.done) {
     if (pattern.test(next.value)) {
-      return;
+      return true;
     }
     next = yield* subscription.next();
   }
 
-  throw new Error(
-    "Expected the stream to produce at least one value before closing.",
-  );
+  return false;
 }