@blazeo.com/appointment-client 1.0.10 → 1.0.13

package/sample/src/LeadTab.jsx

@@ -0,0 +1,335 @@
+import { useState } from "react";
+import {
+  ensureBlazeoHttpReady,
+  fetchLeadByEmail,
+  fetchLeadDetails,
+  fetchLeadsByCompany,
+} from "appointment-client";
+import {
+  configureBlazeoFromEffective,
+  useBlazeoConnection,
+} from "./BlazeoConnectionSettings.jsx";
+import { mapBlazeoDemoError } from "./blazeoDemoError.js";
+
+/** Browser `fetch` often surfaces blocked requests as TypeError "Failed to fetch" (e.g. CORS). */
+function explainFetchFailure(err, configuredBaseUrl) {
+  const msg = err instanceof Error ? err.message : String(err);
+  const isNetwork =
+    msg === "Failed to fetch" ||
+    msg === "Load failed" ||
+    (err instanceof TypeError && (/fetch/i.test(msg) || /network/i.test(msg)));
+  if (!isNetwork) return mapBlazeoDemoError(msg);
+
+  const isRemote =
+    configuredBaseUrl &&
+    /^https?:\/\//i.test(configuredBaseUrl) &&
+    !/localhost|127\.0\.0\.1/i.test(configuredBaseUrl);
+
+  const proxyHint =
+    "Dev workaround (Vite proxy): create sample/.env.development with\n" +
+    "  VITE_DEV_PROXY_TARGET=https://YOUR_API_ORIGIN\n" +
+    "restart npm run dev, then set Base URL to:\n" +
+    "  http://localhost:5173/blazeo-api\n" +
+    "Consumer header stays the same.";
+
+  if (isRemote) {
+    return `${msg}\n\nLikely CORS / blocked browser cross-origin request.\nFix API CORS for http://localhost:5173, OR:\n${proxyHint}`;
+  }
+  return `${msg}\n\n${proxyHint}`;
+}
+
+function toDisplayJson(value) {
+  try {
+    return JSON.stringify(value, null, 2);
+  } catch {
+    return String(value);
+  }
+}
+
+export function LeadTab() {
+  const { effective, connectionOpts } = useBlazeoConnection();
+  const [leadId, setLeadId] = useState("");
+  const [email, setEmail] = useState("");
+  const [companyKey, setCompanyKey] = useState("");
+  const [listCompanyKey, setListCompanyKey] = useState("");
+  const [skip, setSkip] = useState("");
+  const [take, setTake] = useState("");
+  const [busy, setBusy] = useState(false);
+  const [error, setError] = useState("");
+  const [note, setNote] = useState("");
+  const [output, setOutput] = useState("");
+
+  function ensureBaseConfigured() {
+    if (!effective.baseUrl) {
+      setError("Set Base URL in the connection card above or in `blazeoClientDefaults.ts`.");
+      return false;
+    }
+    return true;
+  }
+
+  async function handleFetchById(e) {
+    e.preventDefault();
+    setError("");
+    setNote("");
+    setOutput("");
+    const id = leadId.trim();
+    if (!id) {
+      setError("Enter a lead id.");
+      return;
+    }
+    if (!ensureBaseConfigured()) return;
+    configureBlazeoFromEffective(effective);
+    ensureBlazeoHttpReady({
+      baseUrl: effective.baseUrl,
+      ...(effective.consumer ? { consumer: effective.consumer } : {}),
+    });
+
+    setBusy(true);
+    try {
+      const res = await fetchLeadDetails(id, {
+        ...connectionOpts,
+        baseUrl: effective.baseUrl,
+        ...(effective.consumer ? { consumer: effective.consumer } : {}),
+      });
+      if (!res.ok) {
+        setError(mapBlazeoDemoError(res.detail ?? ""));
+        return;
+      }
+      setNote("LeadModel.get + getRaw → GET /lead/get (lead mapped snapshot + raw envelope).");
+      setOutput(toDisplayJson({ lead: res.lead, rawGet: res.rawGet }));
+    } catch (err) {
+      setError(explainFetchFailure(err, effective.baseUrl));
+    } finally {
+      setBusy(false);
+    }
+  }
+
+  async function handleFetchByEmail(e) {
+    e.preventDefault();
+    setError("");
+    setNote("");
+    setOutput("");
+    const em = email.trim();
+    const ck = companyKey.trim();
+    if (!em || !ck) {
+      setError("Enter email and company key.");
+      return;
+    }
+    if (!ensureBaseConfigured()) return;
+    configureBlazeoFromEffective(effective);
+    ensureBlazeoHttpReady({
+      baseUrl: effective.baseUrl,
+      ...(effective.consumer ? { consumer: effective.consumer } : {}),
+    });
+
+    setBusy(true);
+    try {
+      const res = await fetchLeadByEmail(em, ck, {
+        ...connectionOpts,
+        baseUrl: effective.baseUrl,
+        ...(effective.consumer ? { consumer: effective.consumer } : {}),
+      });
+      if (!res.ok) {
+        setError(mapBlazeoDemoError(res.detail ?? ""));
+        return;
+      }
+      setNote("LeadModel.getByEmail → GET /lead/getbyemail.");
+      setOutput(toDisplayJson({ lead: res.lead }));
+    } catch (err) {
+      setError(explainFetchFailure(err, effective.baseUrl));
+    } finally {
+      setBusy(false);
+    }
+  }
+
+  async function handleFetchByCompany(e) {
+    e.preventDefault();
+    setError("");
+    setNote("");
+    setOutput("");
+    const ck = listCompanyKey.trim();
+    if (!ck) {
+      setError("Enter company key for the list.");
+      return;
+    }
+    if (!ensureBaseConfigured()) return;
+    configureBlazeoFromEffective(effective);
+    ensureBlazeoHttpReady({
+      baseUrl: effective.baseUrl,
+      ...(effective.consumer ? { consumer: effective.consumer } : {}),
+    });
+
+    const listOpts = {};
+    const s = skip.trim();
+    const t = take.trim();
+    if (s !== "") {
+      const n = Number(s);
+      if (!Number.isFinite(n)) {
+        setError("Skip must be a number.");
+        return;
+      }
+      listOpts.skip = n;
+    }
+    if (t !== "") {
+      const n = Number(t);
+      if (!Number.isFinite(n)) {
+        setError("Take must be a number.");
+        return;
+      }
+      listOpts.take = n;
+    }
+
+    setBusy(true);
+    try {
+      const res = await fetchLeadsByCompany(ck, listOpts, {
+        ...connectionOpts,
+        baseUrl: effective.baseUrl,
+        ...(effective.consumer ? { consumer: effective.consumer } : {}),
+      });
+      if (!res.ok) {
+        setError(mapBlazeoDemoError(res.detail ?? ""));
+        return;
+      }
+      setNote(
+        `LeadModel.getByCompany → GET /lead/company/get (${res.leads.length} row(s), MST snapshots as plain objects).`
+      );
+      setOutput(toDisplayJson({ leads: res.leads }));
+    } catch (err) {
+      setError(explainFetchFailure(err, effective.baseUrl));
+    } finally {
+      setBusy(false);
+    }
+  }
+
+  return (
+    <>
+      <div className="card">
+        <h2>Lead by id</h2>
+        <p className="muted small">
+          Uses <code>fetchLeadDetails(leadId)</code> from <code>appointment-client</code>, which wraps{" "}
+          <code>LeadModel.getRaw</code> + <code>LeadModel.get</code> (<code>GET /lead/get</code>). Output shows both the
+          mapped lead snapshot and the raw API envelope.
+        </p>
+        <form onSubmit={handleFetchById} className="form">
+          <label className="form__label">
+            <span>Lead id</span>
+            <input
+              type="text"
+              className="form__input"
+              placeholder="lead_id"
+              value={leadId}
+              onChange={(e) => setLeadId(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <button type="submit" className="btn btn--primary" disabled={busy}>
+            {busy ? "Loading…" : "Fetch lead"}
+          </button>
+        </form>
+      </div>
+
+      <div className="card">
+        <h2>Lead by email + company</h2>
+        <p className="muted small">
+          <code>fetchLeadByEmail</code> → <code>LeadModel.getByEmail</code> (<code>GET /lead/getbyemail</code>).
+        </p>
+        <form onSubmit={handleFetchByEmail} className="form">
+          <label className="form__label">
+            <span>Email</span>
+            <input
+              type="email"
+              className="form__input"
+              placeholder="user@example.com"
+              value={email}
+              onChange={(e) => setEmail(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <label className="form__label">
+            <span>Company key</span>
+            <input
+              type="text"
+              className="form__input"
+              placeholder="company_key"
+              value={companyKey}
+              onChange={(e) => setCompanyKey(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <button type="submit" className="btn btn--secondary" disabled={busy}>
+            {busy ? "Loading…" : "Fetch lead"}
+          </button>
+        </form>
+      </div>
+
+      <div className="card">
+        <h2>Leads by company</h2>
+        <p className="muted small">
+          <code>fetchLeadsByCompany</code> → <code>LeadModel.getByCompany</code> (<code>GET /lead/company/get</code>).
+          Optional <code>skip</code> / <code>take</code> map to query params (see calendar-client).
+        </p>
+        <form onSubmit={handleFetchByCompany} className="form">
+          <label className="form__label">
+            <span>Company key</span>
+            <input
+              type="text"
+              className="form__input"
+              placeholder="company_key"
+              value={listCompanyKey}
+              onChange={(e) => setListCompanyKey(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <label className="form__label">
+            <span>Skip (optional)</span>
+            <input
+              type="text"
+              className="form__input"
+              inputMode="numeric"
+              placeholder="e.g. 0"
+              value={skip}
+              onChange={(e) => setSkip(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <label className="form__label">
+            <span>Take (optional)</span>
+            <input
+              type="text"
+              className="form__input"
+              inputMode="numeric"
+              placeholder="e.g. 50"
+              value={take}
+              onChange={(e) => setTake(e.target.value)}
+              autoComplete="off"
+            />
+          </label>
+          <button type="submit" className="btn btn--secondary" disabled={busy}>
+            {busy ? "Loading…" : "Fetch leads"}
+          </button>
+        </form>
+      </div>
+
+      {note ? (
+        <div className="card">
+          <h2>Note</h2>
+          <p className="muted small">{note}</p>
+        </div>
+      ) : null}
+
+      {error ? (
+        <div className="card card--error" role="alert">
+          <h2>Error</h2>
+          <pre className="pre-block">{error}</pre>
+        </div>
+      ) : null}
+
+      {output ? (
+        <div className="card">
+          <h2>JSON</h2>
+          <pre className="pre-block">{output}</pre>
+        </div>
+      ) : null}
+    </>
+  );
+}

package/src/calendar/buildUnifiedCalendarView.ts

@@ -91,19 +91,37 @@ function dayOrderIndex(d: string): number {
   return i >= 0 ? i : 999;
 }
 
-/** Merge rows that share participant + time span + off into one row with combined `days`. */
+/** Merge rows that share participant + time span into one row with combined active `days`. */
 function mergeOpeningHoursBySlot(rows: UnifiedOpeningHourRow[]) {
   const map = new Map<string, UnifiedOpeningHourRow>();
   for (const r of rows) {
-    const key = [r.member, r.startHour, r.startMinute, r.endHour, r.endMinute, r.off].join("|");
+    // Key excludes 'off' because we want to merge ON and OFF records for the same time slot
+    const key = [r.member, r.startHour, r.startMinute, r.endHour, r.endMinute].join("|");
     const existing = map.get(key);
+    
+    // We only want to add the day to the 'days' array if it is NOT marked as OFF.
+    // If the whole record was marked as OFF, we still process it to establish the slot,
+    // but its days won't be listed as 'active'.
+    const activeDaysFromThisRow = r.off ? [] : r.days;
+
     if (!existing) {
-      map.set(key, { ...r, days: [...r.days] });
+      map.set(key, { ...r, days: [...activeDaysFromThisRow], off: false });
     } else {
-      const set = new Set([...existing.days, ...r.days]);
+      const set = new Set([...existing.days, ...activeDaysFromThisRow]);
       existing.days = Array.from(set).sort((a, b) => dayOrderIndex(a) - dayOrderIndex(b));
+      // If we encounter any record that is NOT off, the whole merged slot is NOT off.
+      if (!r.off) existing.off = false;
+    }
+  }
+  
+  // Final Pass: If a slot has NO active days, it should be marked as off: true 
+  // (though in Plan V2, these usually just disappear from the UI's 'days' list)
+  for (const group of map.values()) {
+    if (group.days.length === 0) {
+      group.off = true;
     }
   }
+
   rows.length = 0;
   rows.push(...map.values());
 }

package/src/calendar/calendarCreation.ts

@@ -132,7 +132,10 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar: any, calenda
         endHour: oh.endHour,
         endMinute: oh.endMinute,
         off: isOff,
-        openingHourId: openingHourId,
+        // Plan V2 Optimization: Generate a unique ID for EVERY day record.
+        // This prevents the backend from deduplicating/overwriting when multiple 
+        // records for the same participant + slot are sent in one batch.
+        openingHourId: newOpeningHourId(),
       });
     }
   }
@@ -141,6 +144,11 @@ async function runMembersAndOpeningHoursAfterCalendarSave(calendar: any, calenda
   for (const [participantId, payload] of hoursByParticipant.entries()) {
     if (payload.length === 0) continue;
 
+    // Plan V2 Optimization: Clear existing records for this participant first.
+    // This ensures that when we save the new batch (with unique per-day IDs), 
+    // we don't leak orphaned records or create duplicates during updates.
+    await (calendarNode as any).removeParticipantOpeningHours(participantId);
+
     // Use the batch save method (plural)
     const res = await saveCalendarOpeningHoursBatch(calendarNode, payload);
     

package/src/calendar/fetchCalendarDetails.ts

@@ -276,9 +276,17 @@ export async function fetchCalendarDetails(
 
   if (!calendarView) return null as any;
 
+  // Use the mapper to normalize the final output, ensuring all fields like duration, 
+  // bookingPageTitle, calendarId, etc. are correctly picked and named.
+  const finalView = mapToDesiredCalendarResponse(
+    payload,
+    calendarView.openingHours,
+    calendarView.members
+  ) as any;
+
   // Attach metadata as non-enumerable properties so they don't show up in JSON.stringify
   // but are still accessible for debugging if needed.
-  Object.defineProperties(calendarView, {
+  Object.defineProperties(finalView, {
     _cal: { value: cal, enumerable: false },
     _participants: { value: participantList, enumerable: false },
     _openingHours: { value: openingHours, enumerable: false },
@@ -294,7 +302,7 @@ export async function fetchCalendarDetails(
     },
   });
 
-  return calendarView as any;
+  return finalView as any;
 }
 
 /**

package/src/calendar/getCalendarsByCompany.ts

@@ -1,10 +1,11 @@
 import { CalendarModel, CalendarParticipantModel } from "@blazeo.com/calendar-client";
 import { ensureBlazeoHttpReady } from "../config/ensureBlazeoHttpReady.js";
+import { mapToDesiredCalendarResponse } from "./mapToDesiredResponse.js";
 
 /**
  * Fetches all calendars for a company and populates each with its members (participants).
- * Fetches both Participant List and Participant Info to ensure names and emails are included,
- * while still skipping heavy data like opening hours.
+ * Uses a highly optimized single-request approach per calendar to ensure speed in list views.
+ * Results are normalized via mapToDesiredCalendarResponse.
  */
 export async function getCalendarsByCompany(
   companyKey: string,
@@ -30,96 +31,48 @@ export async function getCalendarsByCompany(
       if (!calendarId) return null;
 
       try {
-        // We need both List and Info to get the names/emails
-        const [partsRaw, infoRaw] = await Promise.all([
-          CalendarParticipantModel.getByCalendar(calendarId),
-          CalendarParticipantModel.getInfoByCalendar(calendarId)
-        ]);
-
-        const parts = Array.isArray(partsRaw) ? partsRaw : (partsRaw as any)?.participants ?? [];
+        // Optimization: Use only getInfoByCalendar to get names/emails in a single request.
+        // This is much faster for a list view than fetching both list and info records.
+        const infoRaw = await CalendarParticipantModel.getInfoByCalendar(calendarId);
         const info = Array.isArray(infoRaw) ? infoRaw : (infoRaw as any)?.info ?? [];
 
         // Merge logic to ensure names are matched to IDs
         const membersMap = new Map<string, any>();
-        
+
         // Use participantId GUID as the primary key
         const getAnyId = (obj: any) =>
           obj.participantId ?? obj.ParticipantId ?? obj.participant_id ?? obj.id ?? obj.Id;
 
-        // 1. Initialize with basic participant data
-        parts.forEach((p: any) => {
-          const mid = getAnyId(p);
-          if (mid) {
-            membersMap.set(String(mid).toLowerCase(), {
-              id: mid,
-              name: p.name ?? p.Name ?? "Member",
-              email: p.email ?? p.Email,
-              status: p.status ?? p.Status ?? 1,
-              uuId: mid
-            });
-          }
-        });
-
-        // 2. Enrich with detailed info (Name, Email, Alias)
+        // 1. Process info list (Name, Email, Alias)
         info.forEach((i: any) => {
           const mid = getAnyId(i);
           if (!mid) return;
           const key = String(mid).toLowerCase();
-          const existing = membersMap.get(key);
-          
-          const resolvedEmail = i.email ?? i.Email ?? i.userSsoEmail ?? i.UserSsoEmail ?? existing?.email;
 
+          const resolvedEmail = i.email ?? i.Email ?? i.userSsoEmail ?? i.UserSsoEmail;
           const memberData = {
             id: mid,
-            name: i.name ?? i.Name ?? i.alias ?? i.Alias ?? (existing?.name || "Member"),
+            name: i.name ?? i.Name ?? i.alias ?? i.Alias ?? "Member",
             email: resolvedEmail,
-            alias: i.alias ?? i.Alias ?? i.name ?? i.Name,
-            userSsoEmail: resolvedEmail,
-            uuId: mid,
-            status: i.status ?? i.Status ?? existing?.status ?? 1
+            status: i.status ?? i.Status ?? 1,
           };
 
-          if (!existing) {
+          if (!membersMap.has(key)) {
             membersMap.set(key, memberData);
-          } else {
-            Object.assign(existing, memberData);
           }
         });
 
         const members = Array.from(membersMap.values());
 
-        // Map to the EXACT schema requested by the user
-        return {
-          id: cal.id ?? cal.Id,
-          calendarLink: cal.calendarLink ?? cal.CalendarLink ?? "",
-          uuid: calendarId,
-          createdOn: cal.createdOn ?? cal.CreatedOn,
-          name: cal.name ?? cal.Name,
-          timeZoneId: cal.timeZoneId ?? cal.TimeZoneId,
-          description: cal.description ?? cal.Description ?? "",
-          assignmentType: cal.assignmentMethod ?? cal.AssignmentMethod ?? cal.assignmentType,
-          status: cal.status ?? cal.Status ?? 1,
-          location: cal.location ?? cal.Location ?? "",
-          members
-        };
+        // Use the unified mapper to ensure all properties (duration, calendarId, etc.) are included
+        return mapToDesiredCalendarResponse(cal, [], members);
       } catch (err) {
         console.error(`[getCalendarsByCompany] Error fetching members for ${calendarId}:`, err);
-        return {
-          id: cal.id ?? cal.Id,
-          calendarLink: cal.calendarLink ?? cal.CalendarLink ?? "",
-          uuid: calendarId,
-          createdOn: cal.createdOn ?? cal.CreatedOn,
-          name: cal.name ?? cal.Name,
-          timeZoneId: cal.timeZoneId ?? cal.TimeZoneId,
-          description: cal.description ?? cal.Description ?? "",
-          assignmentType: cal.assignmentMethod ?? cal.AssignmentMethod ?? cal.assignmentType,
-          status: cal.status ?? cal.Status ?? 1,
-          location: cal.location ?? cal.Location ?? "",
-          members: []
-        };
+        // Fallback to minimal mapping if enrichment fails
+        return mapToDesiredCalendarResponse(cal, [], []);
       }
     })
   );
 
-  return enrichedCalendars.filter(c => c !== null);
+  return enrichedCalendars.filter(Boolean);
 }

package/src/calendar/mapToDesiredResponse.ts

@@ -24,22 +24,33 @@ export function mapToDesiredCalendarResponse(payload: any, openingHours: any[] =
   }));
 
   // Map opening hours with typename and raw fields
-  const mappedOpeningHours = openingHours.map(oh => ({
-    id: pick(oh, "id", "Id") ?? 0,
-    createdOn: pick(oh, "createdOn", "CreatedOn", "created_on") ?? "0001-01-01T00:00:00.000Z",
-    modifiedOn: pick(oh, "modifiedOn", "ModifiedOn", "modified_on") ?? "0001-01-01T00:00:00.000Z",
-    member: pick(oh, "member", "Member"),
-    openingHourId: pick(oh, "openingHourId", "OpeningHourId", "opening_hour_id") ?? "",
-    calendarId: pick(oh, "calendarId", "CalendarId", "calendar_id") ?? "",
-    participantId: pick(oh, "participantId", "ParticipantId", "participant_id") ?? "",
-    days: oh.days ?? [],
-    startHour: oh.startHour ?? pick(oh, "startHour", "StartHour") ?? 0,
-    startMinute: oh.startMinute ?? pick(oh, "startMinute", "StartMinute") ?? 0,
-    endHour: oh.endHour ?? pick(oh, "endHour", "EndHour") ?? 0,
-    endMinute: oh.endMinute ?? pick(oh, "endMinute", "EndMinute") ?? 0,
-    off: !!(oh.off ?? pick(oh, "off", "Off")),
-    __typename: "OpeningHour"
-  }));
+  const mappedOpeningHours = openingHours.map(oh => {
+    // If it's already a unified object (has day/start/end), preserve it but ensure __typename
+    if (oh.day !== undefined && oh.start !== undefined && oh.end !== undefined) {
+      return {
+        ...oh,
+        __typename: "OpeningHour"
+      };
+    }
+
+    // Otherwise, map from raw PascalCase or camelCase
+    return {
+      id: pick(oh, "id", "Id") ?? 0,
+      createdOn: pick(oh, "createdOn", "CreatedOn", "created_on") ?? "0001-01-01T00:00:00.000Z",
+      modifiedOn: pick(oh, "modifiedOn", "ModifiedOn", "modified_on") ?? "0001-01-01T00:00:00.000Z",
+      member: pick(oh, "member", "Member"),
+      openingHourId: pick(oh, "openingHourId", "OpeningHourId", "opening_hour_id") ?? "",
+      calendarId: pick(oh, "calendarId", "CalendarId", "calendar_id") ?? "",
+      participantId: pick(oh, "participantId", "ParticipantId", "participant_id") ?? "",
+      days: oh.days ?? [],
+      startHour: oh.startHour ?? pick(oh, "startHour", "StartHour") ?? 0,
+      startMinute: oh.startMinute ?? pick(oh, "startMinute", "StartMinute") ?? 0,
+      endHour: oh.endHour ?? pick(oh, "endHour", "EndHour") ?? 0,
+      endMinute: oh.endMinute ?? pick(oh, "endMinute", "EndMinute") ?? 0,
+      off: !!(oh.off ?? pick(oh, "off", "Off")),
+      __typename: "OpeningHour"
+    };
+  });
 
   // Map theme
   const rawTheme = pick(payload, "theme", "Theme");
@@ -68,6 +79,8 @@ export function mapToDesiredCalendarResponse(payload: any, openingHours: any[] =
     __typename: "ReminderChannelStatus"
   })) : [];
 
+  const uuid = pick(payload, "uuid", "Uuid", "calendarId", "CalendarId");
+
   return {
     id: n(pick(payload, "id", "Id")),
     durationUnit: n(pick(payload, "durationUnit", "DurationUnit")),
@@ -80,7 +93,8 @@ export function mapToDesiredCalendarResponse(payload: any, openingHours: any[] =
     bufferTime: n(pick(payload, "bufferTime", "BufferTime")),
     bufferTimeUnit: n(pick(payload, "bufferTimeUnit", "BufferTimeUnit")),
     calendarLink: pick(payload, "calendarLink", "CalendarLink"),
-    uuid: pick(payload, "uuid", "Uuid", "calendarId", "CalendarId"),
+    uuid: uuid,
+    calendarId: uuid, // Explicit alias requested by user
     location: pick(payload, "location", "Location") ?? "",
     bookingPageTitle: pick(payload, "bookingPageTitle", "BookingPageTitle") ?? null,
     reminderChannelStatuses,

package/src/index.ts

@@ -10,8 +10,7 @@ export type { EnsureBlazeoHttpOptions } from "./config/ensureBlazeoHttpReady.js"
 export { blazeoClientConfig } from "./config/blazeoClientDefaults.js";
 export { applyBlazeoClientConfig } from "./config/applyBlazeoDefaults.js";
 export { createCalendarRoot, CalendarRootModel, CalendarSlotModel, EventModel, ParticipantModel } from "./models/CalendarRootModel.js";
-export { fetchCalendarDetails, fetchCalendarBundle, normalizeOpeningHours } from "./calendar/fetchCalendarDetails.js";
-export { getCalendarsByCompany } from "./calendar/getCalendarsByCompany.js";
+export { fetchCalendarBundle, normalizeOpeningHours } from "./calendar/fetchCalendarDetails.js";
 export {
   buildUnifiedCalendarView,
   type UnifiedCalendarMember,
@@ -33,9 +32,9 @@ export { addParticipantToCalendar, removeParticipantFromCalendar, saveCalendarOp
 export { createAppointmentEventAsync, rescheduleAppointmentEventAsync, cancelAppointmentEventAsync } from "./events/appointmentEventFacade.js";
 export { mapAppointmentToEventSnapshot } from "./events/mapAppointmentToEventSnapshot.js";
 
-import { fetchCalendarDetails, fetchCalendarBundle } from "./calendar/fetchCalendarDetails.js";
-import { fetchCalendarWithOpeningHours } from "./calendar/fetchCalendarWithOpeningHours.js";
 import { getCalendarsByCompany } from "./calendar/getCalendarsByCompany.js";
+import { fetchCalendarDetails } from "./calendar/fetchCalendarDetails.js";
+export { getCalendarsByCompany, fetchCalendarDetails };
 
 import { 
   CalendarModel as CoreCalendarModel, 
@@ -46,14 +45,14 @@ import {
   getConfig 
 } from "@blazeo.com/calendar-client";
 
-// Attach new methods to CalendarModel for easier access
-(CoreCalendarModel as any).fetchCalendarDetails = fetchCalendarDetails;
-(CoreCalendarModel as any).fetchCalendarBundle = fetchCalendarBundle;
-(CoreCalendarModel as any).fetchCalendarWithOpeningHours = fetchCalendarWithOpeningHours;
-(CoreCalendarModel as any).getCalendarsByCompany = getCalendarsByCompany;
+// Enriched CalendarModel
+export const CalendarModel = {
+  ...CoreCalendarModel,
+  getCalendarsByCompany,
+  fetchCalendarDetails
+};
 
 export { 
-  CoreCalendarModel as CalendarModel, 
   CoreEventModel as CoreEventModel, 
   CoreParticipantModel as CoreParticipantModel, 
   CoreCalendarParticipantModel as CalendarParticipantModel,
@@ -61,7 +60,6 @@ export {
   getConfig 
 };
 
-
 export const packageName = "@blazeo.com/appointment-client";
 
 export class CalendarClient {