payload-reserve 1.6.0 → 2.1.0

package/dist/plugin.js

@@ -9,10 +9,41 @@ import { createCancelBookingEndpoint } from './endpoints/cancelBooking.js';
 import { createCheckAvailabilityEndpoint } from './endpoints/checkAvailability.js';
 import { createBookingEndpoint } from './endpoints/createBooking.js';
 import { createCustomerSearchEndpoint } from './endpoints/customerSearch.js';
+import { createEffectiveTimezoneEndpoint } from './endpoints/effectiveTimezone.js';
 import { createGetSlotsEndpoint } from './endpoints/getSlots.js';
 import { createResourceAvailabilityEndpoint } from './endpoints/resourceAvailability.js';
 import { provisionStaffResource } from './hooks/users/provisionStaffResource.js';
 import { translations } from './translations/index.js';
+import { applyCollectionOverride } from './utilities/collectionOverrides.js';
+/**
+ * All named field paths reachable from a field list, descending through
+ * presentational containers (tabs, rows, collapsibles, unnamed groups) that
+ * don't create their own data nesting — so dedup catches a field declared
+ * inside one of them. Named groups/arrays DO nest data, so we don't recurse
+ * into them (a `name` inside a named group is a different path).
+ */ function collectFieldNames(fields) {
+    const names = new Set();
+    const walk = (list)=>{
+        for (const field of list){
+            if ('name' in field && field.name) {
+                names.add(field.name);
+            } else if ('tabs' in field && Array.isArray(field.tabs)) {
+                for (const tab of field.tabs){
+                    if ('name' in tab && tab.name) {
+                        names.add(tab.name);
+                    } else if (Array.isArray(tab.fields)) {
+                        walk(tab.fields);
+                    }
+                }
+            } else if ('fields' in field && Array.isArray(field.fields)) {
+                // row / collapsible / unnamed group
+                walk(field.fields);
+            }
+        }
+    };
+    walk(fields);
+    return names;
+}
 export const payloadReserve = (pluginOptions = {})=>(config)=>{
         const resolved = resolveConfig(pluginOptions);
         // Detect localization from the Payload config
@@ -22,24 +53,29 @@ export const payloadReserve = (pluginOptions = {})=>(config)=>{
         if (!config.collections) {
             config.collections = [];
         }
-        if (resolved.disabled) {
-            return config;
-        }
         if (resolved.userCollection) {
             // Extend the existing auth collection with customer fields
             const targetCollection = config.collections.find((col)=>col.slug === resolved.userCollection);
-            if (targetCollection) {
-                // Collect existing field names for deduplication check
-                const existingFieldNames = new Set(targetCollection.fields.map((field)=>'name' in field ? field.name : undefined).filter(Boolean));
+            if (!targetCollection) {
+                // Fail loudly rather than silently skipping field injection and pointing
+                // the customers slug at a collection that doesn't exist (review C2).
+                throw new Error(`payload-reserve: userCollection "${resolved.userCollection}" was not found in config.collections. ` + `Define it before payloadReserve() runs, or correct the slug.`);
+            }
+            {
+                // Collect existing field names — descend into presentational containers
+                // (tabs/rows/collapsibles/groups) so a field nested there isn't
+                // re-injected at the top level (review C4).
+                const existingFieldNames = collectFieldNames(targetCollection.fields);
                 // Fields to inject if not already present. `name` is added so that
                 // admin.useAsTitle: 'name' works out of the box on the extended user
                 // collection (matches the v1.0.0 behaviour documented in README/SKILL).
+                // It is NOT required — an existing users collection may have rows
+                // without a name, and forcing required would fail their next update (C4).
                 const fieldsToAdd = [
                     {
                         name: 'name',
                         type: 'text',
-                        maxLength: 200,
-                        required: true
+                        maxLength: 200
                     },
                     {
                         name: 'phone',
@@ -67,17 +103,49 @@ export const payloadReserve = (pluginOptions = {})=>(config)=>{
             // Point the customers slug at the user collection so other parts of the
             // plugin (endpoints, hooks) reference the correct collection
             resolved.slugs.customers = resolved.userCollection;
-            // Push only the 4 domain collections (no standalone Customers)
-            config.collections.push(createServicesCollection(resolved), createResourcesCollection(resolved), createSchedulesCollection(resolved), createReservationsCollection(resolved));
-        } else {
-            // Default behaviour: push all 5 collections including standalone Customers
-            config.collections.push(createServicesCollection(resolved), createResourcesCollection(resolved), createSchedulesCollection(resolved), createReservationsCollection(resolved), createCustomersCollection(resolved));
+        }
+        // The slugs this plugin is about to register (Customers only in standalone mode)
+        const slugsToRegister = [
+            resolved.slugs.services,
+            resolved.slugs.resources,
+            resolved.slugs.schedules,
+            resolved.slugs.reservations,
+            ...resolved.userCollection ? [] : [
+                resolved.slugs.customers
+            ]
+        ];
+        // C11: fail with a clear, actionable error on slug collision instead of
+        // Payload's generic DuplicateCollection throw.
+        for (const slug of slugsToRegister){
+            if (config.collections.some((col)=>col.slug === slug)) {
+                throw new Error(`payload-reserve: a collection with slug "${slug}" already exists. ` + `Override the plugin's slug via the \`slugs\` option.`);
+            }
+        }
+        // Image upload fields are added only when the media collection actually
+        // exists, so installs without one don't hit an opaque init error (C8).
+        resolved.hasMediaCollection = config.collections.some((col)=>col.slug === resolved.slugs.media);
+        const ov = resolved.collectionOverrides;
+        config.collections.push(applyCollectionOverride(createServicesCollection(resolved), ov.services), applyCollectionOverride(createResourcesCollection(resolved), ov.resources), applyCollectionOverride(createSchedulesCollection(resolved), ov.schedules), applyCollectionOverride(createReservationsCollection(resolved), ov.reservations), // The customers override applies only in standalone mode; in userCollection
+        // mode the host owns that collection and can edit it directly.
+        ...resolved.userCollection ? [] : [
+            applyCollectionOverride(createCustomersCollection(resolved), ov.customers)
+        ]);
+        // C3: collections are registered (above) even when disabled so the DB schema
+        // stays stable; behavior (hooks, endpoints, admin, provisioning) is inert.
+        if (resolved.disabled) {
+            for (const slug of slugsToRegister){
+                const col = config.collections.find((c)=>c.slug === slug);
+                if (col) {
+                    delete col.hooks;
+                }
+            }
+            return config;
         }
         // Register custom endpoints
         if (!config.endpoints) {
             config.endpoints = [];
         }
-        config.endpoints.push(createCancelBookingEndpoint(resolved), createCheckAvailabilityEndpoint(resolved), createBookingEndpoint(resolved), createCustomerSearchEndpoint(resolved), createGetSlotsEndpoint(resolved), createResourceAvailabilityEndpoint(resolved));
+        config.endpoints.push(createCancelBookingEndpoint(resolved), createCheckAvailabilityEndpoint(resolved), createBookingEndpoint(resolved), createCustomerSearchEndpoint(resolved), createEffectiveTimezoneEndpoint(resolved), createGetSlotsEndpoint(resolved), createResourceAvailabilityEndpoint(resolved));
         // Wire staff auto-provisioning onto the staff user collection
         if (resolved.staffProvisioning) {
             const staffUserSlug = resolved.staffProvisioning.userCollection;
@@ -109,6 +177,7 @@ export const payloadReserve = (pluginOptions = {})=>(config)=>{
         };
         config.admin.custom.reservationStatusMachine = resolved.statusMachine;
         config.admin.custom.reservationTenant = resolved.multiTenant;
+        config.admin.custom.reservationTimezone = resolved.timezone;
         // Add dashboard widget
         if (!config.admin.dashboard) {
             config.admin.dashboard = {

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin.ts"],"sourcesContent":["import type { CollectionSlug, Config, Field } from 'payload'\n\nimport { deepMergeSimple } from 'payload/shared'\n\nimport type { ReservationPluginConfig } from './types.js'\n\nimport { createCustomersCollection } from './collections/Customers.js'\nimport { createReservationsCollection } from './collections/Reservations.js'\nimport { createResourcesCollection } from './collections/Resources.js'\nimport { createSchedulesCollection } from './collections/Schedules.js'\nimport { createServicesCollection } from './collections/Services.js'\nimport { resolveConfig } from './defaults.js'\nimport { createCancelBookingEndpoint } from './endpoints/cancelBooking.js'\nimport { createCheckAvailabilityEndpoint } from './endpoints/checkAvailability.js'\nimport { createBookingEndpoint } from './endpoints/createBooking.js'\nimport { createCustomerSearchEndpoint } from './endpoints/customerSearch.js'\nimport { createGetSlotsEndpoint } from './endpoints/getSlots.js'\nimport { createResourceAvailabilityEndpoint } from './endpoints/resourceAvailability.js'\nimport { provisionStaffResource } from './hooks/users/provisionStaffResource.js'\nimport { type PluginT, translations } from './translations/index.js'\n\nexport const payloadReserve =\n  (pluginOptions: ReservationPluginConfig = {}) =>\n  (config: Config): Config => {\n    const resolved = resolveConfig(pluginOptions)\n\n    // Detect localization from the Payload config\n    if (config.localization) {\n      resolved.localized = true\n    }\n\n    if (!config.collections) {\n      config.collections = []\n    }\n\n    if (resolved.disabled) {\n      return config\n    }\n\n    if (resolved.userCollection) {\n      // Extend the existing auth collection with customer fields\n      const targetCollection = config.collections.find(\n        (col) => col.slug === resolved.userCollection,\n      )\n\n      if (targetCollection) {\n        // Collect existing field names for deduplication check\n        const existingFieldNames = new Set(\n          targetCollection.fields\n            .map((field) => ('name' in field ? field.name : undefined))\n            .filter(Boolean),\n        )\n\n        // Fields to inject if not already present. `name` is added so that\n        // admin.useAsTitle: 'name' works out of the box on the extended user\n        // collection (matches the v1.0.0 behaviour documented in README/SKILL).\n        const fieldsToAdd: Field[] = [\n          {\n            name: 'name',\n            type: 'text',\n            maxLength: 200,\n            required: true,\n          },\n          {\n            name: 'phone',\n            type: 'text',\n            maxLength: 50,\n          },\n          {\n            name: 'notes',\n            type: 'textarea',\n          },\n          {\n            name: 'bookings',\n            type: 'join',\n            collection: resolved.slugs.reservations as unknown as CollectionSlug,\n            on: 'customer',\n          },\n        ]\n\n        for (const field of fieldsToAdd) {\n          const fieldName = 'name' in field ? field.name : undefined\n          if (fieldName && !existingFieldNames.has(fieldName)) {\n            targetCollection.fields.push(field)\n          }\n        }\n      }\n\n      // Point the customers slug at the user collection so other parts of the\n      // plugin (endpoints, hooks) reference the correct collection\n      resolved.slugs.customers = resolved.userCollection\n\n      // Push only the 4 domain collections (no standalone Customers)\n      config.collections.push(\n        createServicesCollection(resolved),\n        createResourcesCollection(resolved),\n        createSchedulesCollection(resolved),\n        createReservationsCollection(resolved),\n      )\n    } else {\n      // Default behaviour: push all 5 collections including standalone Customers\n      config.collections.push(\n        createServicesCollection(resolved),\n        createResourcesCollection(resolved),\n        createSchedulesCollection(resolved),\n        createReservationsCollection(resolved),\n        createCustomersCollection(resolved),\n      )\n    }\n\n    // Register custom endpoints\n    if (!config.endpoints) {config.endpoints = []}\n    config.endpoints.push(\n      createCancelBookingEndpoint(resolved),\n      createCheckAvailabilityEndpoint(resolved),\n      createBookingEndpoint(resolved),\n      createCustomerSearchEndpoint(resolved),\n      createGetSlotsEndpoint(resolved),\n      createResourceAvailabilityEndpoint(resolved),\n    )\n\n    // Wire staff auto-provisioning onto the staff user collection\n    if (resolved.staffProvisioning) {\n      const staffUserSlug = resolved.staffProvisioning.userCollection\n      const staffCollection = config.collections.find((col) => col.slug === staffUserSlug)\n      if (!staffCollection) {\n        throw new Error(\n          `staffProvisioning.userCollection \"${staffUserSlug}\" was not found in config.collections`,\n        )\n      }\n      staffCollection.hooks = {\n        ...staffCollection.hooks,\n        afterChange: [\n          ...(staffCollection.hooks?.afterChange ?? []),\n          provisionStaffResource(resolved),\n        ],\n      }\n    }\n\n    // Set up admin configuration\n    if (!config.admin) {config.admin = {}}\n    if (!config.admin.components) {config.admin.components = {}}\n\n    // Store slugs and status machine in admin custom for component access\n    if (!config.admin.custom) {config.admin.custom = {}}\n    config.admin.custom.reservationSlugs = {\n      ...resolved.slugs,\n    }\n    config.admin.custom.reservationStatusMachine = resolved.statusMachine\n    config.admin.custom.reservationTenant = resolved.multiTenant\n\n    // Add dashboard widget\n    if (!config.admin.dashboard) {\n      config.admin.dashboard = { widgets: [] }\n    }\n    if (!config.admin.dashboard.widgets) {\n      config.admin.dashboard.widgets = []\n    }\n    config.admin.dashboard.widgets.push({\n      slug: 'reservation-todays-reservations',\n      Component: 'payload-reserve/rsc#DashboardWidgetServer',\n      label: ({ t }) => (t as PluginT)('reservation:dashboardTitle'),\n      maxWidth: 'large',\n      minWidth: 'medium',\n    })\n\n    // Add availability overview as custom admin view\n    if (!config.admin.components.views) {\n      config.admin.components.views = {}\n    }\n    ;(config.admin.components.views as Record<string, unknown>)['reservation-availability'] = {\n      Component: 'payload-reserve/client#AvailabilityOverview',\n      path: '/reservation-availability',\n    }\n\n    // Merge plugin translations (user translations take precedence)\n    config.i18n = {\n      ...(config.i18n ?? {}),\n      translations: deepMergeSimple(\n        translations,\n        (config.i18n?.translations as Record<string, Record<string, unknown>>) ?? {},\n      ),\n    }\n\n    return config\n  }\n"],"names":["deepMergeSimple","createCustomersCollection","createReservationsCollection","createResourcesCollection","createSchedulesCollection","createServicesCollection","resolveConfig","createCancelBookingEndpoint","createCheckAvailabilityEndpoint","createBookingEndpoint","createCustomerSearchEndpoint","createGetSlotsEndpoint","createResourceAvailabilityEndpoint","provisionStaffResource","translations","payloadReserve","pluginOptions","config","resolved","localization","localized","collections","disabled","userCollection","targetCollection","find","col","slug","existingFieldNames","Set","fields","map","field","name","undefined","filter","Boolean","fieldsToAdd","type","maxLength","required","collection","slugs","reservations","on","fieldName","has","push","customers","endpoints","staffProvisioning","staffUserSlug","staffCollection","Error","hooks","afterChange","admin","components","custom","reservationSlugs","reservationStatusMachine","statusMachine","reservationTenant","multiTenant","dashboard","widgets","Component","label","t","maxWidth","minWidth","views","path","i18n"],"mappings":"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"}
+{"version":3,"sources":["../src/plugin.ts"],"sourcesContent":["import type { CollectionSlug, Config, Field } from 'payload'\n\nimport { deepMergeSimple } from 'payload/shared'\n\nimport type { ReservationPluginConfig } from './types.js'\n\nimport { createCustomersCollection } from './collections/Customers.js'\nimport { createReservationsCollection } from './collections/Reservations.js'\nimport { createResourcesCollection } from './collections/Resources.js'\nimport { createSchedulesCollection } from './collections/Schedules.js'\nimport { createServicesCollection } from './collections/Services.js'\nimport { resolveConfig } from './defaults.js'\nimport { createCancelBookingEndpoint } from './endpoints/cancelBooking.js'\nimport { createCheckAvailabilityEndpoint } from './endpoints/checkAvailability.js'\nimport { createBookingEndpoint } from './endpoints/createBooking.js'\nimport { createCustomerSearchEndpoint } from './endpoints/customerSearch.js'\nimport { createEffectiveTimezoneEndpoint } from './endpoints/effectiveTimezone.js'\nimport { createGetSlotsEndpoint } from './endpoints/getSlots.js'\nimport { createResourceAvailabilityEndpoint } from './endpoints/resourceAvailability.js'\nimport { provisionStaffResource } from './hooks/users/provisionStaffResource.js'\nimport { type PluginT, translations } from './translations/index.js'\nimport { applyCollectionOverride } from './utilities/collectionOverrides.js'\n\n/**\n * All named field paths reachable from a field list, descending through\n * presentational containers (tabs, rows, collapsibles, unnamed groups) that\n * don't create their own data nesting — so dedup catches a field declared\n * inside one of them. Named groups/arrays DO nest data, so we don't recurse\n * into them (a `name` inside a named group is a different path).\n */\nfunction collectFieldNames(fields: Field[]): Set<string> {\n  const names = new Set<string>()\n  const walk = (list: Field[]): void => {\n    for (const field of list) {\n      if ('name' in field && field.name) {\n        names.add(field.name)\n      } else if ('tabs' in field && Array.isArray(field.tabs)) {\n        for (const tab of field.tabs) {\n          if ('name' in tab && tab.name) {\n            names.add(tab.name)\n          } else if (Array.isArray(tab.fields)) {\n            walk(tab.fields)\n          }\n        }\n      } else if ('fields' in field && Array.isArray(field.fields)) {\n        // row / collapsible / unnamed group\n        walk(field.fields)\n      }\n    }\n  }\n  walk(fields)\n  return names\n}\n\nexport const payloadReserve =\n  (pluginOptions: ReservationPluginConfig = {}) =>\n  (config: Config): Config => {\n    const resolved = resolveConfig(pluginOptions)\n\n    // Detect localization from the Payload config\n    if (config.localization) {\n      resolved.localized = true\n    }\n\n    if (!config.collections) {\n      config.collections = []\n    }\n\n    if (resolved.userCollection) {\n      // Extend the existing auth collection with customer fields\n      const targetCollection = config.collections.find(\n        (col) => col.slug === resolved.userCollection,\n      )\n\n      if (!targetCollection) {\n        // Fail loudly rather than silently skipping field injection and pointing\n        // the customers slug at a collection that doesn't exist (review C2).\n        throw new Error(\n          `payload-reserve: userCollection \"${resolved.userCollection}\" was not found in config.collections. ` +\n            `Define it before payloadReserve() runs, or correct the slug.`,\n        )\n      }\n\n      {\n        // Collect existing field names — descend into presentational containers\n        // (tabs/rows/collapsibles/groups) so a field nested there isn't\n        // re-injected at the top level (review C4).\n        const existingFieldNames = collectFieldNames(targetCollection.fields)\n\n        // Fields to inject if not already present. `name` is added so that\n        // admin.useAsTitle: 'name' works out of the box on the extended user\n        // collection (matches the v1.0.0 behaviour documented in README/SKILL).\n        // It is NOT required — an existing users collection may have rows\n        // without a name, and forcing required would fail their next update (C4).\n        const fieldsToAdd: Field[] = [\n          {\n            name: 'name',\n            type: 'text',\n            maxLength: 200,\n          },\n          {\n            name: 'phone',\n            type: 'text',\n            maxLength: 50,\n          },\n          {\n            name: 'notes',\n            type: 'textarea',\n          },\n          {\n            name: 'bookings',\n            type: 'join',\n            collection: resolved.slugs.reservations as unknown as CollectionSlug,\n            on: 'customer',\n          },\n        ]\n\n        for (const field of fieldsToAdd) {\n          const fieldName = 'name' in field ? field.name : undefined\n          if (fieldName && !existingFieldNames.has(fieldName)) {\n            targetCollection.fields.push(field)\n          }\n        }\n      }\n\n      // Point the customers slug at the user collection so other parts of the\n      // plugin (endpoints, hooks) reference the correct collection\n      resolved.slugs.customers = resolved.userCollection\n    }\n\n    // The slugs this plugin is about to register (Customers only in standalone mode)\n    const slugsToRegister = [\n      resolved.slugs.services,\n      resolved.slugs.resources,\n      resolved.slugs.schedules,\n      resolved.slugs.reservations,\n      ...(resolved.userCollection ? [] : [resolved.slugs.customers]),\n    ]\n\n    // C11: fail with a clear, actionable error on slug collision instead of\n    // Payload's generic DuplicateCollection throw.\n    for (const slug of slugsToRegister) {\n      if (config.collections.some((col) => col.slug === slug)) {\n        throw new Error(\n          `payload-reserve: a collection with slug \"${slug}\" already exists. ` +\n            `Override the plugin's slug via the \\`slugs\\` option.`,\n        )\n      }\n    }\n\n    // Image upload fields are added only when the media collection actually\n    // exists, so installs without one don't hit an opaque init error (C8).\n    resolved.hasMediaCollection = config.collections.some(\n      (col) => col.slug === resolved.slugs.media,\n    )\n\n    const ov = resolved.collectionOverrides\n    config.collections.push(\n      applyCollectionOverride(createServicesCollection(resolved), ov.services),\n      applyCollectionOverride(createResourcesCollection(resolved), ov.resources),\n      applyCollectionOverride(createSchedulesCollection(resolved), ov.schedules),\n      applyCollectionOverride(createReservationsCollection(resolved), ov.reservations),\n      // The customers override applies only in standalone mode; in userCollection\n      // mode the host owns that collection and can edit it directly.\n      ...(resolved.userCollection\n        ? []\n        : [applyCollectionOverride(createCustomersCollection(resolved), ov.customers)]),\n    )\n\n    // C3: collections are registered (above) even when disabled so the DB schema\n    // stays stable; behavior (hooks, endpoints, admin, provisioning) is inert.\n    if (resolved.disabled) {\n      for (const slug of slugsToRegister) {\n        const col = config.collections.find((c) => c.slug === slug)\n        if (col) {\n          delete col.hooks\n        }\n      }\n      return config\n    }\n\n    // Register custom endpoints\n    if (!config.endpoints) {config.endpoints = []}\n    config.endpoints.push(\n      createCancelBookingEndpoint(resolved),\n      createCheckAvailabilityEndpoint(resolved),\n      createBookingEndpoint(resolved),\n      createCustomerSearchEndpoint(resolved),\n      createEffectiveTimezoneEndpoint(resolved),\n      createGetSlotsEndpoint(resolved),\n      createResourceAvailabilityEndpoint(resolved),\n    )\n\n    // Wire staff auto-provisioning onto the staff user collection\n    if (resolved.staffProvisioning) {\n      const staffUserSlug = resolved.staffProvisioning.userCollection\n      const staffCollection = config.collections.find((col) => col.slug === staffUserSlug)\n      if (!staffCollection) {\n        throw new Error(\n          `staffProvisioning.userCollection \"${staffUserSlug}\" was not found in config.collections`,\n        )\n      }\n      staffCollection.hooks = {\n        ...staffCollection.hooks,\n        afterChange: [\n          ...(staffCollection.hooks?.afterChange ?? []),\n          provisionStaffResource(resolved),\n        ],\n      }\n    }\n\n    // Set up admin configuration\n    if (!config.admin) {config.admin = {}}\n    if (!config.admin.components) {config.admin.components = {}}\n\n    // Store slugs and status machine in admin custom for component access\n    if (!config.admin.custom) {config.admin.custom = {}}\n    config.admin.custom.reservationSlugs = {\n      ...resolved.slugs,\n    }\n    config.admin.custom.reservationStatusMachine = resolved.statusMachine\n    config.admin.custom.reservationTenant = resolved.multiTenant\n    config.admin.custom.reservationTimezone = resolved.timezone\n\n    // Add dashboard widget\n    if (!config.admin.dashboard) {\n      config.admin.dashboard = { widgets: [] }\n    }\n    if (!config.admin.dashboard.widgets) {\n      config.admin.dashboard.widgets = []\n    }\n    config.admin.dashboard.widgets.push({\n      slug: 'reservation-todays-reservations',\n      Component: 'payload-reserve/rsc#DashboardWidgetServer',\n      label: ({ t }) => (t as PluginT)('reservation:dashboardTitle'),\n      maxWidth: 'large',\n      minWidth: 'medium',\n    })\n\n    // Add availability overview as custom admin view\n    if (!config.admin.components.views) {\n      config.admin.components.views = {}\n    }\n    ;(config.admin.components.views as Record<string, unknown>)['reservation-availability'] = {\n      Component: 'payload-reserve/client#AvailabilityOverview',\n      path: '/reservation-availability',\n    }\n\n    // Merge plugin translations (user translations take precedence)\n    config.i18n = {\n      ...(config.i18n ?? {}),\n      translations: deepMergeSimple(\n        translations,\n        (config.i18n?.translations as Record<string, Record<string, unknown>>) ?? {},\n      ),\n    }\n\n    return config\n  }\n"],"names":["deepMergeSimple","createCustomersCollection","createReservationsCollection","createResourcesCollection","createSchedulesCollection","createServicesCollection","resolveConfig","createCancelBookingEndpoint","createCheckAvailabilityEndpoint","createBookingEndpoint","createCustomerSearchEndpoint","createEffectiveTimezoneEndpoint","createGetSlotsEndpoint","createResourceAvailabilityEndpoint","provisionStaffResource","translations","applyCollectionOverride","collectFieldNames","fields","names","Set","walk","list","field","name","add","Array","isArray","tabs","tab","payloadReserve","pluginOptions","config","resolved","localization","localized","collections","userCollection","targetCollection","find","col","slug","Error","existingFieldNames","fieldsToAdd","type","maxLength","collection","slugs","reservations","on","fieldName","undefined","has","push","customers","slugsToRegister","services","resources","schedules","some","hasMediaCollection","media","ov","collectionOverrides","disabled","c","hooks","endpoints","staffProvisioning","staffUserSlug","staffCollection","afterChange","admin","components","custom","reservationSlugs","reservationStatusMachine","statusMachine","reservationTenant","multiTenant","reservationTimezone","timezone","dashboard","widgets","Component","label","t","maxWidth","minWidth","views","path","i18n"],"mappings":"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"}

package/dist/services/AvailabilityService.d.ts

@@ -1,10 +1,18 @@
 import type { Payload, PayloadRequest, Where } from 'payload';
-import type { DurationType, StatusMachineConfig } from '../types.js';
+import type { CapacityMode, DurationType, StatusMachineConfig } from '../types.js';
+import type { ResolvedItem } from '../utilities/resolveReservationItems.js';
+/** A window during which a resource is occupied, expanded by buffer times. */
+export type Occupancy = {
+    blockedEnd: Date;
+    blockedStart: Date;
+    units: number;
+};
 export declare function computeEndTime(params: {
     durationType: DurationType;
     endTime?: Date;
     serviceDuration: number;
     startTime: Date;
+    timeZone?: string;
 }): {
     durationMinutes: number;
     endTime: Date;
@@ -16,6 +24,46 @@ export declare function buildOverlapQuery(params: {
     excludeReservationId?: number | string;
     resourceId: number | string;
 }): Where;
+/**
+ * Coarse superset query: blocking reservations whose top-level (span) window
+ * comes within COARSE_MARGIN_MS of the candidate window and reference the
+ * resource at top level or in items[]. The precise per-item overlap is computed
+ * in memory afterwards — the top-level span is a superset of every item's
+ * window, so this never misses a real conflict (margin covers neighbor buffers).
+ */
+export declare function buildCoarseOverlapQuery(params: {
+    blockingStatuses: string[];
+    candidateEnd: Date;
+    candidateStart: Date;
+    excludeReservationId?: number | string;
+    resourceId: number | string;
+}): Where;
+/**
+ * The occupancy windows a set of resolved items imposes on `resourceId`. Each
+ * matching item's [startTime, endTime) is expanded by that item's own service
+ * buffers (so neighbor buffers are enforced — review A3), and only the items
+ * that actually reference `resourceId` count (so a multi-resource booking blocks
+ * each resource only for its own item's window — review A4).
+ */
+export declare function itemsToOccupancies(params: {
+    bufferFor: (serviceId: number | string | undefined) => Promise<{
+        after: number;
+        before: number;
+    }>;
+    capacityMode: CapacityMode;
+    items: ResolvedItem[];
+    resourceId: number | string;
+}): Promise<Occupancy[]>;
+/** Occupancy a single fetched reservation imposes on `resourceId`. */
+export declare function reservationOccupancies(params: {
+    bufferFor: (serviceId: number | string | undefined) => Promise<{
+        after: number;
+        before: number;
+    }>;
+    capacityMode: CapacityMode;
+    reservation: Record<string, unknown>;
+    resourceId: number | string;
+}): Promise<Occupancy[]>;
 export declare function isBlockingStatus(status: string, statusMachine: StatusMachineConfig): boolean;
 export declare function validateTransition(fromStatus: string, toStatus: string, statusMachine: StatusMachineConfig): {
     reason?: string;
@@ -33,6 +81,9 @@ export declare function checkAvailability(params: {
     reservationSlug: string;
     resourceId: number | string;
     resourceSlug: string;
+    servicesSlug: string;
+    /** Other items from the same booking — counted as occupancy (review A5). */
+    siblingItems?: ResolvedItem[];
     startTime: Date;
 }): Promise<{
     available: boolean;
@@ -42,7 +93,7 @@ export declare function checkAvailability(params: {
 }>;
 export declare function getAvailableSlots(params: {
     blockingStatuses: string[];
-    date: Date;
+    date: Date | string;
     guestCount?: number;
     payload: Payload;
     req: PayloadRequest;
@@ -53,6 +104,7 @@ export declare function getAvailableSlots(params: {
     scheduleSlug: string;
     serviceId: number | string;
     serviceSlug: string;
+    timeZone?: string;
 }): Promise<Array<{
     end: Date;
     start: Date;

package/dist/services/AvailabilityService.js

@@ -1,11 +1,14 @@
-import { resolveScheduleForDate } from '../utilities/scheduleUtils.js';
-import { addMinutes, computeBlockedWindow, intersectIntervals } from '../utilities/slotUtils.js';
+import { resolveReservationItems } from '../utilities/resolveReservationItems.js';
+import { isExceptionDate, resolveScheduleForDate } from '../utilities/scheduleUtils.js';
+import { addMinutes, computeBlockedWindow, doRangesOverlap, intersectIntervals } from '../utilities/slotUtils.js';
+import { endOfDayInTimezone } from '../utilities/timezoneUtils.js';
+/** Coarse pre-filter widen: covers any realistic neighbor buffer (buffers are
+ * minutes). The precise per-item overlap check runs in memory afterwards. */ const COARSE_MARGIN_MS = 24 * 60 * 60 * 1000;
 // --- Pure functions (no DB) ---
 export function computeEndTime(params) {
     const { durationType, serviceDuration, startTime } = params;
     if (durationType === 'full-day') {
-        const end = new Date(startTime);
-        end.setHours(23, 59, 59, 999);
+        const end = endOfDayInTimezone(startTime, params.timeZone ?? 'UTC');
         const durationMinutes = Math.round((end.getTime() - startTime.getTime()) / 60_000);
         return {
             durationMinutes,
@@ -70,6 +73,90 @@ export function buildOverlapQuery(params) {
         and: conditions
     };
 }
+/**
+ * Coarse superset query: blocking reservations whose top-level (span) window
+ * comes within COARSE_MARGIN_MS of the candidate window and reference the
+ * resource at top level or in items[]. The precise per-item overlap is computed
+ * in memory afterwards — the top-level span is a superset of every item's
+ * window, so this never misses a real conflict (margin covers neighbor buffers).
+ */ export function buildCoarseOverlapQuery(params) {
+    const { blockingStatuses, candidateEnd, candidateStart, excludeReservationId, resourceId } = params;
+    const windowStart = new Date(candidateStart.getTime() - COARSE_MARGIN_MS);
+    const windowEnd = new Date(candidateEnd.getTime() + COARSE_MARGIN_MS);
+    const conditions = [
+        {
+            status: {
+                in: blockingStatuses
+            }
+        },
+        {
+            startTime: {
+                less_than: windowEnd.toISOString()
+            }
+        },
+        {
+            endTime: {
+                greater_than: windowStart.toISOString()
+            }
+        },
+        {
+            or: [
+                {
+                    resource: {
+                        equals: resourceId
+                    }
+                },
+                {
+                    'items.resource': {
+                        equals: resourceId
+                    }
+                }
+            ]
+        }
+    ];
+    if (excludeReservationId !== undefined) {
+        conditions.push({
+            id: {
+                not_equals: excludeReservationId
+            }
+        });
+    }
+    return {
+        and: conditions
+    };
+}
+/**
+ * The occupancy windows a set of resolved items imposes on `resourceId`. Each
+ * matching item's [startTime, endTime) is expanded by that item's own service
+ * buffers (so neighbor buffers are enforced — review A3), and only the items
+ * that actually reference `resourceId` count (so a multi-resource booking blocks
+ * each resource only for its own item's window — review A4).
+ */ export async function itemsToOccupancies(params) {
+    const { bufferFor, capacityMode, items, resourceId } = params;
+    const occupancies = [];
+    for (const item of items){
+        if (String(item.resource) !== String(resourceId) || !item.endTime) {
+            continue;
+        }
+        const { after, before } = await bufferFor(item.service);
+        const { effectiveEnd, effectiveStart } = computeBlockedWindow(new Date(item.startTime), new Date(item.endTime), before, after);
+        occupancies.push({
+            blockedEnd: effectiveEnd,
+            blockedStart: effectiveStart,
+            units: capacityMode === 'per-guest' ? item.guestCount : 1
+        });
+    }
+    return occupancies;
+}
+/** Occupancy a single fetched reservation imposes on `resourceId`. */ export async function reservationOccupancies(params) {
+    const { bufferFor, capacityMode, reservation, resourceId } = params;
+    return itemsToOccupancies({
+        bufferFor,
+        capacityMode,
+        items: resolveReservationItems(reservation),
+        resourceId
+    });
+}
 export function isBlockingStatus(status, statusMachine) {
     return statusMachine.blockingStatuses.includes(status);
 }
@@ -93,7 +180,7 @@ export function validateTransition(fromStatus, toStatus, statusMachine) {
 }
 // --- DB functions (use Payload Local API only) ---
 export async function checkAvailability(params) {
-    const { blockingStatuses, bufferAfter, bufferBefore, endTime, excludeReservationId, guestCount, payload, req, reservationSlug, resourceId, resourceSlug, startTime } = params;
+    const { blockingStatuses, bufferAfter, bufferBefore, endTime, excludeReservationId, guestCount, payload, req, reservationSlug, resourceId, resourceSlug, servicesSlug, siblingItems, startTime } = params;
     // Fetch resource for quantity and capacity mode
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const resource = await payload.findByID({
@@ -104,54 +191,89 @@ export async function checkAvailability(params) {
     });
     const quantity = resource.quantity ?? 1;
     const capacityMode = resource.capacityMode ?? 'per-reservation';
-    // Compute effective window with buffers
-    const { effectiveEnd, effectiveStart } = computeBlockedWindow(startTime, endTime, bufferBefore, bufferAfter);
-    // Build overlap query
-    const where = buildOverlapQuery({
-        blockingStatuses,
-        effectiveEnd,
-        effectiveStart,
-        excludeReservationId,
-        resourceId
-    });
-    if (capacityMode === 'per-guest') {
-        // Must fetch docs to sum guestCount
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const { docs } = await payload.find({
-            collection: reservationSlug,
-            depth: 0,
-            limit: 0,
-            req,
-            select: {
-                guestCount: true
-            },
-            where
-        });
-        const currentGuests = docs.reduce((sum, doc)=>sum + (doc.guestCount ?? 1), 0);
-        return {
-            available: currentGuests + guestCount <= quantity,
-            currentCount: currentGuests,
-            reason: currentGuests + guestCount > quantity ? 'Guest capacity exceeded' : undefined,
-            totalCapacity: quantity
-        };
-    }
-    // per-reservation mode: count is sufficient
-    // TODO: batch queries — linear per-item cost acceptable for 2-5 items
+    // Candidate window expanded by its own buffers
+    const { effectiveEnd: candidateEnd, effectiveStart: candidateStart } = computeBlockedWindow(startTime, endTime, bufferBefore, bufferAfter);
+    // Coarse superset fetch — precise per-item overlap is computed in memory below
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const { totalDocs } = await payload.count({
+    const { docs } = await payload.find({
         collection: reservationSlug,
+        depth: 0,
+        limit: 0,
         req,
-        where
+        where: buildCoarseOverlapQuery({
+            blockingStatuses,
+            candidateEnd,
+            candidateStart,
+            excludeReservationId,
+            resourceId
+        })
     });
+    // Per-call cache: fetch each distinct service's buffers at most once
+    const bufferCache = new Map();
+    const bufferFor = async (serviceId)=>{
+        const key = serviceId === undefined ? '' : String(serviceId);
+        const cached = bufferCache.get(key);
+        if (cached) {
+            return cached;
+        }
+        let result = {
+            after: 0,
+            before: 0
+        };
+        if (serviceId !== undefined) {
+            try {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                const service = await payload.findByID({
+                    id: serviceId,
+                    collection: servicesSlug,
+                    depth: 0,
+                    req
+                });
+                if (service) {
+                    result = {
+                        after: service.bufferTimeAfter ?? 0,
+                        before: service.bufferTimeBefore ?? 0
+                    };
+                }
+            } catch  {
+            // service missing — no buffers
+            }
+        }
+        bufferCache.set(key, result);
+        return result;
+    };
+    const fetchedOccupancies = (await Promise.all(docs.map((doc)=>reservationOccupancies({
+            bufferFor,
+            capacityMode,
+            reservation: doc,
+            resourceId
+        })))).flat();
+    // Sibling items from the same booking (review A5) — expanded with the same
+    // per-service buffers and capacity mode.
+    const siblingOccupancies = siblingItems ? await itemsToOccupancies({
+        bufferFor,
+        capacityMode,
+        items: siblingItems,
+        resourceId
+    }) : [];
+    const occupancies = [
+        ...fetchedOccupancies,
+        ...siblingOccupancies
+    ];
+    // Sum the units of every occupancy whose buffered window overlaps the candidate
+    const currentUnits = occupancies.reduce((sum, occ)=>doRangesOverlap(candidateStart, candidateEnd, occ.blockedStart, occ.blockedEnd) ? sum + occ.units : sum, 0);
+    const candidateUnits = capacityMode === 'per-guest' ? guestCount : 1;
+    const available = currentUnits + candidateUnits <= quantity;
     return {
-        available: totalDocs + 1 <= quantity,
-        currentCount: totalDocs,
-        reason: totalDocs + 1 > quantity ? 'All units are booked for this time' : undefined,
+        available,
+        currentCount: currentUnits,
+        reason: available ? undefined : capacityMode === 'per-guest' ? 'Guest capacity exceeded' : 'All units are booked for this time',
         totalCapacity: quantity
     };
 }
 export async function getAvailableSlots(params) {
-    const { blockingStatuses, date, guestCount, payload, req, reservationSlug, resourceId, resourceIds, resourceSlug, scheduleSlug, serviceId, serviceSlug } = params;
+    const { blockingStatuses, date, guestCount, payload, req, reservationSlug, resourceId, resourceIds, resourceSlug, scheduleSlug, serviceId, serviceSlug, timeZone } = params;
+    const tz = timeZone ?? 'UTC';
     // Resolve the set of resources to intersect (single-resource callers still work)
     const ids = resourceIds && resourceIds.length > 0 ? resourceIds : resourceId !== undefined ? [
         resourceId
@@ -200,9 +322,16 @@ export async function getAvailableSlots(params) {
         if (!schedules || schedules.length === 0) {
             continue;
         }
+        // A11: an exception on ANY of the resource's schedules makes the whole
+        // resource unavailable that day — not just the schedule it's recorded on.
+        const exceptedToday = schedules.some((s)=>isExceptionDate(date, s.exceptions ?? [], tz));
+        if (exceptedToday) {
+            scheduleBearingWindowLists.push([]);
+            continue;
+        }
         const windows = [];
         for (const schedule of schedules){
-            windows.push(...resolveScheduleForDate(schedule, date));
+            windows.push(...resolveScheduleForDate(schedule, date, tz));
         }
         scheduleBearingWindowLists.push(windows);
     }
@@ -219,10 +348,14 @@ export async function getAvailableSlots(params) {
         return [];
     }
     // 4. Candidate slot sizing
+    // NOTE: epoch-trick sizing is only meaningful for fixed/flexible durations.
+    // full-day services return early via the range-as-slot branch below and never
+    // consume slotDuration — keep it that way if reordering this function.
     const { endTime: slotEndOffset } = computeEndTime({
         durationType,
         serviceDuration: duration,
-        startTime: new Date(0)
+        startTime: new Date(0),
+        timeZone: tz
     });
     const slotDuration = Math.round(slotEndOffset.getTime() / 60_000);
     const effectiveDuration = durationType === 'fixed' ? duration : slotDuration;
@@ -240,6 +373,7 @@ export async function getAvailableSlots(params) {
                 reservationSlug,
                 resourceId: rid,
                 resourceSlug,
+                servicesSlug: serviceSlug,
                 startTime: start
             });
             if (!result.available) {