hierarchical-approval 2.3.0 → 2.5.0

package/dist/nestjs.d.cts

@@ -1,16 +1,16 @@
 import { OnModuleDestroy, DynamicModule, ModuleMetadata, InjectionToken, OptionalFactoryDependency, Inject } from '@nestjs/common';
-import { a as ApprovalEngine, b as ApprovalEngineOptions } from './ApprovalEngine-C1dUPnLM.cjs';
-import './IStorageAdapter-DdHO4Rf1.cjs';
-import './instance-DUJY_Axf.cjs';
-import './INotificationAdapter-JJAiMyMd.cjs';
+import { a as ApprovalEngine, b as ApprovalEngineOptions } from './ApprovalEngine-CW7Uu1bV.cjs';
+import './IStorageAdapter-Pq9J60xv.cjs';
+import './instance-BO-i9-nq.cjs';
+import './INotificationAdapter-AwbhZEqz.cjs';
 import 'zod';
 import './Logger-BplhlU7l.cjs';
 import './Clock-3FnOczFJ.cjs';
-import './IOperationMiddleware-D0ksiFM3.cjs';
-import './IAuditAdapter-BHVKMMv6.cjs';
+import './IOperationMiddleware-3J-_NSGq.cjs';
+import './IAuditAdapter-Dwx8ZP4J.cjs';
 import './IMetricsAdapter-DWq8IFaf.cjs';
 import './ISchedulerAdapter-DKv_QjVN.cjs';
-import './IAuthorizationPolicy-CtLkwQ8I.cjs';
+import './IAuthorizationPolicy-B3vaV69v.cjs';
 
 /** Options for {@link HierarchicalApprovalModule.forRoot}. */
 interface HierarchicalApprovalModuleOptions extends ApprovalEngineOptions {

package/dist/nestjs.d.ts

@@ -1,16 +1,16 @@
 import { OnModuleDestroy, DynamicModule, ModuleMetadata, InjectionToken, OptionalFactoryDependency, Inject } from '@nestjs/common';
-import { a as ApprovalEngine, b as ApprovalEngineOptions } from './ApprovalEngine-Ci9urTDI.js';
-import './IStorageAdapter-BU3sau5W.js';
-import './instance-DUJY_Axf.js';
-import './INotificationAdapter-BdgfUrIn.js';
+import { a as ApprovalEngine, b as ApprovalEngineOptions } from './ApprovalEngine-BHWls8-z.js';
+import './IStorageAdapter-Dw2xXP9B.js';
+import './instance-BO-i9-nq.js';
+import './INotificationAdapter-BBq2czpO.js';
 import 'zod';
 import './Logger-BplhlU7l.js';
 import './Clock-3FnOczFJ.js';
-import './IOperationMiddleware-BGYrAqep.js';
-import './IAuditAdapter-C4OASS6u.js';
+import './IOperationMiddleware-CqzFklMn.js';
+import './IAuditAdapter-CMCirvY-.js';
 import './IMetricsAdapter-DWq8IFaf.js';
 import './ISchedulerAdapter-DKv_QjVN.js';
-import './IAuthorizationPolicy-BA_m2Dg9.js';
+import './IAuthorizationPolicy-BryQIKko.js';
 
 /** Options for {@link HierarchicalApprovalModule.forRoot}. */
 interface HierarchicalApprovalModuleOptions extends ApprovalEngineOptions {

package/dist/nestjs.js

@@ -1066,6 +1066,18 @@ var ApprovalEngine = class _ApprovalEngine {
             message: `Level ${l.level} sets reminderEveryDays without reminderAfterDays, so no reminder would ever be sent.`
           });
         }
+        if (l.escalationAfterHours !== void 0 && l.escalationAfterHours <= 0) {
+          errors.push({
+            field: `levels[${i}].escalationAfterHours`,
+            message: `Level ${l.level} escalationAfterHours must be a positive number.`
+          });
+        }
+        if (l.escalationAfterDays !== void 0 && l.escalationAfterHours !== void 0) {
+          errors.push({
+            field: `levels[${i}].escalationAfterHours`,
+            message: `Level ${l.level} sets both escalationAfterDays and escalationAfterHours; pick one so the deadline is unambiguous.`
+          });
+        }
         if (l.escalationAfterDays !== void 0 && l.escalationAfterDays <= 0) {
           errors.push({
             field: `levels[${i}].escalationAfterDays`,
@@ -1130,6 +1142,18 @@ var ApprovalEngine = class _ApprovalEngine {
         }
       });
     }
+    if (config.slaDeadlineDays !== void 0 && config.slaDeadlineHours !== void 0) {
+      errors.push({
+        field: "slaDeadlineHours",
+        message: "Template sets both slaDeadlineDays and slaDeadlineHours; pick one so the SLA is unambiguous."
+      });
+    }
+    if (config.slaDeadlineHours !== void 0 && config.slaDeadlineHours <= 0) {
+      errors.push({
+        field: "slaDeadlineHours",
+        message: "slaDeadlineHours must be a positive number."
+      });
+    }
     if (config.conditions) {
       config.conditions.forEach((rule, ruleIdx) => {
         errors.push(...validateConditionExpression(rule.when, `conditions[${ruleIdx}].when`));
@@ -1243,7 +1267,8 @@ var ApprovalEngine = class _ApprovalEngine {
         threshold: cfg.threshold,
         weights: cfg.weights,
         escalationAfterDays: cfg.escalationAfterDays,
-        escalationDueAt: inFirstGroup && cfg.escalationAfterDays ? this.deadlineFrom(now, cfg.escalationAfterDays) : void 0,
+        escalationAfterHours: cfg.escalationAfterHours,
+        escalationDueAt: inFirstGroup ? this.levelEscalationDue(now, cfg) : void 0,
         subWorkflowTemplate: cfg.subWorkflow?.templateName,
         reminderAfterDays: cfg.reminderAfterDays,
         reminderEveryDays: cfg.reminderEveryDays,
@@ -1273,7 +1298,7 @@ var ApprovalEngine = class _ApprovalEngine {
       timestamp: now,
       ...auditCtx
     };
-    const slaDeadlineAt = template.slaDeadlineDays ? this.deadlineFrom(now, template.slaDeadlineDays) : void 0;
+    const slaDeadlineAt = template.slaDeadlineHours ? this.deadlineFromHours(now, template.slaDeadlineHours) : template.slaDeadlineDays ? this.deadlineFrom(now, template.slaDeadlineDays) : void 0;
     const instance = {
       id: instanceId,
       tenantId: this.tenantId,
@@ -1301,6 +1326,7 @@ var ApprovalEngine = class _ApprovalEngine {
       templateSnapshot: {
         escalation: template.escalation,
         slaDeadlineDays: template.slaDeadlineDays,
+        slaDeadlineHours: template.slaDeadlineHours,
         allowOverride: template.allowOverride
       }
     };
@@ -2572,7 +2598,7 @@ var ApprovalEngine = class _ApprovalEngine {
       reason: opts.reason,
       ...auditCtx
     };
-    const slaDeadlineAt = template.slaDeadlineDays ? this.deadlineFrom(now, template.slaDeadlineDays) : void 0;
+    const slaDeadlineAt = template.slaDeadlineHours ? this.deadlineFromHours(now, template.slaDeadlineHours) : template.slaDeadlineDays ? this.deadlineFrom(now, template.slaDeadlineDays) : void 0;
     const newInstance = {
       id: newInstanceId,
       tenantId: this.tenantId,
@@ -2595,6 +2621,7 @@ var ApprovalEngine = class _ApprovalEngine {
       templateSnapshot: {
         escalation: template.escalation,
         slaDeadlineDays: template.slaDeadlineDays,
+        slaDeadlineHours: template.slaDeadlineHours,
         allowOverride: template.allowOverride
       }
     };
@@ -3537,6 +3564,24 @@ var ApprovalEngine = class _ApprovalEngine {
   deadlineFrom(from, days) {
     return this.calendar ? this.calendar.addBusinessDays(from, days) : new Date(from.getTime() + days * 864e5);
   }
+  /**
+   * Resolve an hour-based deadline.
+   *
+   * A calendar that only knows whole days — `weekendCalendar`, say — has no
+   * `addBusinessHours`, and this falls back to elapsed clock time rather than
+   * quietly pretending the calendar was applied. Configure
+   * `businessHoursCalendar` to have hours skip evenings and weekends.
+   */
+  deadlineFromHours(from, hours) {
+    const addHours = this.calendar?.addBusinessHours?.bind(this.calendar);
+    return addHours ? addHours(from, hours) : new Date(from.getTime() + hours * 36e5);
+  }
+  /** Level deadline from whichever of days/hours the template configured. */
+  levelEscalationDue(from, level) {
+    if (level.escalationAfterHours) return this.deadlineFromHours(from, level.escalationAfterHours);
+    if (level.escalationAfterDays) return this.deadlineFrom(from, level.escalationAfterDays);
+    return void 0;
+  }
   async requireInstance(id) {
     const instance = await this.opts.adapter.getInstance(this.tenantId, id);
     if (!instance) throw new ApprovalNotFoundError("Instance", id);
@@ -3642,9 +3687,7 @@ var ApprovalEngine = class _ApprovalEngine {
           now
         );
       }
-      if (lvl.escalationAfterDays) {
-        lvl.escalationDueAt = this.deadlineFrom(now, lvl.escalationAfterDays);
-      }
+      lvl.escalationDueAt = this.levelEscalationDue(now, lvl);
       this.scheduleReminder(lvl, now);
       lvl.status = "pending";
     }