@epam/ai-dial-chat-hooks 1.3.0-dev.326 → 1.3.0-dev.331

package/oauth/callback-exchange.js

@@ -0,0 +1,29 @@
+import { OAuthResourceKind as e, ToolsetAuthTypes as t, ToolsetOAuthFailureReason as n } from "./types.js";
+import { parseExternalServiceUrl as r } from "../shared/external-services.js";
+import { ExternalServiceAuthType as i } from "../external-services/useExternalServiceLogin.js";
+//#region src/oauth/callback-exchange.ts
+var a = ({ loginToolset: a, signInExternalService: o, signInOfflineCredentials: s }) => async ({ code: c, redirectUri: l, credentialsLevel: u, redirectState: d }) => {
+	if (d.resourceKind === e.ExternalService) {
+		let e = r(d.toolsetId);
+		return e ? (await o(e.appId, e.serviceName, {
+			credentialsLevel: u,
+			authenticationType: i.OAuth,
+			code: c,
+			redirectUri: l,
+			offlineUsageConsent: d.offlineUsageConsent
+		}), null) : n.MissingRedirectState;
+	}
+	return d.resourceKind === e.OfflineCredentials ? (await s({
+		code: c,
+		redirectUri: l
+	}), null) : (await a(d.toolsetId, {
+		url: d.toolsetId,
+		credentialsLevel: u,
+		authenticationType: t.OAuth,
+		code: c,
+		redirectUri: l,
+		offlineUsageConsent: d.offlineUsageConsent
+	}), null);
+};
+//#endregion
+export { a as createOAuthCallbackExchange };

package/oauth.js

@@ -5,5 +5,6 @@ import { emitToolsetLoginSuccess as x, subscribeToolsetLoginSuccess as S } from
 import { getToolsetOAuthChannelName as C, waitForToolsetOAuthResult as w } from "./oauth/handshake.js";
 import { initiateOAuthLogin as T, navigateToolsetOAuthPopup as E, openToolsetOAuthPopup as D } from "./oauth/popup.js";
 import { ToolsetLoginOutcomeType as O, useToolsetLogin as k } from "./oauth/useToolsetLogin/useToolsetLogin.js";
-import { useOAuthCallbackCompletion as A } from "./oauth/useOAuthCallbackCompletion/useOAuthCallbackCompletion.js";
-export { e as OAuthResourceKind, t as TOOLSET_REDIRECT_STATE_KEY, n as ToolsetAuthStatus, r as ToolsetAuthTypes, i as ToolsetCredentialsLevel, O as ToolsetLoginOutcomeType, a as ToolsetOAuthCallbackQuery, o as ToolsetOAuthChannelControlType, s as ToolsetOAuthFailureReason, c as ToolsetOAuthInitiationResultType, l as ToolsetOAuthResultType, u as WithLogin, v as buildToolsetAuthorizeUrl, d as decodeToolsetId, x as emitToolsetLoginSuccess, f as encodeToolsetId, p as getToolsetFallbackName, C as getToolsetOAuthChannelName, y as getToolsetRedirectUri, T as initiateOAuthLogin, m as isPublicToolsetId, E as navigateToolsetOAuthPopup, h as normalizeToolsetId, D as openToolsetOAuthPopup, g as resolveToolsetCredentialsLevel, _ as selectToolsetAuthStatus, S as subscribeToolsetLoginSuccess, b as toToolsetOAuthSettings, A as useOAuthCallbackCompletion, k as useToolsetLogin, w as waitForToolsetOAuthResult };
+import { createOAuthCallbackExchange as A } from "./oauth/callback-exchange.js";
+import { useOAuthCallbackCompletion as j } from "./oauth/useOAuthCallbackCompletion/useOAuthCallbackCompletion.js";
+export { e as OAuthResourceKind, t as TOOLSET_REDIRECT_STATE_KEY, n as ToolsetAuthStatus, r as ToolsetAuthTypes, i as ToolsetCredentialsLevel, O as ToolsetLoginOutcomeType, a as ToolsetOAuthCallbackQuery, o as ToolsetOAuthChannelControlType, s as ToolsetOAuthFailureReason, c as ToolsetOAuthInitiationResultType, l as ToolsetOAuthResultType, u as WithLogin, v as buildToolsetAuthorizeUrl, A as createOAuthCallbackExchange, d as decodeToolsetId, x as emitToolsetLoginSuccess, f as encodeToolsetId, p as getToolsetFallbackName, C as getToolsetOAuthChannelName, y as getToolsetRedirectUri, T as initiateOAuthLogin, m as isPublicToolsetId, E as navigateToolsetOAuthPopup, h as normalizeToolsetId, D as openToolsetOAuthPopup, g as resolveToolsetCredentialsLevel, _ as selectToolsetAuthStatus, S as subscribeToolsetLoginSuccess, b as toToolsetOAuthSettings, j as useOAuthCallbackCompletion, k as useToolsetLogin, w as waitForToolsetOAuthResult };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@epam/ai-dial-chat-hooks",
   "description": "Framework-level React hooks extracted from AI DIAL Chat for building custom chat interfaces",
-  "version": "1.3.0-dev.326",
+  "version": "1.3.0-dev.331",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./index.js",
@@ -131,7 +131,7 @@
     }
   },
   "dependencies": {
-    "@epam/ai-dial-chat-api-client": "1.3.0-dev.326",
+    "@epam/ai-dial-chat-api-client": "1.3.0-dev.331",
     "dompurify": "3.4.17",
     "fflate": "^0.8.3",
     "lru-cache": "^10.4.3",
@@ -140,23 +140,23 @@
   },
   "peerDependencies": {
     "react": "^19.2.8",
-    "@epam/ai-dial-attachment-canvas": "1.3.0-dev.326",
-    "@epam/ai-dial-attachment-input": "1.3.0-dev.326",
-    "@epam/ai-dial-catalog": "1.3.0-dev.326",
-    "@epam/ai-dial-chat-overlay": "1.3.0-dev.326",
-    "@epam/ai-dial-chat-shared": "1.3.0-dev.326",
-    "@epam/ai-dial-conversation-input": "1.3.0-dev.326",
-    "@epam/ai-dial-mcp-apps": "1.3.0-dev.326",
-    "@epam/ai-dial-projects": "1.3.0-dev.326",
-    "@epam/ai-dial-publish-panel": "1.3.0-dev.326",
-    "@epam/ai-dial-quotations": "1.3.0-dev.326",
+    "@epam/ai-dial-attachment-canvas": "1.3.0-dev.331",
+    "@epam/ai-dial-attachment-input": "1.3.0-dev.331",
+    "@epam/ai-dial-catalog": "1.3.0-dev.331",
+    "@epam/ai-dial-chat-overlay": "1.3.0-dev.331",
+    "@epam/ai-dial-chat-shared": "1.3.0-dev.331",
+    "@epam/ai-dial-conversation-input": "1.3.0-dev.331",
+    "@epam/ai-dial-mcp-apps": "1.3.0-dev.331",
+    "@epam/ai-dial-projects": "1.3.0-dev.331",
+    "@epam/ai-dial-publish-panel": "1.3.0-dev.331",
+    "@epam/ai-dial-quotations": "1.3.0-dev.331",
     "@epam/ai-dial-react-file-manager": "^0.4.0-dev.25",
-    "@epam/ai-dial-scheduled-tasks": "1.3.0-dev.326",
-    "@epam/ai-dial-share": "1.3.0-dev.326",
-    "@epam/ai-dial-skill-editor": "1.3.0-dev.326",
-    "@epam/ai-dial-source-panel": "1.3.0-dev.326",
+    "@epam/ai-dial-scheduled-tasks": "1.3.0-dev.331",
+    "@epam/ai-dial-share": "1.3.0-dev.331",
+    "@epam/ai-dial-skill-editor": "1.3.0-dev.331",
+    "@epam/ai-dial-source-panel": "1.3.0-dev.331",
     "@epam/ai-dial-ui-kit": "^0.16.0-dev.72",
-    "@epam/ai-dial-usage-dashboard": "1.3.0-dev.326",
+    "@epam/ai-dial-usage-dashboard": "1.3.0-dev.331",
     "@modelcontextprotocol/sdk": "^1.32.2",
     "@epam/pdf-highlighter-kit": "^0.0.19"
   },

package/scheduled-task/scheduled-task-description.d.ts

@@ -4,7 +4,6 @@ export declare enum ScheduledTaskTriggerDescriptionKind {
     OneTime = "oneTime",
     Hourly = "hourly",
     EveryNMinutes = "everyNMinutes",
-    EveryNWeeks = "everyNWeeks",
     Daily = "daily",
     Weekly = "weekly",
     Monthly = "monthly",
@@ -15,10 +14,10 @@ export interface ScheduledTaskTriggerDescription {
     kind: ScheduledTaskTriggerDescriptionKind;
     time?: string;
     dayOfWeek?: string;
+    /** Every display-timezone weekday of a `Weekly` description, Monday first; `dayOfWeek` is its first entry. */
+    daysOfWeek?: string[];
     dayOfMonth?: string;
     intervalMinutes?: number;
-    /** Week count of an `EveryNWeeks` description (the cron `week` step). */
-    intervalWeeks?: number;
     date?: Date;
     expression?: string;
     sourceTimezone: 'utc';

package/scheduled-task/scheduled-task-description.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-task-description.d.ts","sourceRoot":"","sources":["../../src/scheduled-task/scheduled-task-description.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,8DAA8D;AAC9D,oBAAY,mCAAmC;IAC7C,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,aAAa,kBAAkB;IAC/B,WAAW,gBAAgB;IAC3B,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,+BAA+B;IAC9C,IAAI,EAAE,mCAAmC,CAAC;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,KAAK,CAAC;CACvB;AAED,MAAM,WAAW,sCAAsC;IACrD,qEAAqE;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6FAA6F;IAC7F,aAAa,CAAC,EAAE,IAAI,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,GACvC,SAAS,kBAAkB,EAC3B,+BAGG,sCAA2C,KAC7C,+BAkLF,CAAC"}
+{"version":3,"file":"scheduled-task-description.d.ts","sourceRoot":"","sources":["../../src/scheduled-task/scheduled-task-description.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,8DAA8D;AAC9D,oBAAY,mCAAmC;IAC7C,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,aAAa,kBAAkB;IAC/B,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,+BAA+B;IAC9C,IAAI,EAAE,mCAAmC,CAAC;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8GAA8G;IAC9G,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,KAAK,CAAC;CACvB;AAED,MAAM,WAAW,sCAAsC;IACrD,qEAAqE;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6FAA6F;IAC7F,aAAa,CAAC,EAAE,IAAI,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,GACvC,SAAS,kBAAkB,EAC3B,+BAGG,sCAA2C,KAC7C,+BAuKF,CAAC"}

package/scheduled-task/scheduled-task-description.js

@@ -1,7 +1,7 @@
 import { CRON_LAST_DAY_OF_MONTH as e } from "../shared/cron-day-of-month.js";
 //#region src/scheduled-task/scheduled-task-description.ts
 var t = /* @__PURE__ */ function(e) {
-	return e.OneTime = "oneTime", e.Hourly = "hourly", e.EveryNMinutes = "everyNMinutes", e.EveryNWeeks = "everyNWeeks", e.Daily = "daily", e.Weekly = "weekly", e.Monthly = "monthly", e.Custom = "custom", e.Invalid = "invalid", e;
+	return e.OneTime = "oneTime", e.Hourly = "hourly", e.EveryNMinutes = "everyNMinutes", e.Daily = "daily", e.Weekly = "weekly", e.Monthly = "monthly", e.Custom = "custom", e.Invalid = "invalid", e;
 }({}), n = (t, { timeZone: n = "UTC", referenceDate: r = /* @__PURE__ */ new Date() } = {}) => {
 	let i = (e, t = {}) => ({
 		kind: e,
@@ -15,7 +15,7 @@ var t = /* @__PURE__ */ function(e) {
 	}
 	let a = t.cron?.fields;
 	if (!a || Object.keys(a).length === 0) return i("invalid");
-	let o = () => i("custom", { expression: JSON.stringify(a) }), s = a.week?.match(/^\*\/(10|[1-9])$/), c = {
+	let o = () => i("custom", { expression: JSON.stringify(a) }), s = {
 		hour: [0, 23],
 		minute: [0, 59],
 		day: [1, 31],
@@ -26,19 +26,16 @@ var t = /* @__PURE__ */ function(e) {
 	for (let [e, t] of Object.entries(a)) {
 		if (t == null) continue;
 		if (!t.trim()) return i("invalid");
-		let n = c[e];
+		let n = s[e];
 		if (n && /^-?\d+$/.test(t) && (Number(t) < n[0] || Number(t) > n[1])) return i("invalid");
-		if (e === "second" && t !== "0") return o();
-		if (e === "week") {
-			if (!s) return o();
-		} else if (![
+		if (e === "second" && t !== "0" || ![
 			"hour",
 			"minute",
 			"day",
 			"day_of_week"
 		].includes(e) && t !== "*" && (e !== "second" || t !== "0")) return o();
 	}
-	let l = a.hour, u = a.minute, d = a.day === "*" ? void 0 : a.day, f = d === e, p = a.day_of_week === "*" ? void 0 : a.day_of_week, m = p ? [
+	let c = a.hour, l = a.minute, u = a.day === "*" ? void 0 : a.day, d = u === e, f = a.day_of_week === "*" ? void 0 : a.day_of_week, p = [
 		"monday",
 		"tuesday",
 		"wednesday",
@@ -46,19 +43,20 @@ var t = /* @__PURE__ */ function(e) {
 		"friday",
 		"saturday",
 		"sunday"
-	].findIndex((e) => e === p.toLowerCase() || e.slice(0, 3) === p.toLowerCase()) : -1, h = m >= 0 ? String(m) : p;
-	if (d && h || d && !f && !/^\d+$/.test(d) || h && !/^\d+$/.test(h)) return o();
-	let g = l == null || l === "*";
-	if (s && (g || !h || d)) return o();
-	let _ = u?.match(/^\*\/(\d+)$/);
-	if (g && _ && !d && !h) {
+	], m = (f?.split(",") ?? []).map((e) => {
+		let t = p.findIndex((t) => t === e.toLowerCase() || t.slice(0, 3) === e.toLowerCase());
+		return t >= 0 ? String(t) : e;
+	}), h = m[0];
+	if (u && h || u && !d && !/^\d+$/.test(u) || m.some((e) => !/^[0-6]$/.test(e)) || new Set(m).size !== m.length) return o();
+	let g = c == null || c === "*", _ = l?.match(/^\*\/(\d+)$/);
+	if (g && _ && !u && !h) {
 		let e = Number(_[1]);
 		return e > 0 && e <= 59 ? i("everyNMinutes", { intervalMinutes: e }) : i("invalid");
 	}
-	if (!u || !/^\d+$/.test(u) || !g && !/^\d+$/.test(l) || g && (d || h)) return o();
+	if (!l || !/^\d+$/.test(l) || !g && !/^\d+$/.test(c) || g && (u || h)) return o();
 	let v = new Date(r);
 	if (Number.isNaN(v.getTime())) return i("invalid");
-	if (v.setUTCHours(g ? 0 : Number(l), Number(u), 0, 0), h) {
+	if (v.setUTCHours(g ? 0 : Number(c), Number(l), 0, 0), h) {
 		let e = (Number(h) + 1) % 7;
 		v.setUTCDate(v.getUTCDate() + (e - v.getUTCDay() + 7) % 7);
 	}
@@ -71,19 +69,21 @@ var t = /* @__PURE__ */ function(e) {
 		hour: "2-digit",
 		minute: "2-digit"
 	}).formatToParts(v), b = (e) => y.find((t) => t.type === e)?.value ?? "", x = new Date(Date.UTC(Number(b("year")), Number(b("month")) - 1, Number(b("day")))), S = Date.UTC(v.getUTCFullYear(), v.getUTCMonth(), v.getUTCDate()), C = Math.round((x.getTime() - S) / 864e5), w = b("hour") + ":" + b("minute");
-	return s ? i("everyNWeeks", {
-		intervalWeeks: Number(s[1]),
-		time: w,
-		dayOfWeek: String((Number(h) + C + 7) % 7)
-	}) : g ? i("hourly", { time: b("minute") }) : h ? i("weekly", {
-		time: w,
-		dayOfWeek: String((Number(h) + C + 7) % 7)
-	}) : f ? C === 1 ? i("monthly", {
+	if (g) return i("hourly", { time: b("minute") });
+	if (h) {
+		let e = m.map((e) => String((Number(e) + C + 7) % 7)).sort((e, t) => Number(e) - Number(t));
+		return i("weekly", {
+			time: w,
+			dayOfWeek: e[0],
+			daysOfWeek: e
+		});
+	}
+	return d ? C === 1 ? i("monthly", {
 		time: w,
 		dayOfMonth: "1"
-	}) : o() : d ? C === 0 || Number(d) <= 28 && Number(d) + C >= 1 && Number(d) + C <= 28 ? i("monthly", {
+	}) : o() : u ? C === 0 || Number(u) <= 28 && Number(u) + C >= 1 && Number(u) + C <= 28 ? i("monthly", {
 		time: w,
-		dayOfMonth: String(Number(d) + C)
+		dayOfMonth: String(Number(u) + C)
 	}) : o() : i("daily", { time: w });
 };
 //#endregion

package/scheduled-task/scheduled-task-display.d.ts

@@ -11,10 +11,8 @@ export interface ScheduledTaskScheduleLabels {
     hourlyAt: (minute: string) => string;
     /** A daily run at `time` (`HH:mm`). */
     dailyAt: (time: string) => string;
-    /** A weekly run on the weekday name `day` at `time`. */
+    /** A weekly run on `day` — one weekday name, or several joined as a locale list — at `time`. */
     weeklyAt: (day: string, time: string) => string;
-    /** A run every `count` weeks on the weekday name `day` at `time`. */
-    everyNWeeks: (count: number, day: string, time: string) => string;
     /** A monthly run on day-of-month `day` at `time`. */
     monthlyAt: (day: string, time: string) => string;
     /** Label for a trigger that cannot be read. */

package/scheduled-task/scheduled-task-display.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-task-display.d.ts","sourceRoot":"","sources":["../../src/scheduled-task/scheduled-task-display.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scheduled-task-display.d.ts","sourceRoot":"","sources":["../../src/scheduled-task/scheduled-task-display.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,uBAAuB,EAC5B,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D,mGAAmG;AACnG,MAAM,WAAW,2BAA2B;IAC1C,6CAA6C;IAC7C,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACjC,mCAAmC;IACnC,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACzC,+CAA+C;IAC/C,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,uCAAuC;IACvC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAClC,gGAAgG;IAChG,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAChD,qDAAqD;IACrD,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACjD,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,8DAA8D;IAC9D,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,gDAAgD;AAChD,MAAM,WAAW,8BAA8B;IAC7C,gCAAgC;IAChC,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACjC,kCAAkC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,kCAAkC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,uDAAuD;IACvD,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;CACtC;AAED,sDAAsD;AACtD,MAAM,WAAW,+BAA+B;IAC9C,yDAAyD;IACzD,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAClC,6DAA6D;IAC7D,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAChD;AAED,2DAA2D;AAC3D,MAAM,WAAW,iCAAiC;IAChD,kFAAkF;IAClF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2FAA2F;IAC3F,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,gDAAgD;AAChD,MAAM,WAAW,gCAAgC;IAC/C,qEAAqE;IACrE,cAAc,CAAC,EAAE,8BAA8B,CAAC;IAChD,4EAA4E;IAC5E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,4EAA4E;IAC5E,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ;AAED,kDAAkD;AAClD,MAAM,WAAW,2BAA2B;IAC1C,wCAAwC;IACxC,eAAe,EAAE,+BAA+B,CAAC;IACjD,sCAAsC;IACtC,cAAc,EAAE,8BAA8B,CAAC;IAC/C,iEAAiE;IACjE,aAAa,EAAE,uBAAuB,EAAE,CAAC;IACzC,8FAA8F;IAC9F,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/D,yEAAyE;IACzE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,4EAA4E;IAC5E,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ;AAED,uFAAuF;AACvF,MAAM,WAAW,0BAA0B;IACzC,kEAAkE;IAClE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,+CAA+C;IAC/C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,gEAAgE;AAChE,oBAAY,4BAA4B;IACtC,iEAAiE;IACjE,QAAQ,aAAa;IACrB,gEAAgE;IAChE,SAAS,cAAc;IACvB,yBAAyB;IACzB,OAAO,YAAY;CACpB;AAsBD,4EAA4E;AAC5E,eAAO,MAAM,gCAAgC,GAC3C,MAAM,gBAAgB,EACtB,QAAQ,2BAA2B,EACnC,wBAGG,iCAAsC,KACxC,MAgCF,CAAC;AAEF,wEAAwE;AACxE,eAAO,MAAM,mBAAmB,GAC9B,MAAM,gBAAgB,EACtB,QAAQ,2BAA2B,EACnC,UAAU,iCAAiC,KAC1C,iBAOD,CAAC;AAEH,gEAAgE;AAChE,eAAO,MAAM,oBAAoB,GAC/B,OAAO,gBAAgB,EAAE,EACzB,QAAQ,2BAA2B,EACnC,UAAU,iCAAiC,KAC1C,iBAAiB,EAC6C,CAAC;AAElE,uGAAuG;AACvG,eAAO,MAAM,8BAA8B,GACzC,iBAAiB,MAAM,GAAG,IAAI,GAAG,SAAS,EAC1C,QAAQ,8BAA8B,KACrC,MAAM,GAAG,SAgBX,CAAC;AAEF,yGAAyG;AACzG,eAAO,MAAM,+BAA+B,GAC1C,WAAW,MAAM,EACjB,iBAAiB,MAAM,GAAG,IAAI,GAAG,SAAS,EAC1C,QAAQ,+BAA+B,EACvC,mCAIG,gCAAqC,KACvC,MAmBF,CAAC;AAgBF,+EAA+E;AAC/E,eAAO,MAAM,sBAAsB,GACjC,KAAK,mBAAmB,EACxB,wFAOG,2BAA2B,KAC7B,oBAyBF,CAAC;AAEF,uEAAuE;AACvE,eAAO,MAAM,uBAAuB,GAClC,MAAM,mBAAmB,EAAE,EAC3B,SAAS,2BAA2B,KACnC,oBAAoB,EACkC,CAAC;AAE1D,4EAA4E;AAC5E,eAAO,MAAM,gCAAgC,GAC3C,QAAQ,MAAM,GAAG,SAAS,KACzB,4BAKF,CAAC;AAEF,qGAAqG;AACrG,eAAO,MAAM,+BAA+B,GAC1C,SAAS,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,iBAAiB,CAAC,EAC1D,oCAAoC,0BAA0B,KAC7D,MAIF,CAAC"}

package/scheduled-task/scheduled-task-display.js

@@ -7,7 +7,7 @@ var a = /* @__PURE__ */ function(e) {
 }({}), o = 60, s = 3600, c = (e, t) => new Intl.DateTimeFormat(t, {
 	weekday: "long",
 	timeZone: "UTC"
-}).format(new Date(Date.UTC(2023, 0, 2 + Number(e)))), l = (e, t) => e.getFullYear() === t.getFullYear() && e.getMonth() === t.getMonth() && e.getDate() === t.getDate(), u = (n, r, { locale: i, timeZone: a = Intl.DateTimeFormat().resolvedOptions().timeZone } = {}) => {
+}).format(new Date(Date.UTC(2023, 0, 2 + Number(e)))), l = (e, t) => new Intl.ListFormat(t, { type: "conjunction" }).format(e.map((e) => c(e, t))), u = (e, t) => e.getFullYear() === t.getFullYear() && e.getMonth() === t.getMonth() && e.getDate() === t.getDate(), d = (n, r, { locale: i, timeZone: a = Intl.DateTimeFormat().resolvedOptions().timeZone } = {}) => {
 	let o = t(n.trigger, { timeZone: a }), s = o.time ?? "";
 	switch (o.kind) {
 		case e.OneTime: return r.onceAt(new Intl.DateTimeFormat(i, {
@@ -17,20 +17,19 @@ var a = /* @__PURE__ */ function(e) {
 		case e.EveryNMinutes: return r.everyNMinutes(o.intervalMinutes ?? 0);
 		case e.Hourly: return r.hourlyAt(s);
 		case e.Daily: return r.dailyAt(s);
-		case e.Weekly: return r.weeklyAt(c(o.dayOfWeek, i), s);
-		case e.EveryNWeeks: return r.everyNWeeks(o.intervalWeeks ?? 0, c(o.dayOfWeek, i), s);
+		case e.Weekly: return r.weeklyAt(l(o.daysOfWeek ?? [o.dayOfWeek ?? ""], i), s);
 		case e.Monthly: return r.monthlyAt(o.dayOfMonth ?? "", s);
 		case e.Invalid: return r.invalid;
 		default: return r.recurringFallback;
 	}
-}, d = (e, t, n) => ({
+}, f = (e, t, n) => ({
 	id: e.id,
 	displayName: e.displayName,
 	descriptionPreview: e.description,
-	scheduleLabel: u(e, t, n),
+	scheduleLabel: d(e, t, n),
 	isActive: e.isActive,
 	isCompleted: e.isCompleted
-}), f = (e, t, n) => e.map((e) => d(e, t, n)), p = (e, t) => {
+}), p = (e, t, n) => e.map((e) => f(e, t, n)), m = (e, t) => {
 	if (e == null) return;
 	let n = [
 		[Math.floor(e / s), t.hours],
@@ -38,33 +37,33 @@ var a = /* @__PURE__ */ function(e) {
 		[e % o, t.seconds]
 	].filter(([e]) => e > 0).map(([e, t]) => t(e));
 	return t.suffix(n.length ? n.join(" ") : t.seconds(0));
-}, m = (e, t, n, { durationLabels: r, locale: i, now: a = /* @__PURE__ */ new Date() } = {}) => {
-	let o = new Date(e), s = new Intl.DateTimeFormat(i, { timeStyle: "short" }).format(o), c = l(o, a) ? n.todayAt(s) : n.dateAt(new Intl.DateTimeFormat(i, {
+}, h = (e, t, n, { durationLabels: r, locale: i, now: a = /* @__PURE__ */ new Date() } = {}) => {
+	let o = new Date(e), s = new Intl.DateTimeFormat(i, { timeStyle: "short" }).format(o), c = u(o, a) ? n.todayAt(s) : n.dateAt(new Intl.DateTimeFormat(i, {
 		month: "short",
 		day: "numeric"
-	}).format(o), s), u = r ? p(t, r) : void 0;
-	return u ? `${c} ${u}` : c;
-}, h = (e) => {
+	}).format(o), s), l = r ? m(t, r) : void 0;
+	return l ? `${c} ${l}` : c;
+}, g = (e) => {
 	switch (e) {
 		case r.Success: return i.Success;
 		case r.Error: return i.Error;
 		case r.InProgress: return i.InProgress;
 		default: return i.Missed;
 	}
-}, g = (e, { timestampLabels: t, durationLabels: n, conversations: r, conversationIdsMatch: i, locale: a, now: o }) => {
+}, _ = (e, { timestampLabels: t, durationLabels: n, conversations: r, conversationIdsMatch: i, locale: a, now: o }) => {
 	let { conversationId: s } = e, c = s ? r.find((e) => i(e.id, s)) : void 0;
 	return {
 		id: e.id,
-		status: h(e.status),
-		timestampLabel: m(e.startTime, void 0, t, {
+		status: g(e.status),
+		timestampLabel: h(e.startTime, void 0, t, {
 			locale: a,
 			now: o
 		}),
-		durationLabel: p(e.durationSeconds, n),
+		durationLabel: m(e.durationSeconds, n),
 		conversationId: s,
 		isUnread: c?.isUnread === !0,
 		errorText: e.errorText
 	};
-}, _ = (e, t) => e.map((e) => g(e, t)), v = (e) => e === 404 || e === 409 ? "notFound" : e === 502 ? "retryable" : "generic", y = (e, { adminConsentRequired: t, fallback: r }) => e.code === n.ScheduledTaskAdminConsentRequired ? t : e.upstreamMessage?.trim() || r;
+}, v = (e, t) => e.map((e) => _(e, t)), y = (e) => e === 404 || e === 409 ? "notFound" : e === 502 ? "retryable" : "generic", b = (e, { adminConsentRequired: t, fallback: r }) => e.code === n.ScheduledTaskAdminConsentRequired ? t : e.upstreamMessage?.trim() || r;
 //#endregion
-export { a as ScheduledTaskDeleteErrorKind, v as classifyScheduledTaskDeleteError, p as formatScheduledTaskRunDuration, m as formatScheduledTaskRunTimestamp, u as formatScheduledTaskScheduleLabel, y as selectScheduledTaskErrorMessage, d as toScheduledTaskItem, f as toScheduledTaskItems, g as toScheduledTaskRunItem, _ as toScheduledTaskRunItems };
+export { a as ScheduledTaskDeleteErrorKind, y as classifyScheduledTaskDeleteError, m as formatScheduledTaskRunDuration, h as formatScheduledTaskRunTimestamp, d as formatScheduledTaskScheduleLabel, b as selectScheduledTaskErrorMessage, f as toScheduledTaskItem, p as toScheduledTaskItems, _ as toScheduledTaskRunItem, v as toScheduledTaskRunItems };

package/scheduled-task/scheduled-task-next-occurrence.d.ts

@@ -1,9 +1,9 @@
 import { ScheduleCronDto } from '@epam/ai-dial-chat-api-client';
 /**
  * Returns the next UTC time at which a cron trigger with a fixed
- * `hour`/`minute` fires, honouring its `day_of_week` (Weekly) or `day`
- * (Monthly) constraint. Returns `undefined` when the fields are not plain
- * values this helper can evaluate.
+ * `hour`/`minute` fires, honouring its `day_of_week` (a weekday or a comma
+ * list of weekdays) or `day` (Monthly) constraint. Returns `undefined` when
+ * the fields are not plain values this helper can evaluate.
  */
 export declare const getNextCronOccurrence: (cron: ScheduleCronDto, from?: Date) => Date | undefined;
 //# sourceMappingURL=scheduled-task-next-occurrence.d.ts.map

package/scheduled-task/scheduled-task-next-occurrence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-task-next-occurrence.d.ts","sourceRoot":"","sources":["../../src/scheduled-task/scheduled-task-next-occurrence.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AA2BrE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAChC,MAAM,eAAe,EACrB,OAAM,IAAiB,KACtB,IAAI,GAAG,SA4BT,CAAC"}
+{"version":3,"file":"scheduled-task-next-occurrence.d.ts","sourceRoot":"","sources":["../../src/scheduled-task/scheduled-task-next-occurrence.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AA6BrE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAChC,MAAM,eAAe,EACrB,OAAM,IAAiB,KACtB,IAAI,GAAG,SA4BT,CAAC"}

package/scheduled-task/scheduled-task-next-occurrence.js

@@ -1,6 +1,6 @@
 //#region src/scheduled-task/scheduled-task-next-occurrence.ts
 var e = "last", t = /^\d+$/, n = (t, n, r) => {
-	if (n != null) return (Number(n) + 1) % 7 === t.getUTCDay();
+	if (n != null) return n.split(",").some((e) => (Number(e) + 1) % 7 === t.getUTCDay());
 	if (r === e) {
 		let e = new Date(t);
 		return e.setUTCDate(t.getUTCDate() + 1), e.getUTCDate() === 1;
@@ -8,7 +8,7 @@ var e = "last", t = /^\d+$/, n = (t, n, r) => {
 	return r == null || Number(r) === t.getUTCDate();
 }, r = (r, i = /* @__PURE__ */ new Date()) => {
 	let { hour: a, minute: o, day_of_week: s, day: c } = r.fields;
-	if (!a || !o || !t.test(a) || !t.test(o) || s != null && !/^[0-6]$/.test(s) || c != null && c !== e && !t.test(c)) return;
+	if (!a || !o || !t.test(a) || !t.test(o) || s != null && !/^[0-6](?:,[0-6])*$/.test(s) || c != null && c !== e && !t.test(c)) return;
 	let l = new Date(i);
 	l.setUTCHours(Number(a), Number(o), 0, 0);
 	for (let e = 0; e <= 366; e++) {

package/scheduled-task/scheduled-task-trigger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-task-trigger.d.ts","sourceRoot":"","sources":["../../src/scheduled-task/scheduled-task-trigger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,0BAA0B,EAC1B,gBAAgB,EAEhB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,6BAA6B,EAE9B,MAAM,+BAA+B,CAAC;AAWvC,OAAO,EAEL,KAAK,6BAA6B,EACnC,MAAM,0BAA0B,CAAC;AAuHlC;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,GACpC,QAAQ,6BAA6B,KACpC,0BAwCF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,GACpC,QAAQ,6BAA6B,KACpC,0BAGD,CAAC;AAsKH;;;;;;;GAOG;AACH,eAAO,MAAM,+BAA+B,GAC1C,KAAK,gBAAgB,KACpB,6BAoHF,CAAC"}
+{"version":3,"file":"scheduled-task-trigger.d.ts","sourceRoot":"","sources":["../../src/scheduled-task/scheduled-task-trigger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,0BAA0B,EAC1B,gBAAgB,EAEhB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,6BAA6B,EAE9B,MAAM,+BAA+B,CAAC;AAWvC,OAAO,EAEL,KAAK,6BAA6B,EACnC,MAAM,0BAA0B,CAAC;AAgIlC;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,GACpC,QAAQ,6BAA6B,KACpC,0BAsCF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,GACpC,QAAQ,6BAA6B,KACpC,0BAGD,CAAC;AAoJH;;;;;;;GAOG;AACH,eAAO,MAAM,+BAA+B,GAC1C,KAAK,gBAAgB,KACpB,6BA8GF,CAAC"}

package/scheduled-task/scheduled-task-trigger.js

@@ -9,7 +9,7 @@ var c = /* @__PURE__ */ new Set([
 	"minute",
 	"day_of_week",
 	"day"
-]), l = /^\*\/(10|[1-9])$/, u = "09:00", d = (e) => {
+]), l = /^[0-6]$/, u = (e) => [...e].sort((e, t) => Number(e) - Number(t)), d = "09:00", f = (e) => {
 	if (e.repeat === s.Hourly) {
 		let t = /* @__PURE__ */ new Date();
 		return t.setHours(0, Number(e.minute), 0, 0), {
@@ -17,26 +17,30 @@ var c = /* @__PURE__ */ new Set([
 			minute: String(t.getUTCMinutes())
 		};
 	}
-	let [t, r] = e.time.split(":"), c = Number(t), l = Number(r), u = /* @__PURE__ */ new Date();
-	u.setHours(c, l, 0, 0);
-	let d = (e.repeat === s.Weekly || e.repeat === s.Custom) && !!e.dayOfWeek, f = e.repeat === s.Monthly && !!e.dayOfMonth;
-	if (d) {
-		let t = (a(Number(e.dayOfWeek)) - u.getDay() + 7) % 7;
-		u.setDate(u.getDate() + t);
+	let [t, r] = e.time.split(":"), c = Number(t), l = Number(r), d = /* @__PURE__ */ new Date();
+	d.setHours(c, l, 0, 0);
+	let f = e.repeat === s.Weekly && !!e.dayOfWeek, p = e.repeat === s.Custom ? u(e.daysOfWeek ?? []) : [], m = e.repeat === s.Monthly && !!e.dayOfMonth, h = f ? e.dayOfWeek : p[0];
+	if (h !== void 0) {
+		let e = (a(Number(h)) - d.getDay() + 7) % 7;
+		d.setDate(d.getDate() + e);
 	}
-	let p = {
-		hour: String(u.getUTCHours()),
-		minute: String(u.getUTCMinutes())
+	let g = {
+		hour: String(d.getUTCHours()),
+		minute: String(d.getUTCMinutes())
 	};
-	return d && (p.day_of_week = String(o(u.getUTCDay()))), f && (p.day = i(Number(e.dayOfMonth), n(u))), e.repeat === s.Custom && (p.week = `*/${e.everyWeeks ?? "1"}`), p;
-}, f = (e, t) => {
+	if (f && (g.day_of_week = String(o(d.getUTCDay()))), m && (g.day = i(Number(e.dayOfMonth), n(d))), p.length) {
+		let e = n(d);
+		g.day_of_week = u(p.map((t) => String((Number(t) + e + 7) % 7))).join(",");
+	}
+	return g;
+}, p = (e, t) => {
 	let [n, r, i] = e.split("-").map(Number), a = new Date(n, r - 1, i);
 	return t === "start" ? a.setHours(0, 0, 0, 0) : a.setHours(23, 59, 59, 999), a.toISOString();
-}, p = (e) => {
+}, m = (e) => {
 	let t = e.repeat === s.OneTime ? { date: new Date(e.runAt ?? "").toISOString() } : { cron: {
-		fields: d(e),
-		...e.repeat !== s.Custom && e.startDate ? { startDate: f(e.startDate, "start") } : {},
-		...e.repeat !== s.Custom && e.endDate ? { endDate: f(e.endDate, "end") } : {}
+		fields: f(e),
+		...e.startDate ? { startDate: p(e.startDate, "start") } : {},
+		...e.endDate ? { endDate: p(e.endDate, "end") } : {}
 	} }, n = e.description?.trim();
 	return {
 		displayName: e.displayName.trim(),
@@ -46,36 +50,19 @@ var c = /* @__PURE__ */ new Set([
 		...e.skillUrls?.length ? { skillUrls: [...new Set(e.skillUrls)] } : {},
 		...n ? { description: n } : {}
 	};
-}, m = (e) => ({
-	...p(e),
+}, h = (e) => ({
+	...m(e),
 	skillUrls: [...new Set(e.skillUrls ?? [])]
-}), h = (t) => {
+}), g = (t) => {
 	let n = new Date(t);
 	return `${n.getFullYear()}-${e(n.getMonth() + 1)}-${e(n.getDate())}T${e(n.getHours())}:${e(n.getMinutes())}`;
-}, g = (t) => {
+}, _ = (t) => {
 	let n = new Date(t);
 	return `${n.getFullYear()}-${e(n.getMonth() + 1)}-${e(n.getDate())}`;
-}, _ = (t) => {
-	let i = new Set(Object.entries(t).filter(([, e]) => e != null).map(([e]) => e)), s = [...i].filter((e) => !c.has(e)), u = i.has("day_of_week"), d = i.has("day");
-	if (i.has("week")) {
-		let n = t.week?.match(l);
-		if (n && s.every((e) => e === "week") && u && !d && /^\d+$/.test(String(t.day_of_week)) && /^\d+$/.test(String(t.hour)) && /^\d+$/.test(String(t.minute))) {
-			let r = Number(t.hour), i = Number(t.minute), s = Number(t.day_of_week), c = /* @__PURE__ */ new Date();
-			c.setUTCHours(r, i, 0, 0);
-			let l = (a(s) - c.getUTCDay() + 7) % 7;
-			return c.setUTCDate(c.getUTCDate() + l), {
-				ok: !0,
-				isHourly: !1,
-				isCustom: !0,
-				everyWeeks: n[1],
-				time: `${e(c.getHours())}:${e(c.getMinutes())}`,
-				dayOfWeek: String(o(c.getDay()))
-			};
-		}
-		return { ok: !1 };
-	}
-	if (s.length > 0 || u && d || !i.has("hour") || !i.has("minute")) return { ok: !1 };
-	if (t.hour === "*" && /^\d+$/.test(String(t.minute)) && !u && !d) {
+}, v = (t) => {
+	let i = new Set(Object.entries(t).filter(([, e]) => e != null).map(([e]) => e)), s = [...i].filter((e) => !c.has(e)), d = i.has("day_of_week"), f = i.has("day");
+	if (s.length > 0 || d && f || !i.has("hour") || !i.has("minute")) return { ok: !1 };
+	if (t.hour === "*" && /^\d+$/.test(String(t.minute)) && !d && !f) {
 		let e = /* @__PURE__ */ new Date();
 		return e.setUTCHours(0, Number(t.minute), 0, 0), {
 			ok: !0,
@@ -83,24 +70,36 @@ var c = /* @__PURE__ */ new Set([
 			minute: String(e.getMinutes())
 		};
 	}
-	let f = Number(t.hour), p = Number(t.minute);
-	if (Number.isNaN(f) || Number.isNaN(p)) return { ok: !1 };
-	let m = /* @__PURE__ */ new Date();
-	if (m.setUTCHours(f, p, 0, 0), u) {
-		let e = Number(t.day_of_week);
-		if (Number.isNaN(e)) return { ok: !1 };
-		let n = (a(e) - m.getUTCDay() + 7) % 7;
-		m.setUTCDate(m.getUTCDate() + n);
+	let p = Number(t.hour), m = Number(t.minute);
+	if (Number.isNaN(p) || Number.isNaN(m)) return { ok: !1 };
+	let h = /* @__PURE__ */ new Date();
+	h.setUTCHours(p, m, 0, 0);
+	let g = d ? String(t.day_of_week).split(",") : [];
+	if (g.some((e) => !l.test(e)) || new Set(g).size !== g.length) return { ok: !1 };
+	if (g.length) {
+		let e = (a(Number(g[0])) - h.getUTCDay() + 7) % 7;
+		h.setUTCDate(h.getUTCDate() + e);
 	}
-	let h = d ? r(String(t.day), n(m)) : void 0;
-	return d && !h ? { ok: !1 } : {
+	let _ = `${e(h.getHours())}:${e(h.getMinutes())}`;
+	if (g.length > 1) {
+		let e = n(h);
+		return {
+			ok: !0,
+			isHourly: !1,
+			isCustom: !0,
+			time: _,
+			daysOfWeek: u(g.map((t) => String((Number(t) - e + 7) % 7)))
+		};
+	}
+	let v = f ? r(String(t.day), n(h)) : void 0;
+	return f && !v ? { ok: !1 } : {
 		ok: !0,
 		isHourly: !1,
-		time: `${e(m.getHours())}:${e(m.getMinutes())}`,
-		...u ? { dayOfWeek: String(o(m.getDay())) } : {},
-		...h ? { dayOfMonth: h } : {}
+		time: _,
+		...d ? { dayOfWeek: String(o(h.getDay())) } : {},
+		...v ? { dayOfMonth: v } : {}
 	};
-}, v = (e) => {
+}, y = (e) => {
 	if (!e.model || typeof e.prompt != "string" || !e.prompt.trim() && !e.skillUrls?.length) return {
 		ok: !1,
 		reason: t.MissingRequiredFields
@@ -122,15 +121,15 @@ var c = /* @__PURE__ */ new Set([
 		values: {
 			...a,
 			repeat: s.OneTime,
-			runAt: h(n),
-			time: u
+			runAt: g(n),
+			time: d
 		}
 	};
 	if (!r) return {
 		ok: !1,
 		reason: t.UnsupportedTriggerType
 	};
-	let o = _(r.fields);
+	let o = v(r.fields);
 	if (!o.ok) return {
 		ok: !1,
 		reason: t.UnsupportedCronShape
@@ -140,23 +139,21 @@ var c = /* @__PURE__ */ new Set([
 		values: {
 			...a,
 			repeat: s.Hourly,
-			time: u,
+			time: d,
 			minute: o.minute,
-			...r.startDate ? { startDate: g(r.startDate) } : {},
-			...r.endDate ? { endDate: g(r.endDate) } : {}
+			...r.startDate ? { startDate: _(r.startDate) } : {},
+			...r.endDate ? { endDate: _(r.endDate) } : {}
 		}
 	};
-	if (o.isCustom) return r.startDate || r.endDate ? {
-		ok: !1,
-		reason: t.UnsupportedCronShape
-	} : {
+	if (o.isCustom) return {
 		ok: !0,
 		values: {
 			...a,
 			repeat: s.Custom,
 			time: o.time,
-			everyWeeks: o.everyWeeks,
-			dayOfWeek: o.dayOfWeek
+			daysOfWeek: o.daysOfWeek,
+			...r.startDate ? { startDate: _(r.startDate) } : {},
+			...r.endDate ? { endDate: _(r.endDate) } : {}
 		}
 	};
 	let c = s.Daily;
@@ -168,10 +165,10 @@ var c = /* @__PURE__ */ new Set([
 			time: o.time,
 			...o.dayOfWeek ? { dayOfWeek: o.dayOfWeek } : {},
 			...o.dayOfMonth ? { dayOfMonth: o.dayOfMonth } : {},
-			...r.startDate ? { startDate: g(r.startDate) } : {},
-			...r.endDate ? { endDate: g(r.endDate) } : {}
+			...r.startDate ? { startDate: _(r.startDate) } : {},
+			...r.endDate ? { endDate: _(r.endDate) } : {}
 		}
 	};
 };
 //#endregion
-export { p as mapFormValuesToCreateBody, m as mapFormValuesToUpdateBody, v as mapScheduledTaskDtoToFormValues };
+export { m as mapFormValuesToCreateBody, h as mapFormValuesToUpdateBody, y as mapScheduledTaskDtoToFormValues };