@garagem-ai/site-sdk 0.4.3 → 0.4.5
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.
- package/README.md +16 -16
- package/dist/index.d.mts +7 -5
- package/dist/index.d.ts +7 -5
- package/dist/index.js +66 -40
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +65 -40
- package/dist/index.mjs.map +1 -1
- package/dist/react.js +3 -2
- package/dist/react.js.map +1 -1
- package/dist/react.mjs +3 -2
- package/dist/react.mjs.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +1 -0
- package/src/internal/url.ts +3 -1
- package/src/leads.ts +38 -8
- package/src/react/styles/search-chrome-css.generated.ts +1 -1
- package/src/schedule.ts +16 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@garagem-ai/site-sdk",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.5",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Typed, runtime-agnostic SDK for building custom real estate sites against the Garagem platform. Drop into any Next.js (or other JS) project to fetch listings, sites and CMS data.",
|
|
6
6
|
"main": "./dist/index.js",
|
package/src/index.ts
CHANGED
package/src/internal/url.ts
CHANGED
|
@@ -13,7 +13,9 @@ export function normalizeBaseUrl(baseUrl: string | undefined): string {
|
|
|
13
13
|
* await, which interpolates as `/api/sites/[object Promise]/listings`.
|
|
14
14
|
*/
|
|
15
15
|
export async function coerceSiteId(siteId: unknown): Promise<string> {
|
|
16
|
-
const
|
|
16
|
+
const raw =
|
|
17
|
+
typeof siteId === "function" ? (siteId as () => unknown)() : siteId;
|
|
18
|
+
const value = await Promise.resolve(raw);
|
|
17
19
|
if (typeof value !== "string" || !value.trim()) {
|
|
18
20
|
throw new TypeError(
|
|
19
21
|
"Garagem SDK: siteId must be a string. Await resolveSiteId(...) before getListings / getSearchUi / queryListings."
|
package/src/leads.ts
CHANGED
|
@@ -5,9 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
import { callJson, type FetchLike } from "./fetchers";
|
|
7
7
|
import { coerceSiteId, normalizeBaseUrl } from "./internal/url";
|
|
8
|
+
import { resolvePublicSiteId } from "./resolve-site-id";
|
|
8
9
|
import {
|
|
9
10
|
STUDIO_DEFAULT_VISIT_SCHEDULE,
|
|
10
11
|
isVisitSlotAllowed,
|
|
12
|
+
normalizeVisitDate,
|
|
11
13
|
type HHmm,
|
|
12
14
|
type VisitSchedule,
|
|
13
15
|
} from "./schedule";
|
|
@@ -40,12 +42,39 @@ export type LeadUi = {
|
|
|
40
42
|
};
|
|
41
43
|
|
|
42
44
|
export type GetLeadUiOptions = {
|
|
43
|
-
siteId
|
|
45
|
+
siteId?: string | Promise<string>;
|
|
44
46
|
baseUrl?: string;
|
|
45
47
|
fetch?: FetchLike;
|
|
46
48
|
next?: RequestNextOptions;
|
|
47
49
|
};
|
|
48
50
|
|
|
51
|
+
function browserHost(): string {
|
|
52
|
+
if (typeof window === "undefined") return "";
|
|
53
|
+
return window.location.host;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* Generated dialogs often omit `siteId` or pass `process.env.GARAGEM_SITE_ID`
|
|
58
|
+
* (undefined in the published browser bundle). Recover from the host.
|
|
59
|
+
*/
|
|
60
|
+
async function resolveLeadSiteId(input: {
|
|
61
|
+
siteId?: unknown;
|
|
62
|
+
baseUrl?: string;
|
|
63
|
+
fetch?: FetchLike;
|
|
64
|
+
}): Promise<string> {
|
|
65
|
+
try {
|
|
66
|
+
return await coerceSiteId(input.siteId);
|
|
67
|
+
} catch (error) {
|
|
68
|
+
const host = browserHost();
|
|
69
|
+
if (!host) throw error;
|
|
70
|
+
return resolvePublicSiteId({
|
|
71
|
+
host,
|
|
72
|
+
baseUrl: input.baseUrl,
|
|
73
|
+
fetch: input.fetch,
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
|
|
49
78
|
export type LeadContact = {
|
|
50
79
|
name: string;
|
|
51
80
|
email?: string;
|
|
@@ -54,7 +83,7 @@ export type LeadContact = {
|
|
|
54
83
|
};
|
|
55
84
|
|
|
56
85
|
type LeadSubmitBase = LeadContact & {
|
|
57
|
-
siteId
|
|
86
|
+
siteId?: string | Promise<string>;
|
|
58
87
|
baseUrl?: string;
|
|
59
88
|
fetch?: FetchLike;
|
|
60
89
|
listingId: string;
|
|
@@ -64,7 +93,7 @@ type LeadSubmitBase = LeadContact & {
|
|
|
64
93
|
};
|
|
65
94
|
|
|
66
95
|
export type VisitLeadInput = LeadSubmitBase & {
|
|
67
|
-
visitDate: string;
|
|
96
|
+
visitDate: Date | string;
|
|
68
97
|
visitTime: HHmm;
|
|
69
98
|
schedule?: VisitSchedule;
|
|
70
99
|
};
|
|
@@ -140,7 +169,7 @@ export function studioDefaultLeadUi(): LeadUi {
|
|
|
140
169
|
}
|
|
141
170
|
|
|
142
171
|
export async function getLeadUi(options: GetLeadUiOptions): Promise<LeadUi> {
|
|
143
|
-
const siteId = await
|
|
172
|
+
const siteId = await resolveLeadSiteId(options);
|
|
144
173
|
const url = `${normalizeBaseUrl(options.baseUrl)}/api/sites/${encodeURIComponent(siteId)}/leads/ui`;
|
|
145
174
|
return callJson<LeadUi>(
|
|
146
175
|
url,
|
|
@@ -222,12 +251,12 @@ type SiteSdkLeadBody = {
|
|
|
222
251
|
};
|
|
223
252
|
|
|
224
253
|
async function postSiteLead(input: {
|
|
225
|
-
siteId
|
|
254
|
+
siteId?: string | Promise<string>;
|
|
226
255
|
baseUrl?: string;
|
|
227
256
|
fetch?: FetchLike;
|
|
228
257
|
body: SiteSdkLeadBody;
|
|
229
258
|
}): Promise<LeadSubmitResult> {
|
|
230
|
-
const siteId = await
|
|
259
|
+
const siteId = await resolveLeadSiteId(input);
|
|
231
260
|
const base = normalizeBaseUrl(input.baseUrl);
|
|
232
261
|
const url = `${base}/api/webhooks/sites/${encodeURIComponent(siteId)}/leads`;
|
|
233
262
|
const f = input.fetch ?? fetch;
|
|
@@ -298,7 +327,8 @@ export async function submitVisitLead(
|
|
|
298
327
|
): Promise<LeadSubmitResult> {
|
|
299
328
|
const prepared = leadPostContext(input);
|
|
300
329
|
const schedule = input.schedule ?? STUDIO_DEFAULT_VISIT_SCHEDULE;
|
|
301
|
-
|
|
330
|
+
const visitDate = normalizeVisitDate(input.visitDate, schedule.timeZone);
|
|
331
|
+
if (!visitDate || !isVisitSlotAllowed(schedule, visitDate, input.visitTime)) {
|
|
302
332
|
throw new LeadSubmitError(
|
|
303
333
|
"Garagem SDK: visitDate/visitTime is outside the published schedule.",
|
|
304
334
|
{ code: "invalid_slot" }
|
|
@@ -314,7 +344,7 @@ export async function submitVisitLead(
|
|
|
314
344
|
...prepared.contact,
|
|
315
345
|
propertyId: prepared.listingId,
|
|
316
346
|
listingId: prepared.listingId,
|
|
317
|
-
visitDate
|
|
347
|
+
visitDate,
|
|
318
348
|
visitTime: input.visitTime,
|
|
319
349
|
...prepared.extras,
|
|
320
350
|
},
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* Generated by scripts/build-search-chrome-css.mjs — do not edit. */
|
|
2
2
|
/* eslint-disable */
|
|
3
3
|
/* prettier-ignore */
|
|
4
|
-
export const SEARCH_CHROME_CSS_VERSION = "0.4.
|
|
4
|
+
export const SEARCH_CHROME_CSS_VERSION = "0.4.5";
|
|
5
5
|
export const SEARCH_CHROME_CSS = ":root{--garagem-listing-card-radius:0.75rem;--garagem-listing-card-gap:1.5rem;--garagem-listing-price-size:1.125rem;--garagem-listing-media-ratio:4 / 3;--garagem-search-control-height:2.75rem;--garagem-search-icon-size:1.25rem;--garagem-search-radius:var(--radius,0.75rem);--garagem-skeleton:var(--muted,#e7e5e4)}[data-slot=\"search-page\"]{margin-inline:auto;max-width:80rem;padding:3rem 1.5rem}[data-slot=\"search-heading\"]{display:flex;min-width:0;align-items:baseline;gap:0.375rem;font-size:1.25rem;font-weight:600}[data-slot=\"search-heading-count\"]{flex-shrink:0}[data-slot=\"search-heading-title\"]{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:inherit;font-weight:inherit}[data-slot=\"search-query-sort\"]{display:flex;flex-direction:column;gap:1rem}@media (min-width:1024px){[data-slot=\"search-query-sort\"]{flex-direction:row;align-items:flex-end}}[data-slot=\"search-query\"]{flex:1;min-width:0}[data-slot=\"search-query-input\"],[data-slot=\"search-sort-trigger\"],[data-slot=\"search-toolbar-trigger\"],[data-slot=\"search-filters-trigger\"]{min-height:var(--garagem-search-control-height)}[data-slot=\"search-query-field\"]{position:relative}[data-slot=\"search-query-input\"]{width:100%;border-radius:var(--garagem-search-radius);border:1px solid var(--border,#e4e4e7);background:var(--background,#fff);padding:0.5rem 5.5rem 0.5rem 1rem;outline:none}[data-slot=\"search-query-actions\"]{position:absolute;top:50%;right:0.35rem;display:flex;transform:translateY(-50%);align-items:center;gap:0.15rem}[data-slot=\"search-icon-button\"]{display:inline-flex;height:2.25rem;width:2.25rem;cursor:pointer;align-items:center;justify-content:center;border:0;border-radius:999px;background:var(--primary,#111);color:var(--primary-foreground,#fff)}[data-slot=\"search-icon-button\"][data-kind=\"clear\"]{background:transparent;color:var(--muted-foreground,#737373)}[data-slot=\"search-icon\"]{width:var(--garagem-search-icon-size);height:var(--garagem-search-icon-size);display:block}[data-slot=\"search-sort\"]{display:flex;flex-direction:column;gap:0.25rem}[data-slot=\"search-sort-trigger\"]{appearance:none;cursor:pointer;border-radius:var(--garagem-search-radius);border:1px solid var(--border,#e4e4e7);background:var(--background,#fff);padding:0.5rem 2.25rem 0.5rem 0.75rem;background-image:url(\"data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='none' stroke='%23737373' stroke-width='2' viewBox='0 0 24 24'><path d='m6 9 6 6 6-6'/></svg>\");background-repeat:no-repeat;background-position:right 0.65rem center}[data-slot=\"search-toolbar\"]{display:flex;flex-wrap:wrap;align-items:flex-end;gap:0.5rem}[data-slot=\"search-toolbar-trigger\"],[data-slot=\"search-filters-trigger\"]{cursor:pointer;border-radius:var(--garagem-search-radius);border:1px solid var(--border,#e4e4e7);background:var(--background,#fff);padding:0.5rem 0.75rem;font-size:0.875rem}[data-slot=\"search-popover\"]{position:absolute;z-index:30;margin-top:0.5rem;width:18rem;border-radius:0.75rem;border:1px solid var(--border,#e4e4e7);background:var(--background,#fff);padding:1rem;box-shadow:0 10px 30px rgb(0 0 0 / 0.12);animation:garagem-search-in 140ms ease-out}[data-slot=\"search-grid\"],[data-slot=\"search-skeleton\"]{display:grid;grid-template-columns:1fr;gap:var(--garagem-listing-card-gap)}@media (min-width:640px){[data-slot=\"search-grid\"],[data-slot=\"search-skeleton\"]{grid-template-columns:repeat(2,minmax(0,1fr))}}@media (min-width:1024px){[data-slot=\"search-grid\"],[data-slot=\"search-skeleton\"]{grid-template-columns:repeat(3,minmax(0,1fr))}}[data-slot=\"listing-card\"]{overflow:hidden;border-radius:var(--garagem-listing-card-radius);border:1px solid var(--border,#e4e4e7);background:var(--card,var(--background,#fff))}[data-slot=\"listing-card-price-row\"]{display:inline-flex;align-items:baseline;gap:0.25rem}[data-slot=\"listing-card-price\"]{font-size:var(--garagem-listing-price-size);font-weight:600}[data-slot=\"listing-card-period\"]{font-size:0.75rem;color:var(--muted-foreground,#737373)}[data-slot=\"search-checkbox\"]{appearance:none;width:1.15rem;height:1.15rem;flex-shrink:0;cursor:pointer;border:1px solid var(--primary,#111);border-radius:0.25rem;background:var(--background,#fff)}[data-slot=\"search-checkbox\"]:checked{background-color:var(--primary,#111);background-image:url(\"data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='white' stroke-width='3'><path d='M5 12l5 5L20 7'/></svg>\");background-repeat:no-repeat;background-position:center;background-size:0.8rem}[data-slot=\"search-scroll\"]{max-height:12rem;overflow:auto;scrollbar-width:thin;scrollbar-color:var(--muted-foreground,#a1a1aa) transparent}[data-slot=\"search-range-apply\"]{display:inline-flex;min-height:2.5rem;cursor:pointer;align-items:center;justify-content:center;border:0;border-radius:var(--garagem-search-radius);background:var(--primary,#111);color:var(--primary-foreground,#fff);padding:0 0.75rem;font-size:0.75rem;font-weight:600}[data-slot=\"search-sheet\"]{position:fixed;inset:0;z-index:40}[data-slot=\"search-sheet-overlay\"]{position:absolute;inset:0;border:0;cursor:pointer;background:rgb(0 0 0 / 0.4);animation:garagem-search-fade 160ms ease-out}[data-slot=\"search-sheet-panel\"]{position:absolute;top:0;right:0;display:flex;height:100dvh;width:min(22rem,100%);flex-direction:column;background:var(--background,#fff);animation:garagem-search-sheet 180ms ease-out}[data-slot=\"search-sheet-body\"]{min-height:0;flex:1;overflow:auto;padding:1.5rem 1.5rem 0;scrollbar-width:thin}[data-slot=\"search-sheet-footer\"]{display:flex;gap:0.5rem;border-top:1px solid var(--border,#e4e4e7);padding:1rem 1.5rem}[data-slot=\"search-apply-bar\"]{display:flex;width:100%;gap:0.5rem}[data-slot=\"search-apply-bar\"] > button{min-height:2.5rem;flex:1;cursor:pointer;border-radius:var(--garagem-search-radius);padding:0 1rem}[data-slot=\"search-apply-bar\"] > button[data-kind=\"clear\"]{border:1px solid var(--border,#e4e4e7);background:transparent}[data-slot=\"search-apply-bar\"] > button[data-kind=\"apply\"]{border:0;background:var(--primary,#111);color:var(--primary-foreground,#fff);font-weight:600}[data-slot=\"search-pagination\"]{margin-top:2.5rem;display:flex;justify-content:center}[data-slot=\"search-pagination\"] ul{display:flex;flex-wrap:wrap;justify-content:center;gap:0.25rem;padding:0;margin:0;list-style:none}[data-slot=\"search-pagination-item\"]{display:inline-flex;width:2.25rem;height:2.25rem;align-items:center;justify-content:center;border:1px solid var(--border,#e4e4e7);border-radius:0.375rem;font-size:0.75rem;font-weight:500}@media (min-width:768px){[data-slot=\"search-pagination-item\"]{width:2.5rem;height:2.5rem}}[data-slot=\"search-pagination-item\"] a,[data-slot=\"search-pagination-item\"] span{display:flex;width:100%;height:100%;align-items:center;justify-content:center;color:inherit;text-decoration:none}[data-slot=\"search-pagination-item\"][data-current=\"true\"]{background:var(--primary,#111);color:var(--primary-foreground,#fff)}[data-slot=\"search-pagination-item\"][data-disabled=\"true\"]{cursor:not-allowed;color:var(--muted-foreground,#737373)}[data-slot=\"search-toolbar-item\"]{position:relative}[data-slot=\"search-body\"]{margin-top:2rem;display:flex;flex-direction:column;gap:1.5rem}[data-slot=\"search-label\"]{margin-bottom:0.25rem;display:block;font-size:0.875rem;color:var(--muted-foreground,#737373)}[data-slot=\"search-sheet-title\"]{padding:1.5rem 1.5rem 0;font-size:1.125rem;font-weight:600}[data-slot=\"search-layout\"]{display:grid;gap:2rem}[data-slot=\"search-sidebar\"]{display:none}[data-slot=\"search-layout\"] > div > [data-slot=\"search-filters-trigger\"]{margin-bottom:1rem}@media (min-width:1024px){[data-slot=\"search-layout\"]{grid-template-columns:280px minmax(0,1fr)}[data-slot=\"search-sidebar\"]{display:block;position:sticky;top:1.5rem;align-self:start}[data-slot=\"search-layout\"] > div > [data-slot=\"search-filters-trigger\"]{display:none}}[data-slot=\"listing-card-link\"]{display:block;color:inherit;text-decoration:none;cursor:pointer}[data-slot=\"listing-card-media\"]{position:relative;width:100%;overflow:hidden;background:var(--muted,#f5f5f4);aspect-ratio:var(--garagem-listing-media-ratio)}[data-slot=\"listing-card-media\"] img{height:100%;width:100%;object-fit:cover;transition:transform 0.3s}[data-slot=\"listing-card\"]:hover [data-slot=\"listing-card-media\"] img{transform:scale(1.05)}@media (prefers-reduced-motion:reduce){[data-slot=\"listing-card-media\"] img{transition:none}[data-slot=\"listing-card\"]:hover [data-slot=\"listing-card-media\"] img{transform:none}}[data-slot=\"listing-card-empty\"]{display:flex;height:100%;width:100%;align-items:center;justify-content:center;font-size:0.75rem;color:var(--muted-foreground,#737373)}[data-slot=\"listing-card-cta\"]{margin-top:0.75rem}[data-slot=\"search-filters\"]{display:flex;flex-direction:column;gap:1.25rem}[data-slot=\"search-filter\"]{margin:0;padding:0;border:0;font-size:0.875rem}[data-slot=\"search-filter\"] legend{margin-bottom:0.5rem;padding:0;color:var(--muted-foreground,#737373)}[data-slot=\"search-range-row\"]{display:flex;align-items:flex-end;gap:0.5rem}[data-slot=\"search-range-side\"]{min-width:0;flex:1}[data-slot=\"search-range-side\"] > span:first-child{margin-bottom:0.25rem;display:block;font-size:0.75rem;color:var(--muted-foreground,#737373)}[data-slot=\"search-range-affix\"]{position:relative;display:block}[data-slot=\"search-range-prefix\"]{pointer-events:none;position:absolute;inset-block:0;left:0;display:flex;align-items:center;padding-left:0.75rem;color:var(--muted-foreground,#737373)}[data-slot=\"search-range-input\"]{min-height:2.5rem;width:100%;border-radius:var(--garagem-search-radius);border:1px solid var(--border,#e4e4e7);background:var(--background,#fff);padding:0 0.75rem}[data-slot=\"search-range-affix\"] [data-slot=\"search-range-input\"]{padding-left:2.5rem}[data-slot=\"search-count-group\"]{display:flex;flex-wrap:wrap;gap:0.375rem}[data-slot=\"search-count-choice\"]{min-height:2.5rem;cursor:pointer;border-radius:var(--garagem-search-radius);border:1px solid var(--border,#e4e4e7);background:var(--background,#fff);padding:0 0.75rem;font-size:0.875rem}[data-slot=\"search-count-choice\"][data-selected=\"true\"]{border-color:var(--primary,#111);background:color-mix(in srgb,var(--primary,#111) 10%,transparent)}[data-slot=\"search-enum-list\"],[data-slot=\"search-scroll\"]{display:flex;flex-direction:column;gap:0.375rem}[data-slot=\"search-enum-option\"]{display:flex;cursor:pointer;align-items:center;gap:0.5rem}[data-slot=\"listing-card-badge\"]{position:absolute;left:0.75rem;top:0.75rem;border-radius:999px;background:color-mix(in srgb,var(--background,#fff) 90%,transparent);padding:0.25rem 0.5rem;font-size:0.75rem;font-weight:500}[data-slot=\"listing-card-body\"]{padding:1rem}[data-slot=\"listing-card-title\"]{display:-webkit-box;margin-top:0.25rem;overflow:hidden;-webkit-box-orient:vertical;-webkit-line-clamp:1;font-size:0.875rem;font-weight:500}[data-slot=\"listing-card-location\"]{margin-top:0.125rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:0.75rem;color:var(--muted-foreground,#737373)}[data-slot=\"listing-card-features\"]{display:flex;flex-wrap:wrap;margin-top:0.75rem;gap:0.25rem 1rem;padding:0;list-style:none;font-size:0.75rem;color:var(--muted-foreground,#737373)}[data-slot=\"search-skeleton-block\"]{animation:garagem-search-pulse 1.2s ease-in-out infinite;background:var(--garagem-skeleton);border-radius:0.375rem}[data-slot=\"search-skeleton-card\"]{overflow:hidden;border-radius:var(--garagem-listing-card-radius);border:1px solid var(--border,#e4e4e7)}[data-slot=\"search-skeleton-body\"]{display:flex;flex-direction:column;gap:0.5rem;padding:1rem}[data-slot=\"search-skeleton-block\"][data-kind=\"media\"]{aspect-ratio:var(--garagem-listing-media-ratio)}[data-slot=\"search-skeleton-block\"][data-kind=\"line-lg\"]{height:1.25rem;width:50%}[data-slot=\"search-skeleton-block\"][data-kind=\"line-md\"]{height:1rem;width:75%}[data-slot=\"search-skeleton-block\"][data-kind=\"line-sm\"]{height:0.75rem;width:66.666667%}[data-slot=\"search-skeleton-block\"][data-kind=\"detail-media\"]{max-width:45rem;aspect-ratio:4 / 3}[data-slot=\"search-skeleton-block\"][data-kind=\"detail-title\"]{width:66.666667%;height:2rem;margin-top:1.5rem}@media (prefers-reduced-motion:reduce){[data-slot=\"search-popover\"],[data-slot=\"search-sheet-overlay\"],[data-slot=\"search-sheet-panel\"],[data-slot=\"search-skeleton-block\"]{animation:none}}@keyframes garagem-search-in{from{opacity:0;transform:translateY(-4px) scale(0.98)}to{opacity:1;transform:none}}@keyframes garagem-search-fade{from{opacity:0}to{opacity:1}}@keyframes garagem-search-sheet{from{transform:translateX(100%)}to{transform:none}}@keyframes garagem-search-pulse{50%{opacity:0.55}}";
|
package/src/schedule.ts
CHANGED
|
@@ -31,6 +31,8 @@ export type VisitSchedule = VisitScheduleConfig & {
|
|
|
31
31
|
|
|
32
32
|
const HHMM_RE = /^([01]\d|2[0-3]):([0-5]\d)$/;
|
|
33
33
|
const YMD_RE = /^(\d{4})-(\d{2})-(\d{2})$/;
|
|
34
|
+
const ISO_INSTANT_RE =
|
|
35
|
+
/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$/;
|
|
34
36
|
|
|
35
37
|
const WEEKDAY_SHORT: Record<string, number> = {
|
|
36
38
|
Sun: 0,
|
|
@@ -167,10 +169,18 @@ function parseYmd(
|
|
|
167
169
|
return { year, month, day };
|
|
168
170
|
}
|
|
169
171
|
|
|
170
|
-
/**
|
|
171
|
-
function
|
|
172
|
+
/** Normalize a civil date or ISO instant to YYYY-MM-DD in `timeZone`. */
|
|
173
|
+
export function normalizeVisitDate(
|
|
174
|
+
date: Date | string,
|
|
175
|
+
timeZone: string = VISIT_TIME_ZONE
|
|
176
|
+
): string | null {
|
|
172
177
|
if (typeof date === "string") {
|
|
173
|
-
|
|
178
|
+
if (parseYmd(date)) return date;
|
|
179
|
+
if (!ISO_INSTANT_RE.test(date)) return null;
|
|
180
|
+
const instant = new Date(date);
|
|
181
|
+
return Number.isFinite(instant.getTime())
|
|
182
|
+
? calendarYmd(instant, timeZone)
|
|
183
|
+
: null;
|
|
174
184
|
}
|
|
175
185
|
if (date instanceof Date && Number.isFinite(date.getTime())) {
|
|
176
186
|
return calendarYmd(date, timeZone);
|
|
@@ -194,10 +204,11 @@ export function slotsForDate(
|
|
|
194
204
|
now: Date = new Date()
|
|
195
205
|
): HHmm[] {
|
|
196
206
|
const timeZone = schedule.timeZone;
|
|
197
|
-
const ymd =
|
|
207
|
+
const ymd = normalizeVisitDate(date, timeZone);
|
|
198
208
|
if (!ymd) return [];
|
|
199
209
|
const weekday = weekdayOfYmd(ymd, timeZone);
|
|
200
210
|
if (weekday == null) return [];
|
|
211
|
+
if (schedule.disabledDays.includes(weekday)) return [];
|
|
201
212
|
if (weekday === 0 && !schedule.sunday) return [];
|
|
202
213
|
if (weekday === 6 && !schedule.saturday) return [];
|
|
203
214
|
const base =
|
|
@@ -218,7 +229,7 @@ export function slotsForDate(
|
|
|
218
229
|
|
|
219
230
|
export function isVisitSlotAllowed(
|
|
220
231
|
schedule: VisitSchedule,
|
|
221
|
-
visitDate: string,
|
|
232
|
+
visitDate: Date | string,
|
|
222
233
|
visitTime: HHmm,
|
|
223
234
|
now: Date = new Date()
|
|
224
235
|
): boolean {
|