@bash-app/bash-common 30.78.0 → 30.80.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recurrenceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/recurrenceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAkB,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAUjD,wBAAgB,sCAAsC,CACpD,aAAa,EAAE,eAAe,EAC9B,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,GACxC,IAAI,EAAE,CAMR;AAED,wBAAgB,uCAAuC,CACrD,aAAa,EAAE,eAAe,EAC9B,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,GACxC,QAAQ,EAAE,CAMZ;
|
|
1
|
+
{"version":3,"file":"recurrenceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/recurrenceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAkB,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAUjD,wBAAgB,sCAAsC,CACpD,aAAa,EAAE,eAAe,EAC9B,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,GACxC,IAAI,EAAE,CAMR;AAED,wBAAgB,uCAAuC,CACrD,aAAa,EAAE,eAAe,EAC9B,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,GACxC,QAAQ,EAAE,CAMZ;AAwPD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,WAAW,GAAE,OAAe,GAC3B,MAAM,CAqBR;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,eAAe,GAChC,QAAQ,GAAG,SAAS,CAEtB"}
|
|
@@ -9,15 +9,9 @@ export function getRecurringBashEventPossibleLuxonTimes(startDateTime, recurrenc
|
|
|
9
9
|
return getRecurringBashEventPossibleDatesTimesInternal(startDateTime, recurrence, false);
|
|
10
10
|
}
|
|
11
11
|
function getRecurringBashEventPossibleDatesTimesInternal(startDateTime, recurrence, toDate) {
|
|
12
|
-
console.log("🚨 getRecurringBashEventPossibleDatesTimesInternal called:", {
|
|
13
|
-
startDateTime,
|
|
14
|
-
recurrence,
|
|
15
|
-
toDate,
|
|
16
|
-
});
|
|
17
12
|
if (!recurrence ||
|
|
18
13
|
!recurrence.frequency ||
|
|
19
14
|
recurrence.frequency === RecurringFrequency.Never) {
|
|
20
|
-
console.log("🚨 Early return: No recurrence or frequency is Never");
|
|
21
15
|
return [];
|
|
22
16
|
}
|
|
23
17
|
let recurrenceDates = [];
|
|
@@ -28,28 +22,22 @@ function getRecurringBashEventPossibleDatesTimesInternal(startDateTime, recurren
|
|
|
28
22
|
const beginningDate = shouldUseEventDate
|
|
29
23
|
? (startDateTime ? dateTimeFromDate(startDateTime) : DateTime.local())
|
|
30
24
|
: findEarliestPossibleBashEventDate(startDateTime);
|
|
31
|
-
console.log("🚨 beginningDate:", beginningDate?.toISO(), "shouldUseEventDate:", shouldUseEventDate);
|
|
32
25
|
switch (recurrence.frequency) {
|
|
33
26
|
case RecurringFrequency.Daily:
|
|
34
|
-
console.log("🚨 Calling getDailyRecurringDates");
|
|
35
27
|
recurrenceDates = getDailyRecurringDates(beginningDate, recurrence);
|
|
36
28
|
break;
|
|
37
29
|
case RecurringFrequency.Weekly:
|
|
38
|
-
console.log("🚨 Calling getWeeklyRecurringDates");
|
|
39
30
|
recurrenceDates = getWeeklyRecurringDates(beginningDate, recurrence);
|
|
40
31
|
break;
|
|
41
32
|
case RecurringFrequency.Monthly:
|
|
42
|
-
console.log("🚨 Calling getMonthlyRecurringDates");
|
|
43
33
|
recurrenceDates = getMonthlyRecurringDates(beginningDate, recurrence);
|
|
44
34
|
break;
|
|
45
35
|
case RecurringFrequency.Yearly:
|
|
46
|
-
console.log("🚨 Calling getYearlyRecurringDates");
|
|
47
36
|
recurrenceDates = getYearlyRecurringDates(beginningDate, recurrence);
|
|
48
37
|
break;
|
|
49
38
|
default:
|
|
50
39
|
console.error(`Unsupported frequency: ${recurrence.frequency}`);
|
|
51
40
|
}
|
|
52
|
-
console.log("🚨 recurrenceDates before mapping:", recurrenceDates.length, recurrenceDates.map(d => d.toISO()));
|
|
53
41
|
return recurrenceDates
|
|
54
42
|
.map((date) => date.toFormat(LUXON_DATETIME_FORMAT_ISO_LIKE))
|
|
55
43
|
.sort()
|
|
@@ -147,42 +135,25 @@ function getMonthlyRecurringDates(beginningDateTime, recurrence) {
|
|
|
147
135
|
const interval = recurrence.interval ?? 1;
|
|
148
136
|
const recurrenceEnds = dateTimeFromDate(recurrence.ends).endOf("day");
|
|
149
137
|
const dayOfMonth = recurrence.repeatOnDayOfMonth ?? beginningDateTime.day;
|
|
150
|
-
console.log("📅 Monthly recurrence debug:", {
|
|
151
|
-
beginningDateTime: beginningDateTime.toISO(),
|
|
152
|
-
recurrenceEnds: recurrenceEnds.toISO(),
|
|
153
|
-
dayOfMonth,
|
|
154
|
-
interval,
|
|
155
|
-
"beginningDateTime.day": beginningDateTime.day,
|
|
156
|
-
"beginningDateTime.daysInMonth": beginningDateTime.daysInMonth,
|
|
157
|
-
});
|
|
158
138
|
const recurrenceDates = [];
|
|
159
139
|
let currentDate = beginningDateTime.set({ day: Math.min(dayOfMonth, beginningDateTime.daysInMonth || 31) });
|
|
160
|
-
console.log("📅 Initial currentDate:", currentDate.toISO());
|
|
161
140
|
// If the day of month is after the current day, start from the current month
|
|
162
141
|
if (currentDate < beginningDateTime) {
|
|
163
|
-
console.log("📅 currentDate < beginningDateTime, adding 1 month");
|
|
164
142
|
currentDate = currentDate.plus({ months: 1 });
|
|
165
143
|
currentDate = currentDate.set({ day: Math.min(dayOfMonth, currentDate.daysInMonth || 31) });
|
|
166
|
-
console.log("📅 New currentDate after adjustment:", currentDate.toISO());
|
|
167
144
|
}
|
|
168
145
|
let iterations = 0;
|
|
169
146
|
while (currentDate <= recurrenceEnds && iterations < 100) {
|
|
170
147
|
iterations++;
|
|
171
|
-
console.log(`📅 Iteration ${iterations}: currentDate=${currentDate.toISO()}, recurrenceEnds=${recurrenceEnds.toISO()}, currentDate <= recurrenceEnds: ${currentDate <= recurrenceEnds}`);
|
|
172
148
|
if (currentDate >= beginningDateTime) {
|
|
173
149
|
// Set the time to match the beginning time
|
|
174
150
|
const dateWithTime = dateTimeSetTime(currentDate, beginningDateTime);
|
|
175
|
-
console.log(`📅 Adding date: ${dateWithTime.toISO()}`);
|
|
176
151
|
recurrenceDates.push(dateWithTime);
|
|
177
152
|
}
|
|
178
153
|
currentDate = currentDate.plus({ months: interval });
|
|
179
154
|
// Handle months with fewer days (e.g., Feb 31 -> Feb 28/29)
|
|
180
155
|
currentDate = currentDate.set({ day: Math.min(dayOfMonth, currentDate.daysInMonth || 31) });
|
|
181
156
|
}
|
|
182
|
-
console.log("📅 Monthly recurrence complete:", {
|
|
183
|
-
totalDates: recurrenceDates.length,
|
|
184
|
-
dates: recurrenceDates.map(d => d.toISO()),
|
|
185
|
-
});
|
|
186
157
|
return recurrenceDates;
|
|
187
158
|
}
|
|
188
159
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recurrenceUtils.js","sourceRoot":"","sources":["../../src/utils/recurrenceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAkB,MAAM,OAAO,CAAC;AAEjD,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,8BAA8B,GAC/B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD,MAAM,UAAU,sCAAsC,CACpD,aAA8B,EAC9B,UAAyC;IAEzC,OAAO,+CAA+C,CACpD,aAAa,EACb,UAAU,EACV,IAAI,CACK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,uCAAuC,CACrD,aAA8B,EAC9B,UAAyC;IAEzC,OAAO,+CAA+C,CACpD,aAAa,EACb,UAAU,EACV,KAAK,CACQ,CAAC;AAClB,CAAC;AAED,SAAS,+CAA+C,CACtD,aAA8B,EAC9B,UAAyC,EACzC,MAAe;IAEf,
|
|
1
|
+
{"version":3,"file":"recurrenceUtils.js","sourceRoot":"","sources":["../../src/utils/recurrenceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAkB,MAAM,OAAO,CAAC;AAEjD,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,8BAA8B,GAC/B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD,MAAM,UAAU,sCAAsC,CACpD,aAA8B,EAC9B,UAAyC;IAEzC,OAAO,+CAA+C,CACpD,aAAa,EACb,UAAU,EACV,IAAI,CACK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,uCAAuC,CACrD,aAA8B,EAC9B,UAAyC;IAEzC,OAAO,+CAA+C,CACpD,aAAa,EACb,UAAU,EACV,KAAK,CACQ,CAAC;AAClB,CAAC;AAED,SAAS,+CAA+C,CACtD,aAA8B,EAC9B,UAAyC,EACzC,MAAe;IAEf,IACE,CAAC,UAAU;QACX,CAAC,UAAU,CAAC,SAAS;QACrB,UAAU,CAAC,SAAS,KAAK,kBAAkB,CAAC,KAAK,EACjD,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,eAAe,GAAe,EAAE,CAAC;IAErC,0EAA0E;IAC1E,kEAAkE;IAClE,MAAM,kBAAkB,GACtB,UAAU,CAAC,SAAS,KAAK,kBAAkB,CAAC,OAAO;QACnD,UAAU,CAAC,SAAS,KAAK,kBAAkB,CAAC,MAAM,CAAC;IAErD,MAAM,aAAa,GAAG,kBAAkB;QACtC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,aAAa,CAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAClF,CAAC,CAAC,iCAAiC,CAAC,aAAa,CAAa,CAAC;IAEjE,QAAQ,UAAU,CAAC,SAAS,EAAE,CAAC;QAC7B,KAAK,kBAAkB,CAAC,KAAK;YAC3B,eAAe,GAAG,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;YACpE,MAAM;QACR,KAAK,kBAAkB,CAAC,MAAM;YAC5B,eAAe,GAAG,uBAAuB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;YACrE,MAAM;QACR,KAAK,kBAAkB,CAAC,OAAO;YAC7B,eAAe,GAAG,wBAAwB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;YACtE,MAAM;QACR,KAAK,kBAAkB,CAAC,MAAM;YAC5B,eAAe,GAAG,uBAAuB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;YACrE,MAAM;QACR;YACE,OAAO,CAAC,KAAK,CAAC,0BAA0B,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,OAAO,eAAe;SACnB,GAAG,CAAC,CAAC,IAAc,EAAU,EAAE,CAC9B,IAAI,CAAC,QAAQ,CAAC,8BAA8B,CAAC,CAC9C;SACA,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,OAAe,EAAmB,EAAE;QACxC,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CACnC,OAAO,EACP,8BAA8B,CAC/B,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;GAIG;AACH,SAAS,sBAAsB,CAC7B,iBAA2B,EAC3B,UAAsB;IAEtB,IAAI,UAAU,CAAC,SAAS,KAAK,kBAAkB,CAAC,KAAK,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,CAAC,CAAC;IAC1C,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACtE,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC;IACzE,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,CAAC;IAE/D,MAAM,eAAe,GAAe,EAAE,CAAC;IACvC,IAAI,WAAW,GAAG,iBAAiB,CAAC;IAEpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,IAAI,WAAW,IAAI,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9E,IAAI,WAAW,IAAI,iBAAiB,EAAE,CAAC;YACrC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACpC,CAAC;QACD,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAC9B,iBAA2B,EAC3B,UAAsB;IAEtB,IAAI,UAAU,CAAC,SAAS,KAAK,kBAAkB,CAAC,MAAM,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,CAAC,CAAC;IAC1C,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,kDAAkD;IACzH,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC;IACzE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,8EAA8E;IAE5I,MAAM,eAAe,GAAe,EAAE,CAAC;IACvC,IAAI,wBAAwB,GAAG,iBAAiB,CAAC;IAEjD,mDAAmD;IACnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,IAAI,OAAO,GAAoB,IAAI,CAAC;QACpC,KAAK,MAAM,aAAa,IAAI,UAAU,CAAC,YAAY,EAAE,CAAC;YACpD,MAAM,YAAY,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;YACpD,OAAO,GAAG,wBAAwB,CAAC,GAAG,CAAC;gBACrC,OAAO,EAAE,YAA8B;aACxC,CAAC,CAAC;YACH,IAAI,OAAO,GAAG,cAAc,IAAI,OAAO,GAAG,iBAAiB,EAAE,CAAC;gBAC5D,SAAS,CAAC,oEAAoE;YAChF,CAAC;YACD,6EAA6E;YAC7E,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YACtD,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,wBAAwB,GAAG,0BAA0B,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACH,SAAS,0BAA0B,CACjC,IAAc,EACd,QAAgB;IAEhB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,QAAQ,GAAG,CAAC,CAAC,CAAC,UAAU;IAC1B,CAAC;IACD,qGAAqG;IACrG,MAAM,iBAAiB,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpE,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED;;;;GAIG;AACH,SAAS,wBAAwB,CAC/B,iBAA2B,EAC3B,UAAsB;IAEtB,IAAI,UAAU,CAAC,SAAS,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,CAAC,CAAC;IAC1C,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,UAAU,CAAC,kBAAkB,IAAI,iBAAiB,CAAC,GAAG,CAAC;IAE1E,MAAM,eAAe,GAAe,EAAE,CAAC;IACvC,IAAI,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,iBAAiB,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5G,6EAA6E;IAC7E,IAAI,WAAW,GAAG,iBAAiB,EAAE,CAAC;QACpC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9C,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;IAC9F,CAAC;IAED,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,OAAO,WAAW,IAAI,cAAc,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;QACzD,UAAU,EAAE,CAAC;QAEb,IAAI,WAAW,IAAI,iBAAiB,EAAE,CAAC;YACrC,2CAA2C;YAC3C,MAAM,YAAY,GAAG,eAAe,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;YACrE,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACrC,CAAC;QACD,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrD,4DAA4D;QAC5D,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;IAC9F,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAC9B,iBAA2B,EAC3B,UAAsB;IAEtB,IAAI,UAAU,CAAC,SAAS,KAAK,kBAAkB,CAAC,MAAM,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,CAAC,CAAC;IAC1C,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAEtE,yEAAyE;IACzE,MAAM,QAAQ,GAAG,UAAU,CAAC,gBAAgB;QAC1C,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,gBAAgB,CAAC;QAC/C,CAAC,CAAC,iBAAiB,CAAC;IAEtB,MAAM,eAAe,GAAe,EAAE,CAAC;IACvC,IAAI,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QAC7B,IAAI,EAAE,iBAAiB,CAAC,IAAI;QAC5B,IAAI,EAAE,iBAAiB,CAAC,IAAI;QAC5B,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,MAAM,EAAE,iBAAiB,CAAC,MAAM;KACjC,CAAC,CAAC;IAEH,oEAAoE;IACpE,IAAI,WAAW,GAAG,iBAAiB,EAAE,CAAC;QACpC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,WAAW,IAAI,cAAc,EAAE,CAAC;QACrC,IAAI,WAAW,IAAI,iBAAiB,EAAE,CAAC;YACrC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACpC,CAAC;QACD,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,IAAwB,EACxB,QAA4B,EAC5B,cAAuB,KAAK;IAE5B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,GAAG,QAAQ,GAAG,CAAC,CAAC;IAC9B,IAAI,MAAM,GAAW,IAAI,CAAC;IAC1B,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,kBAAkB,CAAC,KAAK;YAC3B,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;YACnC,MAAM;QACR,KAAK,kBAAkB,CAAC,MAAM;YAC5B,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;YACrC,MAAM;QACR,KAAK,kBAAkB,CAAC,OAAO;YAC7B,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;YACvC,MAAM;QACR,KAAK,kBAAkB,CAAC,MAAM;YAC5B,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;YACrC,MAAM;IACV,CAAC;IACD,OAAO,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,gBAAiC;IAEjC,OAAO,yCAAyC,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS,yCAAyC,CAChD,gBAAiC,EACjC,SAAkB;IAElB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IACD,4CAA4C;IAC5C,MAAM,aAAa,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;IACzC,MAAM,gBAAgB,GAAG,eAAe,CACtC,eAAe,CAAC,QAAQ,EAAE,EAC1B,gBAAgB,CACjB,CAAC;IACF,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa,CAAC;IAChE,CAAC;SAAM,CAAC;QACN,OAAO,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa,CAAC;IAChE,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
package/prisma/schema.prisma
CHANGED
|
@@ -378,7 +378,7 @@ model UserReferralCode {
|
|
|
378
378
|
id String @id @default(cuid())
|
|
379
379
|
userId String @unique
|
|
380
380
|
referralCode String @unique
|
|
381
|
-
referralTier ReferralTier @default(
|
|
381
|
+
referralTier ReferralTier @default(None)
|
|
382
382
|
totalReferrals Int @default(0)
|
|
383
383
|
totalEarnings Int @default(0)
|
|
384
384
|
isActive Boolean @default(true)
|
|
@@ -3988,10 +3988,9 @@ enum CreditTransactionType {
|
|
|
3988
3988
|
}
|
|
3989
3989
|
|
|
3990
3990
|
enum ReferralTier {
|
|
3991
|
+
None
|
|
3991
3992
|
Ambashador
|
|
3992
|
-
|
|
3993
|
-
MicroInfluencer
|
|
3994
|
-
Influencer
|
|
3993
|
+
Insider
|
|
3995
3994
|
}
|
|
3996
3995
|
|
|
3997
3996
|
enum VoucherStatus {
|
|
@@ -37,18 +37,11 @@ function getRecurringBashEventPossibleDatesTimesInternal(
|
|
|
37
37
|
recurrence: Recurrence | undefined | null,
|
|
38
38
|
toDate: boolean
|
|
39
39
|
): (DateTime | Date)[] {
|
|
40
|
-
console.log("🚨 getRecurringBashEventPossibleDatesTimesInternal called:", {
|
|
41
|
-
startDateTime,
|
|
42
|
-
recurrence,
|
|
43
|
-
toDate,
|
|
44
|
-
});
|
|
45
|
-
|
|
46
40
|
if (
|
|
47
41
|
!recurrence ||
|
|
48
42
|
!recurrence.frequency ||
|
|
49
43
|
recurrence.frequency === RecurringFrequency.Never
|
|
50
44
|
) {
|
|
51
|
-
console.log("🚨 Early return: No recurrence or frequency is Never");
|
|
52
45
|
return [];
|
|
53
46
|
}
|
|
54
47
|
|
|
@@ -64,30 +57,22 @@ function getRecurringBashEventPossibleDatesTimesInternal(
|
|
|
64
57
|
? (startDateTime ? dateTimeFromDate(startDateTime) as DateTime : DateTime.local())
|
|
65
58
|
: findEarliestPossibleBashEventDate(startDateTime) as DateTime;
|
|
66
59
|
|
|
67
|
-
console.log("🚨 beginningDate:", beginningDate?.toISO(), "shouldUseEventDate:", shouldUseEventDate);
|
|
68
|
-
|
|
69
60
|
switch (recurrence.frequency) {
|
|
70
61
|
case RecurringFrequency.Daily:
|
|
71
|
-
console.log("🚨 Calling getDailyRecurringDates");
|
|
72
62
|
recurrenceDates = getDailyRecurringDates(beginningDate, recurrence);
|
|
73
63
|
break;
|
|
74
64
|
case RecurringFrequency.Weekly:
|
|
75
|
-
console.log("🚨 Calling getWeeklyRecurringDates");
|
|
76
65
|
recurrenceDates = getWeeklyRecurringDates(beginningDate, recurrence);
|
|
77
66
|
break;
|
|
78
67
|
case RecurringFrequency.Monthly:
|
|
79
|
-
console.log("🚨 Calling getMonthlyRecurringDates");
|
|
80
68
|
recurrenceDates = getMonthlyRecurringDates(beginningDate, recurrence);
|
|
81
69
|
break;
|
|
82
70
|
case RecurringFrequency.Yearly:
|
|
83
|
-
console.log("🚨 Calling getYearlyRecurringDates");
|
|
84
71
|
recurrenceDates = getYearlyRecurringDates(beginningDate, recurrence);
|
|
85
72
|
break;
|
|
86
73
|
default:
|
|
87
74
|
console.error(`Unsupported frequency: ${recurrence.frequency}`);
|
|
88
75
|
}
|
|
89
|
-
|
|
90
|
-
console.log("🚨 recurrenceDates before mapping:", recurrenceDates.length, recurrenceDates.map(d => d.toISO()));
|
|
91
76
|
|
|
92
77
|
return recurrenceDates
|
|
93
78
|
.map((date: DateTime): string =>
|
|
@@ -221,37 +206,22 @@ function getMonthlyRecurringDates(
|
|
|
221
206
|
const recurrenceEnds = dateTimeFromDate(recurrence.ends).endOf("day");
|
|
222
207
|
const dayOfMonth = recurrence.repeatOnDayOfMonth ?? beginningDateTime.day;
|
|
223
208
|
|
|
224
|
-
console.log("📅 Monthly recurrence debug:", {
|
|
225
|
-
beginningDateTime: beginningDateTime.toISO(),
|
|
226
|
-
recurrenceEnds: recurrenceEnds.toISO(),
|
|
227
|
-
dayOfMonth,
|
|
228
|
-
interval,
|
|
229
|
-
"beginningDateTime.day": beginningDateTime.day,
|
|
230
|
-
"beginningDateTime.daysInMonth": beginningDateTime.daysInMonth,
|
|
231
|
-
});
|
|
232
|
-
|
|
233
209
|
const recurrenceDates: DateTime[] = [];
|
|
234
210
|
let currentDate = beginningDateTime.set({ day: Math.min(dayOfMonth, beginningDateTime.daysInMonth || 31) });
|
|
235
211
|
|
|
236
|
-
console.log("📅 Initial currentDate:", currentDate.toISO());
|
|
237
|
-
|
|
238
212
|
// If the day of month is after the current day, start from the current month
|
|
239
213
|
if (currentDate < beginningDateTime) {
|
|
240
|
-
console.log("📅 currentDate < beginningDateTime, adding 1 month");
|
|
241
214
|
currentDate = currentDate.plus({ months: 1 });
|
|
242
215
|
currentDate = currentDate.set({ day: Math.min(dayOfMonth, currentDate.daysInMonth || 31) });
|
|
243
|
-
console.log("📅 New currentDate after adjustment:", currentDate.toISO());
|
|
244
216
|
}
|
|
245
217
|
|
|
246
218
|
let iterations = 0;
|
|
247
219
|
while (currentDate <= recurrenceEnds && iterations < 100) {
|
|
248
220
|
iterations++;
|
|
249
|
-
console.log(`📅 Iteration ${iterations}: currentDate=${currentDate.toISO()}, recurrenceEnds=${recurrenceEnds.toISO()}, currentDate <= recurrenceEnds: ${currentDate <= recurrenceEnds}`);
|
|
250
221
|
|
|
251
222
|
if (currentDate >= beginningDateTime) {
|
|
252
223
|
// Set the time to match the beginning time
|
|
253
224
|
const dateWithTime = dateTimeSetTime(currentDate, beginningDateTime);
|
|
254
|
-
console.log(`📅 Adding date: ${dateWithTime.toISO()}`);
|
|
255
225
|
recurrenceDates.push(dateWithTime);
|
|
256
226
|
}
|
|
257
227
|
currentDate = currentDate.plus({ months: interval });
|
|
@@ -259,11 +229,6 @@ function getMonthlyRecurringDates(
|
|
|
259
229
|
currentDate = currentDate.set({ day: Math.min(dayOfMonth, currentDate.daysInMonth || 31) });
|
|
260
230
|
}
|
|
261
231
|
|
|
262
|
-
console.log("📅 Monthly recurrence complete:", {
|
|
263
|
-
totalDates: recurrenceDates.length,
|
|
264
|
-
dates: recurrenceDates.map(d => d.toISO()),
|
|
265
|
-
});
|
|
266
|
-
|
|
267
232
|
return recurrenceDates;
|
|
268
233
|
}
|
|
269
234
|
|