@aion0/forge 0.5.49 → 0.5.50

package/components/CraftMarketplaceModal.tsx

@@ -0,0 +1,207 @@
+'use client';
+
+import React, { useState, useEffect, useMemo } from 'react';
+
+interface MarketItem {
+  name: string;
+  displayName: string;
+  description?: string;
+  version: string;
+  author?: string;
+  tags?: string[];
+  requires?: { hasFile?: string[]; hasGlob?: string[] };
+  installed: boolean;
+  installedVersion?: string;
+  hasUpdate: boolean;
+  compatible: boolean;
+}
+
+export default function CraftMarketplaceModal({ projectPath, onClose, onInstalled }: {
+  projectPath: string;
+  onClose: () => void;
+  onInstalled: () => void;
+}) {
+  const [items, setItems] = useState<MarketItem[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const [busyId, setBusyId] = useState<string | null>(null);
+  const [search, setSearch] = useState('');
+  const [filter, setFilter] = useState<'all' | 'compatible' | 'installed'>('compatible');
+
+  const refresh = async (force = false) => {
+    setLoading(true);
+    setError(null);
+    try {
+      const res = await fetch(`/api/craft-system/marketplace?projectPath=${encodeURIComponent(projectPath)}${force ? '&refresh=1' : ''}`);
+      const j = await res.json();
+      if (!res.ok) throw new Error(j.error || `${res.status}`);
+      setItems(j.items || []);
+    } catch (e: any) {
+      setError(e?.message || String(e));
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  // Always force-refresh on initial open so users see what's actually on the
+  // remote (the server-side cache is short, but a freshly published craft
+  // could otherwise sit hidden for the cache TTL).
+  useEffect(() => { refresh(true); }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
+  const filtered = useMemo(() => {
+    const q = search.trim().toLowerCase();
+    return items.filter(it => {
+      if (filter === 'compatible' && !it.compatible) return false;
+      if (filter === 'installed' && !it.installed) return false;
+      if (q && !`${it.name} ${it.displayName} ${it.description || ''} ${(it.tags || []).join(' ')}`.toLowerCase().includes(q)) return false;
+      return true;
+    });
+  }, [items, search, filter]);
+
+  const install = async (name: string) => {
+    setBusyId(name);
+    try {
+      const res = await fetch('/api/craft-system/marketplace/install', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ projectPath, name }),
+      });
+      const j = await res.json();
+      if (!j.ok) throw new Error(j.error || 'install failed');
+      onInstalled();
+      await refresh();
+    } catch (e: any) {
+      setError(e?.message || String(e));
+    } finally {
+      setBusyId(null);
+    }
+  };
+
+  const uninstall = async (name: string) => {
+    if (!confirm(`Uninstall craft "${name}"? Files at .forge/crafts/${name}/ will be deleted.`)) return;
+    setBusyId(name);
+    try {
+      const res = await fetch('/api/craft-system/marketplace/uninstall', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ projectPath, name }),
+      });
+      const j = await res.json();
+      if (!j.ok) throw new Error(j.error || 'uninstall failed');
+      onInstalled();
+      await refresh();
+    } catch (e: any) {
+      setError(e?.message || String(e));
+    } finally {
+      setBusyId(null);
+    }
+  };
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" onClick={onClose}>
+      <div className="bg-[var(--bg-primary)] border border-[var(--border)] rounded-lg shadow-2xl w-[800px] max-w-[95vw] h-[80vh] flex flex-col"
+        onClick={e => e.stopPropagation()}>
+        <div className="px-4 py-2.5 border-b border-[var(--border)] flex items-center gap-2">
+          <span className="text-sm font-semibold text-[var(--text-primary)]">🛒 Crafts Marketplace</span>
+          <span className="text-[10px] text-[var(--text-secondary)]">{items.length} craft{items.length === 1 ? '' : 's'} in registry</span>
+          <div className="flex-1" />
+          <button onClick={() => refresh(true)}
+            className="text-[10px] px-2 py-1 rounded text-[var(--text-secondary)] hover:bg-[var(--bg-tertiary)]"
+            title="Re-fetch the registry">↻</button>
+          <button onClick={onClose} className="text-[10px] text-[var(--text-secondary)] hover:text-[var(--text-primary)]">✕</button>
+        </div>
+
+        {/* Filter bar */}
+        <div className="px-4 py-2 border-b border-[var(--border)] flex items-center gap-2 text-xs">
+          <input
+            value={search} onChange={e => setSearch(e.target.value)}
+            placeholder="Search name / description / tag…"
+            className="flex-1 text-xs bg-[var(--bg-tertiary)] border border-[var(--border)] rounded px-2 py-1"
+          />
+          <select value={filter} onChange={e => setFilter(e.target.value as any)}
+            className="text-xs bg-[var(--bg-tertiary)] border border-[var(--border)] rounded px-2 py-1">
+            <option value="compatible">Compatible</option>
+            <option value="all">All</option>
+            <option value="installed">Installed</option>
+          </select>
+        </div>
+
+        {error && (
+          <div className="px-4 py-2 text-[11px] text-red-300 bg-red-500/10 border-b border-red-500/30">
+            {error}
+          </div>
+        )}
+
+        {/* List */}
+        <div className="flex-1 overflow-auto">
+          {loading && <div className="p-4 text-xs text-[var(--text-secondary)]">Loading marketplace…</div>}
+          {!loading && filtered.length === 0 && (
+            <div className="p-6 text-center text-xs text-[var(--text-secondary)]">
+              {items.length === 0
+                ? 'No crafts in the registry yet. Configure `craftsRepoUrl` in settings to point at your own.'
+                : 'No crafts match your filter.'}
+            </div>
+          )}
+          {filtered.map(it => (
+            <div key={it.name} className="px-4 py-2.5 border-b border-[var(--border)]/50 flex items-start gap-3">
+              <div className="flex-1 min-w-0">
+                <div className="flex items-center gap-2 flex-wrap">
+                  <span className="text-[12px] font-semibold text-[var(--text-primary)]">{it.displayName}</span>
+                  <span className="text-[9px] font-mono text-[var(--text-secondary)]">{it.name}</span>
+                  <span className="text-[9px] px-1.5 py-0.5 rounded bg-[var(--bg-tertiary)] text-[var(--text-secondary)]">v{it.version}</span>
+                  {it.author && <span className="text-[9px] text-[var(--text-secondary)]">by {it.author}</span>}
+                  {it.installed && <span className="text-[9px] px-1.5 py-0.5 rounded bg-emerald-500/20 text-emerald-300">installed{it.installedVersion ? ` v${it.installedVersion}` : ''}</span>}
+                  {it.hasUpdate && <span className="text-[9px] px-1.5 py-0.5 rounded bg-yellow-500/20 text-yellow-300">update available</span>}
+                  {!it.compatible && <span className="text-[9px] px-1.5 py-0.5 rounded bg-orange-500/20 text-orange-300" title={JSON.stringify(it.requires)}>incompatible with this project</span>}
+                </div>
+                {it.description && <div className="text-[11px] text-[var(--text-secondary)] mt-0.5">{it.description}</div>}
+                {it.tags && it.tags.length > 0 && (
+                  <div className="flex gap-1 mt-1 flex-wrap">
+                    {it.tags.map(t => (
+                      <span key={t} className="text-[9px] px-1.5 py-0.5 rounded bg-[var(--bg-tertiary)] text-[var(--text-secondary)]">{t}</span>
+                    ))}
+                  </div>
+                )}
+              </div>
+              <div className="flex flex-col gap-1 shrink-0">
+                {!it.installed && (
+                  <button onClick={() => install(it.name)} disabled={busyId === it.name || !it.compatible}
+                    className="text-[10px] px-2.5 py-1 rounded bg-[var(--accent)]/30 text-[var(--accent)] hover:bg-[var(--accent)]/40 disabled:opacity-40">
+                    {busyId === it.name ? '…' : 'Install'}
+                  </button>
+                )}
+                {it.installed && it.hasUpdate && (
+                  <button onClick={async () => {
+                      setBusyId(it.name);
+                      try {
+                        const res = await fetch('/api/craft-system/marketplace/update', {
+                          method: 'POST', headers: { 'Content-Type': 'application/json' },
+                          body: JSON.stringify({ projectPath, name: it.name }),
+                        });
+                        const j = await res.json();
+                        if (!j.ok) throw new Error(j.error || 'update failed');
+                        onInstalled();
+                        await refresh();
+                      } catch (e: any) { setError(e?.message || String(e)); }
+                      finally { setBusyId(null); }
+                    }}
+                    disabled={busyId === it.name}
+                    className="text-[10px] px-2.5 py-1 rounded bg-yellow-500/20 text-yellow-300 hover:bg-yellow-500/30 disabled:opacity-40"
+                    title={`Update v${it.installedVersion} → v${it.version}, preserves your data/`}>
+                    {busyId === it.name ? '…' : `Update → v${it.version}`}
+                  </button>
+                )}
+                {it.installed && (
+                  <button onClick={() => uninstall(it.name)} disabled={busyId === it.name}
+                    className="text-[10px] px-2.5 py-1 rounded text-red-300 hover:bg-red-500/10 disabled:opacity-40">
+                    Uninstall
+                  </button>
+                )}
+              </div>
+            </div>
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+}

package/components/CraftPublishModal.tsx

@@ -0,0 +1,285 @@
+'use client';
+
+import React, { useState, useEffect } from 'react';
+
+interface PublishBundle {
+  entry: any;
+  files: { path: string; content: string }[];
+  fileLinks?: { path: string; githubUrl: string }[];
+  repo?: { owner: string; name: string; url: string };
+  registryEditUrl?: string;
+  instructions: string[];
+}
+
+const CraftManifestEditorLazy = React.lazy(() => import('./CraftManifestEditor'));
+
+export default function CraftPublishModal({ projectPath, craftName, onClose }: {
+  projectPath: string;
+  craftName: string;
+  onClose: () => void;
+}) {
+  const [editingManifest, setEditingManifest] = useState(false);
+  const [bundle, setBundle] = useState<PublishBundle | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [tab, setTab] = useState<'instructions' | 'entry' | 'files'>('instructions');
+  const [activeFile, setActiveFile] = useState<string>('');
+  const [gh, setGh] = useState<{ available: boolean; user?: string } | null>(null);
+  const [autoState, setAutoState] = useState<'idle' | 'running' | 'done' | 'failed'>('idle');
+  const [autoLog, setAutoLog] = useState<string[]>([]);
+  const [prUrl, setPrUrl] = useState<string | null>(null);
+  const [autoError, setAutoError] = useState<string | null>(null);
+
+  // Probe whether gh CLI is usable for one-click publish
+  useEffect(() => {
+    fetch('/api/craft-system/publish/auto')
+      .then(r => r.ok ? r.json() : { available: false })
+      .then(setGh)
+      .catch(() => setGh({ available: false }));
+  }, []);
+
+  const oneClick = async () => {
+    setAutoState('running');
+    setAutoLog([]);
+    setAutoError(null);
+    setPrUrl(null);
+    try {
+      const res = await fetch('/api/craft-system/publish/auto', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ projectPath, name: craftName }),
+      });
+      const j = await res.json();
+      if (!j.ok) {
+        setAutoError(j.error || 'failed');
+        setAutoLog(j.log || []);
+        setAutoState('failed');
+        return;
+      }
+      setPrUrl(j.prUrl);
+      setAutoLog(j.log || []);
+      setAutoState('done');
+    } catch (e: any) {
+      setAutoError(e?.message || String(e));
+      setAutoState('failed');
+    }
+  };
+
+  useEffect(() => {
+    fetch('/api/craft-system/publish', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ projectPath, name: craftName }),
+    })
+      .then(async r => { if (!r.ok) throw new Error((await r.json()).error || `${r.status}`); return r.json(); })
+      .then((j: PublishBundle) => {
+        setBundle(j);
+        setActiveFile(j.files[0]?.path || '');
+      })
+      .catch(e => setError(e?.message || String(e)));
+  }, [projectPath, craftName]);
+
+  const copy = (text: string) => navigator.clipboard.writeText(text).catch(() => {});
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" onClick={onClose}>
+      <div className="bg-[var(--bg-primary)] border border-[var(--border)] rounded-lg shadow-2xl w-[820px] max-w-[95vw] h-[80vh] flex flex-col"
+        onClick={e => e.stopPropagation()}>
+        <div className="px-4 py-2.5 border-b border-[var(--border)] flex items-center gap-2">
+          <span className="text-sm font-semibold text-[var(--text-primary)]">📦 Publish craft: {craftName}</span>
+          {bundle?.entry?.version && <span className="text-[10px] px-1.5 py-0.5 rounded bg-[var(--bg-tertiary)] font-mono text-[var(--text-secondary)]">v{bundle.entry.version}</span>}
+          <button onClick={() => setEditingManifest(true)}
+            className="text-[10px] px-2 py-1 rounded text-[var(--text-secondary)] hover:bg-[var(--bg-tertiary)] hover:text-[var(--accent)]"
+            title="Edit craft.yaml — bump version, tweak metadata, etc.">
+            📝 Edit manifest
+          </button>
+          <div className="flex-1" />
+          <button onClick={onClose} className="text-[10px] text-[var(--text-secondary)] hover:text-[var(--text-primary)]">✕</button>
+        </div>
+
+        {error && <div className="m-4 p-2 text-xs text-red-300 bg-red-500/10 border border-red-500/30 rounded">{error}</div>}
+        {!bundle && !error && <div className="p-4 text-xs text-[var(--text-secondary)]">Bundling craft files…</div>}
+
+        {bundle && (
+          <>
+            <div className="px-4 pt-2 flex gap-1 text-xs border-b border-[var(--border)]">
+              {(['instructions', 'entry', 'files'] as const).map(t => (
+                <button key={t} onClick={() => setTab(t)}
+                  className={`px-3 py-1 rounded-t ${tab === t ? 'bg-[var(--bg-tertiary)] text-[var(--accent)]' : 'text-[var(--text-secondary)] hover:text-[var(--text-primary)]'}`}>
+                  {t === 'instructions' ? 'How to publish' : t === 'entry' ? 'registry.json entry' : `Files (${bundle.files.length})`}
+                </button>
+              ))}
+            </div>
+
+            {tab === 'instructions' && (
+              <div className="flex-1 overflow-auto p-4 text-[11px] text-[var(--text-primary)] space-y-3">
+                <div className="text-[var(--text-secondary)]">
+                  Every publish goes through a pull request to{' '}
+                  {bundle.repo
+                    ? <a href={bundle.repo.url} target="_blank" rel="noreferrer" className="text-[var(--accent)] hover:underline">{bundle.repo.owner}/{bundle.repo.name}</a>
+                    : 'the registry'} — GitHub auto-forks the repo if you don't have write access. Maintainers also use the PR flow; direct commits to main are not accepted.
+                </div>
+
+                {/* One-click PR via gh CLI */}
+                <div className="rounded border border-[var(--accent)]/40 bg-[var(--accent)]/5 p-3 space-y-2">
+                  <div className="flex items-center gap-2">
+                    <span className="text-[12px] font-semibold text-[var(--text-primary)]">🚀 One-click publish</span>
+                    {gh?.available && <span className="text-[9px] px-1.5 py-0.5 rounded bg-emerald-500/20 text-emerald-300">gh CLI ready as @{gh.user}</span>}
+                    {gh && !gh.available && <span className="text-[9px] px-1.5 py-0.5 rounded bg-orange-500/20 text-orange-300">gh CLI unavailable</span>}
+                  </div>
+                  {gh?.available ? (
+                    <>
+                      <div className="text-[10px] text-[var(--text-secondary)]">
+                        Forge will fork {bundle.repo?.owner}/{bundle.repo?.name}, push the craft + registry update on a new branch, and open a PR — all from your authenticated <code>gh</code> CLI.
+                      </div>
+                      <div className="flex items-center gap-2">
+                        <button onClick={oneClick} disabled={autoState === 'running' || autoState === 'done'}
+                          className="text-[11px] px-3 py-1.5 rounded bg-[var(--accent)]/30 text-[var(--accent)] hover:bg-[var(--accent)]/40 disabled:opacity-40">
+                          {autoState === 'running' ? '⏳ Publishing…'
+                            : autoState === 'done' ? '✓ Submitted'
+                            : autoState === 'failed' ? 'Retry'
+                            : 'Submit PR via gh'}
+                        </button>
+                        {prUrl && (
+                          <a href={prUrl} target="_blank" rel="noreferrer"
+                            className="text-[11px] px-3 py-1.5 rounded bg-emerald-500/20 text-emerald-300 hover:bg-emerald-500/30">
+                            Open PR →
+                          </a>
+                        )}
+                      </div>
+                      {autoLog.length > 0 && (
+                        <div className="bg-black/30 rounded p-2 text-[9px] font-mono text-[var(--text-secondary)] max-h-32 overflow-auto space-y-0.5">
+                          {autoLog.map((l, i) => <div key={i}>· {l}</div>)}
+                        </div>
+                      )}
+                      {autoError && (
+                        <div className="text-[10px] text-red-300 bg-red-500/10 rounded p-2 break-words">
+                          {autoError}
+                        </div>
+                      )}
+                    </>
+                  ) : (
+                    <div className="text-[10px] text-[var(--text-secondary)]">
+                      To enable one-click publish, install + authenticate <code>gh</code> in a terminal:
+                      <pre className="mt-1 bg-black/30 rounded p-1.5 font-mono text-[var(--text-primary)]">brew install gh{'\n'}gh auth login</pre>
+                      Then refresh this dialog. Until then, use the manual steps below.
+                    </div>
+                  )}
+                </div>
+
+                <div className="text-[10px] text-[var(--text-secondary)] mt-3 mb-1">Or do it manually:</div>
+                <ol className="list-decimal pl-5 space-y-1.5">
+                  {bundle.instructions.map((line, i) => <li key={i}>{line}</li>)}
+                </ol>
+
+                {bundle.fileLinks && bundle.fileLinks.length > 0 && (
+                  <div className="mt-3 border border-[var(--border)] rounded p-2.5 space-y-1.5">
+                    <div className="text-[10px] text-[var(--text-secondary)] mb-1">Step 1: Create each file in your fork (one click each)</div>
+                    {bundle.fileLinks.map(fl => (
+                      <a key={fl.path} href={fl.githubUrl} target="_blank" rel="noreferrer"
+                        className="flex items-center gap-2 px-2 py-1.5 rounded bg-[var(--bg-tertiary)] hover:bg-[var(--accent)]/10 border border-[var(--border)] transition-colors">
+                        <span className="text-[11px] font-mono text-[var(--text-primary)] flex-1">
+                          {bundle.entry.name}/{fl.path}
+                        </span>
+                        <span className="text-[10px] px-2 py-0.5 rounded bg-[var(--accent)]/20 text-[var(--accent)]">
+                          Open in GitHub →
+                        </span>
+                      </a>
+                    ))}
+                  </div>
+                )}
+
+                {bundle.registryEditUrl && (
+                  <div className="border border-[var(--border)] rounded p-2.5 space-y-1.5">
+                    <div className="text-[10px] text-[var(--text-secondary)] mb-1">Step 2: Append your craft to registry.json</div>
+                    <a href={bundle.registryEditUrl} target="_blank" rel="noreferrer"
+                      className="flex items-center gap-2 px-2 py-1.5 rounded bg-[var(--bg-tertiary)] hover:bg-[var(--accent)]/10 border border-[var(--border)] transition-colors">
+                      <span className="text-[11px] font-mono text-[var(--text-primary)] flex-1">registry.json</span>
+                      <button onClick={(e) => { e.preventDefault(); e.stopPropagation(); copy(JSON.stringify(bundle.entry, null, 2)); }}
+                        className="text-[10px] px-2 py-0.5 rounded text-[var(--text-secondary)] hover:bg-[var(--bg-tertiary)]"
+                        title="Copy entry JSON to clipboard before opening editor">
+                        📋 Copy entry
+                      </button>
+                      <span className="text-[10px] px-2 py-0.5 rounded bg-[var(--accent)]/20 text-[var(--accent)]">
+                        Open editor →
+                      </span>
+                    </a>
+                    <div className="text-[9px] text-[var(--text-secondary)] opacity-70">
+                      In the editor, paste the entry inside the <code>crafts: [...]</code> array, then commit + open PR.
+                    </div>
+                  </div>
+                )}
+
+                <div className="mt-3 text-[var(--text-secondary)] text-[10px] opacity-70">
+                  Need an alternative? Use the Files tab to copy each file's content manually, or the registry.json entry tab to copy the JSON snippet.
+                </div>
+              </div>
+            )}
+
+            {tab === 'entry' && (
+              <div className="flex-1 overflow-auto p-4 flex flex-col">
+                <div className="flex items-center mb-2">
+                  <span className="text-[10px] text-[var(--text-secondary)]">Append this object to the <code>crafts</code> array in <code>registry.json</code>:</span>
+                  <div className="flex-1" />
+                  <button onClick={() => copy(JSON.stringify(bundle.entry, null, 2))}
+                    className="text-[10px] px-2 py-1 rounded text-[var(--text-secondary)] hover:bg-[var(--bg-tertiary)]">📋 Copy</button>
+                </div>
+                <pre className="flex-1 overflow-auto bg-[var(--bg-tertiary)]/40 rounded p-3 text-[11px] font-mono text-[var(--text-primary)] whitespace-pre-wrap">
+                  {JSON.stringify(bundle.entry, null, 2)}
+                </pre>
+              </div>
+            )}
+
+            {tab === 'files' && (
+              <div className="flex-1 flex min-h-0">
+                <div className="w-48 border-r border-[var(--border)] overflow-auto">
+                  {bundle.files.map(f => (
+                    <button key={f.path} onClick={() => setActiveFile(f.path)}
+                      className={`w-full text-left px-3 py-1.5 text-[11px] font-mono ${activeFile === f.path ? 'bg-[var(--accent)]/10 text-[var(--accent)]' : 'text-[var(--text-secondary)] hover:bg-[var(--bg-tertiary)]'}`}>
+                      {f.path}
+                    </button>
+                  ))}
+                </div>
+                <div className="flex-1 flex flex-col">
+                  <div className="px-3 py-1.5 border-b border-[var(--border)] flex items-center text-[10px] text-[var(--text-secondary)]">
+                    <span className="font-mono">{activeFile}</span>
+                    <div className="flex-1" />
+                    <button onClick={() => copy(bundle.files.find(f => f.path === activeFile)?.content || '')}
+                      className="px-2 py-0.5 rounded hover:bg-[var(--bg-tertiary)]">📋 Copy</button>
+                  </div>
+                  <pre className="flex-1 overflow-auto p-3 text-[11px] font-mono text-[var(--text-primary)] whitespace-pre-wrap break-words">
+                    {bundle.files.find(f => f.path === activeFile)?.content}
+                  </pre>
+                </div>
+              </div>
+            )}
+          </>
+        )}
+      </div>
+
+      {/* Manifest editor mounted on top — saving re-fetches the bundle so the publish flow uses fresh values */}
+      {editingManifest && (
+        <React.Suspense fallback={null}>
+          <CraftManifestEditorLazy
+            projectPath={projectPath}
+            craftName={craftName}
+            onClose={() => setEditingManifest(false)}
+            onSaved={() => {
+              setEditingManifest(false);
+              // Re-fetch the bundle so the new version/metadata appears in publish UI + auto-publish
+              setBundle(null);
+              setError(null);
+              fetch('/api/craft-system/publish', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ projectPath, name: craftName }),
+              })
+                .then(async r => { if (!r.ok) throw new Error((await r.json()).error || `${r.status}`); return r.json(); })
+                .then((j: PublishBundle) => { setBundle(j); setActiveFile(j.files[0]?.path || ''); })
+                .catch(e => setError(e?.message || String(e)));
+            }}
+          />
+        </React.Suspense>
+      )}
+    </div>
+  );
+}