@voyantjs/storefront 0.6.8 → 0.7.0

package/dist/routes-public.d.ts

@@ -39,7 +39,7 @@ export declare function createStorefrontPublicRoutes(options?: StorefrontService
                                 }[];
                             }[];
                         };
-                        passengers: {
+                        travelers: {
                             fields: {
                                 key: string;
                                 label: string;
@@ -367,7 +367,7 @@ export declare function createStorefrontPublicRoutes(options?: StorefrontService
                     applicableDepartureIds: string[];
                     validFrom: string | null;
                     validTo: string | null;
-                    minPassengers: number | null;
+                    minTravelers: number | null;
                     imageMobileUrl: string | null;
                     imageDesktopUrl: string | null;
                     stackable: boolean;
@@ -400,7 +400,7 @@ export declare function createStorefrontPublicRoutes(options?: StorefrontService
                     applicableDepartureIds: string[];
                     validFrom: string | null;
                     validTo: string | null;
-                    minPassengers: number | null;
+                    minTravelers: number | null;
                     imageMobileUrl: string | null;
                     imageDesktopUrl: string | null;
                     stackable: boolean;

package/dist/service-departures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-departures.d.ts","sourceRoot":"","sources":["../src/service-departures.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAEjE,OAAO,KAAK,EACV,4BAA4B,EAC5B,oCAAoC,EACrC,MAAM,iBAAiB,CAAA;AA6yBxB,wBAAsB,sBAAsB,CAAC,EAAE,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAQvF;AAED,wBAAsB,+BAA+B,CACnD,EAAE,EAAE,kBAAkB,EACtB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BpC;AAED,wBAAsB,+BAA+B,CACnD,EAAE,EAAE,kBAAkB,EACtB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,oCAAoC;;;;;;;;;;cA7JlB,MAAM;eAAS,MAAM;kBAAY,MAAM;mBAAa,MAAM;;UA4PpF;AAED,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,kBAAkB,EACtB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgGlB;AAED,wBAAsB,+BAA+B,CACnD,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;UA6ElD"}
+{"version":3,"file":"service-departures.d.ts","sourceRoot":"","sources":["../src/service-departures.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAEjE,OAAO,KAAK,EACV,4BAA4B,EAC5B,oCAAoC,EACrC,MAAM,iBAAiB,CAAA;AA00BxB,wBAAsB,sBAAsB,CAAC,EAAE,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAYvF;AAED,wBAAsB,+BAA+B,CACnD,EAAE,EAAE,kBAAkB,EACtB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BpC;AAED,wBAAsB,+BAA+B,CACnD,EAAE,EAAE,kBAAkB,EACtB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,oCAAoC;;;;;;;;;;cAtKlB,MAAM;eAAS,MAAM;kBAAY,MAAM;mBAAa,MAAM;;UAqQpF;AAED,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,kBAAkB,EACtB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgGlB;AAED,wBAAsB,+BAA+B,CACnD,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;UAyFlD"}

package/dist/service-departures.js

@@ -1,7 +1,7 @@
 import { availabilitySlots, availabilityStartTimes } from "@voyantjs/availability/schema";
 import { productExtras } from "@voyantjs/extras/schema";
 import { extraPriceRules, optionPriceRules, optionUnitPriceRules, optionUnitTiers, priceCatalogs, } from "@voyantjs/pricing/schema";
-import { optionUnits, productDayServices, productDays, productLocations, productMedia, productOptions, products, } from "@voyantjs/products/schema";
+import { optionUnits, productDayServices, productDays, productItineraries, productLocations, productMedia, productOptions, products, } from "@voyantjs/products/schema";
 import { sellabilityService } from "@voyantjs/sellability";
 import { and, asc, count, desc, eq, gte, inArray, lte, ne } from "drizzle-orm";
 function normalizeIso(value) {
@@ -93,6 +93,20 @@ async function listMeetingPointsByProductIds(db, productIds) {
     }
     return byProduct;
 }
+async function listDefaultItineraryIdsByProductIds(db, productIds) {
+    if (productIds.length === 0) {
+        return new Map();
+    }
+    const rows = await db
+        .select({
+        productId: productItineraries.productId,
+        itineraryId: productItineraries.id,
+    })
+        .from(productItineraries)
+        .where(and(inArray(productItineraries.productId, productIds), eq(productItineraries.isDefault, true)))
+        .orderBy(asc(productItineraries.sortOrder), asc(productItineraries.createdAt));
+    return new Map(rows.map((row) => [row.productId, row.itineraryId]));
+}
 async function listSlots(db, filters = {}) {
     const conditions = [
         eq(products.status, "active"),
@@ -124,6 +138,7 @@ async function listSlots(db, filters = {}) {
         .select({
         id: availabilitySlots.id,
         productId: availabilitySlots.productId,
+        itineraryId: availabilitySlots.itineraryId,
         optionId: availabilitySlots.optionId,
         startTimeId: availabilitySlots.startTimeId,
         dateLocal: availabilitySlots.dateLocal,
@@ -415,7 +430,7 @@ function computeFallbackLineItems(args) {
                 ? args.context.units.find((row) => row.id === request.unitId)
                 : null;
             lineItems.push({
-                name: unit?.name ?? args.context.option?.name ?? "Passenger",
+                name: unit?.name ?? args.context.option?.name ?? "Traveler",
                 total: totalAmount,
                 quantity: request.quantity,
                 unitPrice: unitAmount,
@@ -489,12 +504,13 @@ async function applyExtraLineItems(args) {
         total: Number(total.toFixed(2)),
     };
 }
-async function buildDeparture(db, slot, meetingPointByProduct) {
+async function buildDeparture(db, slot, defaultItineraryByProduct, meetingPointByProduct) {
     const context = await resolvePricingContext(db, slot.productId, slot.optionId);
+    const itineraryId = slot.itineraryId ?? defaultItineraryByProduct.get(slot.productId) ?? null;
     return {
         id: slot.id,
         productId: slot.productId,
-        itineraryId: slot.id,
+        itineraryId: itineraryId ?? slot.id,
         optionId: slot.optionId,
         dateLocal: normalizeLocalDate(slot.dateLocal),
         startAt: normalizeIso(slot.startsAt),
@@ -522,8 +538,11 @@ export async function getStorefrontDeparture(db, departureId) {
     if (!slot) {
         return null;
     }
-    const meetingPointByProduct = await listMeetingPointsByProductIds(db, [slot.productId]);
-    return buildDeparture(db, slot, meetingPointByProduct);
+    const [meetingPointByProduct, defaultItineraryByProduct] = await Promise.all([
+        listMeetingPointsByProductIds(db, [slot.productId]),
+        listDefaultItineraryIdsByProductIds(db, [slot.productId]),
+    ]);
+    return buildDeparture(db, slot, defaultItineraryByProduct, meetingPointByProduct);
 }
 export async function listStorefrontProductDepartures(db, productId, query) {
     const filters = {
@@ -541,8 +560,11 @@ export async function listStorefrontProductDepartures(db, productId, query) {
         }),
         countSlots(db, filters),
     ]);
-    const meetingPointByProduct = await listMeetingPointsByProductIds(db, [productId]);
-    const data = await Promise.all(slots.map((slot) => buildDeparture(db, slot, meetingPointByProduct)));
+    const [meetingPointByProduct, defaultItineraryByProduct] = await Promise.all([
+        listMeetingPointsByProductIds(db, [productId]),
+        listDefaultItineraryIdsByProductIds(db, [productId]),
+    ]);
+    const data = await Promise.all(slots.map((slot) => buildDeparture(db, slot, defaultItineraryByProduct, meetingPointByProduct)));
     return {
         data,
         total,
@@ -711,6 +733,16 @@ export async function getStorefrontProductExtensions(db, productId, optionId) {
     };
 }
 export async function getStorefrontDepartureItinerary(db, input) {
+    const [slot] = await listSlots(db, {
+        productId: input.productId,
+        slotId: input.departureId,
+        limit: 1,
+    });
+    const defaultItineraryByProduct = await listDefaultItineraryIdsByProductIds(db, [input.productId]);
+    const itineraryId = slot?.itineraryId ?? defaultItineraryByProduct.get(input.productId);
+    if (!itineraryId) {
+        return null;
+    }
     const days = await db
         .select({
         id: productDays.id,
@@ -719,7 +751,7 @@ export async function getStorefrontDepartureItinerary(db, input) {
         description: productDays.description,
     })
         .from(productDays)
-        .where(eq(productDays.productId, input.productId))
+        .where(eq(productDays.itineraryId, itineraryId))
         .orderBy(asc(productDays.dayNumber));
     if (days.length === 0) {
         return null;

package/dist/service.js

@@ -47,8 +47,8 @@ export function resolveStorefrontSettings(input) {
             billing: {
                 fields: (parsed.forms?.billing?.fields ?? []).map(normalizeField),
             },
-            passengers: {
-                fields: (parsed.forms?.passengers?.fields ?? []).map(normalizeField),
+            travelers: {
+                fields: (parsed.forms?.travelers?.fields ?? []).map(normalizeField),
             },
         },
         payment: {

package/dist/validation.d.ts

@@ -127,7 +127,7 @@ export declare const storefrontSettingsInputSchema: z.ZodObject<{
                 }, z.core.$strip>>>;
             }, z.core.$strip>>>;
         }, z.core.$strip>>;
-        passengers: z.ZodOptional<z.ZodObject<{
+        travelers: z.ZodOptional<z.ZodObject<{
             fields: z.ZodDefault<z.ZodArray<z.ZodObject<{
                 key: z.ZodString;
                 label: z.ZodString;
@@ -213,7 +213,7 @@ export declare const storefrontSettingsSchema: z.ZodObject<{
                 }, z.core.$strip>>;
             }, z.core.$strip>>;
         }, z.core.$strip>;
-        passengers: z.ZodObject<{
+        travelers: z.ZodObject<{
             fields: z.ZodArray<z.ZodObject<{
                 key: z.ZodString;
                 label: z.ZodString;
@@ -615,7 +615,7 @@ export declare const storefrontPromotionalOfferSchema: z.ZodObject<{
     applicableDepartureIds: z.ZodArray<z.ZodString>;
     validFrom: z.ZodNullable<z.ZodString>;
     validTo: z.ZodNullable<z.ZodString>;
-    minPassengers: z.ZodNullable<z.ZodNumber>;
+    minTravelers: z.ZodNullable<z.ZodNumber>;
     imageMobileUrl: z.ZodNullable<z.ZodString>;
     imageDesktopUrl: z.ZodNullable<z.ZodString>;
     stackable: z.ZodBoolean;
@@ -642,7 +642,7 @@ export declare const storefrontPromotionalOfferListResponseSchema: z.ZodObject<{
         applicableDepartureIds: z.ZodArray<z.ZodString>;
         validFrom: z.ZodNullable<z.ZodString>;
         validTo: z.ZodNullable<z.ZodString>;
-        minPassengers: z.ZodNullable<z.ZodNumber>;
+        minTravelers: z.ZodNullable<z.ZodNumber>;
         imageMobileUrl: z.ZodNullable<z.ZodString>;
         imageDesktopUrl: z.ZodNullable<z.ZodString>;
         stackable: z.ZodBoolean;
@@ -666,7 +666,7 @@ export declare const storefrontPromotionalOfferResponseSchema: z.ZodObject<{
         applicableDepartureIds: z.ZodArray<z.ZodString>;
         validFrom: z.ZodNullable<z.ZodString>;
         validTo: z.ZodNullable<z.ZodString>;
-        minPassengers: z.ZodNullable<z.ZodNumber>;
+        minTravelers: z.ZodNullable<z.ZodNumber>;
         imageMobileUrl: z.ZodNullable<z.ZodString>;
         imageDesktopUrl: z.ZodNullable<z.ZodString>;
         stackable: z.ZodBoolean;

package/dist/validation.js

@@ -86,7 +86,7 @@ export const storefrontSettingsInputSchema = z.object({
             fields: z.array(storefrontFormFieldInputSchema).default([]),
         })
             .optional(),
-        passengers: z
+        travelers: z
             .object({
             fields: z.array(storefrontFormFieldInputSchema).default([]),
         })
@@ -118,7 +118,7 @@ export const storefrontSettingsSchema = z.object({
         billing: z.object({
             fields: z.array(storefrontFormFieldSchema),
         }),
-        passengers: z.object({
+        travelers: z.object({
             fields: z.array(storefrontFormFieldSchema),
         }),
     }),
@@ -302,7 +302,7 @@ export const storefrontPromotionalOfferSchema = z.object({
     applicableDepartureIds: z.array(z.string()),
     validFrom: z.string().nullable(),
     validTo: z.string().nullable(),
-    minPassengers: z.number().int().nullable(),
+    minTravelers: z.number().int().nullable(),
     imageMobileUrl: z.string().nullable(),
     imageDesktopUrl: z.string().nullable(),
     stackable: z.boolean(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voyantjs/storefront",
-  "version": "0.6.8",
+  "version": "0.7.0",
   "license": "FSL-1.1-Apache-2.0",
   "type": "module",
   "exports": {
@@ -25,18 +25,18 @@
     "drizzle-orm": "^0.45.2",
     "hono": "^4.12.10",
     "zod": "^4.3.6",
-    "@voyantjs/core": "0.6.8",
-    "@voyantjs/extras": "0.6.8",
-    "@voyantjs/availability": "0.6.8",
-    "@voyantjs/hono": "0.6.8",
-    "@voyantjs/pricing": "0.6.8",
-    "@voyantjs/sellability": "0.6.8",
-    "@voyantjs/products": "0.6.8"
+    "@voyantjs/availability": "0.7.0",
+    "@voyantjs/core": "0.7.0",
+    "@voyantjs/extras": "0.7.0",
+    "@voyantjs/hono": "0.7.0",
+    "@voyantjs/pricing": "0.7.0",
+    "@voyantjs/products": "0.7.0",
+    "@voyantjs/sellability": "0.7.0"
   },
   "devDependencies": {
     "typescript": "^6.0.2",
     "vitest": "^4.1.2",
-    "@voyantjs/db": "0.6.8",
+    "@voyantjs/db": "0.7.0",
     "@voyantjs/voyant-typescript-config": "0.1.0"
   },
   "files": [