@voyantjs/availability 0.52.0 → 0.52.2

package/dist/service-allocation-automation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-allocation-automation.d.ts","sourceRoot":"","sources":["../src/service-allocation-automation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service-allocation-automation.d.ts","sourceRoot":"","sources":["../src/service-allocation-automation.ts"],"names":[],"mappings":"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"}

package/dist/service-allocation-automation.js

@@ -2,6 +2,16 @@ import { and, eq, sql } from "drizzle-orm";
 import { planRoomAllocation, planVehicleSeatAllocation, } from "./auto-allocator.js";
 import { allocationResources, availabilitySlots, productOptionResourceTemplates, } from "./schema.js";
 import { AllocationServiceError, getSlotAllocationManifest, recordAllocationAudit, } from "./service-allocation.js";
+/**
+ * Emit `ARRAY[$1, $2, …]::text[]` so Postgres doesn't try to cast a
+ * tuple to `text[]`. See `sqlTextArray` in service-allocation.ts and
+ * issue #952.
+ */
+function sqlTextArray(values) {
+    if (values.length === 0)
+        return sql `ARRAY[]::text[]`;
+    return sql `ARRAY[${sql.join(values.map((value) => sql `${value}`), sql.raw(", "))}]::text[]`;
+}
 export async function listProductOptionResourceTemplates(db, productId) {
     const optionRows = await executeRows(db, sql `
       SELECT id, name, code, description, status, is_default, sort_order
@@ -15,7 +25,7 @@ export async function listProductOptionResourceTemplates(db, productId) {
     const templateRows = await executeRows(db, sql `
       SELECT id, product_option_id, kind, ref_type, ref_id, capacity, name_pattern, layout, default_count, flags, created_at, updated_at
       FROM product_option_resource_templates
-      WHERE product_option_id = ANY(${optionIds}::text[])
+      WHERE product_option_id = ANY(${sqlTextArray(optionIds)})
       ORDER BY kind, created_at
     `);
     const byOption = new Map();
@@ -128,17 +138,17 @@ export async function autoMaterializeAllocationResources(db, slotId, input, opti
           AND b.status IN ('draft', 'on_hold', 'confirmed', 'in_progress', 'completed')
           AND ba.status IN ('held', 'confirmed', 'fulfilled')
       ),
-      slot_items AS (
-        SELECT bi.booking_id, bi.option_id
+      -- Pax per option = sum of booking_item quantities for items belonging
+      -- to bookings on this slot. The previous formulation joined
+      -- booking_travelers to booking_id, which cross-multiplied items × travelers
+      -- whenever a booking had more than one item (e.g. Adult + Senior rows
+      -- on the same booking inflated pax_count to 4 instead of 2).
+      pax AS (
+        SELECT bi.option_id, SUM(bi.quantity)::int AS pax_count
         FROM booking_items bi
         JOIN slot_bookings sb ON sb.booking_id = bi.booking_id
         WHERE bi.option_id IS NOT NULL
-      ),
-      pax AS (
-        SELECT si.option_id, COUNT(bt.id)::int AS pax_count
-        FROM slot_items si
-        JOIN booking_travelers bt ON bt.booking_id = si.booking_id
-        GROUP BY si.option_id
+        GROUP BY bi.option_id
       )
       SELECT
         pax.option_id,
@@ -171,13 +181,19 @@ export async function autoMaterializeAllocationResources(db, slotId, input, opti
         const unitsNeeded = Math.max(1, Math.ceil(group.pax_count / Math.max(1, group.capacity)));
         for (let index = 0; index < unitsNeeded; index++) {
             sequence += 1;
+            // Default the resource's ref to its materializing option so the UI
+            // can badge each row with the option name (e.g. Standard double).
+            // Templates that explicitly set ref_type/ref_id (e.g. pointing at a
+            // hotel inventory row) keep their own values.
+            const resolvedRefType = group.ref_type ?? "option";
+            const resolvedRefId = group.ref_id ?? group.option_id;
             const [row] = await db
                 .insert(allocationResources)
                 .values({
                 slotId,
                 kind,
-                refType: group.ref_type,
-                refId: group.ref_id,
+                refType: resolvedRefType,
+                refId: resolvedRefId,
                 label: renderNamePattern(group.name_pattern, {
                     sequence: String(sequence),
                     option: group.option_name ?? "",
@@ -231,7 +247,7 @@ export async function autoAllocateSlotResources(db, slotId, input, options = {})
         SELECT
           row.traveler_id,
           jsonb_build_object(${kind}::text, row.resource_id::text)
-        FROM unnest(${travelerIds}::text[], ${resourceIds}::text[]) AS row(traveler_id, resource_id)
+        FROM unnest(${sqlTextArray(travelerIds)}, ${sqlTextArray(resourceIds)}) AS row(traveler_id, resource_id)
         ON CONFLICT (traveler_id) DO UPDATE SET
           allocations =
             COALESCE(booking_traveler_travel_details.allocations, '{}'::jsonb)
@@ -472,6 +488,16 @@ function renderNamePattern(pattern, vars) {
     return pattern.replace(/\{(\w+)\}/g, (_, key) => vars[key] ?? "");
 }
 async function executeRows(db, query) {
-    const rows = await db.execute(query);
-    return Array.isArray(rows) ? rows : [];
+    const result = await db.execute(query);
+    if (Array.isArray(result))
+        return result;
+    // node-postgres / neon-serverless drivers return `{ rows, rowCount, ... }`
+    // instead of a bare array — unwrap so this wrapper is driver-agnostic.
+    if (result &&
+        typeof result === "object" &&
+        "rows" in result &&
+        Array.isArray(result.rows)) {
+        return result.rows;
+    }
+    return [];
 }

package/dist/service-allocation.js

@@ -143,7 +143,7 @@ export async function getSlotsResourceAvailability(db, slotIds) {
           AND b.status IN ('draft', 'on_hold', 'confirmed', 'in_progress', 'completed')
           AND ba.status IN ('held', 'confirmed', 'fulfilled')
       ) usage ON true
-      WHERE ar.slot_id = ANY(${uniqueIds}::text[])
+      WHERE ar.slot_id = ANY(${sqlTextArray(uniqueIds)})
       ORDER BY ar.slot_id, ar.kind, ar.sort_order, ar.created_at
     `);
     const out = new Map();
@@ -206,7 +206,7 @@ export async function validateSlotAllocationCapacity(db, slotId, planned) {
     const resources = await executeRows(db, sql `
       SELECT id, kind, capacity, slot_id
       FROM allocation_resources
-      WHERE slot_id = ${slotId} AND id = ANY(${resourceIds}::text[])
+      WHERE slot_id = ${slotId} AND id = ANY(${sqlTextArray(resourceIds)})
       FOR UPDATE
     `);
     const resourceById = new Map(resources.map((r) => [r.id, r]));
@@ -246,7 +246,7 @@ export async function validateSlotAllocationCapacity(db, slotId, planned) {
           AND ba.availability_slot_id = ${slotId}
           AND b.status IN ('draft', 'on_hold', 'confirmed', 'in_progress', 'completed')
           AND ba.status IN ('held', 'confirmed', 'fulfilled')
-          AND btd.traveler_id <> ALL(${travelerIdsArr}::text[])
+          AND btd.traveler_id <> ALL(${sqlTextArray(travelerIdsArr)})
       `);
         const existingAssigned = existingRows[0]?.count ?? 0;
         const total = existingAssigned + plan.travelerIds.size;
@@ -462,7 +462,7 @@ export async function pairSharingGroup(db, slotId, input, options = {}) {
     await db.execute(sql `
     INSERT INTO booking_traveler_travel_details (traveler_id, sharing_group_id)
     SELECT id, ${sharingGroupId}
-    FROM unnest(${input.travelerIds}::text[]) AS u(id)
+    FROM unnest(${sqlTextArray(input.travelerIds)}) AS u(id)
     ON CONFLICT (traveler_id) DO UPDATE SET
       sharing_group_id = EXCLUDED.sharing_group_id,
       updated_at = now()
@@ -642,12 +642,34 @@ async function loadSharingGroupLabelMap(db, groupIds) {
         label: sharingGroupLabels.label,
     })
         .from(sharingGroupLabels)
-        .where(sql `${sharingGroupLabels.groupId} = ANY(${uniqueIds}::text[])`);
+        .where(sql `${sharingGroupLabels.groupId} = ANY(${sqlTextArray(uniqueIds)})`);
     return Object.fromEntries(rows.map((row) => [row.groupId, row.label]));
 }
 async function executeRows(db, query) {
-    const rows = await db.execute(query);
-    return Array.isArray(rows) ? rows : [];
+    const result = await db.execute(query);
+    if (Array.isArray(result))
+        return result;
+    // node-postgres / neon-serverless drivers return `{ rows, rowCount, ... }`
+    // instead of a bare array — unwrap so this wrapper is driver-agnostic.
+    if (result &&
+        typeof result === "object" &&
+        "rows" in result &&
+        Array.isArray(result.rows)) {
+        return result.rows;
+    }
+    return [];
+}
+/**
+ * Emit a Postgres `ARRAY[$1, $2, …]::text[]` literal instead of the
+ * naive `${jsArray}::text[]` form. drizzle's `sql` template spreads
+ * JS arrays into a row constructor (`($1, $2)`) which Postgres
+ * refuses to cast to `text[]` — see issue #952. Empty input returns
+ * `ARRAY[]::text[]` which Postgres accepts.
+ */
+function sqlTextArray(values) {
+    if (values.length === 0)
+        return sql `ARRAY[]::text[]`;
+    return sql `ARRAY[${sql.join(values.map((value) => sql `${value}`), sql.raw(", "))}]::text[]`;
 }
 function serializeSlot(slot) {
     return {
@@ -698,7 +720,7 @@ async function loadSlotTravelerRows(db, bookingIds) {
       (btd.dietary_encrypted IS NOT NULL) AS has_dietary_requirements
     FROM booking_travelers bt
     LEFT JOIN booking_traveler_travel_details btd ON btd.traveler_id = bt.id
-    WHERE bt.booking_id = ANY(${bookingIds}::text[])
+    WHERE bt.booking_id = ANY(${sqlTextArray(bookingIds)})
     ORDER BY bt.booking_id, bt.is_primary DESC, bt.created_at
   `);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voyantjs/availability",
-  "version": "0.52.0",
+  "version": "0.52.2",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -44,13 +44,13 @@
     "drizzle-orm": "^0.45.2",
     "hono": "^4.12.10",
     "zod": "^4.3.6",
-    "@voyantjs/core": "0.52.0",
-    "@voyantjs/db": "0.52.0",
-    "@voyantjs/hono": "0.52.0"
+    "@voyantjs/core": "0.52.2",
+    "@voyantjs/db": "0.52.2",
+    "@voyantjs/hono": "0.52.2"
   },
   "devDependencies": {
     "typescript": "^6.0.2",
-    "@voyantjs/products": "0.52.0",
+    "@voyantjs/products": "0.52.2",
     "@voyantjs/voyant-typescript-config": "0.1.0"
   },
   "files": [