create-nextblock 0.13.10 → 0.13.12

package/templates/nextblock-template/lib/media/youtube.ts

@@ -0,0 +1,99 @@
+// Shared YouTube URL normalization.
+//
+// No public render path may emit a www.youtube.com iframe: the player writes
+// cookies via document.cookie on load (TESTCOOKIESENABLED, LAST_RESULT_ENTRY_KEY,
+// ExcludeSameSiteUnspecifiedTreatedAsLax) which Chrome logs as a DevTools "Cookie"
+// issue and Lighthouse fails through the `inspector-issues` audit (Best Practices
+// 26/27 = 96). Switching to youtube-nocookie.com does NOT stop those writes --
+// only not loading the player does. See components/media/YouTubeFacade.tsx.
+
+const YOUTUBE_HOST_RE = /^(?:www\.|m\.|music\.)?(?:youtube\.com|youtube-nocookie\.com)$/i;
+const YOUTU_BE_RE = /^(?:www\.)?youtu\.be$/i;
+const VIDEO_ID_RE = /^[A-Za-z0-9_-]{6,20}$/;
+
+export interface ParsedYouTubeUrl {
+  videoId: string;
+  /** Extra player params carried over from the source URL (v/si/autoplay stripped). */
+  params: URLSearchParams;
+}
+
+/**
+ * Accepts every shape an author can paste or that YouTube's Share > Embed panel
+ * emits: watch?v= (v anywhere in the query), youtu.be/, /embed/, /shorts/,
+ * /live/, /v/, m. and music. subdomains, and youtube-nocookie.com/embed/.
+ * Returns null for non-YouTube URLs.
+ */
+export function parseYouTubeUrl(rawUrl: string | undefined | null): ParsedYouTubeUrl | null {
+  if (!rawUrl) return null;
+  let url: URL;
+  try {
+    url = new URL(rawUrl, 'https://www.youtube.com');
+  } catch {
+    return null;
+  }
+
+  let videoId = '';
+  if (YOUTU_BE_RE.test(url.hostname)) {
+    videoId = url.pathname.split('/').filter(Boolean)[0] || '';
+  } else if (YOUTUBE_HOST_RE.test(url.hostname)) {
+    const segments = url.pathname.split('/').filter(Boolean);
+    const head = segments[0] || '';
+    if (head === 'watch') {
+      videoId = url.searchParams.get('v') || '';
+    } else if (head === 'embed' || head === 'shorts' || head === 'live' || head === 'v') {
+      videoId = segments[1] || '';
+    }
+  }
+  if (!VIDEO_ID_RE.test(videoId)) return null;
+
+  const params = new URLSearchParams(url.search);
+  params.delete('v');
+  params.delete('si'); // share-tracking token, not needed for playback
+  // Never auto-start on load: an autoplaying frame boots the player (and its
+  // cookie writes) during a Lighthouse run. The facade re-adds autoplay=1 only
+  // after a real user click.
+  params.delete('autoplay');
+  return { videoId, params };
+}
+
+export function buildNoCookieEmbedUrl(
+  videoId: string,
+  params?: URLSearchParams,
+  opts?: { autoplay?: boolean }
+): string {
+  const search = new URLSearchParams(params ? params.toString() : '');
+  if (opts?.autoplay) search.set('autoplay', '1');
+  const qs = search.toString();
+  return `https://www.youtube-nocookie.com/embed/${videoId}${qs ? `?${qs}` : ''}`;
+}
+
+/** Last-resort string rewrite for raw-HTML paths that cannot be parsed into nodes. */
+export function rewriteYouTubeHostsInHtml(html: string): string {
+  if (!html) return html;
+  return html.replace(
+    /(?:https?:)?\/\/(?:www\.|m\.|music\.)?youtube\.com\/embed\//gi,
+    'https://www.youtube-nocookie.com/embed/'
+  );
+}
+
+export type YouTubePosterQuality = 'maxres' | 'hq';
+
+/**
+ * Intrinsic size of each poster variant. maxresdefault is 16:9 but is not
+ * uploaded for every video; hqdefault always exists and is 4:3 (the frame is
+ * letterboxed inside it), which is why the facade object-covers the poster.
+ */
+export const YOUTUBE_POSTER_DIMENSIONS: Record<
+  YouTubePosterQuality,
+  { width: number; height: number }
+> = {
+  maxres: { width: 1280, height: 720 },
+  hq: { width: 480, height: 360 },
+};
+
+export function youTubePosterUrl(
+  videoId: string,
+  quality: YouTubePosterQuality = 'maxres'
+): string {
+  return `https://i.ytimg.com/vi/${videoId}/${quality === 'maxres' ? 'maxresdefault' : 'hqdefault'}.jpg`;
+}

package/templates/nextblock-template/lib/onboarding/actions.ts

@@ -1,31 +1,31 @@
-'use server';
-
-import { createClient } from '@nextblock-cms/db/server';
-import { revalidatePath } from 'next/cache';
-
-/** Persist the onboarding dismiss flag in the `onboarding_state` row (read-merge). */
-export async function setOnboardingDismissed(dismissed: boolean) {
-  const supabase = createClient();
-
-  const { data: existing } = await supabase
-    .from('site_settings')
-    .select('value')
-    .eq('key', 'onboarding_state')
-    .maybeSingle();
-
-  const current =
-    existing?.value && typeof existing.value === 'object' && !Array.isArray(existing.value)
-      ? (existing.value as Record<string, unknown>)
-      : {};
-
-  const { error } = await supabase
-    .from('site_settings')
-    .upsert({ key: 'onboarding_state', value: { ...current, dismissed } });
-
-  if (error) {
-    console.error('Error updating onboarding state:', error.message);
-    throw new Error('Failed to update onboarding state.');
-  }
-
-  revalidatePath('/cms/dashboard');
-}
+'use server';
+
+import { createClient } from '@nextblock-cms/db/server';
+import { revalidatePath } from 'next/cache';
+
+/** Persist the onboarding dismiss flag in the `onboarding_state` row (read-merge). */
+export async function setOnboardingDismissed(dismissed: boolean) {
+  const supabase = createClient();
+
+  const { data: existing } = await supabase
+    .from('site_settings')
+    .select('value')
+    .eq('key', 'onboarding_state')
+    .maybeSingle();
+
+  const current =
+    existing?.value && typeof existing.value === 'object' && !Array.isArray(existing.value)
+      ? (existing.value as Record<string, unknown>)
+      : {};
+
+  const { error } = await supabase
+    .from('site_settings')
+    .upsert({ key: 'onboarding_state', value: { ...current, dismissed } });
+
+  if (error) {
+    console.error('Error updating onboarding state:', error.message);
+    throw new Error('Failed to update onboarding state.');
+  }
+
+  revalidatePath('/cms/dashboard');
+}

package/templates/nextblock-template/lib/onboarding/status.ts

@@ -1,222 +1,222 @@
-import 'server-only';
-// Derives the dashboard onboarding checklist live from configuration state. Every check
-// reads public/service-role data only, so it works for both ADMIN and WRITER dashboards.
-import { createClient } from '@nextblock-cms/db/server';
-import { getStoreConfigStatus } from '@nextblock-cms/ecommerce/server';
-import { getEmailPublicSettings } from '../config/email-settings';
-import { getPrivacySettings } from '../privacy/settings';
-import { detectChannel } from '../setup/env-status';
-import { getSystemConfiguration } from '../setup/system-config';
-import { selfActionsSettingsUrl } from '../updates/repo-identity';
-import { isGithubConnectAvailable } from '../updates/github-device';
-
-export type OnboardingStep = {
-  key: string;
-  title: string;
-  description: string;
-  href: string;
-  done: boolean;
-  optional: boolean;
-  /** When true, render the CTA as an external link (new tab) instead of an in-app route. */
-  isExternal?: boolean;
-  /** When true, render the device-flow "Connect GitHub" control instead of a link. */
-  connectGithub?: boolean;
-};
-
-export type OnboardingStatus = {
-  steps: OnboardingStep[];
-  completed: number;
-  total: number;
-  dismissed: boolean;
-};
-
-// Seeded defaults (libs/db baseline seed 00000000000003 + migration 00000000000004). The
-// branding/copyright steps count as "done" only when the value has been customized away from
-// these — a fresh install ships with the seeds, so a plain presence check would mark every
-// step complete immediately.
-const SEEDED_SITE_TITLE = 'NextBlock™ CMS';
-// Every object_key a fresh install may ship as the DEFAULT logo — the original baseline WebP
-// and the migration-00000000000004 email-safe PNG (which repoints the seeded default). A logo
-// counts as customized only when it is none of these; a new default swap must be added here or
-// branding falsely reads as done out of the box. Mirrors BUNDLED_PUBLIC_MEDIA_KEYS in
-// lib/media/resolveMediaUrl.ts.
-const SEEDED_LOGO_OBJECT_KEYS = new Set<string>([
-  'images/nextblock-logo-small.webp',
-  'images/nextblock-logo-button-tiny.png',
-]);
-const SEEDED_COPYRIGHT: Record<string, string> = {
-  en: '© {year} Nextblock CMS. All rights reserved.',
-  fr: '© {year} Nextblock CMS. Tous droits réservés.',
-};
-
-/** True when at least one language's copyright text is set AND differs from the seed. */
-function hasCustomCopyright(value: unknown): boolean {
-  if (!value || typeof value !== 'object') return false;
-  return Object.entries(value as Record<string, unknown>).some(([lang, v]) => {
-    if (typeof v !== 'string') return false;
-    const trimmed = v.trim();
-    return trimmed.length > 0 && trimmed !== (SEEDED_COPYRIGHT[lang] ?? '');
-  });
-}
-
-/** Pull the active logo's media object_key from the (to-one) embedded relation. */
-function extractLogoObjectKey(logoRow: unknown): string | null {
-  if (!logoRow || typeof logoRow !== 'object') return null;
-  const media = (logoRow as { media?: unknown }).media;
-  const record = Array.isArray(media) ? media[0] : media;
-  if (!record || typeof record !== 'object') return null;
-  const key = (record as { object_key?: unknown }).object_key;
-  return typeof key === 'string' ? key : null;
-}
-
-export async function getOnboardingStatus(opts: {
-  isEcommerceActive: boolean;
-}): Promise<OnboardingStatus> {
-  const supabase = createClient();
-
-  const [{ data: settingRows }, { data: logoRow }, emailPublic, privacy] = await Promise.all([
-    supabase
-      .from('site_settings')
-      .select('key, value')
-      .in('key', ['footer_copyright', 'bot_protection_public', 'onboarding_state', 'site_title']),
-    supabase
-      .from('logos')
-      .select('media:media_id(object_key)')
-      .order('created_at', { ascending: false })
-      .limit(1)
-      .maybeSingle(),
-    getEmailPublicSettings(),
-    getPrivacySettings(),
-  ]);
-
-  const rows = new Map((settingRows ?? []).map((r) => [r.key, r.value]));
-  const botPublic = (rows.get('bot_protection_public') ?? {}) as Record<string, unknown>;
-  const onboardingState = (rows.get('onboarding_state') ?? {}) as Record<string, unknown>;
-
-  const siteTitleRaw = rows.get('site_title');
-  const siteTitle = typeof siteTitleRaw === 'string' ? siteTitleRaw.trim() : '';
-  const siteTitleCustomized = siteTitle.length > 0 && siteTitle !== SEEDED_SITE_TITLE;
-  const logoObjectKey = extractLogoObjectKey(logoRow);
-  const logoCustomized = Boolean(logoObjectKey) && !SEEDED_LOGO_OBJECT_KEYS.has(logoObjectKey ?? '');
-
-  // Branding is "done" once the user renames the site or uploads their own logo — not merely
-  // because the seeded NextBlock title/logo exist.
-  const brandingDone = siteTitleCustomized || logoCustomized;
-  const copyrightDone = hasCustomCopyright(rows.get('footer_copyright'));
-  const emailDone = Boolean(emailPublic.host) || Boolean(process.env['SMTP_HOST']);
-  const analyticsDone = Boolean(privacy.gtm_id);
-  const botProvider = typeof botPublic['provider'] === 'string' ? (botPublic['provider'] as string) : 'none';
-  const botDone = botProvider !== 'none' && botProvider !== '';
-
-  const steps: OnboardingStep[] = [
-    {
-      key: 'admin',
-      title: 'Create your admin account',
-      description: 'Your administrator account is set up.',
-      href: '/cms/users',
-      done: true,
-      optional: false,
-    },
-    {
-      key: 'branding',
-      title: 'Add your branding',
-      description: 'Upload your logo and set your site identity.',
-      href: '/cms/settings/logos',
-      done: brandingDone,
-      optional: false,
-    },
-    {
-      key: 'copyright',
-      title: 'Set your copyright / footer',
-      description: 'Configure the footer copyright shown across your site.',
-      href: '/cms/settings/copyright',
-      done: copyrightDone,
-      optional: false,
-    },
-    {
-      key: 'email',
-      title: 'Configure email (SMTP)',
-      description: 'Enable verification emails, password resets, and notifications.',
-      href: '/cms/settings/email',
-      done: emailDone,
-      optional: false,
-    },
-    {
-      key: 'analytics',
-      title: 'Connect analytics',
-      description: 'Add a Google Tag Manager ID for consent-gated analytics.',
-      href: '/cms/settings/google-analytics',
-      done: analyticsDone,
-      optional: true,
-    },
-    {
-      key: 'bot',
-      title: 'Enable bot protection',
-      description: 'Protect your sign-up and sign-in forms with a CAPTCHA.',
-      href: '/cms/settings/bot-protection',
-      done: botDone,
-      optional: true,
-    },
-  ];
-
-  if (opts.isEcommerceActive) {
-    let paymentsDone = false;
-    try {
-      const storeStatus = await getStoreConfigStatus();
-      paymentsDone = storeStatus.stripe.hasKeys || storeStatus.freemius.hasKeys;
-    } catch {
-      paymentsDone = false;
-    }
-    // Insert Payments before the optional steps.
-    steps.splice(4, 0, {
-      key: 'payments',
-      title: 'Set up payment providers',
-      description: 'Add your Stripe and/or Freemius API keys to accept payments.',
-      href: '/cms/payments',
-      done: paymentsDone,
-      optional: false,
-    });
-  }
-
-  // Git-backed (Vercel 1-click / fork) installs: remind the operator to enable GitHub
-  // Actions so the upstream sync workflow can run. "done" flips once the background poll
-  // (maybeRefreshUpstreamStatus) has seen the workflow run at least once.
-  if (detectChannel() === 'vercel') {
-    let actionsActive = false;
-    try {
-      const config = await getSystemConfiguration();
-      const upstream = config.settings?.['upstream_status'] as
-        | { actions_active?: boolean }
-        | undefined;
-      actionsActive = upstream?.actions_active === true;
-    } catch {
-      actionsActive = false;
-    }
-    const canConnect = !actionsActive && isGithubConnectAvailable();
-    steps.push({
-      key: 'github-actions',
-      title: 'Automatic updates (GitHub Actions)',
-      description: actionsActive
-        ? 'The daily upstream-sync workflow is active for your repository.'
-        : canConnect
-          ? 'Connect GitHub to install the upstream-sync workflow into your repo — Vercel’s 1-click deploy can’t copy it automatically.'
-          : 'Vercel deploys have GitHub Actions on by default — this completes once GitHub registers the sync workflow on your default branch. A manually forked repo needs Actions enabled under Settings → Actions.',
-      href:
-        selfActionsSettingsUrl() ??
-        'https://github.com/nextblock-cms/nextblock/blob/HEAD/docs/13-STAYING-UP-TO-DATE.md',
-      done: actionsActive,
-      optional: true,
-      isExternal: true,
-      connectGithub: canConnect,
-    });
-  }
-
-  const completed = steps.filter((s) => s.done).length;
-
-  return {
-    steps,
-    completed,
-    total: steps.length,
-    dismissed: onboardingState['dismissed'] === true,
-  };
-}
+import 'server-only';
+// Derives the dashboard onboarding checklist live from configuration state. Every check
+// reads public/service-role data only, so it works for both ADMIN and WRITER dashboards.
+import { createClient } from '@nextblock-cms/db/server';
+import { getStoreConfigStatus } from '@nextblock-cms/ecommerce/server';
+import { getEmailPublicSettings } from '../config/email-settings';
+import { getPrivacySettings } from '../privacy/settings';
+import { detectChannel } from '../setup/env-status';
+import { getSystemConfiguration } from '../setup/system-config';
+import { selfActionsSettingsUrl } from '../updates/repo-identity';
+import { isGithubConnectAvailable } from '../updates/github-device';
+
+export type OnboardingStep = {
+  key: string;
+  title: string;
+  description: string;
+  href: string;
+  done: boolean;
+  optional: boolean;
+  /** When true, render the CTA as an external link (new tab) instead of an in-app route. */
+  isExternal?: boolean;
+  /** When true, render the device-flow "Connect GitHub" control instead of a link. */
+  connectGithub?: boolean;
+};
+
+export type OnboardingStatus = {
+  steps: OnboardingStep[];
+  completed: number;
+  total: number;
+  dismissed: boolean;
+};
+
+// Seeded defaults (libs/db baseline seed 00000000000003 + migration 00000000000004). The
+// branding/copyright steps count as "done" only when the value has been customized away from
+// these — a fresh install ships with the seeds, so a plain presence check would mark every
+// step complete immediately.
+const SEEDED_SITE_TITLE = 'NextBlock™ CMS';
+// Every object_key a fresh install may ship as the DEFAULT logo — the original baseline WebP
+// and the migration-00000000000004 email-safe PNG (which repoints the seeded default). A logo
+// counts as customized only when it is none of these; a new default swap must be added here or
+// branding falsely reads as done out of the box. Mirrors BUNDLED_PUBLIC_MEDIA_KEYS in
+// lib/media/resolveMediaUrl.ts.
+const SEEDED_LOGO_OBJECT_KEYS = new Set<string>([
+  'images/nextblock-logo-small.webp',
+  'images/nextblock-logo-button-tiny.png',
+]);
+const SEEDED_COPYRIGHT: Record<string, string> = {
+  en: '© {year} Nextblock CMS. All rights reserved.',
+  fr: '© {year} Nextblock CMS. Tous droits réservés.',
+};
+
+/** True when at least one language's copyright text is set AND differs from the seed. */
+function hasCustomCopyright(value: unknown): boolean {
+  if (!value || typeof value !== 'object') return false;
+  return Object.entries(value as Record<string, unknown>).some(([lang, v]) => {
+    if (typeof v !== 'string') return false;
+    const trimmed = v.trim();
+    return trimmed.length > 0 && trimmed !== (SEEDED_COPYRIGHT[lang] ?? '');
+  });
+}
+
+/** Pull the active logo's media object_key from the (to-one) embedded relation. */
+function extractLogoObjectKey(logoRow: unknown): string | null {
+  if (!logoRow || typeof logoRow !== 'object') return null;
+  const media = (logoRow as { media?: unknown }).media;
+  const record = Array.isArray(media) ? media[0] : media;
+  if (!record || typeof record !== 'object') return null;
+  const key = (record as { object_key?: unknown }).object_key;
+  return typeof key === 'string' ? key : null;
+}
+
+export async function getOnboardingStatus(opts: {
+  isEcommerceActive: boolean;
+}): Promise<OnboardingStatus> {
+  const supabase = createClient();
+
+  const [{ data: settingRows }, { data: logoRow }, emailPublic, privacy] = await Promise.all([
+    supabase
+      .from('site_settings')
+      .select('key, value')
+      .in('key', ['footer_copyright', 'bot_protection_public', 'onboarding_state', 'site_title']),
+    supabase
+      .from('logos')
+      .select('media:media_id(object_key)')
+      .order('created_at', { ascending: false })
+      .limit(1)
+      .maybeSingle(),
+    getEmailPublicSettings(),
+    getPrivacySettings(),
+  ]);
+
+  const rows = new Map((settingRows ?? []).map((r) => [r.key, r.value]));
+  const botPublic = (rows.get('bot_protection_public') ?? {}) as Record<string, unknown>;
+  const onboardingState = (rows.get('onboarding_state') ?? {}) as Record<string, unknown>;
+
+  const siteTitleRaw = rows.get('site_title');
+  const siteTitle = typeof siteTitleRaw === 'string' ? siteTitleRaw.trim() : '';
+  const siteTitleCustomized = siteTitle.length > 0 && siteTitle !== SEEDED_SITE_TITLE;
+  const logoObjectKey = extractLogoObjectKey(logoRow);
+  const logoCustomized = Boolean(logoObjectKey) && !SEEDED_LOGO_OBJECT_KEYS.has(logoObjectKey ?? '');
+
+  // Branding is "done" once the user renames the site or uploads their own logo — not merely
+  // because the seeded NextBlock title/logo exist.
+  const brandingDone = siteTitleCustomized || logoCustomized;
+  const copyrightDone = hasCustomCopyright(rows.get('footer_copyright'));
+  const emailDone = Boolean(emailPublic.host) || Boolean(process.env['SMTP_HOST']);
+  const analyticsDone = Boolean(privacy.gtm_id);
+  const botProvider = typeof botPublic['provider'] === 'string' ? (botPublic['provider'] as string) : 'none';
+  const botDone = botProvider !== 'none' && botProvider !== '';
+
+  const steps: OnboardingStep[] = [
+    {
+      key: 'admin',
+      title: 'Create your admin account',
+      description: 'Your administrator account is set up.',
+      href: '/cms/users',
+      done: true,
+      optional: false,
+    },
+    {
+      key: 'branding',
+      title: 'Add your branding',
+      description: 'Upload your logo and set your site identity.',
+      href: '/cms/settings/logos',
+      done: brandingDone,
+      optional: false,
+    },
+    {
+      key: 'copyright',
+      title: 'Set your copyright / footer',
+      description: 'Configure the footer copyright shown across your site.',
+      href: '/cms/settings/copyright',
+      done: copyrightDone,
+      optional: false,
+    },
+    {
+      key: 'email',
+      title: 'Configure email (SMTP)',
+      description: 'Enable verification emails, password resets, and notifications.',
+      href: '/cms/settings/email',
+      done: emailDone,
+      optional: false,
+    },
+    {
+      key: 'analytics',
+      title: 'Connect analytics',
+      description: 'Add a Google Tag Manager ID for consent-gated analytics.',
+      href: '/cms/settings/google-analytics',
+      done: analyticsDone,
+      optional: true,
+    },
+    {
+      key: 'bot',
+      title: 'Enable bot protection',
+      description: 'Protect your sign-up and sign-in forms with a CAPTCHA.',
+      href: '/cms/settings/bot-protection',
+      done: botDone,
+      optional: true,
+    },
+  ];
+
+  if (opts.isEcommerceActive) {
+    let paymentsDone = false;
+    try {
+      const storeStatus = await getStoreConfigStatus();
+      paymentsDone = storeStatus.stripe.hasKeys || storeStatus.freemius.hasKeys;
+    } catch {
+      paymentsDone = false;
+    }
+    // Insert Payments before the optional steps.
+    steps.splice(4, 0, {
+      key: 'payments',
+      title: 'Set up payment providers',
+      description: 'Add your Stripe and/or Freemius API keys to accept payments.',
+      href: '/cms/payments',
+      done: paymentsDone,
+      optional: false,
+    });
+  }
+
+  // Git-backed (Vercel 1-click / fork) installs: remind the operator to enable GitHub
+  // Actions so the upstream sync workflow can run. "done" flips once the background poll
+  // (maybeRefreshUpstreamStatus) has seen the workflow run at least once.
+  if (detectChannel() === 'vercel') {
+    let actionsActive = false;
+    try {
+      const config = await getSystemConfiguration();
+      const upstream = config.settings?.['upstream_status'] as
+        | { actions_active?: boolean }
+        | undefined;
+      actionsActive = upstream?.actions_active === true;
+    } catch {
+      actionsActive = false;
+    }
+    const canConnect = !actionsActive && isGithubConnectAvailable();
+    steps.push({
+      key: 'github-actions',
+      title: 'Automatic updates (GitHub Actions)',
+      description: actionsActive
+        ? 'The daily upstream-sync workflow is active for your repository.'
+        : canConnect
+          ? 'Connect GitHub to install the upstream-sync workflow into your repo — Vercel’s 1-click deploy can’t copy it automatically.'
+          : 'Vercel deploys have GitHub Actions on by default — this completes once GitHub registers the sync workflow on your default branch. A manually forked repo needs Actions enabled under Settings → Actions.',
+      href:
+        selfActionsSettingsUrl() ??
+        'https://github.com/nextblock-cms/nextblock/blob/HEAD/docs/13-STAYING-UP-TO-DATE.md',
+      done: actionsActive,
+      optional: true,
+      isExternal: true,
+      connectGithub: canConnect,
+    });
+  }
+
+  const completed = steps.filter((s) => s.done).length;
+
+  return {
+    steps,
+    completed,
+    total: steps.length,
+    dismissed: onboardingState['dismissed'] === true,
+  };
+}