@timardex/cluemart-shared 1.5.502 → 1.5.504

package/dist/hooks/index.mjs

@@ -1,4 +1,4 @@
-import "../chunk-6JRXEOO3.mjs";
+import "../chunk-A3BCQJII.mjs";
 import "../chunk-RQDZX76B.mjs";
 import "../chunk-DWO35OY4.mjs";
 import "../chunk-I7WE3EBR.mjs";
@@ -14,7 +14,7 @@ import {
   dateFormat,
   normalizeUrl,
   timeFormat
-} from "../chunk-PZZKQ3IV.mjs";
+} from "../chunk-XNMKWMNF.mjs";
 import {
   EnumEventDateStatus,
   EnumEventType,

package/dist/index.cjs

@@ -102,6 +102,7 @@ __export(index_exports, {
   getCurrentAndFutureDates: () => getCurrentAndFutureDates,
   globalDefaultValues: () => globalDefaultValues,
   isFutureDatesBeforeThreshold: () => isFutureDatesBeforeThreshold,
+  isIsoDateString: () => isIsoDateString,
   licenseNiceNames: () => licenseNiceNames,
   lightColors: () => lightColors,
   loginFields: () => loginFields,
@@ -728,10 +729,6 @@ var priceUnits = [
   { label: "Half dozen", value: "HALF_DOZEN" }
 ];
 
-// src/utils/dailyClueGame.ts
-var import_dayjs = __toESM(require("dayjs"));
-var import_utc = __toESM(require("dayjs/plugin/utc"));
-
 // src/types/game.ts
 var gameScreenIdentifierList = [
   {
@@ -844,8 +841,76 @@ var EnumGameStatus = /* @__PURE__ */ ((EnumGameStatus2) => {
   return EnumGameStatus2;
 })(EnumGameStatus || {});
 
-// src/utils/dailyClueGame.ts
+// src/utils/date.ts
+var import_dayjs = __toESM(require("dayjs"));
+var import_customParseFormat = __toESM(require("dayjs/plugin/customParseFormat.js"));
+var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter.js"));
+var import_timezone = __toESM(require("dayjs/plugin/timezone.js"));
+var import_utc = __toESM(require("dayjs/plugin/utc.js"));
+var dateFormat = "DD-MM-YYYY";
+var timeFormat = "HH:mm";
+import_dayjs.default.extend(import_customParseFormat.default);
 import_dayjs.default.extend(import_utc.default);
+import_dayjs.default.extend(import_timezone.default);
+import_dayjs.default.extend(import_isSameOrAfter.default);
+var NZ_TZ = "Pacific/Auckland";
+function toNZTime(date3) {
+  return date3 ? (0, import_dayjs.default)(date3).tz(NZ_TZ) : (0, import_dayjs.default)().tz(NZ_TZ);
+}
+var formatDate = (dateStr, display = "datetime", timeStr) => {
+  const dateTimeStr = timeStr ? `${dateStr} ${timeStr}` : dateStr;
+  const dateTime = timeStr ? (0, import_dayjs.default)(dateTimeStr, `${dateFormat} ${timeFormat}`) : (0, import_dayjs.default)(dateStr, dateFormat);
+  const formattedDate = dateTime.format("dddd, D MMMM, YYYY");
+  const formattedTime = dateTime.format("h:mm a");
+  switch (display) {
+    case "date":
+      return formattedDate;
+    case "time":
+      return formattedTime;
+    case "datetime":
+      return `${formattedDate} at ${formattedTime}`;
+    default:
+      return formattedDate;
+  }
+};
+var getCurrentAndFutureDates = (dates) => {
+  const now = (0, import_dayjs.default)();
+  return dates.filter((dateObj) => {
+    const dateTime = (0, import_dayjs.default)(
+      `${dateObj.startDate} ${dateObj.startTime}`,
+      `${dateFormat} ${timeFormat}`
+    );
+    return dateTime.isSameOrAfter(now);
+  });
+};
+var isFutureDatesBeforeThreshold = (date3, minHoursFromNow) => {
+  const threshold = minHoursFromNow ? (0, import_dayjs.default)().add(minHoursFromNow, "hour") : (0, import_dayjs.default)().startOf("day");
+  const dateTime = (0, import_dayjs.default)(
+    `${date3.startDate} ${date3.startTime}`,
+    `${dateFormat} ${timeFormat}`
+  );
+  return dateTime.isSameOrAfter(threshold);
+};
+var formatTimestamp = (timestamp) => {
+  const formattedDate = toNZTime(timestamp).format(dateFormat);
+  return formatDate(formattedDate, "date");
+};
+var isIsoDateString = (value) => {
+  return typeof value === "string" && !isNaN(Date.parse(value));
+};
+function sortDatesChronologically(dates) {
+  if (!dates || !dates.length) {
+    return [];
+  }
+  return [...dates].sort((a, b) => {
+    const dateTimeFormat = `${dateFormat} ${timeFormat}`;
+    const dateA = (0, import_dayjs.default)(`${a.startDate} ${a.startTime}`, dateTimeFormat);
+    const dateB = (0, import_dayjs.default)(`${b.startDate} ${b.startTime}`, dateTimeFormat);
+    return dateA.valueOf() - dateB.valueOf();
+  });
+}
+
+// src/utils/dailyClueGame.ts
 function createSeededRng(seed) {
   let t = seed >>> 0;
   return function random() {
@@ -873,15 +938,15 @@ function seededShuffle(array6, seed) {
   }
   return result;
 }
-function getDayIndex(startDate) {
-  return (0, import_dayjs.default)().utc().startOf("day").diff((0, import_dayjs.default)(startDate).utc().startOf("day"), "day");
+function getDayIndex(start, today) {
+  return today.diff(start, "day");
 }
 function computeDailyClueState(dailyClue) {
   const { startDate, endDate } = dailyClue.gameFields.gameDate;
   const { shuffled, collected } = dailyClue.letterInfo;
-  const today = (0, import_dayjs.default)().utc().startOf("day");
-  const start = (0, import_dayjs.default)(startDate).utc().startOf("day");
-  const end = (0, import_dayjs.default)(endDate).utc().startOf("day");
+  const today = toNZTime().startOf("day");
+  const start = toNZTime(startDate).startOf("day");
+  const end = toNZTime(endDate).startOf("day");
   const shuffledPlacements = seededShuffle(
     gameScreenIdentifierList,
     start.toISOString()
@@ -889,14 +954,6 @@ function computeDailyClueState(dailyClue) {
   if (today.isBefore(start)) {
     return null;
   }
-  if (today.isAfter(end)) {
-    return null;
-  }
-  const index = getDayIndex(startDate);
-  if (index < 0 || index >= shuffled.length) return null;
-  if (collected?.includes(shuffled[index])) {
-    return null;
-  }
   if (today.isAfter(end)) {
     return {
       gameHistory: {
@@ -910,6 +967,11 @@ function computeDailyClueState(dailyClue) {
       todaysPlacement: null
     };
   }
+  const index = getDayIndex(start, today);
+  if (index < 0 || index >= shuffled.length) return null;
+  if (collected?.includes(shuffled[index])) {
+    return null;
+  }
   return {
     gameHistory: null,
     todaysClue: shuffledPlacements[index].clue,
@@ -918,63 +980,7 @@ function computeDailyClueState(dailyClue) {
   };
 }
 
-// src/utils/index.ts
-var import_dayjs2 = __toESM(require("dayjs"));
-var import_customParseFormat = __toESM(require("dayjs/plugin/customParseFormat.js"));
-var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter.js"));
-var import_timezone = __toESM(require("dayjs/plugin/timezone.js"));
-var import_utc2 = __toESM(require("dayjs/plugin/utc.js"));
-var dateFormat = "DD-MM-YYYY";
-var timeFormat = "HH:mm";
-import_dayjs2.default.extend(import_customParseFormat.default);
-import_dayjs2.default.extend(import_utc2.default);
-import_dayjs2.default.extend(import_timezone.default);
-import_dayjs2.default.extend(import_isSameOrAfter.default);
-var NZ_TZ = "Pacific/Auckland";
-function toNZTime(date3) {
-  return (0, import_dayjs2.default)(date3).tz(NZ_TZ).format();
-}
-var formatDate = (dateStr, display = "datetime", timeStr) => {
-  const dateTimeStr = timeStr ? `${dateStr} ${timeStr}` : dateStr;
-  const dateTime = timeStr ? (0, import_dayjs2.default)(dateTimeStr, `${dateFormat} ${timeFormat}`) : (0, import_dayjs2.default)(dateStr, dateFormat);
-  const formattedDate = dateTime.format("dddd, D MMMM, YYYY");
-  const formattedTime = dateTime.format("h:mm a");
-  switch (display) {
-    case "date":
-      return formattedDate;
-    case "time":
-      return formattedTime;
-    case "datetime":
-      return `${formattedDate} at ${formattedTime}`;
-    default:
-      return formattedDate;
-  }
-};
-var getCurrentAndFutureDates = (dates) => {
-  const now = (0, import_dayjs2.default)();
-  return dates.filter((dateObj) => {
-    const dateTime = (0, import_dayjs2.default)(
-      `${dateObj.startDate} ${dateObj.startTime}`,
-      `${dateFormat} ${timeFormat}`
-    );
-    return dateTime.isSameOrAfter(now);
-  });
-};
-var isFutureDatesBeforeThreshold = (date3, minHoursFromNow) => {
-  const threshold = minHoursFromNow ? (0, import_dayjs2.default)().add(minHoursFromNow, "hour") : (0, import_dayjs2.default)().startOf("day");
-  const dateTime = (0, import_dayjs2.default)(
-    `${date3.startDate} ${date3.startTime}`,
-    `${dateFormat} ${timeFormat}`
-  );
-  return dateTime.isSameOrAfter(threshold);
-};
-var formatTimestamp = (timestamp) => {
-  const formattedDate = (0, import_dayjs2.default)(timestamp).tz("Pacific/Auckland").format(dateFormat);
-  return formatDate(formattedDate, "date");
-};
-var isIsoDateString = (value) => {
-  return typeof value === "string" && !isNaN(Date.parse(value));
-};
+// src/utils/utils.ts
 var removeTypename = (obj) => {
   if (obj instanceof Date) {
     return obj;
@@ -1014,17 +1020,6 @@ var statusOptions = [
   })).sort((a, b) => a.label.localeCompare(b.label))
   // Sort the options alphabetically
 ];
-function sortDatesChronologically(dates) {
-  if (!dates || !dates.length) {
-    return [];
-  }
-  return [...dates].sort((a, b) => {
-    const dateTimeFormat = `${dateFormat} ${timeFormat}`;
-    const dateA = (0, import_dayjs2.default)(`${a.startDate} ${a.startTime}`, dateTimeFormat);
-    const dateB = (0, import_dayjs2.default)(`${b.startDate} ${b.startTime}`, dateTimeFormat);
-    return dateA.valueOf() - dateB.valueOf();
-  });
-}
 var availableRegionTypes = Object.values(EnumRegions);
 var availableRegionOptions = mapArrayToOptions(availableRegionTypes);
 var paymentMethodOptions = mapArrayToOptions(
@@ -6508,7 +6503,7 @@ var React = __toESM(require("react"));
 var import_react_hook_form = require("react-hook-form");
 
 // src/yupSchema/global.ts
-var import_dayjs3 = __toESM(require("dayjs"));
+var import_dayjs2 = __toESM(require("dayjs"));
 var import_customParseFormat2 = __toESM(require("dayjs/plugin/customParseFormat.js"));
 var import_isSameOrAfter2 = __toESM(require("dayjs/plugin/isSameOrAfter.js"));
 var yup = __toESM(require("yup"));
@@ -6537,8 +6532,8 @@ var noLeadingZeros = (fieldName, options = {}) => {
     return true;
   };
 };
-import_dayjs3.default.extend(import_isSameOrAfter2.default);
-import_dayjs3.default.extend(import_customParseFormat2.default);
+import_dayjs2.default.extend(import_isSameOrAfter2.default);
+import_dayjs2.default.extend(import_customParseFormat2.default);
 var emailRequiredSchema = yup.string().email("Invalid email address").required("Email is required").label("Email").transform(
   (value) => typeof value === "string" ? value.trim().toLowerCase() : value
 );
@@ -6569,12 +6564,12 @@ var contactDetailsSchema = yup.object({
   landlinePhone: landlinePhoneSchema
 }).nullable().default(void 0);
 var endDateNotInPastTest = yup.string().test("not-in-past", "End date cannot be in the past", (value) => {
-  const now = (0, import_dayjs3.default)();
-  return value ? (0, import_dayjs3.default)(value, dateFormat, true).isSameOrAfter(now, "day") : false;
+  const now = (0, import_dayjs2.default)();
+  return value ? (0, import_dayjs2.default)(value, dateFormat, true).isSameOrAfter(now, "day") : false;
 });
 var startDateNotInPastTest = yup.string().test("not-in-past", "Start date cannot be in the past", (value) => {
-  const now = (0, import_dayjs3.default)();
-  return value ? (0, import_dayjs3.default)(value, dateFormat, true).isSameOrAfter(now, "day") : false;
+  const now = (0, import_dayjs2.default)();
+  return value ? (0, import_dayjs2.default)(value, dateFormat, true).isSameOrAfter(now, "day") : false;
 });
 var endDateAfterStartDateTest = yup.string().test(
   "end-after-start",
@@ -6582,8 +6577,8 @@ var endDateAfterStartDateTest = yup.string().test(
   function(value) {
     const { startDate } = this.parent;
     if (!startDate || !value) return false;
-    return (0, import_dayjs3.default)(value, dateFormat, true).isSameOrAfter(
-      (0, import_dayjs3.default)(startDate, dateFormat, true),
+    return (0, import_dayjs2.default)(value, dateFormat, true).isSameOrAfter(
+      (0, import_dayjs2.default)(startDate, dateFormat, true),
       "day"
     );
   }
@@ -6594,12 +6589,12 @@ var endTimeMustBeAfterStartTimeTest = yup.string().test(
   function(value) {
     const { startDate, endDate, startTime } = this.parent;
     if (!startDate || !endDate || !startTime || !value) return false;
-    const startDateTime = (0, import_dayjs3.default)(
+    const startDateTime = (0, import_dayjs2.default)(
       `${startDate} ${startTime}`,
       `${dateFormat} ${timeFormat}`,
       true
     );
-    const endDateTime = (0, import_dayjs3.default)(
+    const endDateTime = (0, import_dayjs2.default)(
       `${endDate} ${value}`,
       `${dateFormat} ${timeFormat}`,
       true
@@ -6611,10 +6606,10 @@ var startTimeCannotBeInPastTest = yup.string().test(
   "valid-start-time",
   "Start time cannot be in the past",
   function(value) {
-    const now = (0, import_dayjs3.default)();
+    const now = (0, import_dayjs2.default)();
     const { startDate } = this.parent;
     if (!startDate || !value) return false;
-    const startDateTime = (0, import_dayjs3.default)(
+    const startDateTime = (0, import_dayjs2.default)(
       `${startDate} ${value}`,
       `${dateFormat} ${timeFormat}`,
       true
@@ -8294,6 +8289,7 @@ var EnumActivity = /* @__PURE__ */ ((EnumActivity2) => {
   getCurrentAndFutureDates,
   globalDefaultValues,
   isFutureDatesBeforeThreshold,
+  isIsoDateString,
   licenseNiceNames,
   lightColors,
   loginFields,