@voyantjs/extras 0.20.0 → 0.21.0

package/dist/service-content.js

@@ -0,0 +1,253 @@
+/**
+ * Extras content service — `getExtraContent` with locale-resolved
+ * cache reads, SWR refresh, and synthesizer fallback.
+ *
+ * Mirrors `service-content.ts` in the products / cruises / hospitality
+ * / charters packages but extras-shaped. The extras content aggregate
+ * (§3.2 / §3.6) is `{ extra, options[], media[], policies[] }` — one
+ * payload returned by a single getContent. Pricing stays out (volatile-
+ * live, flows through `liveResolve`).
+ *
+ * Extras don't appear in the search index (per the vertical's catalog-
+ * policy.ts), but sourced extras still need rich content for the
+ * booking-flow's add-on selection UI. The cache layer covers exactly
+ * that surface.
+ */
+import { createInvalidateOnDrift, fetchOverlaysForEntity, isStale, pickBestCachedLocale, readSourcedEntry, withContentRefreshLock, } from "@voyantjs/catalog";
+import { and, eq } from "drizzle-orm";
+import { EXTRAS_CONTENT_SCHEMA_VERSION, extraContentSchema, mergeOverlaysIntoExtraContent, validateExtraContent, } from "./content-shape.js";
+import { EXTRAS_CONTENT_MARKET_ANY, extrasSourcedContentTable, } from "./schema-sourced-content.js";
+import { synthesizeExtraContent, } from "./service-content-synthesizer.js";
+/** Extras cache TTL is 24h — same as products. */
+const EXTRAS_DEFAULT_TTL_MS = 24 * 60 * 60 * 1000;
+export async function getExtraContent(db, entityId, scope, options) {
+    const sourcedEntry = await readSourcedEntry(db, "extras", entityId);
+    if (!sourcedEntry)
+        return null;
+    const provenance = {
+        kind: "sourced",
+        provenance: {
+            source_kind: sourcedEntry.source_kind,
+            source_provider: sourcedEntry.source_provider ?? undefined,
+            source_connection_id: sourcedEntry.source_connection_id ?? undefined,
+            source_ref: sourcedEntry.source_ref ?? undefined,
+            source_freshness: sourcedEntry.source_freshness,
+            last_sourced_at: sourcedEntry.last_sourced_at ?? undefined,
+        },
+        entry_id: sourcedEntry.id,
+        status: sourcedEntry.status,
+        projection: sourcedEntry.projection,
+        projection_etag: sourcedEntry.projection_etag,
+        projection_seen_at: sourcedEntry.projection_seen_at,
+        first_seen_at: sourcedEntry.first_seen_at,
+        last_seen_at: sourcedEntry.last_seen_at,
+    };
+    const adapter = sourcedEntry.source_connection_id
+        ? (options.registry.resolveByConnection(sourcedEntry.source_connection_id) ??
+            options.registry.byKind(sourcedEntry.source_kind)[0]?.adapter)
+        : options.registry.byKind(sourcedEntry.source_kind)[0]?.adapter;
+    const adapterCtx = options.buildAdapterContext?.(adapter) ?? {
+        connection_id: sourcedEntry.source_connection_id ?? sourcedEntry.source_kind,
+    };
+    const market = scope.market ?? EXTRAS_CONTENT_MARKET_ANY;
+    const acceptMT = scope.acceptMachineTranslated ?? true;
+    const cachedRows = await fetchCacheCandidates(db, entityId, market);
+    const eligibleRows = acceptMT ? cachedRows : cachedRows.filter((r) => !r.machine_translated);
+    const best = pickBestCachedLocale(eligibleRows.map((row) => ({ ...row, locale: row.locale })), scope.preferredLocales);
+    if (best && !isStale(best.candidate)) {
+        return finalizeFromCache(db, entityId, best, false, options);
+    }
+    if (best && isStale(best.candidate)) {
+        if (adapter?.getContent) {
+            void scheduleRefresh(db, adapter, adapterCtx, {
+                entity_module: "extras",
+                entity_id: entityId,
+                locale: scope.preferredLocales[0] ?? best.candidate.locale,
+                market,
+                currency: scope.currency,
+            });
+        }
+        return finalizeFromCache(db, entityId, best, true, options);
+    }
+    if (!adapter?.getContent) {
+        const overlays = await fetchOverlaysForEntity(db, "extras", entityId);
+        const synthesized = synthesizeExtraContent({ locale: scope.preferredLocales[0] ?? "en-GB" }, {
+            provenance,
+            overlays: overlays.map((o) => ({ field_path: o.field_path, value: o.value })),
+        });
+        return wrapSynthesized(synthesized, scope, false);
+    }
+    const fresh = await fetchFreshContent(db, adapter, adapterCtx, {
+        entity_module: "extras",
+        entity_id: entityId,
+        locale: scope.preferredLocales[0] ?? "en-GB",
+        market,
+        currency: scope.currency,
+    });
+    if (!fresh) {
+        const overlays = await fetchOverlaysForEntity(db, "extras", entityId);
+        const synthesized = synthesizeExtraContent({ locale: scope.preferredLocales[0] ?? "en-GB" }, {
+            provenance,
+            overlays: overlays.map((o) => ({ field_path: o.field_path, value: o.value })),
+        });
+        return wrapSynthesized(synthesized, scope, false);
+    }
+    return finalizeFresh(db, entityId, fresh, scope, options);
+}
+async function fetchCacheCandidates(db, entityId, market) {
+    return db
+        .select()
+        .from(extrasSourcedContentTable)
+        .where(and(eq(extrasSourcedContentTable.entity_id, entityId), eq(extrasSourcedContentTable.market, market), eq(extrasSourcedContentTable.content_schema_version, EXTRAS_CONTENT_SCHEMA_VERSION)));
+}
+async function fetchFreshContent(db, adapter, ctx, request) {
+    const result = await withContentRefreshLock(db, {
+        entityModule: request.entity_module,
+        entityId: request.entity_id,
+        locale: request.locale,
+        market: request.market,
+    }, async () => {
+        const got = await adapter.getContent(ctx, request);
+        const validation = validateExtraContent(got.content);
+        if (!validation.valid) {
+            throw new Error(`extras getContent for ${request.entity_id} failed validation: ${validation.reason}`);
+        }
+        await writeCacheRow(db, request, got);
+        return got;
+    });
+    return result ?? null;
+}
+function scheduleRefresh(db, adapter, ctx, request) {
+    void withContentRefreshLock(db, {
+        entityModule: request.entity_module,
+        entityId: request.entity_id,
+        locale: request.locale,
+        market: request.market,
+    }, async () => {
+        const got = await adapter.getContent(ctx, request);
+        const validation = validateExtraContent(got.content);
+        if (!validation.valid)
+            return;
+        await writeCacheRow(db, request, got);
+    }).catch(() => {
+        // intentional swallow — see §3.4 SWR refresh contract
+    });
+}
+async function writeCacheRow(db, request, result) {
+    const market = request.market ?? EXTRAS_CONTENT_MARKET_ANY;
+    const now = new Date();
+    // Coerce JSON-string dates to Date — see products writeCacheRow.
+    const sourceUpdatedAt = toDateOrNull(result.source_updated_at);
+    const freshUntil = toDateOrNull(result.fresh_until) ?? new Date(now.getTime() + EXTRAS_DEFAULT_TTL_MS);
+    await db
+        .insert(extrasSourcedContentTable)
+        .values({
+        entity_id: request.entity_id,
+        locale: request.locale,
+        market,
+        payload: result.content,
+        content_schema_version: result.content_schema_version,
+        returned_locale: result.returned_locale,
+        machine_translated: result.machine_translated ?? false,
+        source_updated_at: sourceUpdatedAt,
+        fetched_at: now,
+        fresh_until: freshUntil,
+        etag: result.etag ?? null,
+        fetch_status: "ok",
+        fetch_error: null,
+    })
+        .onConflictDoUpdate({
+        target: [
+            extrasSourcedContentTable.entity_id,
+            extrasSourcedContentTable.locale,
+            extrasSourcedContentTable.market,
+        ],
+        set: {
+            payload: result.content,
+            content_schema_version: result.content_schema_version,
+            returned_locale: result.returned_locale,
+            machine_translated: result.machine_translated ?? false,
+            source_updated_at: sourceUpdatedAt,
+            fetched_at: now,
+            fresh_until: freshUntil,
+            etag: result.etag ?? null,
+            fetch_status: "ok",
+            fetch_error: null,
+        },
+    });
+}
+async function finalizeFromCache(db, entityId, best, servedStale, options) {
+    const validation = validateExtraContent(best.candidate.payload);
+    if (!validation.valid) {
+        throw new Error(`extras cache row for ${entityId} (${best.candidate.locale}) failed validation: ${validation.reason}`);
+    }
+    const overlays = await fetchOverlaysForEntity(db, "extras", entityId);
+    const merged = mergeOverlaysIntoExtraContent(validation.content, overlays.map((o) => ({ field_path: o.field_path, value: o.value })), {
+        onOverlayError: options.onOverlayError
+            ? (e) => options.onOverlayError({
+                field_path: e.overlay.field_path,
+                reason: e.reason,
+            })
+            : undefined,
+    });
+    return {
+        content: merged,
+        resolution: {
+            candidate: { locale: best.candidate.locale, payload: merged },
+            served_locale: best.candidate.returned_locale,
+            match_kind: best.match_kind,
+        },
+        source: "sourced-cache",
+        served_stale: servedStale,
+        synthesized: false,
+        machine_translated: best.candidate.machine_translated,
+    };
+}
+async function finalizeFresh(db, entityId, fresh, scope, options) {
+    const cachedContent = extraContentSchema.parse(fresh.content);
+    const overlays = await fetchOverlaysForEntity(db, "extras", entityId);
+    const merged = mergeOverlaysIntoExtraContent(cachedContent, overlays.map((o) => ({ field_path: o.field_path, value: o.value })), {
+        onOverlayError: options.onOverlayError
+            ? (e) => options.onOverlayError({
+                field_path: e.overlay.field_path,
+                reason: e.reason,
+            })
+            : undefined,
+    });
+    return {
+        content: merged,
+        resolution: {
+            candidate: { locale: scope.preferredLocales[0] ?? fresh.returned_locale, payload: merged },
+            served_locale: fresh.returned_locale,
+            match_kind: scope.preferredLocales[0] === fresh.returned_locale ? "exact" : "language_match",
+        },
+        source: "sourced-fresh",
+        served_stale: false,
+        synthesized: false,
+        machine_translated: fresh.machine_translated ?? false,
+    };
+}
+function wrapSynthesized(synthesized, scope, servedStale) {
+    return {
+        content: synthesized.content,
+        resolution: {
+            candidate: { locale: synthesized.served_locale, payload: synthesized.content },
+            served_locale: synthesized.served_locale,
+            match_kind: scope.preferredLocales[0] === synthesized.served_locale ? "exact" : "any",
+        },
+        source: "synthesized",
+        served_stale: servedStale,
+        synthesized: true,
+        machine_translated: false,
+    };
+}
+/** Drift event consumer for the extras content cache. Per §3.4.1. */
+export const invalidateExtraContentOnDrift = createInvalidateOnDrift(extrasSourcedContentTable, { entityModule: "extras" });
+function toDateOrNull(value) {
+    if (!value)
+        return null;
+    if (value instanceof Date)
+        return value;
+    const parsed = new Date(value);
+    return Number.isNaN(parsed.getTime()) ? null : parsed;
+}

package/dist/service.d.ts

@@ -15,10 +15,11 @@ export declare const extrasService: {
         data: {
             id: string;
             productId: string;
+            supplierId: string | null;
             code: string | null;
             name: string;
             description: string | null;
-            selectionType: "optional" | "required" | "default_selected" | "unavailable";
+            selectionType: "unavailable" | "optional" | "default_selected" | "required";
             pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free";
             pricedPerPerson: boolean;
             minQuantity: number | null;
@@ -37,10 +38,11 @@ export declare const extrasService: {
     getProductExtraById(db: PostgresJsDatabase, id: string): Promise<{
         id: string;
         productId: string;
+        supplierId: string | null;
         code: string | null;
         name: string;
         description: string | null;
-        selectionType: "optional" | "required" | "default_selected" | "unavailable";
+        selectionType: "unavailable" | "optional" | "default_selected" | "required";
         pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free";
         pricedPerPerson: boolean;
         minQuantity: number | null;
@@ -58,9 +60,10 @@ export declare const extrasService: {
         createdAt: Date;
         updatedAt: Date;
         productId: string;
+        supplierId: string | null;
         name: string;
         description: string | null;
-        selectionType: "optional" | "required" | "default_selected" | "unavailable";
+        selectionType: "unavailable" | "optional" | "default_selected" | "required";
         pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free";
         pricedPerPerson: boolean;
         minQuantity: number | null;
@@ -73,10 +76,11 @@ export declare const extrasService: {
     updateProductExtra(db: PostgresJsDatabase, id: string, data: UpdateProductExtraInput): Promise<{
         id: string;
         productId: string;
+        supplierId: string | null;
         code: string | null;
         name: string;
         description: string | null;
-        selectionType: "optional" | "required" | "default_selected" | "unavailable";
+        selectionType: "unavailable" | "optional" | "default_selected" | "required";
         pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free";
         pricedPerPerson: boolean;
         minQuantity: number | null;
@@ -96,7 +100,7 @@ export declare const extrasService: {
             id: string;
             optionId: string;
             productExtraId: string;
-            selectionType: "optional" | "required" | "default_selected" | "unavailable" | null;
+            selectionType: "unavailable" | "optional" | "default_selected" | "required" | null;
             pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free" | null;
             pricedPerPerson: boolean | null;
             minQuantity: number | null;
@@ -118,7 +122,7 @@ export declare const extrasService: {
         id: string;
         optionId: string;
         productExtraId: string;
-        selectionType: "optional" | "required" | "default_selected" | "unavailable" | null;
+        selectionType: "unavailable" | "optional" | "default_selected" | "required" | null;
         pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free" | null;
         pricedPerPerson: boolean | null;
         minQuantity: number | null;
@@ -136,7 +140,7 @@ export declare const extrasService: {
         id: string;
         createdAt: Date;
         updatedAt: Date;
-        selectionType: "optional" | "required" | "default_selected" | "unavailable" | null;
+        selectionType: "unavailable" | "optional" | "default_selected" | "required" | null;
         pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free" | null;
         pricedPerPerson: boolean | null;
         minQuantity: number | null;
@@ -154,7 +158,7 @@ export declare const extrasService: {
         id: string;
         optionId: string;
         productExtraId: string;
-        selectionType: "optional" | "required" | "default_selected" | "unavailable" | null;
+        selectionType: "unavailable" | "optional" | "default_selected" | "required" | null;
         pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free" | null;
         pricedPerPerson: boolean | null;
         minQuantity: number | null;
@@ -179,7 +183,7 @@ export declare const extrasService: {
             optionExtraConfigId: string | null;
             name: string;
             description: string | null;
-            status: "draft" | "selected" | "confirmed" | "cancelled" | "fulfilled";
+            status: "confirmed" | "cancelled" | "draft" | "selected" | "fulfilled";
             pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free";
             pricedPerPerson: boolean;
             quantity: number;
@@ -205,7 +209,7 @@ export declare const extrasService: {
         optionExtraConfigId: string | null;
         name: string;
         description: string | null;
-        status: "draft" | "selected" | "confirmed" | "cancelled" | "fulfilled";
+        status: "confirmed" | "cancelled" | "draft" | "selected" | "fulfilled";
         pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free";
         pricedPerPerson: boolean;
         quantity: number;
@@ -228,13 +232,13 @@ export declare const extrasService: {
         description: string | null;
         pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free";
         pricedPerPerson: boolean;
+        status: "confirmed" | "cancelled" | "draft" | "selected" | "fulfilled";
         metadata: Record<string, unknown> | null;
-        status: "draft" | "selected" | "confirmed" | "cancelled" | "fulfilled";
-        notes: string | null;
         bookingId: string;
+        quantity: number;
+        notes: string | null;
         productExtraId: string | null;
         optionExtraConfigId: string | null;
-        quantity: number;
         sellCurrency: string;
         unitSellAmountCents: number | null;
         totalSellAmountCents: number | null;
@@ -249,7 +253,7 @@ export declare const extrasService: {
         optionExtraConfigId: string | null;
         name: string;
         description: string | null;
-        status: "draft" | "selected" | "confirmed" | "cancelled" | "fulfilled";
+        status: "confirmed" | "cancelled" | "draft" | "selected" | "fulfilled";
         pricingMode: "included" | "per_person" | "per_booking" | "quantity_based" | "on_request" | "free";
         pricedPerPerson: boolean;
         quantity: number;

package/dist/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAG5B,OAAO,KAAK,EACV,2BAA2B,EAC3B,wBAAwB,EACxB,6BAA6B,EAC7B,wBAAwB,EACxB,gCAAgC,EAChC,2BAA2B,EAC3B,wBAAwB,EACxB,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,iBAAiB,CAAA;AAExB,KAAK,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAA;AACxE,KAAK,0BAA0B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gCAAgC,CAAC,CAAA;AAClF,KAAK,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAA;AACxE,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AACvE,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AACvE,KAAK,4BAA4B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,6BAA6B,CAAC,CAAA;AACjF,KAAK,4BAA4B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,6BAA6B,CAAC,CAAA;AACjF,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AACvE,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AAYvE,eAAO,MAAM,aAAa;0BACI,kBAAkB,SAAS,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;4BAuB9C,kBAAkB,MAAM,MAAM;;;;;;;;;;;;;;;;;;2BAK/B,kBAAkB,QAAQ,uBAAuB;;;;;;;;;;;;;;;;;;2BAKjD,kBAAkB,MAAM,MAAM,QAAQ,uBAAuB;;;;;;;;;;;;;;;;;;2BAS7D,kBAAkB,MAAM,MAAM;;;+BAQ1B,kBAAkB,SAAS,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;iCAqBnD,kBAAkB,MAAM,MAAM;;;;;;;;;;;;;;;;;;gCAS/B,kBAAkB,QAAQ,4BAA4B;;;;;;;;;;;;;;;;;;gCAMlF,kBAAkB,MAClB,MAAM,QACJ,4BAA4B;;;;;;;;;;;;;;;;;;gCAUF,kBAAkB,MAAM,MAAM;;;0BAQpC,kBAAkB,SAAS,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAuB9C,kBAAkB,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;2BAK/B,kBAAkB,QAAQ,uBAAuB;;;;;;;;;;;;;;;;;;;;;;2BAKjD,kBAAkB,MAAM,MAAM,QAAQ,uBAAuB;;;;;;;;;;;;;;;;;;;;;;2BAS7D,kBAAkB,MAAM,MAAM;;;CAO5D,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAG5B,OAAO,KAAK,EACV,2BAA2B,EAC3B,wBAAwB,EACxB,6BAA6B,EAC7B,wBAAwB,EACxB,gCAAgC,EAChC,2BAA2B,EAC3B,wBAAwB,EACxB,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,iBAAiB,CAAA;AAExB,KAAK,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAA;AACxE,KAAK,0BAA0B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gCAAgC,CAAC,CAAA;AAClF,KAAK,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAA;AACxE,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AACvE,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AACvE,KAAK,4BAA4B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,6BAA6B,CAAC,CAAA;AACjF,KAAK,4BAA4B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,6BAA6B,CAAC,CAAA;AACjF,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AACvE,KAAK,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAA;AAYvE,eAAO,MAAM,aAAa;0BACI,kBAAkB,SAAS,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;4BAwB9C,kBAAkB,MAAM,MAAM;;;;;;;;;;;;;;;;;;;2BAK/B,kBAAkB,QAAQ,uBAAuB;;;;;;;;;;;;;;;;;;;2BAKjD,kBAAkB,MAAM,MAAM,QAAQ,uBAAuB;;;;;;;;;;;;;;;;;;;2BAS7D,kBAAkB,MAAM,MAAM;;;+BAQ1B,kBAAkB,SAAS,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;iCAqBnD,kBAAkB,MAAM,MAAM;;;;;;;;;;;;;;;;;;gCAS/B,kBAAkB,QAAQ,4BAA4B;;;;;;;;;;;;;;;;;;gCAMlF,kBAAkB,MAClB,MAAM,QACJ,4BAA4B;;;;;;;;;;;;;;;;;;gCAUF,kBAAkB,MAAM,MAAM;;;0BAQpC,kBAAkB,SAAS,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAuB9C,kBAAkB,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;2BAK/B,kBAAkB,QAAQ,uBAAuB;;;;;;;;;;;;;;;;;;;;;;2BAKjD,kBAAkB,MAAM,MAAM,QAAQ,uBAAuB;;;;;;;;;;;;;;;;;;;;;;2BAS7D,kBAAkB,MAAM,MAAM;;;CAO5D,CAAA"}

package/dist/service.js

@@ -9,6 +9,8 @@ export const extrasService = {
         const conditions = [];
         if (query.productId)
             conditions.push(eq(productExtras.productId, query.productId));
+        if (query.supplierId)
+            conditions.push(eq(productExtras.supplierId, query.supplierId));
         if (query.active !== undefined)
             conditions.push(eq(productExtras.active, query.active));
         if (query.search) {

package/dist/validation.d.ts

@@ -1,9 +1,9 @@
 import { z } from "zod";
 export declare const extraSelectionTypeSchema: z.ZodEnum<{
+    unavailable: "unavailable";
     optional: "optional";
-    required: "required";
     default_selected: "default_selected";
-    unavailable: "unavailable";
+    required: "required";
 }>;
 export declare const extraPricingModeSchema: z.ZodEnum<{
     included: "included";
@@ -14,22 +14,23 @@ export declare const extraPricingModeSchema: z.ZodEnum<{
     free: "free";
 }>;
 export declare const bookingExtraStatusSchema: z.ZodEnum<{
-    draft: "draft";
-    selected: "selected";
     confirmed: "confirmed";
     cancelled: "cancelled";
+    draft: "draft";
+    selected: "selected";
     fulfilled: "fulfilled";
 }>;
 export declare const productExtraCoreSchema: z.ZodObject<{
     productId: z.ZodString;
+    supplierId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     code: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     selectionType: z.ZodDefault<z.ZodEnum<{
+        unavailable: "unavailable";
         optional: "optional";
-        required: "required";
         default_selected: "default_selected";
-        unavailable: "unavailable";
+        required: "required";
     }>>;
     pricingMode: z.ZodDefault<z.ZodEnum<{
         included: "included";
@@ -49,14 +50,15 @@ export declare const productExtraCoreSchema: z.ZodObject<{
 }, z.core.$strip>;
 export declare const insertProductExtraSchema: z.ZodObject<{
     productId: z.ZodString;
+    supplierId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     code: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     name: z.ZodString;
     description: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     selectionType: z.ZodDefault<z.ZodEnum<{
+        unavailable: "unavailable";
         optional: "optional";
-        required: "required";
         default_selected: "default_selected";
-        unavailable: "unavailable";
+        required: "required";
     }>>;
     pricingMode: z.ZodDefault<z.ZodEnum<{
         included: "included";
@@ -76,14 +78,15 @@ export declare const insertProductExtraSchema: z.ZodObject<{
 }, z.core.$strip>;
 export declare const updateProductExtraSchema: z.ZodObject<{
     productId: z.ZodOptional<z.ZodString>;
+    supplierId: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
     code: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
     name: z.ZodOptional<z.ZodString>;
     description: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
     selectionType: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
+        unavailable: "unavailable";
         optional: "optional";
-        required: "required";
         default_selected: "default_selected";
-        unavailable: "unavailable";
+        required: "required";
     }>>>;
     pricingMode: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
         included: "included";
@@ -105,6 +108,7 @@ export declare const productExtraListQuerySchema: z.ZodObject<{
     limit: z.ZodDefault<z.ZodCoercedNumber<unknown>>;
     offset: z.ZodDefault<z.ZodCoercedNumber<unknown>>;
     productId: z.ZodOptional<z.ZodString>;
+    supplierId: z.ZodOptional<z.ZodString>;
     active: z.ZodOptional<z.ZodPipe<z.ZodEnum<{
         0: "0";
         1: "1";
@@ -117,10 +121,10 @@ export declare const optionExtraConfigCoreSchema: z.ZodObject<{
     optionId: z.ZodString;
     productExtraId: z.ZodString;
     selectionType: z.ZodOptional<z.ZodNullable<z.ZodEnum<{
+        unavailable: "unavailable";
         optional: "optional";
-        required: "required";
         default_selected: "default_selected";
-        unavailable: "unavailable";
+        required: "required";
     }>>>;
     pricingMode: z.ZodOptional<z.ZodNullable<z.ZodEnum<{
         included: "included";
@@ -144,10 +148,10 @@ export declare const insertOptionExtraConfigSchema: z.ZodObject<{
     optionId: z.ZodString;
     productExtraId: z.ZodString;
     selectionType: z.ZodOptional<z.ZodNullable<z.ZodEnum<{
+        unavailable: "unavailable";
         optional: "optional";
-        required: "required";
         default_selected: "default_selected";
-        unavailable: "unavailable";
+        required: "required";
     }>>>;
     pricingMode: z.ZodOptional<z.ZodNullable<z.ZodEnum<{
         included: "included";
@@ -171,10 +175,10 @@ export declare const updateOptionExtraConfigSchema: z.ZodObject<{
     optionId: z.ZodOptional<z.ZodString>;
     productExtraId: z.ZodOptional<z.ZodString>;
     selectionType: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodEnum<{
+        unavailable: "unavailable";
         optional: "optional";
-        required: "required";
         default_selected: "default_selected";
-        unavailable: "unavailable";
+        required: "required";
     }>>>>;
     pricingMode: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodEnum<{
         included: "included";
@@ -213,10 +217,10 @@ export declare const bookingExtraCoreSchema: z.ZodObject<{
     name: z.ZodString;
     description: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     status: z.ZodDefault<z.ZodEnum<{
-        draft: "draft";
-        selected: "selected";
         confirmed: "confirmed";
         cancelled: "cancelled";
+        draft: "draft";
+        selected: "selected";
         fulfilled: "fulfilled";
     }>>;
     pricingMode: z.ZodDefault<z.ZodEnum<{
@@ -245,10 +249,10 @@ export declare const insertBookingExtraSchema: z.ZodObject<{
     name: z.ZodString;
     description: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     status: z.ZodDefault<z.ZodEnum<{
-        draft: "draft";
-        selected: "selected";
         confirmed: "confirmed";
         cancelled: "cancelled";
+        draft: "draft";
+        selected: "selected";
         fulfilled: "fulfilled";
     }>>;
     pricingMode: z.ZodDefault<z.ZodEnum<{
@@ -277,10 +281,10 @@ export declare const updateBookingExtraSchema: z.ZodObject<{
     name: z.ZodOptional<z.ZodString>;
     description: z.ZodOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
     status: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
-        draft: "draft";
-        selected: "selected";
         confirmed: "confirmed";
         cancelled: "cancelled";
+        draft: "draft";
+        selected: "selected";
         fulfilled: "fulfilled";
     }>>>;
     pricingMode: z.ZodOptional<z.ZodDefault<z.ZodEnum<{
@@ -309,10 +313,10 @@ export declare const bookingExtraListQuerySchema: z.ZodObject<{
     productExtraId: z.ZodOptional<z.ZodString>;
     optionExtraConfigId: z.ZodOptional<z.ZodString>;
     status: z.ZodOptional<z.ZodEnum<{
-        draft: "draft";
-        selected: "selected";
         confirmed: "confirmed";
         cancelled: "cancelled";
+        draft: "draft";
+        selected: "selected";
         fulfilled: "fulfilled";
     }>>;
 }, z.core.$strip>;

package/dist/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AASvB,eAAO,MAAM,wBAAwB;;;;;EAKnC,CAAA;AAEF,eAAO,MAAM,sBAAsB;;;;;;;EAOjC,CAAA;AAEF,eAAO,MAAM,wBAAwB;;;;;;EAMnC,CAAA;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;iBAcjC,CAAA;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAyB,CAAA;AAC9D,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAmC,CAAA;AACxE,eAAO,MAAM,2BAA2B;;;;;;;;;;;iBAItC,CAAA;AAEF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;iBActC,CAAA;AAEF,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;iBAA8B,CAAA;AACxE,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAwC,CAAA;AAClF,eAAO,MAAM,gCAAgC;;;;;;;;;;;iBAI3C,CAAA;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAkBjC,CAAA;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAyB,CAAA;AAC9D,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAmC,CAAA;AACxE,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;iBAKtC,CAAA"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AASvB,eAAO,MAAM,wBAAwB;;;;;EAKnC,CAAA;AAEF,eAAO,MAAM,sBAAsB;;;;;;;EAOjC,CAAA;AAEF,eAAO,MAAM,wBAAwB;;;;;;EAMnC,CAAA;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAejC,CAAA;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAyB,CAAA;AAC9D,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAmC,CAAA;AACxE,eAAO,MAAM,2BAA2B;;;;;;;;;;;;iBAKtC,CAAA;AAEF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;iBActC,CAAA;AAEF,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;iBAA8B,CAAA;AACxE,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAwC,CAAA;AAClF,eAAO,MAAM,gCAAgC;;;;;;;;;;;iBAI3C,CAAA;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAkBjC,CAAA;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAyB,CAAA;AAC9D,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAAmC,CAAA;AACxE,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;iBAKtC,CAAA"}

package/dist/validation.js

@@ -28,6 +28,7 @@ export const bookingExtraStatusSchema = z.enum([
 ]);
 export const productExtraCoreSchema = z.object({
     productId: z.string(),
+    supplierId: z.string().nullable().optional(),
     code: z.string().max(100).nullable().optional(),
     name: z.string().min(1).max(255),
     description: z.string().nullable().optional(),
@@ -45,6 +46,7 @@ export const insertProductExtraSchema = productExtraCoreSchema;
 export const updateProductExtraSchema = productExtraCoreSchema.partial();
 export const productExtraListQuerySchema = paginationSchema.extend({
     productId: z.string().optional(),
+    supplierId: z.string().optional(),
     active: booleanQueryParam.optional(),
     search: z.string().optional(),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voyantjs/extras",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -29,15 +29,15 @@
     "drizzle-orm": "^0.45.2",
     "hono": "^4.12.10",
     "zod": "^4.3.6",
-    "@voyantjs/core": "0.20.0",
-    "@voyantjs/db": "0.20.0",
-    "@voyantjs/hono": "0.20.0",
-    "@voyantjs/catalog": "0.20.0"
+    "@voyantjs/core": "0.21.0",
+    "@voyantjs/db": "0.21.0",
+    "@voyantjs/hono": "0.21.0",
+    "@voyantjs/catalog": "0.21.0"
   },
   "devDependencies": {
     "typescript": "^6.0.2",
-    "@voyantjs/bookings": "0.20.0",
-    "@voyantjs/products": "0.20.0",
+    "@voyantjs/bookings": "0.21.0",
+    "@voyantjs/products": "0.21.0",
     "@voyantjs/voyant-typescript-config": "0.1.0"
   },
   "files": [