Remove utils

src/index.ts

@@ -1,3 +1,3 @@
 export * from "./job";
-export * from "./work";
 export * from "./task";
+export * from "./work";

src/job.ts

@@ -83,7 +83,7 @@ export class Job<T, Args extends unknown[]> {
   }
 
   perform(...args: Args): Task<T> {
-    const task = new Task<T>((signal) => this.#taskFn(signal, ...args));
+    const task = new Task((signal) => this.#taskFn(signal, ...args));
 
     this.#instrumentTask(task);
     this.#reactiveState.performCount++;

src/task.ts

@@ -1,5 +1,5 @@
 import { createObject } from "solid-proxies";
-import { cancellablePromise } from "./utils/promise";
+import { work } from "./work";
 
 export enum TaskStatus {
   Idle = "idle",
@@ -161,7 +161,7 @@ export class Task<T> implements Promise<T> {
       this.#abortController.signal.throwIfAborted();
       this.#reactiveState.status = TaskStatus.Pending;
 
-      const value = await cancellablePromise(
+      const value = await work(
         this.#abortController.signal,
         this.#promiseFn(this.#abortController.signal)
       );

src/work.ts

@@ -1,12 +1,20 @@
-import { cancellablePromise, timeoutPromise } from "./utils/promise";
+export async function work<T>(signal: AbortSignal, promise: Promise<T>) {
+  signal.throwIfAborted();
 
-export async function work<T>(
-  signal: AbortSignal,
-  promise: Promise<T>
-): Promise<T> {
-  return cancellablePromise(signal, promise);
+  return Promise.race([
+    new Promise<never>((_resolve, reject) => {
+      signal.addEventListener(
+        "abort",
+        () => {
+          reject(signal.reason);
+        },
+        { once: true, passive: true }
+      );
+    }),
+    promise,
+  ]);
 }
 
 export async function timeout(signal: AbortSignal, ms: number): Promise<void> {
-  return work(signal, timeoutPromise(ms));
+  return work(signal, new Promise((resolve) => setTimeout(resolve, ms)));
 }