@bash-app/bash-common 30.406.0 → 30.410.0

package/dist/utils/service/serviceListingDealPreferences.js

@@ -0,0 +1,126 @@
+import { readPartnerDealflowFields, serviceListingOpenToInKindDeal, } from "./partnerDealflow.js";
+import { readPartnerRevenueShareFields, REVENUE_SHARE_WITH_HOST_BASIS_LABEL, serviceListingOpenToRevenueShare, } from "./partnerRevenueShareOptIn.js";
+function formatUsdFromCents(cents) {
+    const dollars = cents / 100;
+    return dollars % 1 === 0 ? `$${dollars.toFixed(0)}` : `$${dollars.toFixed(2)}`;
+}
+function minimumCashLabel(deal) {
+    if (deal?.dealRequiresMinimumCash !== true)
+        return null;
+    if (typeof deal.dealMinimumCashCents !== "number" || deal.dealMinimumCashCents <= 0) {
+        return null;
+    }
+    return `${formatUsdFromCents(deal.dealMinimumCashCents)} min cash`;
+}
+function truncateOffer(text, maxLen) {
+    const t = text.trim();
+    if (t.length <= maxLen)
+        return t;
+    return `${t.slice(0, maxLen - 1).trim()}…`;
+}
+/** Compact chips for cards and list rows. */
+export function getServiceListingDealBadges(service) {
+    const badges = [];
+    const deal = readPartnerDealflowFields(service);
+    if (serviceListingOpenToRevenueShare(service)) {
+        badges.push({ id: "rev-share", label: "Rev share" });
+    }
+    if (serviceListingOpenToInKindDeal(service)) {
+        badges.push({ id: "in-kind", label: "In-kind" });
+    }
+    const minCash = minimumCashLabel(deal);
+    if (minCash) {
+        badges.push({ id: "min-cash", label: minCash });
+    }
+    const hostBidOpen = service.vendor?.preferences?.openToHostBids === true ||
+        service.exhibitor?.openToHostBids === true ||
+        service.sponsor?.openToHostBids === true;
+    if (hostBidOpen) {
+        badges.push({ id: "host-bids", label: "Host bids" });
+    }
+    return badges;
+}
+/** Longer copy for public detail pages. */
+export function getServiceListingDealDetailRows(service) {
+    const rows = [];
+    const deal = readPartnerDealflowFields(service);
+    const rev = readPartnerRevenueShareFields(service);
+    const venue = service.venue;
+    if (venue?.revenueShareEnabled === true && venue.revenueShareHostPercentage != null) {
+        rows.push({
+            label: "Venue revenue share",
+            value: `Host keeps ${venue.revenueShareHostPercentage}% of agreed ticket or bar revenue.`,
+        });
+    }
+    else if (rev?.openToRevenueShareWithHost === true) {
+        const pct = rev.revenueShareWithHostPercentage;
+        const basis = rev.revenueShareWithHostBasis;
+        const basisLabel = basis && basis in REVENUE_SHARE_WITH_HOST_BASIS_LABEL
+            ? REVENUE_SHARE_WITH_HOST_BASIS_LABEL[basis]
+            : null;
+        rows.push({
+            label: "Revenue share with host",
+            value: typeof pct === "number"
+                ? `Shares ${pct}% with the host${basisLabel ? ` (${basisLabel.toLowerCase()})` : ""}.`
+                : "Open to sharing revenue with the host (percentage not set).",
+        });
+    }
+    if (serviceListingOpenToInKindDeal(service) && deal?.inKindDealOfferText) {
+        const est = typeof deal.inKindEstimatedValueCents === "number" &&
+            deal.inKindEstimatedValueCents > 0
+            ? ` Approx. value ${formatUsdFromCents(deal.inKindEstimatedValueCents)}.`
+            : "";
+        rows.push({
+            label: "In-kind / trade offer",
+            value: `${deal.inKindDealOfferText.trim()}${est}`,
+        });
+    }
+    const minCash = minimumCashLabel(deal);
+    if (minCash) {
+        rows.push({
+            label: "Minimum cash on hybrid deals",
+            value: `Requires ${minCash.replace(" min cash", "")} minimum cash alongside rev-share or in-kind terms so hosts know you're serious.`,
+        });
+    }
+    return rows;
+}
+/** Card preview line for in-kind (truncated). */
+export function getServiceListingInKindPreview(service, maxLen = 80) {
+    const deal = readPartnerDealflowFields(service);
+    if (!serviceListingOpenToInKindDeal(service) || !deal?.inKindDealOfferText) {
+        return null;
+    }
+    return truncateOffer(deal.inKindDealOfferText, maxLen);
+}
+/** Copy live listing deal prefs onto a booking at confirmation time. */
+export function buildPartnerDealflowBookingSnapshot(service) {
+    const rev = readPartnerRevenueShareFields(service);
+    const deal = readPartnerDealflowFields(service);
+    const venue = service.venue;
+    const snap = {};
+    if (venue?.revenueShareEnabled === true) {
+        snap.openToRevenueShareWithHostSnapshot = true;
+        snap.revenueShareWithHostPercentageSnapshot =
+            venue.revenueShareHostPercentage ?? null;
+        snap.revenueShareWithHostBasisSnapshot = venue.revenueShareBasis ?? null;
+    }
+    else if (rev?.openToRevenueShareWithHost === true) {
+        snap.openToRevenueShareWithHostSnapshot = true;
+        snap.revenueShareWithHostPercentageSnapshot =
+            rev.revenueShareWithHostPercentage ?? null;
+        snap.revenueShareWithHostBasisSnapshot =
+            rev.revenueShareWithHostBasis ?? null;
+    }
+    if (deal?.openToInKindDeals === true) {
+        snap.openToInKindDealsSnapshot = true;
+        snap.inKindDealOfferTextSnapshot = deal.inKindDealOfferText?.trim() ?? null;
+        snap.inKindEstimatedValueCentsSnapshot =
+            deal.inKindEstimatedValueCents ?? null;
+    }
+    if (deal?.dealRequiresMinimumCash === true) {
+        snap.dealRequiresMinimumCashSnapshot = true;
+        snap.dealMinimumCashCentsSnapshot = deal.dealMinimumCashCents ?? null;
+    }
+    return snap;
+}
+//# sourceMappingURL=serviceListingDealPreferences.js.map

package/dist/utils/service/serviceListingDealPreferences.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "30.406.0",
+  "version": "30.410.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "dist/index.js",
@@ -37,7 +37,7 @@
     "@aws-sdk/client-textract": "^3.1004.0",
     "@aws-sdk/s3-request-presigner": "^3.1004.0",
     "@types/qrcode": "^1.5.5",
-    "lodash-es": "^4.17.21",
+    "lodash-es": "4.18.1",
     "mixpanel-browser": "^2.75.0",
     "qrcode": "^1.5.3",
     "slugify": "^1.6.6"
@@ -76,5 +76,8 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "overrides": {
+    "lodash-es": "4.18.1"
   }
 }

package/prisma/schema.prisma

@@ -549,6 +549,8 @@ model EventTask {
   status                     TaskStatus?
   neededCount                Int? // Number of volunteers needed
   estimatedDuration          Int? // Estimated duration in minutes
+  doBy                       DateTime? // Suggested "do this by" — stay-ahead, not a deadline
+  dueBy                      DateTime? // Hard deadline for the volunteer
   createdAt                  DateTime?            @default(now())
   organizationId             String? // Organization association
   assignedTo                 User?                @relation("TasksAssignedToMe", fields: [assignedToId], references: [id], onDelete: Cascade)
@@ -1003,6 +1005,12 @@ model BashEvent {
   allowAttendeeRefundRequests Boolean                @default(true)
   /// Free-text cancellation / refund policy shown at checkout and on the guest's ticket.
   cancellationPolicy              String?
+  /// When true, the cancellation policy block is hidden on the bash detail page (default false for ticketed events, effectively true for RSVP).
+  hideCancellationPolicy          Boolean            @default(false)
+  /// When true, the "Group up" section is hidden on the bash detail page.
+  hideGroupUp                     Boolean            @default(false)
+  /// When true, the "Services open to" box is hidden on the bash detail page.
+  hideServicesOpenTo              Boolean            @default(false)
   /// When true (default), cancelling the bash auto-refunds paid ticket holders. Hosts may set false only before any ticket/RSVP exists.
   refundsGuaranteedOnCancellation Boolean            @default(true)
   /// When true, host may postpone after tickets exist. May only flip false→true before any ticket/RSVP exists.
@@ -1059,7 +1067,7 @@ model BashEvent {
   topPromoterPrize            String? // Optional prize label: "Free table for your crew"
   promoterLeaderboardIsPublic Boolean                @default(false) // Host opts in to public leaderboard
   /// When true, the bash detail promo-code request CTA is hidden from guests (in-app notifications still work for hosts).
-  hideGuestPromoCodeRequest   Boolean                @default(false)
+  hideGuestPromoCodeRequest   Boolean                @default(true)
   showAttendees               Boolean                @default(true)
   /// Host opt-in: show soft "public interest" controls on the bash detail page (signed-in viewers). Not a guest list; invite RSVP stays separate.
   allowPublicInterestRsvp     Boolean                @default(false)
@@ -5892,6 +5900,14 @@ model EventService {
   fulfillmentModes    String[]              @default([])
   /// Minimum advance-notice days required for F&B bookings (e.g. 7 = one week).
   leadTimeDays        Int?
+  openToRevenueShareWithHost     Boolean @default(false)
+  revenueShareWithHostPercentage Int?
+  revenueShareWithHostBasis      String?
+  openToInKindDeals              Boolean @default(false)
+  inKindDealOfferText            String?
+  inKindEstimatedValueCents      Int?
+  dealRequiresMinimumCash        Boolean @default(false)
+  dealMinimumCashCents           Int?
   crowdSize           AmountOfGuests?       @relation(fields: [crowdSizeId], references: [id], onDelete: Cascade)
   serviceRange        ServiceRange?         @relation(fields: [serviceRangeId], references: [id])
   service             Service?
@@ -5950,6 +5966,14 @@ model EntertainmentService {
   minimumQuantity    Int?
   tierPricing        Json?
   pricingNotes       String?
+  openToRevenueShareWithHost     Boolean @default(false)
+  revenueShareWithHostPercentage Int?
+  revenueShareWithHostBasis      String?
+  openToInKindDeals              Boolean @default(false)
+  inKindDealOfferText            String?
+  inKindEstimatedValueCents      Int?
+  dealRequiresMinimumCash        Boolean @default(false)
+  dealMinimumCashCents           Int?
   crowdSize          AmountOfGuests? @relation(fields: [crowdSizeId], references: [id], onDelete: Cascade)
   serviceRange       ServiceRange?   @relation(fields: [serviceRangeId], references: [id])
   service            Service?
@@ -6064,6 +6088,18 @@ model VendorPreferences {
   bidMinLeadDays           Int?
   /// small | medium | large — typical event size the vendor prefers.
   bidProjectSize           String?
+  /// Partner offers a revenue share with the host instead of (or in addition to) upfront fees.
+  openToRevenueShareWithHost   Boolean @default(false)
+  /// 0..100 — share of the partner's relevant sales paid to the host.
+  revenueShareWithHostPercentage Int?
+  /// ALL_SALES | REFERRAL_ATTRIBUTED — which sales count toward the share.
+  revenueShareWithHostBasis      String?
+  openToInKindDeals              Boolean @default(false)
+  inKindDealOfferText            String?
+  inKindEstimatedValueCents      Int?
+  /// Minimum cash (cents) required alongside rev-share or in-kind deals.
+  dealRequiresMinimumCash        Boolean @default(false)
+  dealMinimumCashCents           Int?
   createdAt                DateTime                       @default(now())
   updatedAt                DateTime                       @updatedAt
   vendor                   Vendor                         @relation(fields: [vendorId], references: [id], onDelete: Cascade)
@@ -6142,6 +6178,14 @@ model Exhibitor {
   bidMinLeadDays Int?
   /// small | medium | large — typical event size the exhibitor is comfortable with.
   bidProjectSize String?
+  openToRevenueShareWithHost     Boolean @default(false)
+  revenueShareWithHostPercentage Int?
+  revenueShareWithHostBasis      String?
+  openToInKindDeals              Boolean @default(false)
+  inKindDealOfferText            String?
+  inKindEstimatedValueCents      Int?
+  dealRequiresMinimumCash        Boolean @default(false)
+  dealMinimumCashCents           Int?
 
   crowdSize    AmountOfGuests? @relation(fields: [crowdSizeId], references: [id], onDelete: Cascade)
   serviceRange ServiceRange?   @relation(fields: [serviceRangeId], references: [id])
@@ -6178,6 +6222,14 @@ model Sponsor {
   bidMinLeadDays Int?
   /// small | medium | large — typical event size the sponsor is comfortable with.
   bidProjectSize String?
+  openToRevenueShareWithHost     Boolean @default(false)
+  revenueShareWithHostPercentage Int?
+  revenueShareWithHostBasis      String?
+  openToInKindDeals              Boolean @default(false)
+  inKindDealOfferText            String?
+  inKindEstimatedValueCents      Int?
+  dealRequiresMinimumCash        Boolean @default(false)
+  dealMinimumCashCents           Int?
 
   service      Service?
   crowdSize    AmountOfGuests? @relation(fields: [crowdSizeId], references: [id])
@@ -6269,6 +6321,11 @@ model Venue {
   revenueShareBasis          String?
   /// Free-form notes shown next to the rev-share split.
   revenueShareNotes          String?
+  openToInKindDeals          Boolean @default(false)
+  inKindDealOfferText        String?
+  inKindEstimatedValueCents  Int?
+  dealRequiresMinimumCash    Boolean @default(false)
+  dealMinimumCashCents       Int?
 
   fbCarryoverCredits VenueFBCarryoverCredit[]
   fbMinimumOverrides VenueFBMinimumOverride[]
@@ -8067,6 +8124,15 @@ model ServiceBooking {
   revenueShareHostPctSnapshot       Int?
   /// Snapshot of `Venue.revenueShareBasis`.
   revenueShareBasisSnapshot         String?
+  /// Partner / venue deal prefs at confirmation (rev-share, in-kind, min cash).
+  openToRevenueShareWithHostSnapshot Boolean?
+  revenueShareWithHostPercentageSnapshot Int?
+  revenueShareWithHostBasisSnapshot      String?
+  openToInKindDealsSnapshot              Boolean?
+  inKindDealOfferTextSnapshot            String?
+  inKindEstimatedValueCentsSnapshot      Int?
+  dealRequiresMinimumCashSnapshot        Boolean?
+  dealMinimumCashCentsSnapshot           Int?
   /// Computed venue rev-share owed (cents) at settlement.
   revenueShareCalculatedCents       Int?
   // Settlement lifecycle state (drives dunning, retries, dispute window).

package/src/__tests__/partnerDealflow.test.ts

@@ -0,0 +1,62 @@
+import type { ServiceExt } from "../extendedSchemas";
+import {
+  readPartnerDealflowFields,
+  serviceListingOpenToInKindDeal,
+} from "../utils/service/partnerDealflow";
+
+describe("partnerDealflow", () => {
+  it("detects in-kind listings with non-empty offer text", () => {
+    const service = {
+      sponsor: {
+        openToInKindDeals: true,
+        inKindDealOfferText: "100 free socks",
+      },
+    } as ServiceExt;
+
+    expect(readPartnerDealflowFields(service)?.openToInKindDeals).toBe(true);
+    expect(serviceListingOpenToInKindDeal(service)).toBe(true);
+  });
+
+  it("rejects in-kind when offer text is blank", () => {
+    const service = {
+      sponsor: {
+        openToInKindDeals: true,
+        inKindDealOfferText: "  ",
+      },
+    } as ServiceExt;
+
+    expect(serviceListingOpenToInKindDeal(service)).toBe(false);
+  });
+
+  it("reads dealflow from vendor preferences before flat partner rows", () => {
+    const service = {
+      vendor: {
+        preferences: {
+          openToInKindDeals: true,
+          inKindDealOfferText: "Sample trays",
+          dealRequiresMinimumCash: true,
+          dealMinimumCashCents: 5000,
+        },
+      },
+      sponsor: {
+        openToInKindDeals: true,
+        inKindDealOfferText: "should not win",
+      },
+    } as ServiceExt;
+
+    const row = readPartnerDealflowFields(service);
+    expect(row?.inKindDealOfferText).toBe("Sample trays");
+    expect(row?.dealMinimumCashCents).toBe(5000);
+  });
+
+  it("does not treat in-kind flag alone as a listing when toggle is off", () => {
+    const service = {
+      venue: {
+        openToInKindDeals: false,
+        inKindDealOfferText: "Free room night",
+      },
+    } as ServiceExt;
+
+    expect(serviceListingOpenToInKindDeal(service)).toBe(false);
+  });
+});

package/src/__tests__/partnerRevenueShareOptIn.test.ts

@@ -0,0 +1,68 @@
+import type { ServiceExt } from "../extendedSchemas";
+import {
+  readPartnerRevenueShareFields,
+  serviceListingOpenToRevenueShare,
+} from "../utils/service/partnerRevenueShareOptIn";
+
+describe("partnerRevenueShareOptIn", () => {
+  it("treats venue ticket/bar rev share as discoverable without partner opt-in", () => {
+    const service = {
+      venue: {
+        revenueShareEnabled: true,
+        revenueShareHostPercentage: 10,
+      },
+    } as ServiceExt;
+
+    expect(serviceListingOpenToRevenueShare(service)).toBe(true);
+    expect(readPartnerRevenueShareFields(service)).toBeNull();
+  });
+
+  it("requires partner opt-in plus a non-null percentage", () => {
+    const openNoPct = {
+      vendor: {
+        preferences: {
+          openToRevenueShareWithHost: true,
+          revenueShareWithHostPercentage: null,
+        },
+      },
+    } as ServiceExt;
+
+    expect(serviceListingOpenToRevenueShare(openNoPct)).toBe(false);
+
+    const closedWithPct = {
+      vendor: {
+        preferences: {
+          openToRevenueShareWithHost: false,
+          revenueShareWithHostPercentage: 20,
+        },
+      },
+    } as ServiceExt;
+
+    expect(serviceListingOpenToRevenueShare(closedWithPct)).toBe(false);
+
+    const openZero = {
+      exhibitor: {
+        openToRevenueShareWithHost: true,
+        revenueShareWithHostPercentage: 0,
+      },
+    } as ServiceExt;
+
+    expect(serviceListingOpenToRevenueShare(openZero)).toBe(true);
+  });
+
+  it("reads rev-share fields from the first matching partner subtype", () => {
+    const service = {
+      eventService: {
+        openToRevenueShareWithHost: true,
+        revenueShareWithHostPercentage: 12,
+        revenueShareWithHostBasis: "REFERRAL_ATTRIBUTED",
+      },
+    } as ServiceExt;
+
+    expect(readPartnerRevenueShareFields(service)).toEqual({
+      openToRevenueShareWithHost: true,
+      revenueShareWithHostPercentage: 12,
+      revenueShareWithHostBasis: "REFERRAL_ATTRIBUTED",
+    });
+  });
+});

package/src/__tests__/reservedCustomBashEventType.test.ts

@@ -0,0 +1,27 @@
+import {
+  isReservedCustomBashEventTypeDisplayName,
+} from "../definitions.js";
+
+describe("isReservedCustomBashEventTypeDisplayName", () => {
+  it("blocks homepage synthetic section titles", () => {
+    expect(isReservedCustomBashEventTypeDisplayName("Featured")).toBe(true);
+    expect(isReservedCustomBashEventTypeDisplayName("Popular")).toBe(true);
+    expect(isReservedCustomBashEventTypeDisplayName("Trending")).toBe(true);
+    expect(isReservedCustomBashEventTypeDisplayName("Ideas")).toBe(true);
+    expect(isReservedCustomBashEventTypeDisplayName("Pro Events")).toBe(true);
+    expect(isReservedCustomBashEventTypeDisplayName("The crew's going")).toBe(
+      true
+    );
+  });
+
+  it("blocks built-in bash type labels", () => {
+    expect(isReservedCustomBashEventTypeDisplayName("Birthday")).toBe(true);
+    expect(isReservedCustomBashEventTypeDisplayName("House Party")).toBe(true);
+  });
+
+  it("allows novel custom labels", () => {
+    expect(isReservedCustomBashEventTypeDisplayName("Rooftop Party")).toBe(
+      false
+    );
+  });
+});

package/src/__tests__/serviceListingDealPreferences.test.ts

@@ -0,0 +1,112 @@
+import type { ServiceExt } from "../extendedSchemas";
+import {
+  buildPartnerDealflowBookingSnapshot,
+  getServiceListingDealBadges,
+  getServiceListingDealDetailRows,
+} from "../utils/service/serviceListingDealPreferences";
+
+describe("serviceListingDealPreferences", () => {
+  it("shows min cash badge only when amount is set", () => {
+    const withMin = {
+      sponsor: {
+        dealRequiresMinimumCash: true,
+        dealMinimumCashCents: 25000,
+      },
+    } as ServiceExt;
+
+    expect(getServiceListingDealBadges(withMin).some((b) => b.id === "min-cash")).toBe(
+      true
+    );
+
+    const checkboxOnly = {
+      sponsor: {
+        dealRequiresMinimumCash: true,
+        dealMinimumCashCents: null,
+      },
+    } as ServiceExt;
+
+    expect(
+      getServiceListingDealBadges(checkboxOnly).some((b) => b.id === "min-cash")
+    ).toBe(false);
+  });
+
+  it("snapshots venue rev share instead of partner fields when venue is enabled", () => {
+    const service = {
+      venue: {
+        revenueShareEnabled: true,
+        revenueShareHostPercentage: 18,
+        revenueShareBasis: "ALL_SALES",
+      },
+      eventService: {
+        openToRevenueShareWithHost: true,
+        revenueShareWithHostPercentage: 99,
+      },
+    } as ServiceExt;
+
+    const snap = buildPartnerDealflowBookingSnapshot(service);
+
+    expect(snap.openToRevenueShareWithHostSnapshot).toBe(true);
+    expect(snap.revenueShareWithHostPercentageSnapshot).toBe(18);
+    expect(snap.revenueShareWithHostBasisSnapshot).toBe("ALL_SALES");
+  });
+
+  it("snapshots hybrid min-cash flag even when cents are unset (Stripe amount is separate)", () => {
+    const service = {
+      sponsor: {
+        dealRequiresMinimumCash: true,
+        dealMinimumCashCents: null,
+        openToInKindDeals: true,
+        inKindDealOfferText: "Branded socks",
+      },
+    } as ServiceExt;
+
+    const snap = buildPartnerDealflowBookingSnapshot(service);
+
+    expect(snap.dealRequiresMinimumCashSnapshot).toBe(true);
+    expect(snap.dealMinimumCashCentsSnapshot).toBeNull();
+    expect(snap.openToInKindDealsSnapshot).toBe(true);
+    expect(snap.inKindDealOfferTextSnapshot).toBe("Branded socks");
+  });
+
+  it("snapshots rev-share opt-in with null percentage when partner saved incomplete prefs", () => {
+    const service = {
+      sponsor: {
+        openToRevenueShareWithHost: true,
+        revenueShareWithHostPercentage: null,
+      },
+    } as ServiceExt;
+
+    expect(buildPartnerDealflowBookingSnapshot(service)).toEqual({
+      openToRevenueShareWithHostSnapshot: true,
+      revenueShareWithHostPercentageSnapshot: null,
+      revenueShareWithHostBasisSnapshot: null,
+    });
+  });
+
+  it("includes min-cash detail copy only when cents are positive", () => {
+    const hybrid = {
+      sponsor: {
+        dealRequiresMinimumCash: true,
+        dealMinimumCashCents: 25000,
+        openToInKindDeals: true,
+        inKindDealOfferText: "100 pairs",
+      },
+    } as ServiceExt;
+
+    const rows = getServiceListingDealDetailRows(hybrid);
+    expect(rows.some((r) => r.label.includes("Minimum cash"))).toBe(true);
+
+    const flagOnly = {
+      sponsor: {
+        dealRequiresMinimumCash: true,
+        dealMinimumCashCents: 0,
+      },
+    } as ServiceExt;
+
+    expect(
+      getServiceListingDealDetailRows(flagOnly).some((r) =>
+        r.label.includes("Minimum cash")
+      )
+    ).toBe(false);
+  });
+});

package/src/definitions.ts

@@ -32,6 +32,8 @@ import {
   ServiceBookingExt,
   type UserExt,
 } from "./extendedSchemas.js";
+import { DISCOVERY_SCOPE_SECTION_TITLE } from "./discoveryScope.js";
+import { HOMEPAGE_SYNTHETIC_SECTION_ROW_KEYS } from "./homepageSyntheticRows.js";
 import { LuxonDateRange } from "./utils/luxonUtils.js";
 import { ApiServiceCantBookReason } from "./utils/service/apiServiceBookingApiUtils.js";
 import { ServiceAttendeeOption } from "./utils/service/attendeeOptionUtils.js";
@@ -705,8 +707,8 @@ export const BASH_EVENT_WIZARD_WHAT_SUBSTEP = {
 } as const;
 
 export const BASH_EVENT_WIZARD_WHERE_SUBSTEP = {
-  LOCATION: 0,
-  UPLOAD_MEDIA: 1,
+  UPLOAD_MEDIA: 0,
+  LOCATION: 1,
 } as const;
 
 export const BASH_EVENT_WIZARD_WHEN_SUBSTEP = {
@@ -1904,6 +1906,20 @@ export const DIETARY_OPTION_VALUES: ReadonlyArray<DietaryOption> = [
   "AlcoholFreeOptions",
 ];
 
+/**
+ * Guest-facing filter chips — everyday accommodations only.
+ * Religious, drink, and diet-trend tags stay on the host form / enum
+ * so existing events keep their data, but they do not crowd the filter menu.
+ */
+export const DIETARY_OPTION_FILTER_VALUES: ReadonlyArray<DietaryOption> = [
+  "VegetarianOptions",
+  "VeganOptions",
+  "GlutenFreeOptions",
+  "DairyFreeOptions",
+  "NutFreeOptions",
+  "SugarFreeOptions",
+];
+
 /** Display labels for `IncomeRange` (wizard primary/secondary chips). */
 export type IncomeRangeToStringType = {
   [key in IncomeRange]: string;
@@ -2168,6 +2184,55 @@ export function bashSectionTitleForBashType(bashType: string): string {
   return pluralizeBashEventSingularLabel(spaced);
 }
 
+function normalizeReservedCustomBashEventTypeLabel(label: string): string {
+  return label.trim().toLowerCase().replace(/\s+/g, " ");
+}
+
+let reservedCustomBashEventTypeLabels: Set<string> | null = null;
+
+function reservedCustomBashEventTypeLabelSet(): Set<string> {
+  if (reservedCustomBashEventTypeLabels) {
+    return reservedCustomBashEventTypeLabels;
+  }
+  const set = new Set<string>();
+  const add = (value: string) => {
+    const normalized = normalizeReservedCustomBashEventTypeLabel(value);
+    if (normalized) set.add(normalized);
+  };
+
+  for (const key of HOMEPAGE_SYNTHETIC_SECTION_ROW_KEYS) {
+    add(key);
+    add(bashSectionTitleForBashType(key));
+  }
+  for (const title of Object.values(DISCOVERY_SCOPE_SECTION_TITLE)) {
+    add(title);
+  }
+  for (const title of Object.values(SYNTHETIC_BASH_SECTION_TITLE)) {
+    add(title);
+  }
+  for (const enumKey of BASH_EVENT_TYPE_ENUM_VALUES) {
+    const k = enumKey as BashEventType;
+    add(enumKey);
+    add(BashEventTypeToString[k]);
+    add(bashSectionTitleForBashType(enumKey));
+  }
+
+  reservedCustomBashEventTypeLabels = set;
+  return set;
+}
+
+/**
+ * Homepage section titles and built-in bash types cannot be created as custom
+ * types in the wizard (would collide with synthetic discovery rows).
+ */
+export function isReservedCustomBashEventTypeDisplayName(
+  displayName: string
+): boolean {
+  return reservedCustomBashEventTypeLabelSet().has(
+    normalizeReservedCustomBashEventTypeLabel(displayName)
+  );
+}
+
 export type RecordKey = string | number | symbol;
 export type PartialExcept<T, K extends keyof T> = Partial<T> & {
   [P in K]: T[P];