@getvitops/astro 6.0.0 → 8.0.0

package/src/schemas/LocalBusiness.astro

@@ -1,154 +1,10 @@
 ---
-export interface OpeningHoursSpecification {
-  dayOfWeek: ('Monday' | 'Tuesday' | 'Wednesday' | 'Thursday' | 'Friday' | 'Saturday' | 'Sunday')[];
-  opens: string;
-  closes: string;
-  validFrom?: string;
-  validThrough?: string;
-}
+import { localBusinessGraph } from '@getvitops/utils/schema';
+import type { LocalBusinessGraphOptions } from '@getvitops/utils/schema';
 
-export interface Props {
-  type?: 'LocalBusiness' | 'Restaurant' | 'Store' | 'MedicalBusiness' | 'FinancialService' | 'FoodEstablishment' | 'HealthAndBeautyBusiness' | 'HomeAndConstructionBusiness' | 'LegalService' | 'LodgingBusiness' | 'ProfessionalService' | 'SportsActivityLocation';
-  name: string;
-  description?: string;
-  url?: string;
-  telephone?: string;
-  email?: string;
-  image?: string | string[];
-  priceRange?: string;
-  address: {
-    streetAddress: string;
-    addressLocality: string;
-    addressRegion?: string;
-    postalCode: string;
-    addressCountry: string;
-  };
-  geo?: {
-    latitude: number;
-    longitude: number;
-  };
-  openingHoursSpecification?: OpeningHoursSpecification[];
-  aggregateRating?: {
-    ratingValue: number;
-    reviewCount?: number;
-    ratingCount?: number;
-    bestRating?: number;
-    worstRating?: number;
-  };
-  review?: {
-    author: string;
-    datePublished: string;
-    reviewBody: string;
-    reviewRating?: {
-      ratingValue: number;
-      bestRating?: number;
-      worstRating?: number;
-    };
-  }[];
-  servesCuisine?: string[];
-  menu?: string;
-  acceptsReservations?: boolean;
-  hasMenu?: string;
-  paymentAccepted?: string[];
-  currenciesAccepted?: string;
-  areaServed?: string[];
-  sameAs?: string[];
-}
+export type Props = LocalBusinessGraphOptions;
 
-const {
-  type = 'LocalBusiness',
-  name,
-  description,
-  url,
-  telephone,
-  email,
-  image,
-  priceRange,
-  address,
-  geo,
-  openingHoursSpecification,
-  aggregateRating,
-  review,
-  servesCuisine,
-  menu,
-  acceptsReservations,
-  hasMenu,
-  paymentAccepted,
-  currenciesAccepted,
-  areaServed,
-  sameAs,
-} = Astro.props;
-
-const jsonLd = {
-  '@context': 'https://schema.org',
-  '@type': type,
-  name,
-  ...(description && { description }),
-  ...(url && { url }),
-  ...(telephone && { telephone }),
-  ...(email && { email }),
-  ...(image && { image: Array.isArray(image) ? image : [image] }),
-  ...(priceRange && { priceRange }),
-  address: {
-    '@type': 'PostalAddress',
-    streetAddress: address.streetAddress,
-    addressLocality: address.addressLocality,
-    ...(address.addressRegion && { addressRegion: address.addressRegion }),
-    postalCode: address.postalCode,
-    addressCountry: address.addressCountry,
-  },
-  ...(geo?.latitude != null && geo?.longitude != null && {
-    geo: {
-      '@type': 'GeoCoordinates',
-      latitude: geo.latitude,
-      longitude: geo.longitude,
-    },
-  }),
-  ...(openingHoursSpecification && {
-    openingHoursSpecification: openingHoursSpecification.map(spec => ({
-      '@type': 'OpeningHoursSpecification',
-      dayOfWeek: spec.dayOfWeek,
-      opens: spec.opens,
-      closes: spec.closes,
-      ...(spec.validFrom && { validFrom: spec.validFrom }),
-      ...(spec.validThrough && { validThrough: spec.validThrough }),
-    })),
-  }),
-  ...(aggregateRating && {
-    aggregateRating: {
-      '@type': 'AggregateRating',
-      ratingValue: aggregateRating.ratingValue,
-      ...(aggregateRating.reviewCount && { reviewCount: aggregateRating.reviewCount }),
-      ...(aggregateRating.ratingCount && { ratingCount: aggregateRating.ratingCount }),
-      bestRating: aggregateRating.bestRating ?? 5,
-      worstRating: aggregateRating.worstRating ?? 1,
-    },
-  }),
-  ...(review && {
-    review: review.map(r => ({
-      '@type': 'Review',
-      author: { '@type': 'Person', name: r.author },
-      datePublished: r.datePublished,
-      reviewBody: r.reviewBody,
-      ...(r.reviewRating && {
-        reviewRating: {
-          '@type': 'Rating',
-          ratingValue: r.reviewRating.ratingValue,
-          bestRating: r.reviewRating.bestRating ?? 5,
-          worstRating: r.reviewRating.worstRating ?? 1,
-        },
-      }),
-    })),
-  }),
-  ...(servesCuisine && { servesCuisine }),
-  ...(menu && { menu }),
-  ...(acceptsReservations !== undefined && { acceptsReservations }),
-  ...(hasMenu && { hasMenu }),
-  ...(paymentAccepted && { paymentAccepted }),
-  ...(currenciesAccepted && { currenciesAccepted }),
-  ...(areaServed && { areaServed }),
-  ...(sameAs && { sameAs }),
-};
+const jsonLd = localBusinessGraph(Astro.props);
 ---
 
 <script is:inline type="application/ld+json" set:html={JSON.stringify(jsonLd)} />

package/src/schemas/Organization.astro

@@ -1,6 +1,6 @@
 ---
-import { organizationGraph } from '@getvitops/utils';
-import type { OrganizationGraphOptions } from '@getvitops/utils';
+import { organizationGraph } from '@getvitops/utils/schema';
+import type { OrganizationGraphOptions } from '@getvitops/utils/schema';
 
 export type Props = OrganizationGraphOptions;
 

package/src/scripts/tracking.ts

@@ -1,5 +1,8 @@
 // Ad conversion tracking: capture click IDs from the landing URL, track tel:
-// clicks. Form enhancement is in form-enhance.ts.
+// clicks. Form submission itself goes through `createConversionRoute()`
+// (`@getvitops/astro/routes`), which handles both the no-JS `<form
+// method="post">` path and a fetch-based one — there is no separate
+// form-enhancement script here.
 //
 // Runs early and ungated on purpose. Reading the query string is not storage and
 // needs nobody's permission; *keeping* it does. So the capture is synchronous —
@@ -100,7 +103,6 @@ function persist(): void {
     ts: existing?.['ts'] ?? Date.now(),
   };
 
-  // Remove undefined values before serializing
   const clean = Object.fromEntries(Object.entries(merged).filter(([, v]) => v !== undefined));
 
   const expires = new Date(Date.now() + COOKIE_DAYS * 864e5).toUTCString();

package/virtual.d.ts

@@ -1,14 +1,3 @@
-/**
- * Astro generates the real types for `astro:env/*` into a consumer's
- * `.astro/` on `astro sync`, which never runs for this package — so the
- * import typechecks nowhere but a consumer project. Declared here at the
- * shape `plan-features.ts` actually uses; the runtime value comes from
- * Astro's env schema, and this file cannot import it.
- */
-declare module 'astro:env/server' {
-  export const SITE_PLAN: string | undefined;
-}
-
 /** Types for the virtual module the getvitops() integration provides to <Head />. */
 declare module 'virtual:getvitops/head' {
   interface FaviconLink {