@tstdl/base 0.93.139 → 0.93.141

package/task-queue/postgres/drizzle/meta/0000_snapshot.json

@@ -1,5 +1,5 @@
 {
-  "id": "4a091e17-ecca-4dcc-9681-ee533ba465a9",
+  "id": "748b4480-a37e-43bb-a9fc-6920c03c3ed3",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
@@ -52,40 +52,26 @@
           "primaryKey": false,
           "notNull": true
         },
-        "complete_after_tags": {
-          "name": "complete_after_tags",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "schedule_after_tags": {
-          "name": "schedule_after_tags",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": true
-        },
         "fail_fast": {
           "name": "fail_fast",
           "type": "boolean",
           "primaryKey": false,
           "notNull": true
         },
-        "dependency_join_mode": {
-          "name": "dependency_join_mode",
-          "type": "dependency_join_mode",
-          "typeSchema": "task_queue",
+        "priority": {
+          "name": "priority",
+          "type": "integer",
           "primaryKey": false,
           "notNull": true
         },
-        "dependency_trigger_statuses": {
-          "name": "dependency_trigger_statuses",
-          "type": "task_status[]",
-          "typeSchema": "task_queue",
+        "unresolved_schedule_dependencies": {
+          "name": "unresolved_schedule_dependencies",
+          "type": "integer",
           "primaryKey": false,
           "notNull": true
         },
-        "priority": {
-          "name": "priority",
+        "unresolved_complete_dependencies": {
+          "name": "unresolved_complete_dependencies",
           "type": "integer",
           "primaryKey": false,
           "notNull": true
@@ -239,36 +225,6 @@
           "method": "btree",
           "with": {}
         },
-        "task_schedule_after_tags_idx": {
-          "name": "task_schedule_after_tags_idx",
-          "columns": [
-            {
-              "expression": "schedule_after_tags",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "gin",
-          "with": {}
-        },
-        "task_complete_after_tags_idx": {
-          "name": "task_complete_after_tags_idx",
-          "columns": [
-            {
-              "expression": "complete_after_tags",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "gin",
-          "with": {}
-        },
         "task_tags_idx": {
           "name": "task_tags_idx",
           "columns": [
@@ -319,15 +275,17 @@
         }
       },
       "foreignKeys": {
-        "task_parent_id_task_id_fk": {
-          "name": "task_parent_id_task_id_fk",
+        "task_namespace_parentId_task_fkey": {
+          "name": "task_namespace_parentId_task_fkey",
           "tableFrom": "task",
           "tableTo": "task",
           "schemaTo": "task_queue",
           "columnsFrom": [
+            "namespace",
             "parent_id"
           ],
           "columnsTo": [
+            "namespace",
             "id"
           ],
           "onDelete": "no action",
@@ -336,6 +294,14 @@
       },
       "compositePrimaryKeys": {},
       "uniqueConstraints": {
+        "task_namespace_id_unique": {
+          "name": "task_namespace_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "namespace",
+            "id"
+          ]
+        },
         "task_namespace_idempotency_key_unique": {
           "name": "task_namespace_idempotency_key_unique",
           "nullsNotDistinct": false,
@@ -397,40 +363,26 @@
           "primaryKey": false,
           "notNull": true
         },
-        "complete_after_tags": {
-          "name": "complete_after_tags",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "schedule_after_tags": {
-          "name": "schedule_after_tags",
-          "type": "text[]",
-          "primaryKey": false,
-          "notNull": true
-        },
         "fail_fast": {
           "name": "fail_fast",
           "type": "boolean",
           "primaryKey": false,
           "notNull": true
         },
-        "dependency_join_mode": {
-          "name": "dependency_join_mode",
-          "type": "dependency_join_mode",
-          "typeSchema": "task_queue",
+        "priority": {
+          "name": "priority",
+          "type": "integer",
           "primaryKey": false,
           "notNull": true
         },
-        "dependency_trigger_statuses": {
-          "name": "dependency_trigger_statuses",
-          "type": "task_status[]",
-          "typeSchema": "task_queue",
+        "unresolved_schedule_dependencies": {
+          "name": "unresolved_schedule_dependencies",
+          "type": "integer",
           "primaryKey": false,
           "notNull": true
         },
-        "priority": {
-          "name": "priority",
+        "unresolved_complete_dependencies": {
+          "name": "unresolved_complete_dependencies",
           "type": "integer",
           "primaryKey": false,
           "notNull": true
@@ -555,15 +507,139 @@
       "policies": {},
       "checkConstraints": {},
       "isRLSEnabled": false
+    },
+    "task_queue.task_dependency": {
+      "name": "task_dependency",
+      "schema": "task_queue",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "namespace": {
+          "name": "namespace",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "dependency_task_id": {
+          "name": "dependency_task_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "task_dependency_type",
+          "typeSchema": "task_queue",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "required_statuses": {
+          "name": "required_statuses",
+          "type": "task_status[]",
+          "typeSchema": "task_queue",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "task_dependency_namespace_dependency_task_id_type_idx": {
+          "name": "task_dependency_namespace_dependency_task_id_type_idx",
+          "columns": [
+            {
+              "expression": "namespace",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "dependency_task_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "task_dependency_namespace_dependencyTaskId_task_fkey": {
+          "name": "task_dependency_namespace_dependencyTaskId_task_fkey",
+          "tableFrom": "task_dependency",
+          "tableTo": "task",
+          "schemaTo": "task_queue",
+          "columnsFrom": [
+            "namespace",
+            "dependency_task_id"
+          ],
+          "columnsTo": [
+            "namespace",
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "task_dependency_namespace_taskId_task_fkey": {
+          "name": "task_dependency_namespace_taskId_task_fkey",
+          "tableFrom": "task_dependency",
+          "tableTo": "task",
+          "schemaTo": "task_queue",
+          "columnsFrom": [
+            "namespace",
+            "task_id"
+          ],
+          "columnsTo": [
+            "namespace",
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "td_namespace_task_id_dependency_task_id_type_unique": {
+          "name": "td_namespace_task_id_dependency_task_id_type_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "namespace",
+            "task_id",
+            "dependency_task_id",
+            "type"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
     }
   },
   "enums": {
-    "task_queue.dependency_join_mode": {
-      "name": "dependency_join_mode",
+    "task_queue.task_dependency_type": {
+      "name": "task_dependency_type",
       "schema": "task_queue",
       "values": [
-        "and",
-        "or"
+        "schedule",
+        "complete"
       ]
     },
     "task_queue.task_status": {
@@ -574,8 +650,10 @@
         "running",
         "completed",
         "cancelled",
+        "dead",
         "waiting",
-        "dead"
+        "waiting-children",
+        "paused"
       ]
     }
   },

package/task-queue/postgres/drizzle/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1769034172474,
-      "tag": "0000_simple_invisible_woman",
+      "when": 1771949216507,
+      "tag": "0000_wakeful_sunspot",
       "breakpoints": true
     }
   ]

package/task-queue/postgres/module.d.ts

@@ -2,6 +2,7 @@ import { Injector } from '../../injector/injector.js';
 import { type DatabaseConfig } from '../../orm/server/index.js';
 export declare class PostgresTaskQueueModuleConfig {
     database?: DatabaseConfig;
+    autoMigrate?: boolean;
 }
 /**
  * configure queue module

package/task-queue/postgres/module.js

@@ -1,12 +1,13 @@
 import { inject } from '../../injector/index.js';
 import { Injector } from '../../injector/injector.js';
-import { Database, migrate } from '../../orm/server/index.js';
+import { Database, migrate, registerDatabaseMigration } from '../../orm/server/index.js';
 import { TaskQueueProvider } from '../provider.js';
 import { TaskQueue } from '../task-queue.js';
 import { PostgresTaskQueue } from './task-queue.js';
 import { PostgresTaskQueueProvider } from './task-queue.provider.js';
 export class PostgresTaskQueueModuleConfig {
     database;
+    autoMigrate;
 }
 /**
  * configure queue module
@@ -16,6 +17,9 @@ export function configurePostgresTaskQueue({ injector, ...config } = {}) {
     targetInjector.register(PostgresTaskQueueModuleConfig, { useValue: config });
     targetInjector.registerSingleton(TaskQueueProvider, { useToken: PostgresTaskQueueProvider });
     targetInjector.registerSingleton(TaskQueue, { useToken: PostgresTaskQueue });
+    if (config.autoMigrate != false) {
+        registerDatabaseMigration('PostgresTaskQueue', migratePostgresTaskQueueSchema, { injector });
+    }
 }
 export async function migratePostgresTaskQueueSchema() {
     const connection = inject(PostgresTaskQueueModuleConfig, undefined, { optional: true })?.database?.connection;

package/task-queue/postgres/schemas.d.ts

@@ -1,16 +1,19 @@
-import { PostgresTask, PostgresTaskArchive } from './task.model.js';
+import { PostgresTask, PostgresTaskArchive, PostgresTaskDependency } from './task.model.js';
 export declare const taskQueueSchema: import("../../orm/server/index.js").DatabaseSchema<"task_queue">;
+export declare const taskDependencyType: import("../../orm/enums.js").PgEnumFromEnumeration<{
+    readonly Schedule: "schedule";
+    readonly Complete: "complete";
+}>;
 export declare const taskStatus: import("../../orm/enums.js").PgEnumFromEnumeration<{
     readonly Pending: "pending";
     readonly Running: "running";
     readonly Completed: "completed";
     readonly Cancelled: "cancelled";
-    readonly Waiting: "waiting";
     readonly Dead: "dead";
-}>;
-export declare const dependencyJoinMode: import("../../orm/enums.js").PgEnumFromEnumeration<{
-    readonly And: "and";
-    readonly Or: "or";
+    readonly Waiting: "waiting";
+    readonly WaitingChildren: "waiting-children";
+    readonly Paused: "paused";
 }>;
 export declare const task: import("../../orm/server/types.js").PgTableFromType<typeof PostgresTask, "task_queue">;
 export declare const taskArchive: import("../../orm/server/types.js").PgTableFromType<typeof PostgresTaskArchive, "task_queue">;
+export declare const taskDependency: import("../../orm/server/types.js").PgTableFromType<typeof PostgresTaskDependency, "task_queue">;

package/task-queue/postgres/schemas.js

@@ -1,8 +1,9 @@
 import { databaseSchema } from '../../orm/server/index.js';
-import { DependencyJoinMode, TaskStatus } from '../task-queue.js';
-import { PostgresTask, PostgresTaskArchive } from './task.model.js';
+import { TaskDependencyType, TaskStatus } from '../task-queue.js';
+import { PostgresTask, PostgresTaskArchive, PostgresTaskDependency } from './task.model.js';
 export const taskQueueSchema = databaseSchema('task_queue');
+export const taskDependencyType = taskQueueSchema.getEnum(TaskDependencyType);
 export const taskStatus = taskQueueSchema.getEnum(TaskStatus);
-export const dependencyJoinMode = taskQueueSchema.getEnum(DependencyJoinMode);
 export const task = taskQueueSchema.getTable(PostgresTask);
 export const taskArchive = taskQueueSchema.getTable(PostgresTaskArchive);
+export const taskDependency = taskQueueSchema.getTable(PostgresTaskDependency);

package/task-queue/postgres/task-queue.d.ts

@@ -3,7 +3,7 @@ import { afterResolve } from '../../injector/index.js';
 import type { Query } from '../../orm/index.js';
 import { type Transaction } from '../../orm/server/index.js';
 import type { OneOrMany } from '../../schema/index.js';
-import { TaskQueue, type EnqueueManyItem, type EnqueueManyOptions, type EnqueueOneOptions, type Task } from '../task-queue.js';
+import { TaskQueue, type EnqueueManyItem, type EnqueueManyOptions, type EnqueueOneOptions, type Task, type TaskQueueWaitOptions, type TaskQueueWaitResult } from '../task-queue.js';
 import type { TaskData, TaskDefinitionMap, TaskOfType, TaskResult, TasksResults, TasksStates, TaskState, TaskTypes } from '../types.js';
 export declare class PostgresTaskQueue<Definitions extends TaskDefinitionMap = TaskDefinitionMap> extends TaskQueue<Definitions> {
     #private;
@@ -49,6 +49,7 @@ export declare class PostgresTaskQueue<Definitions extends TaskDefinitionMap = T
     getTreeByQuery(query: Query<Task>, options?: {
         transaction?: Transaction;
     }): Promise<Task[]>;
+    waitForTasks(ids: string[], options?: TaskQueueWaitOptions): Promise<TaskQueueWaitResult>;
     cancel(id: string, options?: {
         transaction?: Transaction;
     }): Promise<void>;
@@ -102,13 +103,12 @@ export declare class PostgresTaskQueue<Definitions extends TaskDefinitionMap = T
         fatal?: boolean;
         transaction?: Transaction;
     }): Promise<void>;
-    triggerTagFanIn(tags: string[], options?: {
-        transaction?: Transaction;
-    }): Promise<void>;
     failMany(tasks: Task<Definitions>[], errors: unknown[], options?: {
         transaction?: Transaction;
     }): Promise<void>;
     private resolveDependencies;
+    private evaluateTaskStatus;
+    private transitionTask;
     maintenance(options?: {
         transaction?: Transaction;
     }): Promise<void>;
@@ -122,15 +122,6 @@ export declare class PostgresTaskQueue<Definitions extends TaskDefinitionMap = T
         types?: Type[];
     }): AsyncIterableIterator<TaskOfType<Definitions, Type>>;
     private maintenanceLoop;
-    /**
-     * @internal for internal unit test use only
-     * @param options
-     * @returns
-     */
-    processPendingFanIn(options?: {
-        transaction?: Transaction;
-    }): Promise<number>;
-    private startSystemWorker;
     getBatchConsumer<Type extends TaskTypes<Definitions>>(size: number, cancellationSignal: CancellationSignal, options?: {
         forceDequeue?: boolean;
         types?: Type[];