@cartbase/storefront 0.16.0 → 0.18.0

package/src/lib/get-product-price.ts

@@ -1,133 +1,133 @@
-import { getPercentageDiff } from "./get-percentage-diff"
-import { convertToLocale } from "./money"
-
-/**
- * Product price extraction — ported from
- * `@1click/ui/src/lib/get-product-price.ts` (v2.3.1). The
- * `@medusajs/types` `HttpTypes.StoreProduct` parameter is replaced by the
- * structural shapes below so this module stays decoupled from the SDK
- * domain modules (Cartbase's `variant.calculated_price` is the b2b-v1
- * pricing context documented in `@cartbase/storefront/api/types`
- * `CalculatedPrice`, decimal EUR major units).
- *
- * Wire-shape note (code truth, `src/lib/products/pricing.ts`): Cartbase serves
- * `calculated_price.price_list_type` FLAT on the calculated_price object.
- * The Medusa wire shape ALSO nests a `calculated_price.calculated_price`
- * detail object carrying `price_list_type` — the original library read the
- * nested path. `getPricesForVariant` reads the flat key first and falls
- * back to the nested path so both shapes produce the same result.
- */
-
-/** Structural `variant.calculated_price` shape (see api/types CalculatedPrice). */
-export type CalculatedPriceLike = {
-  calculated_amount: number
-  original_amount: number
-  currency_code: string
-  price_list_type?: string | null
-  /** Medusa-wire nested detail object (fallback path). */
-  calculated_price?: { price_list_type?: string | null } | null
-}
-
-/** Structural variant shape — any richer product-variant DTO satisfies it. */
-export type VariantWithPrice = {
-  id?: string
-  sku?: string | null
-  calculated_price?: CalculatedPriceLike | null
-}
-
-/** Structural product shape — any richer product DTO satisfies it. */
-export type ProductWithVariants = {
-  id?: string
-  variants?: VariantWithPrice[] | null
-}
-
-export type VariantPrice = {
-  calculated_price_number: number
-  calculated_price: string
-  original_price_number: number
-  original_price: string
-  currency_code: string
-  price_type: string | null | undefined
-  percentage_diff: string
-}
-
-export const getPricesForVariant = (
-  variant: VariantWithPrice | null | undefined
-): VariantPrice | null => {
-  if (!variant?.calculated_price?.calculated_amount) {
-    return null
-  }
-
-  const cp = variant.calculated_price
-  return {
-    calculated_price_number: cp.calculated_amount,
-    calculated_price: convertToLocale({
-      amount: cp.calculated_amount,
-      currency_code: cp.currency_code,
-    }),
-    original_price_number: cp.original_amount,
-    original_price: convertToLocale({
-      amount: cp.original_amount,
-      currency_code: cp.currency_code,
-    }),
-    currency_code: cp.currency_code,
-    // Flat key (Cartbase wire shape) first — an explicit null stays null;
-    // the nested Medusa detail is the fallback only when the flat key is
-    // absent entirely (the original @1click read path).
-    price_type:
-      cp.price_list_type !== undefined
-        ? cp.price_list_type
-        : cp.calculated_price?.price_list_type,
-    percentage_diff: getPercentageDiff(cp.original_amount, cp.calculated_amount),
-  }
-}
-
-export function getProductPrice({
-  product,
-  variantId,
-}: {
-  product: ProductWithVariants
-  variantId?: string
-}) {
-  if (!product || !product.id) {
-    throw new Error("No product provided")
-  }
-
-  const cheapestPrice = (): VariantPrice | null => {
-    if (!product || !product.variants?.length) {
-      return null
-    }
-
-    const cheapestVariant = product.variants
-      .filter((v) => !!v.calculated_price)
-      .sort(
-        (a, b) =>
-          (a.calculated_price?.calculated_amount ?? 0) -
-          (b.calculated_price?.calculated_amount ?? 0)
-      )[0]
-
-    return getPricesForVariant(cheapestVariant)
-  }
-
-  const variantPrice = (): VariantPrice | null => {
-    if (!product || !variantId) {
-      return null
-    }
-
-    const variant = product.variants?.find(
-      (v) => v.id === variantId || v.sku === variantId
-    )
-
-    if (!variant) {
-      return null
-    }
-
-    return getPricesForVariant(variant)
-  }
-
-  return {
-    product,
-    cheapestPrice: cheapestPrice(),
-    variantPrice: variantPrice(),
-  }
-}
+import { getPercentageDiff } from "./get-percentage-diff"
+import { convertToLocale } from "./money"
+
+/**
+ * Product price extraction — ported from
+ * `@1click/ui/src/lib/get-product-price.ts` (v2.3.1). The
+ * `@medusajs/types` `HttpTypes.StoreProduct` parameter is replaced by the
+ * structural shapes below so this module stays decoupled from the SDK
+ * domain modules (Cartbase's `variant.calculated_price` is the b2b-v1
+ * pricing context documented in `@cartbase/storefront/api/types`
+ * `CalculatedPrice`, decimal EUR major units).
+ *
+ * Wire-shape note (code truth, `src/lib/products/pricing.ts`): Cartbase serves
+ * `calculated_price.price_list_type` FLAT on the calculated_price object.
+ * The Medusa wire shape ALSO nests a `calculated_price.calculated_price`
+ * detail object carrying `price_list_type` — the original library read the
+ * nested path. `getPricesForVariant` reads the flat key first and falls
+ * back to the nested path so both shapes produce the same result.
+ */
+
+/** Structural `variant.calculated_price` shape (see api/types CalculatedPrice). */
+export type CalculatedPriceLike = {
+  calculated_amount: number
+  original_amount: number
+  currency_code: string
+  price_list_type?: string | null
+  /** Medusa-wire nested detail object (fallback path). */
+  calculated_price?: { price_list_type?: string | null } | null
+}
+
+/** Structural variant shape — any richer product-variant DTO satisfies it. */
+export type VariantWithPrice = {
+  id?: string
+  sku?: string | null
+  calculated_price?: CalculatedPriceLike | null
+}
+
+/** Structural product shape — any richer product DTO satisfies it. */
+export type ProductWithVariants = {
+  id?: string
+  variants?: VariantWithPrice[] | null
+}
+
+export type VariantPrice = {
+  calculated_price_number: number
+  calculated_price: string
+  original_price_number: number
+  original_price: string
+  currency_code: string
+  price_type: string | null | undefined
+  percentage_diff: string
+}
+
+export const getPricesForVariant = (
+  variant: VariantWithPrice | null | undefined
+): VariantPrice | null => {
+  if (!variant?.calculated_price?.calculated_amount) {
+    return null
+  }
+
+  const cp = variant.calculated_price
+  return {
+    calculated_price_number: cp.calculated_amount,
+    calculated_price: convertToLocale({
+      amount: cp.calculated_amount,
+      currency_code: cp.currency_code,
+    }),
+    original_price_number: cp.original_amount,
+    original_price: convertToLocale({
+      amount: cp.original_amount,
+      currency_code: cp.currency_code,
+    }),
+    currency_code: cp.currency_code,
+    // Flat key (Cartbase wire shape) first — an explicit null stays null;
+    // the nested Medusa detail is the fallback only when the flat key is
+    // absent entirely (the original @1click read path).
+    price_type:
+      cp.price_list_type !== undefined
+        ? cp.price_list_type
+        : cp.calculated_price?.price_list_type,
+    percentage_diff: getPercentageDiff(cp.original_amount, cp.calculated_amount),
+  }
+}
+
+export function getProductPrice({
+  product,
+  variantId,
+}: {
+  product: ProductWithVariants
+  variantId?: string
+}) {
+  if (!product || !product.id) {
+    throw new Error("No product provided")
+  }
+
+  const cheapestPrice = (): VariantPrice | null => {
+    if (!product || !product.variants?.length) {
+      return null
+    }
+
+    const cheapestVariant = product.variants
+      .filter((v) => !!v.calculated_price)
+      .sort(
+        (a, b) =>
+          (a.calculated_price?.calculated_amount ?? 0) -
+          (b.calculated_price?.calculated_amount ?? 0)
+      )[0]
+
+    return getPricesForVariant(cheapestVariant)
+  }
+
+  const variantPrice = (): VariantPrice | null => {
+    if (!product || !variantId) {
+      return null
+    }
+
+    const variant = product.variants?.find(
+      (v) => v.id === variantId || v.sku === variantId
+    )
+
+    if (!variant) {
+      return null
+    }
+
+    return getPricesForVariant(variant)
+  }
+
+  return {
+    product,
+    cheapestPrice: cheapestPrice(),
+    variantPrice: variantPrice(),
+  }
+}

package/src/lib/media-image.tsx

@@ -0,0 +1,39 @@
+import NextImage, { type ImageProps } from "next/image"
+
+/**
+ * The store's picture element (store-speed-law card, step 3, 2026-09-15).
+ *
+ * Product pictures live on the Cartbase media CDN, and Next resizes them on
+ * the store's own project, per device and in the modern formats, which the
+ * scaffold allows through `images.remotePatterns` (next.config.ts). The
+ * scaffold used to ship `images.unoptimized: true` instead, so no picture
+ * was ever resized: a phone downloaded the merchant's full upload.
+ *
+ * A picture from any other host (a catalogue not yet rehosted, a demo
+ * placeholder, a merchant's own asset host) renders as it is instead of
+ * failing the page: Next refuses to resize a host the config does not
+ * list, so this element switches resizing off for those. A merchant who
+ * adds their host to `remotePatterns` gets resizing there too by passing
+ * `unoptimized={false}` where they render it, or by using `next/image`
+ * directly.
+ */
+
+/** The public base of the media CDN (REGISTRY.md, CDN domain). */
+export const MEDIA_HOST = "cartbase.cloud"
+
+/** Is this picture served by the media CDN (or by the app itself)? */
+export function isResizableSrc(src: ImageProps["src"]): boolean {
+  if (typeof src !== "string") return true
+  if (src.startsWith("/")) return true
+  try {
+    const host = new URL(src).hostname
+    return host === MEDIA_HOST || host.endsWith(`.${MEDIA_HOST}`)
+  } catch {
+    return false
+  }
+}
+
+export function StoreImage(props: ImageProps) {
+  const unoptimized = props.unoptimized ?? !isResizableSrc(props.src)
+  return <NextImage {...props} unoptimized={unoptimized} />
+}

package/src/lib/payment-constants.ts

@@ -1,53 +1,53 @@
-/**
- * Payment tender helpers — identifier sniffing for store payment sessions.
- *
- * The Cartbase wire has exactly TWO tender shapes since the pp_* kill
- * (20260811250000, no-payment-method-by-default card):
- *
- *   - a PROCESSOR the merchant connected — `provider_id` (`pp_stripe`
- *     today; PayPal etc. as integrations land);
- *   - a merchant-operated PAYMENT METHOD — `payment_method_id` + `name` +
- *     `kind` (`manual` for Bank transfer / Pay in store, `cod` for the
- *     collection-on-delivery switch). Its session carries `provider_id`
- *     NULL; the merchant's NAME is the display everywhere.
- *
- * The dead ids (`pp_cod`, `pp_manual`, `pp_system_default`) are gone from
- * the wire and from this module. The Medusa-era Stripe prefixes
- * (`pp_stripe_*`, `pp_medusa-*`) are kept as fallbacks so components
- * ported later keep working against either wire.
- *
- * Intentionally ships NO icons — stores render their own icons via their
- * own icon set. The library stays free of icon-kit imports at this layer.
- */
-
-/**
- * True if the provider id is a Stripe-backed card payment provider.
- * Cartbase's canonical ids first (`pp_stripe` / `stripe`), then the
- * Medusa-era prefixes (`pp_stripe_*`, `pp_medusa-*`).
- */
-export const isStripeLike = (providerId?: string | null): boolean => {
-  return Boolean(
-    providerId &&
-      (providerId === "pp_stripe" ||
-        providerId === "stripe" ||
-        providerId.startsWith("pp_stripe_") ||
-        providerId.startsWith("pp_medusa-"))
-  )
-}
-
-/** True if the provider id is PayPal. */
-export const isPaypal = (providerId?: string | null): boolean => {
-  return Boolean(providerId?.startsWith("pp_paypal"))
-}
-
-export const paymentInfoMap: Record<
-  string,
-  { title: string; icon: React.JSX.Element | null }
-> = {
-  pp_stripe: { title: "Credit / debit card", icon: null },
-  pp_stripe_stripe: { title: "Credit / debit card", icon: null },
-  "pp_medusa-payments_default": { title: "Credit / debit card", icon: null },
-  "pp_stripe-ideal_stripe": { title: "iDeal", icon: null },
-  "pp_stripe-bancontact_stripe": { title: "Bancontact", icon: null },
-  pp_paypal_paypal: { title: "PayPal", icon: null },
-}
+/**
+ * Payment tender helpers — identifier sniffing for store payment sessions.
+ *
+ * The Cartbase wire has exactly TWO tender shapes since the pp_* kill
+ * (20260811250000, no-payment-method-by-default card):
+ *
+ *   - a PROCESSOR the merchant connected — `provider_id` (`pp_stripe`
+ *     today; PayPal etc. as integrations land);
+ *   - a merchant-operated PAYMENT METHOD — `payment_method_id` + `name` +
+ *     `kind` (`manual` for Bank transfer / Pay in store, `cod` for the
+ *     collection-on-delivery switch). Its session carries `provider_id`
+ *     NULL; the merchant's NAME is the display everywhere.
+ *
+ * The dead ids (`pp_cod`, `pp_manual`, `pp_system_default`) are gone from
+ * the wire and from this module. The Medusa-era Stripe prefixes
+ * (`pp_stripe_*`, `pp_medusa-*`) are kept as fallbacks so components
+ * ported later keep working against either wire.
+ *
+ * Intentionally ships NO icons — stores render their own icons via their
+ * own icon set. The library stays free of icon-kit imports at this layer.
+ */
+
+/**
+ * True if the provider id is a Stripe-backed card payment provider.
+ * Cartbase's canonical ids first (`pp_stripe` / `stripe`), then the
+ * Medusa-era prefixes (`pp_stripe_*`, `pp_medusa-*`).
+ */
+export const isStripeLike = (providerId?: string | null): boolean => {
+  return Boolean(
+    providerId &&
+      (providerId === "pp_stripe" ||
+        providerId === "stripe" ||
+        providerId.startsWith("pp_stripe_") ||
+        providerId.startsWith("pp_medusa-"))
+  )
+}
+
+/** True if the provider id is PayPal. */
+export const isPaypal = (providerId?: string | null): boolean => {
+  return Boolean(providerId?.startsWith("pp_paypal"))
+}
+
+export const paymentInfoMap: Record<
+  string,
+  { title: string; icon: React.JSX.Element | null }
+> = {
+  pp_stripe: { title: "Credit / debit card", icon: null },
+  pp_stripe_stripe: { title: "Credit / debit card", icon: null },
+  "pp_medusa-payments_default": { title: "Credit / debit card", icon: null },
+  "pp_stripe-ideal_stripe": { title: "iDeal", icon: null },
+  "pp_stripe-bancontact_stripe": { title: "Bancontact", icon: null },
+  pp_paypal_paypal: { title: "PayPal", icon: null },
+}

package/src/lib/platform.ts

@@ -1,13 +1,13 @@
-/**
- * The platform's origin (one key, store-birth-and-doors item 6, 2026-09-07):
- * a constant, not an input. Every Cartbase store's API lives here; a
- * storefront overrides it only to point at a local or staging platform
- * (`NEXT_PUBLIC_CARTBASE_URL`), never to find its own store, which the
- * publishable key does.
- */
-export const CARTBASE_API_ORIGIN = "https://admin.cartbase.ai"
-
-/** The origin to call: the override when set, else the platform. */
-export function cartbaseApiOrigin(override?: string | null): string {
-  return (override && override.trim()) || CARTBASE_API_ORIGIN
-}
+/**
+ * The platform's origin (one key, store-birth-and-doors item 6, 2026-09-07):
+ * a constant, not an input. Every Cartbase store's API lives here; a
+ * storefront overrides it only to point at a local or staging platform
+ * (`NEXT_PUBLIC_CARTBASE_URL`), never to find its own store, which the
+ * publishable key does.
+ */
+export const CARTBASE_API_ORIGIN = "https://admin.cartbase.ai"
+
+/** The origin to call: the override when set, else the platform. */
+export function cartbaseApiOrigin(override?: string | null): string {
+  return (override && override.trim()) || CARTBASE_API_ORIGIN
+}

package/src/lib/price.tsx

@@ -1,39 +1,39 @@
-import * as React from "react"
-
-import { convertToLocale } from "./money"
-
-/**
- * Price — render an amount in its own currency, and nothing else.
- *
- * Replaces `DualPrice` (deleted 2026-09-13, Alexander: "clean and clear
- * the dual pricing"). That component appended a grey BGN leg to every EUR
- * price for Bulgaria's euro-changeover disclosure rule, with the statutory
- * 1.95583 rate baked in. Cartbase prices in EUR (see the EUR-only law) and
- * the second currency belongs to a store's own locale work if it ever
- * wants one, not to every price in the library.
- *
- * Stateless and side-effect-free, so it renders in server and client
- * components alike, and it is deliberately NOT a client component: the old
- * one carried "use client" for no reason, which pulled every price
- * rendering into the client bundle.
- *
- * @example
- *   <Price amount={19.99} currencyCode="eur" />   // "€19.99"
- */
-
-export type PriceProps = {
-  /** Amount in major units of the currency (19.99 for €19.99). */
-  amount: number
-  /** ISO currency code, case-insensitive. */
-  currencyCode: string
-  /** Class for the span. */
-  className?: string
-}
-
-export function Price({ amount, currencyCode, className }: PriceProps): React.ReactElement {
-  return (
-    <span className={className}>
-      {convertToLocale({ amount, currency_code: currencyCode })}
-    </span>
-  )
-}
+import * as React from "react"
+
+import { convertToLocale } from "./money"
+
+/**
+ * Price — render an amount in its own currency, and nothing else.
+ *
+ * Replaces `DualPrice` (deleted 2026-09-13, Alexander: "clean and clear
+ * the dual pricing"). That component appended a grey BGN leg to every EUR
+ * price for Bulgaria's euro-changeover disclosure rule, with the statutory
+ * 1.95583 rate baked in. Cartbase prices in EUR (see the EUR-only law) and
+ * the second currency belongs to a store's own locale work if it ever
+ * wants one, not to every price in the library.
+ *
+ * Stateless and side-effect-free, so it renders in server and client
+ * components alike, and it is deliberately NOT a client component: the old
+ * one carried "use client" for no reason, which pulled every price
+ * rendering into the client bundle.
+ *
+ * @example
+ *   <Price amount={19.99} currencyCode="eur" />   // "€19.99"
+ */
+
+export type PriceProps = {
+  /** Amount in major units of the currency (19.99 for €19.99). */
+  amount: number
+  /** ISO currency code, case-insensitive. */
+  currencyCode: string
+  /** Class for the span. */
+  className?: string
+}
+
+export function Price({ amount, currencyCode, className }: PriceProps): React.ReactElement {
+  return (
+    <span className={className}>
+      {convertToLocale({ amount, currency_code: currencyCode })}
+    </span>
+  )
+}

package/src/lib/store-api-error.ts

@@ -1,36 +1,36 @@
-import { StoreApiError } from "../api/types"
-
-/**
- * storeApiError — the successor of `@1click/ui`'s `medusaError`.
- *
- * Normalizes any error thrown by the `@cartbase/storefront` SDK layer into a
- * clean, user-presentable `Error` whose message starts with a capital and
- * ends with a period — the same normalization contract the Medusa-era
- * helper enforced, adapted to the Cartbase error contract (`StoreApiError`
- * with `status` + `code` + raw `body`, see `../api/types`).
- *
- * Always throws — never returns. Use in `.catch()` chains:
- *
- *   addLineItem(client, cartId, input).catch(storeApiError)
- *
- * Callers that need the PROGRAMMATIC surface (branching on `status` /
- * `code`, e.g. `checkout_method_hidden`, `invalid_gift_card`) should catch
- * `StoreApiError` directly instead — this adapter is the display-boundary
- * normalizer, deliberately lossy about everything but the message.
- */
-export default function storeApiError(error: unknown): never {
-  if (error instanceof StoreApiError) {
-    const message = error.message || `Store API error (${error.status})`
-    throw new Error(sentence(message))
-  }
-  if (error instanceof Error) {
-    throw new Error(sentence(error.message || "Unknown error"))
-  }
-  throw new Error("Error setting up the request: " + String(error))
-}
-
-/** Capitalize + terminal period — the medusaError display normalization. */
-function sentence(message: string): string {
-  const capitalized = message.charAt(0).toUpperCase() + message.slice(1)
-  return capitalized.endsWith(".") ? capitalized : capitalized + "."
-}
+import { StoreApiError } from "../api/types"
+
+/**
+ * storeApiError — the successor of `@1click/ui`'s `medusaError`.
+ *
+ * Normalizes any error thrown by the `@cartbase/storefront` SDK layer into a
+ * clean, user-presentable `Error` whose message starts with a capital and
+ * ends with a period — the same normalization contract the Medusa-era
+ * helper enforced, adapted to the Cartbase error contract (`StoreApiError`
+ * with `status` + `code` + raw `body`, see `../api/types`).
+ *
+ * Always throws — never returns. Use in `.catch()` chains:
+ *
+ *   addLineItem(client, cartId, input).catch(storeApiError)
+ *
+ * Callers that need the PROGRAMMATIC surface (branching on `status` /
+ * `code`, e.g. `checkout_method_hidden`, `invalid_gift_card`) should catch
+ * `StoreApiError` directly instead — this adapter is the display-boundary
+ * normalizer, deliberately lossy about everything but the message.
+ */
+export default function storeApiError(error: unknown): never {
+  if (error instanceof StoreApiError) {
+    const message = error.message || `Store API error (${error.status})`
+    throw new Error(sentence(message))
+  }
+  if (error instanceof Error) {
+    throw new Error(sentence(error.message || "Unknown error"))
+  }
+  throw new Error("Error setting up the request: " + String(error))
+}
+
+/** Capitalize + terminal period — the medusaError display normalization. */
+function sentence(message: string): string {
+  const capitalized = message.charAt(0).toUpperCase() + message.slice(1)
+  return capitalized.endsWith(".") ? capitalized : capitalized + "."
+}

package/src/lib/variant-caption.ts

@@ -1,32 +1,32 @@
-/**
- * The variant caption a shopper sees under a product title.
- *
- * A product with one variant has no real variant, only a placeholder name
- * for the row that holds its price: the platform names it "Default", a
- * Shopify import carries "Default Title", Medusa "Default variant". None of
- * them is a fact about the product, so none is shown. Every surface that
- * prints a variant (cart drawer, checkout summary, order page) goes through
- * this one function; a real variant title ("Size M / Red") passes through.
- *
- * Found 2026-09-14 on evoo's checkout summary, where every Shopify-imported
- * product read "Default Title" under its name while three surfaces each
- * tested a different spelling of the placeholder.
- */
-
-const PLACEHOLDER_TITLES = new Set(["default", "default title", "default variant"])
-
-/** True for an empty title or any spelling of the single-variant placeholder. */
-export function isPlaceholderVariantTitle(
-  title: string | null | undefined
-): boolean {
-  if (!title) return true
-  return PLACEHOLDER_TITLES.has(title.trim().toLowerCase())
-}
-
-/** The caption to render, or null when there is nothing worth showing. */
-export function variantCaption(title: string | null | undefined): string | null {
-  if (!title) return null
-  const trimmed = title.trim()
-  if (!trimmed || isPlaceholderVariantTitle(trimmed)) return null
-  return trimmed
-}
+/**
+ * The variant caption a shopper sees under a product title.
+ *
+ * A product with one variant has no real variant, only a placeholder name
+ * for the row that holds its price: the platform names it "Default", a
+ * Shopify import carries "Default Title", Medusa "Default variant". None of
+ * them is a fact about the product, so none is shown. Every surface that
+ * prints a variant (cart drawer, checkout summary, order page) goes through
+ * this one function; a real variant title ("Size M / Red") passes through.
+ *
+ * Found 2026-09-14 on evoo's checkout summary, where every Shopify-imported
+ * product read "Default Title" under its name while three surfaces each
+ * tested a different spelling of the placeholder.
+ */
+
+const PLACEHOLDER_TITLES = new Set(["default", "default title", "default variant"])
+
+/** True for an empty title or any spelling of the single-variant placeholder. */
+export function isPlaceholderVariantTitle(
+  title: string | null | undefined
+): boolean {
+  if (!title) return true
+  return PLACEHOLDER_TITLES.has(title.trim().toLowerCase())
+}
+
+/** The caption to render, or null when there is nothing worth showing. */
+export function variantCaption(title: string | null | undefined): string | null {
+  if (!title) return null
+  const trimmed = title.trim()
+  if (!trimmed || isPlaceholderVariantTitle(trimmed)) return null
+  return trimmed
+}