orionplace-svelte 0.7.0 → 0.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orionplace-svelte",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "SvelteKit 2 storefront for your Orionplace marketplace: setup CLI, server API gateway, typed store and ready-made catalog, cart, checkout and account components in English and Russian, plus an Android app build.",
   "type": "module",
   "license": "MIT",

package/src/project-readme.mjs

@@ -405,11 +405,10 @@ out; the journal and other pages stay indexable. Leave it empty on a live shop.
 
 Every product page carries schema.org product data for Google and Yandex: the
 price, the crossed-out old price, stock, photos, brand, seller, rating and the
-return terms the page shows. To include the return terms, set
-\`ORIONPLACE_SHIPPING_COUNTRIES\` in \`.env\` to the countries you ship to, as
-ISO codes separated by spaces, for example
-\`ORIONPLACE_SHIPPING_COUNTRIES="RU BY"\`; without it the return terms are left
-out. The delivery cost is not included: it depends on the buyer's address.
+return terms the page shows. The return terms name the shop's shipping
+countries, which Application Load sends in \`init.shipping_countries\`; without
+a shipping country they are left out. The delivery cost is not included: it
+depends on the buyer's address.
 
 This setup does not add analytics.
 

package/templates/src/lib/interfaces/orionplace/appBase/IAppLoadCommon.ts

@@ -24,6 +24,8 @@ export interface IAppLoadCommon {
   weights: Record<string, IAppLoadCommonUnit>;
   lengths: Record<string, IAppLoadCommonUnit>;
   geo_location_enabled: boolean;
+  /** ISO codes of the shop's shipping countries, sorted. */
+  shipping_countries?: string[];
   is_authenticated: boolean;
   wallet?: Record<string, IAppLoadCommonWalletValue>;
   logos: IAppLoadCommonLogos;

package/templates/src/lib/utils/orionplace/productStructuredData.ts

@@ -45,7 +45,7 @@ export interface StorefrontProductDataOptions {
   /** The currency the page shows prices in (its ID and code). */
   currencyId: string;
   currencyCode: string | undefined;
-  /** ORIONPLACE_SHIPPING_COUNTRIES, parsed by shippingCountryCodes(). */
+  /** App Load `init.shipping_countries`, parsed by shippingCountryCodes(). */
   shippingCountries: string[];
   /** False when the page hides the seller (single-seller storefront). */
   showSeller: boolean;
@@ -54,11 +54,12 @@ export interface StorefrontProductDataOptions {
 }
 
 /**
- * The countries the shop ships to, from ORIONPLACE_SHIPPING_COUNTRIES:
- * ISO 3166-1 alpha-2 codes separated by spaces or commas, e.g. "RU BY".
+ * The countries the shop ships to: App Load `init.shipping_countries` (the
+ * backend's countries marked as shipping countries), as valid ISO 3166-1
+ * alpha-2 codes.
  */
 export function shippingCountryCodes(value: unknown): string[] {
-  const codes = String(value ?? '')
+  const codes = (Array.isArray(value) ? value.join(' ') : String(value ?? ''))
     .split(/[\s,;]+/)
     .map((code) => code.trim().toUpperCase())
     .filter((code) => /^[A-Z]{2}$/.test(code));

package/templates/src/routes/+layout.server.ts

@@ -1,4 +1,3 @@
-import { env } from '$env/dynamic/private';
 import { loadOrionplaceAppLoad } from '@/lib/orionplace/appLoadServer';
 import { OrionplaceStore } from '@/lib/orionplace/store.svelte';
 import { storefrontErrorLocale } from '@/lib/utils/orionplace/errorPageLabels';
@@ -34,8 +33,5 @@ export const load: LayoutServerLoad = async (event) => {
   return {
     orionplace: { result, failure },
     orionplaceLocale: store.localeCode,
-    // The countries the shop ships to, for the return terms in the product
-    // page's schema.org data.
-    orionplaceShippingCountries: env.ORIONPLACE_SHIPPING_COUNTRIES ?? '',
   };
 };

package/templates/src/routes/product/[id]/+page.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { page } from '$app/state';
   import { useOrionplaceStore } from '@/lib/stores/orionplace.svelte';
   import { computed, ref, watch } from '@/lib/orionplace/reactivity.svelte';
   import { navigateTo, useRoute } from '@/lib/orionplace/navigation.svelte';
@@ -78,11 +77,6 @@
     return images?.full?.[0] ?? images?.small?.[0];
   });
 
-  // ORIONPLACE_SHIPPING_COUNTRIES from the server's .env (+layout.server.ts),
-  // for the return terms in the page's schema.org data.
-  const shippingCountries      = computed(() =>
-    shippingCountryCodes(page.data.orionplaceShippingCountries),
-  );
   const productName            = computed(() =>
     getAvailableNestedValueFromObject(
       product.value?.locale,
@@ -117,7 +111,10 @@
         description: productSummary.value,
         currencyId: store.currencyId,
         currencyCode: store.currentCurrency?.currency_code,
-        shippingCountries: shippingCountries.value,
+        // The backend's shipping countries, for the return terms.
+        shippingCountries: shippingCountryCodes(
+          store.init?.shipping_countries,
+        ),
         showSeller: !store.init?.visual_settings?.single_seller_mode,
         absoluteUrl: (value) => storefrontAbsoluteUrl(value, origin),
       }),