Merge pull request #98 from thefrontside/tm/switch-all-to-npm

Switch all we can to npm and Node compatible APIs

Author: cowboyd

fx/request.test.ts

@@ -2,23 +2,29 @@ import { beforeEach, describe, it } from "@effectionx/bdd";
 import { expect } from "@std/expect";
 
 import { json, request } from "./request.ts";
-import { ensure, until } from "effection";
+import { call, ensure, withResolvers } from "effection";
+import { createServer } from "node:http";
 
 // Ensure to run tests with --allow-net permission
 describe("request() and json()", () => {
   let url: string;
   beforeEach(function* () {
-    let server = Deno.serve(
-      () =>
-        new Response(JSON.stringify({ id: 1, title: "do things" }), {
-          headers: new Headers({
-            "Content-Type": "application/json",
-          }),
-        }),
-    );
+    let server = createServer((_req, res) => {
+      res.writeHead(200, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ id: 1, title: "do things" }));
+    });
+
+    const ready = withResolvers<void>();
+    server.listen(0, () => ready.resolve());
+    yield* ready.operation;
 
-    url = `http://localhost:${server.addr.port}/todos/1`,
-      yield* ensure(() => until(server.shutdown()));
+    const addr = server.address();
+    const port = typeof addr === "object" && addr ? addr.port : 0;
+
+    url = `http://localhost:${port}/todos/1`;
+    yield* ensure(() =>
+      call(() => new Promise<void>((resolve) => server.close(() => resolve())))
+    );
   });
 
   it("returns a response that can be parsed with json", function* () {

jsonl-store/context.ts

@@ -1,10 +1,11 @@
 import { type Context, createContext, type Operation } from "effection";
 import { join } from "@std/path";
+import process from "node:process";
 import type { Store } from "./types.ts";
 import { JSONLStore } from "./jsonl.ts";
 
 const DEFAULT_STORE: Store = JSONLStore.from({
-  location: join(import.meta.dirname ?? Deno.cwd(), ".store"),
+  location: join(import.meta.dirname ?? process.cwd(), ".store"),
 });
 
 export const StoreContext: Context<Store> = createContext<Store>(

jsonl-store/jsonl.test.ts

@@ -1,41 +1,36 @@
 import { expect } from "@std/expect";
 import { dirname, join } from "@std/path";
 import { beforeEach, describe, it } from "@effectionx/bdd";
-import { each, stream, until } from "effection";
-import { mkdir } from "node:fs";
-import { promisify } from "node:util";
+import { each, until } from "effection";
+import * as fsp from "node:fs/promises";
+import { mkdtemp } from "node:fs/promises";
+import { tmpdir } from "node:os";
 
 import { JSONLStore } from "./jsonl.ts";
 import type { Store } from "./types.ts";
 
-// using promisify there because Deno's ensure doesn't work
-// correctly in Node. We should run these tests in Node
-// to make sure that it'll work in Node too.
-
 describe("JSONLStore", () => {
   let store: Store;
   let tmpDir: string;
 
   async function readTmpFile(fileName: string) {
-    return await Deno.readTextFile(`${tmpDir}/${fileName}`);
+    return await fsp.readFile(`${tmpDir}/${fileName}`, "utf-8");
   }
 
   async function writeTmpFile(fileName: string, data: string) {
-    await promisify(mkdir)(join(tmpDir, dirname(fileName)), {
+    await fsp.mkdir(join(tmpDir, dirname(fileName)), {
       recursive: true,
     });
-    await Deno.writeTextFile(join(tmpDir, fileName), data);
+    await fsp.writeFile(join(tmpDir, fileName), data, "utf-8");
   }
 
   async function appendTmpFile(fileName: string, data: string) {
     const destination = join(tmpDir, fileName);
-    const file = await Deno.open(destination, { append: true });
-    await file.write(new TextEncoder().encode(data));
-    file.close();
+    await fsp.appendFile(destination, data, "utf-8");
   }
 
   beforeEach(function* () {
-    tmpDir = yield* until(Deno.makeTempDir());
+    tmpDir = yield* until(mkdtemp(join(tmpdir(), "jsonl-test-")));
     store = JSONLStore.from({ location: tmpDir });
   });
 
@@ -69,18 +64,16 @@ describe("JSONLStore", () => {
     });
     it("clears store when called clear", function* () {
       yield* store.clear();
-      const entries = [];
-      for (const dirEntry of yield* each(stream(Deno.readDir(tmpDir)))) {
-        entries.push(dirEntry);
-        yield* each.next();
-      }
+      const entries = yield* until(fsp.readdir(tmpDir));
       expect(entries).toHaveLength(0);
     });
   });
 
   describe("reading content of a file", () => {
     beforeEach(function* () {
-      yield* until(Deno.writeTextFile(join(tmpDir, "test.jsonl"), `1\n2\n3\n`));
+      yield* until(
+        fsp.writeFile(join(tmpDir, "test.jsonl"), `1\n2\n3\n`, "utf-8"),
+      );
     });
     it("streams multiple items", function* () {
       const items: number[] = [];

jsonl-store/jsonl.ts

@@ -17,15 +17,16 @@ import {
 import type { Store, StoreConstructorOptions } from "./types.ts";
 
 import fs from "node:fs";
-import { promisify } from "node:util";
+import * as fsp from "node:fs/promises";
+import { Readable } from "node:stream";
 
 function* mkdir(
   path: fs.PathLike,
   options: fs.MakeDirectoryOptions & {
     recursive: true;
   },
 ): Operation<string | undefined> {
-  return yield* call(() => promisify(fs.mkdir)(path, options));
+  return yield* call(() => fsp.mkdir(path, options));
 }
 
 export class JSONLStore implements Store {
@@ -110,10 +111,11 @@ export class JSONLStore implements Store {
     return resource(function* (provide) {
       const channel = createChannel<T, void>();
 
-      const file = yield* call(() => Deno.open(location, { read: true }));
+      const fileStream = fs.createReadStream(fromFileUrl(location));
+      const webStream = Readable.toWeb(fileStream);
 
-      const lines = file
-        .readable
+      // deno-lint-ignore no-explicit-any
+      const lines = (webStream as any)
         .pipeThrough(new TextDecoderStream())
         .pipeThrough(new TextLineStream())
         .pipeThrough(new JsonParseStream());
@@ -153,20 +155,13 @@ export class JSONLStore implements Store {
 
     yield* mkdir(dirname(fromFileUrl(location)), { recursive: true });
 
-    const file = yield* call(() =>
-      Deno.open(location, {
-        create: true,
-        write: true,
-      })
+    yield* call(() =>
+      fsp.writeFile(
+        fromFileUrl(location),
+        `${JSON.stringify(data)}\n`,
+        { encoding: "utf-8" },
+      )
     );
-
-    try {
-      yield* call(() =>
-        file.write(new TextEncoder().encode(`${JSON.stringify(data)}\n`))
-      );
-    } finally {
-      file.close();
-    }
   }
 
   /**
@@ -185,19 +180,13 @@ export class JSONLStore implements Store {
   *append(key: string, data: unknown): Operation<void> {
     const location = new URL(`./${key}.jsonl`, this.location);
 
-    const file = yield* call(() =>
-      Deno.open(location, {
-        append: true,
-      })
+    yield* call(() =>
+      fsp.appendFile(
+        fromFileUrl(location),
+        `${JSON.stringify(data)}\n`,
+        { encoding: "utf-8" },
+      )
     );
-
-    try {
-      yield* call(() =>
-        file.write(new TextEncoder().encode(`${JSON.stringify(data)}\n`))
-      );
-    } finally {
-      file.close();
-    }
   }
 
   /**

process/deno.json

@@ -10,7 +10,7 @@
     "effection": "npm:effection@^3",
     "shellwords": "npm:shellwords@^1.1.1",
     "@std/expect": "jsr:@std/[email protected]",
-    "@effectionx/stream-helpers": "jsr:@effectionx/[email protected]",
+    "@effectionx/stream-helpers": "npm:@effectionx/[email protected]",
     "@effectionx/bdd": "jsr:@effectionx/[email protected]",
     "@effectionx/signals": "npm:@effectionx/[email protected]"
   }

process/test/daemon.test.ts

@@ -7,7 +7,7 @@ import { type Daemon, daemon } from "../mod.ts";
 import { captureError, expectMatch, fetchText } from "./helpers.ts";
 import { lines } from "../src/helpers.ts";
 
-const SystemRoot = Deno.env.get("SystemRoot");
+const SystemRoot = process.env.SystemRoot;
 
 describe("daemon", () => {
   let task: Task<void>;

process/test/exec.test.ts

@@ -13,7 +13,7 @@ import {
 import { exec, type Process, type ProcessResult } from "../mod.ts";
 import { lines } from "../src/helpers.ts";
 
-const SystemRoot = Deno.env.get("SystemRoot");
+const SystemRoot = process.env.SystemRoot;
 
 // Validate SHELL environment variable is set for proper test execution
 if (process.platform === "win32" && !process.env.SHELL) {

signals/deno.json

@@ -12,6 +12,6 @@
     ".": "./mod.ts"
   },
   "tasks": {
-    "test": "deno run -A jsr:@effectionx/watch deno test"
+    "test": "deno run -A npm:@effectionx/watch deno test"
   }
 }

stream-helpers/deno.json

@@ -16,6 +16,6 @@
     "./test-helpers": "./test-helpers.ts"
   },
   "tasks": {
-    "test": "deno run -A jsr:@effectionx/watch deno test"
+    "test": "deno run -A npm:@effectionx/watch deno test"
   }
 }

watch/deno.json

@@ -18,8 +18,8 @@
     "zod": "npm:zod@^3.20.2",
     "zod-opts": "npm:[email protected]",
     "@effectionx/bdd": "jsr:@effectionx/[email protected]",
-    "@effectionx/process": "jsr:@effectionx/[email protected]",
-    "@effectionx/stream-helpers": "jsr:@effectionx/[email protected]",
+    "@effectionx/process": "npm:@effectionx/[email protected]",
+    "@effectionx/stream-helpers": "npm:@effectionx/[email protected]",
     "@effectionx/signals": "npm:@effectionx/[email protected]"
   },
   "lint": {