@praxisjs/concurrent 0.2.3 → 1.1.0

package/dist/pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC7C,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,KAAK,EAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;CAC/B;AAED,wBAAgB,IAAI,CAAC,CAAC,EACpB,WAAW,EAAE,MAAM,EACnB,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,GACrC,YAAY,CAAC,CAAC,CAAC,CAyCjB"}
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC7C,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,KAAK,EAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;CAC/B;AAED,wBAAgB,IAAI,CAAC,CAAC,EACpB,WAAW,EAAE,MAAM,EACnB,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,GACrC,YAAY,CAAC,CAAC,CAAC,CA0CjB"}

package/dist/pool.js

@@ -1,5 +1,6 @@
 import { signal, computed } from "@praxisjs/core/internal";
 export function pool(concurrency, fn) {
+    concurrency = Math.max(1, concurrency);
     const _active = signal(0);
     const _pending = signal(0);
     const _error = signal(null);

package/dist/pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"pool.js","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAW3D,MAAM,UAAU,IAAI,CAClB,WAAmB,EACnB,EAAsC;IAEtC,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC1B,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,MAAM,GAAG,MAAM,CAAe,IAAI,CAAC,CAAC;IAC1C,MAAM,MAAM,GAGP,EAAE,CAAC;IAER,KAAK,UAAU,MAAM;QACnB,IAAI,OAAO,EAAE,IAAI,WAAW,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC/B,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9B,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC;YACH,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QAC7B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAChE,OAAO,CAAC,SAAS,CAAC,CAAC;QACrB,CAAC;gBAAS,CAAC;YACT,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7B,KAAK,MAAM,EAAE,CAAC;QAChB,CAAC;IACH,CAAC;IAED,SAAS,GAAG,CAAC,GAAG,IAAe;QAC7B,OAAO,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE;YAC5C,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAC/B,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9B,KAAK,MAAM,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5C,GAAG,CAAC,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IACvC,GAAG,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzC,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;IAErC,OAAO,GAAsB,CAAC;AAChC,CAAC"}
+{"version":3,"file":"pool.js","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAW3D,MAAM,UAAU,IAAI,CAClB,WAAmB,EACnB,EAAsC;IAEtC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC1B,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,MAAM,GAAG,MAAM,CAAe,IAAI,CAAC,CAAC;IAC1C,MAAM,MAAM,GAGP,EAAE,CAAC;IAER,KAAK,UAAU,MAAM;QACnB,IAAI,OAAO,EAAE,IAAI,WAAW,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAC/B,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9B,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC;YACH,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QAC7B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAChE,OAAO,CAAC,SAAS,CAAC,CAAC;QACrB,CAAC;gBAAS,CAAC;YACT,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7B,KAAK,MAAM,EAAE,CAAC;QAChB,CAAC;IACH,CAAC;IAED,SAAS,GAAG,CAAC,GAAG,IAAe;QAC7B,OAAO,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE;YAC5C,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAC/B,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9B,KAAK,MAAM,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5C,GAAG,CAAC,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IACvC,GAAG,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzC,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;IAErC,OAAO,GAAsB,CAAC;AAChC,CAAC"}

package/dist/queue.d.ts

@@ -1,4 +1,7 @@
 import type { Computed } from "@praxisjs/shared";
+export declare class QueueClearedError extends Error {
+    constructor();
+}
 export interface QueueInstance<T> {
     (...args: unknown[]): Promise<T>;
     loading: Computed<boolean>;

package/dist/queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../src/queue.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACjC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3B,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,KAAK,EAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IAC9B,KAAK,IAAI,IAAI,CAAC;CACf;AAED,wBAAgB,KAAK,CAAC,CAAC,EACrB,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,GACrC,aAAa,CAAC,CAAC,CAAC,CAoDlB"}
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../src/queue.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,iBAAkB,SAAQ,KAAK;;CAK3C;AAED,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACjC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3B,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,KAAK,EAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IAC9B,KAAK,IAAI,IAAI,CAAC;CACf;AAED,wBAAgB,KAAK,CAAC,CAAC,EACrB,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,GACrC,aAAa,CAAC,CAAC,CAAC,CA0DlB"}

package/dist/queue.js

@@ -1,4 +1,10 @@
 import { signal, computed } from "@praxisjs/core/internal";
+export class QueueClearedError extends Error {
+    constructor() {
+        super("Queue cleared");
+        this.name = "QueueClearedError";
+    }
+}
 export function queue(fn) {
     const _loading = signal(false);
     const _pending = signal(0);
@@ -11,7 +17,7 @@ export function queue(fn) {
             return;
         _running = true;
         _loading.set(true);
-        while (_queue.length > 0 && !_cleared) {
+        while (_queue.length > 0) {
             const item = _queue.shift();
             if (!item)
                 break;
@@ -31,6 +37,9 @@ export function queue(fn) {
         _loading.set(false);
     }
     function enqueue(...args) {
+        if (_cleared) {
+            _cleared = false;
+        }
         return new Promise((resolve, reject) => {
             _queue.push({ args, resolve, reject });
             _pending.update((n) => n + 1);
@@ -41,7 +50,10 @@ export function queue(fn) {
     enqueue.pending = computed(() => _pending());
     enqueue.error = computed(() => _error());
     enqueue.clear = () => {
-        _queue.length = 0;
+        // Reject all currently queued (not-yet-started) items
+        while (_queue.length > 0) {
+            _queue.shift()?.reject(new QueueClearedError());
+        }
         _pending.set(0);
         _cleared = true;
     };

package/dist/queue.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue.js","sourceRoot":"","sources":["../src/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAW3D,MAAM,UAAU,KAAK,CACnB,EAAsC;IAEtC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,MAAM,GAAG,MAAM,CAAe,IAAI,CAAC,CAAC;IAC1C,MAAM,MAAM,GAIP,EAAE,CAAC;IACR,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,KAAK,UAAU,KAAK;QAClB,IAAI,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC5C,QAAQ,GAAG,IAAI,CAAC;QAChB,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI;gBAAE,MAAM;YACjB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACvC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9B,IAAI,CAAC;gBACH,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;YAC7B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC9D,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACd,MAAM,CAAC,CAAC,CAAC,CAAC;YACZ,CAAC;QACH,CAAC;QACD,QAAQ,GAAG,KAAK,CAAC;QACjB,QAAQ,GAAG,KAAK,CAAC;QACjB,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;IAED,SAAS,OAAO,CAAC,GAAG,IAAe;QACjC,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YACvC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9B,KAAK,KAAK,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7C,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7C,OAAO,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,OAAO,CAAC,KAAK,GAAG,GAAG,EAAE;QACnB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAClB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAChB,QAAQ,GAAG,IAAI,CAAC;IAClB,CAAC,CAAC;IAEF,OAAO,OAA2B,CAAC;AACrC,CAAC"}
+{"version":3,"file":"queue.js","sourceRoot":"","sources":["../src/queue.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@praxisjs/concurrent",
-  "version": "0.2.3",
+  "version": "1.1.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -14,7 +14,8 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@praxisjs/core": "0.4.2",
+    "@praxisjs/core": "1.1.0",
+    "@praxisjs/decorators": "0.6.0",
     "@praxisjs/shared": "0.2.0"
   },
   "scripts": {

package/src/__tests__/decorators.test.ts

@@ -75,6 +75,35 @@ describe("Queue decorator", () => {
   });
 });
 
+// ── Queue (additional) ────────────────────────────────────────────────────────
+
+describe("Queue decorator (additional)", () => {
+  it("clear() is accessible on the instance via method_clear property", async () => {
+    const { ctx, run } = methodCtx("save");
+    let resolveFirst!: () => void;
+    const original = async (_: unknown, idx: unknown) =>
+      idx === 0
+        ? new Promise<void>((r) => { resolveFirst = r; })
+        : Promise.resolve();
+    Queue()(original, ctx);
+
+    const instance: Record<string, unknown> = {};
+    run(instance);
+
+    expect(typeof instance.save_clear).toBe("function");
+
+    const save = instance.save as (...args: unknown[]) => Promise<unknown>;
+    save(null, 0);
+    const p1 = save(null, 1);
+
+    // Call clear via the exposed property
+    (instance.save_clear as () => void)();
+
+    await expect(p1).rejects.toThrow("Queue cleared");
+    resolveFirst();
+  });
+});
+
 // ── Pool ──────────────────────────────────────────────────────────────────────
 
 describe("Pool decorator", () => {
@@ -116,4 +145,66 @@ describe("Pool decorator", () => {
     resolvers.forEach((r) => { r(); });
     await Promise.all([t1, t2]);
   });
+
+  it("Pool(-1, fn) — clamps to 1, does not allow unlimited concurrency", async () => {
+    const { ctx, run } = methodCtx("work");
+    const resolvers: Array<() => void> = [];
+    const original = async () => new Promise<void>((r) => resolvers.push(r));
+    Pool(-1)(original, ctx);
+
+    const instance: Record<string, unknown> = {};
+    run(instance);
+
+    const work = instance.work as () => Promise<void>;
+    const t1 = work();
+    const t2 = work();
+
+    // With concurrency clamped to 1, only one task should be active at a time
+    expect((instance.work_active as () => number)()).toBe(1);
+    expect((instance.work_pending as () => number)()).toBe(1);
+
+    resolvers[0]();
+    await t1;
+    resolvers[1]();
+    await t2;
+  });
+
+  it("decorated method called concurrently up to pool limit — active() signal is accurate", async () => {
+    const { ctx, run } = methodCtx("process");
+    const resolvers: Array<() => void> = [];
+    const original = async () => new Promise<void>((r) => resolvers.push(r));
+    Pool(3)(original, ctx);
+
+    const instance: Record<string, unknown> = {};
+    run(instance);
+
+    const process = instance.process as () => Promise<void>;
+    const active = instance.process_active as () => number;
+
+    const t1 = process();
+    expect(active()).toBe(1);
+
+    const t2 = process();
+    expect(active()).toBe(2);
+
+    const t3 = process();
+    expect(active()).toBe(3);
+
+    // 4th task exceeds limit, goes to pending
+    const t4 = process();
+    expect(active()).toBe(3);
+    expect((instance.process_pending as () => number)()).toBe(1);
+
+    // Resolve t1 first — this will allow t4 to start and push its resolver
+    resolvers[0]();
+    await t1;
+
+    // Now t4 has started and pushed a resolver
+    resolvers[1]();
+    resolvers[2]();
+    resolvers[3]();
+    await Promise.all([t2, t3, t4]);
+
+    expect(active()).toBe(0);
+  });
 });

package/src/__tests__/pool.test.ts

@@ -129,16 +129,15 @@ describe("pool", () => {
     expect(results[1]).toBe(1);         // subsequent task ran
   });
 
-  it("concurrency=0 — tasks are enqueued but never executed", async () => {
+  it("concurrency=0 — clamps to 1, tasks execute serially", async () => {
     const fn = vi.fn(async () => "result");
     const p = pool(0, fn);
 
-    // Queue a task — tryRun() bails immediately because _active(0) >= concurrency(0)
-    void p();
-    await new Promise((r) => setTimeout(r, 0));
-
-    expect(fn).not.toHaveBeenCalled();
-    expect(p.pending()).toBe(1);
+    // concurrency=0 is clamped to 1, so the task runs immediately
+    const result = await p();
+    expect(fn).toHaveBeenCalledOnce();
+    expect(result).toBe("result");
+    expect(p.pending()).toBe(0);
     expect(p.loading()).toBe(false);
   });
 
@@ -154,4 +153,52 @@ describe("pool", () => {
     await Promise.all([p(), p(), p(), p()]);
     expect(maxObservedActive).toBeLessThanOrEqual(concurrency);
   });
+
+  it("pool(-5, fn) — clamps to 1, runs tasks serially", async () => {
+    const order: number[] = [];
+    let resolveFirst!: () => void;
+
+    const p = pool(-5, async (n: unknown) => {
+      if (n === 0) await new Promise<void>((r) => { resolveFirst = r; });
+      order.push(n as number);
+    });
+
+    const t1 = p(0);
+    const t2 = p(1);
+
+    expect(p.active()).toBe(1);
+    expect(p.pending()).toBe(1);
+
+    resolveFirst();
+    await t1;
+    await t2;
+
+    expect(order).toEqual([0, 1]);
+  });
+
+  it("multiple tasks error — error signal reflects last error", async () => {
+    let callCount = 0;
+    const p = pool(1, async () => {
+      callCount++;
+      throw new Error(`error ${callCount}`);
+    });
+
+    await p();
+    await p();
+    await p();
+
+    expect(p.error()?.message).toBe("error 3");
+  });
+
+  it("active() never goes negative even if task throws synchronously", async () => {
+    const p = pool(2, async () => {
+      throw new Error("sync-ish throw");
+    });
+
+    await p();
+    await p();
+
+    expect(p.active()).toBeGreaterThanOrEqual(0);
+    expect(p.active()).toBe(0);
+  });
 });

package/src/__tests__/queue.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest";
 
-import { queue } from "../queue";
+import { queue, QueueClearedError } from "../queue";
 
 describe("queue", () => {
   it("executes the task and resolves the promise", async () => {
@@ -96,8 +96,12 @@ describe("queue", () => {
     );
 
     q(null, 0);
-    q(null, 1);
-    q(null, 2);
+    const p1 = q(null, 1);
+    const p2 = q(null, 2);
+
+    // Suppress expected rejections from clear()
+    p1.catch(() => undefined);
+    p2.catch(() => undefined);
 
     q.clear();
     resolveFirst();
@@ -105,4 +109,100 @@ describe("queue", () => {
     // After clearing, pending count should be 0
     expect(q.pending()).toBe(0);
   });
+
+  it("clear() with pending tasks rejects their promises with QueueClearedError", async () => {
+    let resolveFirst!: () => void;
+    const q = queue(
+      (_: unknown, idx: unknown) =>
+        idx === 0
+          ? new Promise<void>((r) => { resolveFirst = r; })
+          : Promise.resolve(),
+    );
+
+    q(null, 0); // running — not in _queue
+    const p1 = q(null, 1); // pending — in _queue
+    const p2 = q(null, 2); // pending — in _queue
+
+    q.clear();
+
+    await expect(p1).rejects.toBeInstanceOf(QueueClearedError);
+    await expect(p2).rejects.toBeInstanceOf(QueueClearedError);
+
+    resolveFirst();
+  });
+
+  it("clear() then new enqueue() — queue works normally after being cleared", async () => {
+    let resolveFirst!: () => void;
+    const q = queue(
+      (n: unknown, stall: unknown) =>
+        stall
+          ? new Promise<number>((r) => { resolveFirst = () => r(n as number); })
+          : Promise.resolve(n as number),
+    );
+
+    q(0, true); // running — stalls
+    const p1 = q(1, false); // pending
+    q.clear();
+
+    await expect(p1).rejects.toBeInstanceOf(QueueClearedError);
+    resolveFirst();
+
+    // Queue should work normally after clearing
+    const result = await q(42, false);
+    expect(result).toBe(42);
+    expect(q.pending()).toBe(0);
+  });
+
+  it("clear() with no pending tasks — no-op, no crash", () => {
+    const q = queue(async () => "ok");
+    expect(() => q.clear()).not.toThrow();
+    expect(q.pending()).toBe(0);
+  });
+
+  it("error in task does not corrupt pending counter", async () => {
+    const q = queue(async (n: unknown) => {
+      if (n === 0) throw new Error("bad");
+      return n as number;
+    });
+
+    const p0 = q(0);
+    const p1 = q(1);
+    const p2 = q(2);
+
+    await expect(p0).rejects.toThrow("bad");
+    expect(await p1).toBe(1);
+    expect(await p2).toBe(2);
+    expect(q.pending()).toBe(0);
+  });
+
+  it("multiple tasks error — only last error stored", async () => {
+    const q = queue(async (n: unknown) => {
+      throw new Error(`error ${n as number}`);
+    });
+
+    const p0 = q(0);
+    const p1 = q(1);
+    const p2 = q(2);
+
+    await expect(p0).rejects.toThrow("error 0");
+    await expect(p1).rejects.toThrow("error 1");
+    await expect(p2).rejects.toThrow("error 2");
+
+    // Only the last error is stored
+    expect(q.error()?.message).toBe("error 2");
+  });
+
+  it("very large queue (100 tasks, concurrency=1) — all execute in order", async () => {
+    const order: number[] = [];
+    const q = queue(async (n: unknown) => {
+      order.push(n as number);
+      return n as number;
+    });
+
+    const tasks = Array.from({ length: 100 }, (_, i) => q(i));
+    await Promise.all(tasks);
+
+    expect(order).toEqual(Array.from({ length: 100 }, (_, i) => i));
+    expect(q.pending()).toBe(0);
+  });
 });

package/src/__tests__/task.test.ts

@@ -134,4 +134,66 @@ describe("task", () => {
     expect(result).toBe("fresh");
     expect(t.loading()).toBe(false);
   });
+
+  it("two concurrent calls — second result wins when first is slower", async () => {
+    let resolveFirst!: (v: string) => void;
+    let resolveSecond!: (v: string) => void;
+
+    const t = task((which: unknown) =>
+      which === "first"
+        ? new Promise<string>((r) => { resolveFirst = r; })
+        : new Promise<string>((r) => { resolveSecond = r; }),
+    );
+
+    const p1 = t("first");
+    const p2 = t("second");
+
+    // second resolves before first
+    resolveSecond("second-result");
+    resolveFirst("first-result");
+
+    const [r1, r2] = await Promise.all([p1, p2]);
+    expect(r2).toBe("second-result");
+    expect(r1).toBeUndefined(); // stale
+    expect(t.lastResult()).toBe("second-result");
+  });
+
+  it("cancelAll() called, then new call — new call works normally", async () => {
+    let resolveStale!: (v: string) => void;
+    const t = task((which: unknown) =>
+      which === "stale"
+        ? new Promise<string>((r) => { resolveStale = r; })
+        : Promise.resolve("fresh"),
+    );
+
+    const staleP = t("stale");
+    t.cancelAll();
+    resolveStale("stale-value");
+    await staleP;
+
+    const freshResult = await t("fresh");
+    expect(freshResult).toBe("fresh");
+    expect(t.loading()).toBe(false);
+    expect(t.lastResult()).toBe("fresh");
+  });
+
+  it("lastResult is null when task throws (not stale from previous run)", async () => {
+    let shouldThrow = false;
+    const t = task(async () => {
+      if (shouldThrow) throw new Error("fail");
+      return "success";
+    });
+
+    await t();
+    expect(t.lastResult()).toBe("success");
+
+    shouldThrow = true;
+    await t();
+
+    // After a throw, lastResult should remain the previous value
+    // (the error path does not update lastResult)
+    expect(t.error()?.message).toBe("fail");
+    // lastResult is not reset to null on error — it keeps the last successful value
+    expect(t.lastResult()).toBe("success");
+  });
 });

package/src/decorators.ts

@@ -1,58 +1,50 @@
+import { createMethodDecorator } from "@praxisjs/decorators";
+
 import { pool } from "./pool";
 import { queue } from "./queue";
 import { task } from "./task";
 
 export function Task() {
-  return function (
-    value: (...args: unknown[]) => Promise<unknown>,
-    context: ClassMethodDecoratorContext,
-  ): void {
-    const methodKey = String(context.name);
-
-    context.addInitializer(function (this: unknown) {
-      const self = this as Record<string, unknown>;
-      const t = task(value.bind(this));
-      self[`${methodKey}_loading`] = t.loading;
-      self[`${methodKey}_error`] = t.error;
-      self[`${methodKey}_lastResult`] = t.lastResult;
-      self[methodKey] = (...args: unknown[]) => t(...args);
-    });
-  };
+  return createMethodDecorator({
+    wrap(original, instance, name) {
+      const self = instance as Record<string, unknown>;
+      const t = task((original as (...args: unknown[]) => Promise<unknown>).bind(instance));
+      self[`${name}_loading`] = t.loading;
+      self[`${name}_error`] = t.error;
+      self[`${name}_lastResult`] = t.lastResult;
+      return (...args: unknown[]) => t(...args);
+    },
+  // Concurrent decorators work on any class, not just StatefulComponent
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  }) as unknown as (value: (...args: unknown[]) => Promise<unknown>, context: ClassMethodDecoratorContext<any>) => void;
 }
 
 export function Queue() {
-  return function (
-    value: (...args: unknown[]) => Promise<unknown>,
-    context: ClassMethodDecoratorContext,
-  ): void {
-    const methodKey = String(context.name);
-
-    context.addInitializer(function (this: unknown) {
-      const self = this as Record<string, unknown>;
-      const q = queue(value.bind(this));
-      self[`${methodKey}_loading`] = q.loading;
-      self[`${methodKey}_pending`] = q.pending;
-      self[`${methodKey}_error`] = q.error;
-      self[methodKey] = (...args: unknown[]) => q(...args);
-    });
-  };
+  return createMethodDecorator({
+    wrap(original, instance, name) {
+      const self = instance as Record<string, unknown>;
+      const q = queue((original as (...args: unknown[]) => Promise<unknown>).bind(instance));
+      self[`${name}_loading`] = q.loading;
+      self[`${name}_pending`] = q.pending;
+      self[`${name}_error`] = q.error;
+      self[`${name}_clear`] = () => { q.clear(); };
+      return (...args: unknown[]) => q(...args);
+    },
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  }) as unknown as (value: (...args: unknown[]) => Promise<unknown>, context: ClassMethodDecoratorContext<any>) => void;
 }
 
 export function Pool(concurrency: number) {
-  return function (
-    value: (...args: unknown[]) => Promise<unknown>,
-    context: ClassMethodDecoratorContext,
-  ): void {
-    const methodKey = String(context.name);
-
-    context.addInitializer(function (this: unknown) {
-      const self = this as Record<string, unknown>;
-      const p = pool(concurrency, value.bind(this));
-      self[`${methodKey}_loading`] = p.loading;
-      self[`${methodKey}_active`] = p.active;
-      self[`${methodKey}_pending`] = p.pending;
-      self[`${methodKey}_error`] = p.error;
-      self[methodKey] = (...args: unknown[]) => p(...args);
-    });
-  };
+  return createMethodDecorator({
+    wrap(original, instance, name) {
+      const self = instance as Record<string, unknown>;
+      const p = pool(concurrency, (original as (...args: unknown[]) => Promise<unknown>).bind(instance));
+      self[`${name}_loading`] = p.loading;
+      self[`${name}_active`] = p.active;
+      self[`${name}_pending`] = p.pending;
+      self[`${name}_error`] = p.error;
+      return (...args: unknown[]) => p(...args);
+    },
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  }) as unknown as (value: (...args: unknown[]) => Promise<unknown>, context: ClassMethodDecoratorContext<any>) => void;
 }

package/src/index.ts

@@ -1,10 +1 @@
-export { task } from "./task";
-export type { TaskInstance } from "./task";
-
-export { queue } from "./queue";
-export type { QueueInstance } from "./queue";
-
-export { pool } from "./pool";
-export type { PoolInstance } from "./pool";
-
 export { Task, Queue, Pool } from "./decorators";

package/src/pool.ts

@@ -13,6 +13,7 @@ export function pool<T>(
   concurrency: number,
   fn: (...args: unknown[]) => Promise<T>,
 ): PoolInstance<T> {
+  concurrency = Math.max(1, concurrency);
   const _active = signal(0);
   const _pending = signal(0);
   const _error = signal<Error | null>(null);

package/src/queue.ts

@@ -1,6 +1,13 @@
 import { signal, computed } from "@praxisjs/core/internal";
 import type { Computed } from "@praxisjs/shared";
 
+export class QueueClearedError extends Error {
+  constructor() {
+    super("Queue cleared");
+    this.name = "QueueClearedError";
+  }
+}
+
 export interface QueueInstance<T> {
   (...args: unknown[]): Promise<T>;
   loading: Computed<boolean>;
@@ -27,7 +34,7 @@ export function queue<T>(
     if (_running || _queue.length === 0) return;
     _running = true;
     _loading.set(true);
-    while (_queue.length > 0 && !_cleared) {
+    while (_queue.length > 0) {
       const item = _queue.shift();
       if (!item) break;
       const { args, resolve, reject } = item;
@@ -46,6 +53,9 @@ export function queue<T>(
   }
 
   function enqueue(...args: unknown[]): Promise<T> {
+    if (_cleared) {
+      _cleared = false;
+    }
     return new Promise<T>((resolve, reject) => {
       _queue.push({ args, resolve, reject });
       _pending.update((n) => n + 1);
@@ -57,7 +67,10 @@ export function queue<T>(
   enqueue.pending = computed(() => _pending());
   enqueue.error = computed(() => _error());
   enqueue.clear = () => {
-    _queue.length = 0;
+    // Reject all currently queued (not-yet-started) items
+    while (_queue.length > 0) {
+      _queue.shift()?.reject(new QueueClearedError());
+    }
     _pending.set(0);
     _cleared = true;
   };