Merge pull request #105 from thefrontside/tm/fix-shellwords

Do not use named imports with shellwords

Author: taras

fx/request.test.ts

@@ -2,17 +2,23 @@ import { beforeEach, describe, it } from "@effectionx/bdd";
 import { expect } from "@std/expect";
 
 import { call, ensure, withResolvers } from "effection";
-import { createServer } from "node:http";
+import {
+  createServer,
+  type IncomingMessage,
+  type ServerResponse,
+} from "node:http";
 import { json, request } from "./request.ts";
 
 // Ensure to run tests with --allow-net permission
 describe("request() and json()", () => {
   let url: string;
   beforeEach(function* () {
-    let server = createServer((_req, res) => {
-      res.writeHead(200, { "Content-Type": "application/json" });
-      res.end(JSON.stringify({ id: 1, title: "do things" }));
-    });
+    let server = createServer(
+      (_req: IncomingMessage, res: ServerResponse) => {
+        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());

process/deno.json

@@ -1,7 +1,7 @@
 {
   "name": "@effectionx/process",
   "exports": "./mod.ts",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "license": "MIT",
   "imports": {
     "@types/cross-spawn": "npm:@types/cross-spawn@6.0.6",

process/src/exec.ts

@@ -1,4 +1,4 @@
-import { split } from "shellwords";
+import * as shellwords from "shellwords";
 
 import { type Operation, spawn } from "effection";
 import type {
@@ -34,7 +34,7 @@ const createProcess: CreateOSProcess = (cmd, opts) => {
  * forever, consider using `daemon()`
  */
 export function exec(command: string, options: ExecOptions = {}): Exec {
-  let [cmd, ...args] = options.shell ? [command] : split(command);
+  let [cmd, ...args] = options.shell ? [command] : shellwords.split(command);
   let opts = { ...options, arguments: args.concat(options.arguments || []) };
 
   return {

watch/watch.ts

@@ -22,6 +22,12 @@ import { exec, type ExecOptions, type Process } from "@effectionx/process";
 
 import { debounce } from "./stream-helpers.ts";
 
+// Extended FSWatcher interface that includes EventEmitter methods
+interface FSWatcherWithEvents {
+  on(event: string, listener: (...args: EmitArgsWithName) => void): this;
+  close(): Promise<void>;
+}
+
 /**
  * Represents a single start of the specified command
  */
@@ -105,14 +111,16 @@ export function watch(options: WatchOptions): Stream<Start, never> {
 
     let gitignored = yield* findIgnores(options.path);
 
+    // Cast to extended interface that includes EventEmitter methods
     let watcher = chokidar.watch(options.path, {
       ignored: (path) => {
         let relpath = relative(options.path, path);
         let isGit = relpath === ".git" || relpath.startsWith(".git");
         return isGit || gitignored(path);
       },
       ignoreInitial: true,
-    });
+    }) as unknown as FSWatcherWithEvents;
+
     let { event = "all" } = options;
     watcher.on(event, (...args: EmitArgsWithName) => {
       if (event !== "all") {