@jsonpages/cli 3.0.28 → 3.0.29

package/assets/src_tenant_alpha.sh

@@ -30,6 +30,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/App.tsx"
 /**
  * Thin Entry Point (Tenant).
  * Data from getHydratedData (file-backed or draft); assets from public/assets/images.
+ * Persistence: Export JSON (download) + optional Salva su repo (POST /api/persist → git push).
  */
 import { useState, useEffect } from 'react';
 import { JsonPagesEngine } from '@jsonpages/core';
@@ -40,6 +41,7 @@ import { addSectionConfig } from '@/lib/addSectionConfig';
 import { getHydratedData } from '@/lib/draftStorage';
 import type { JsonPagesConfig } from '@jsonpages/core';
 import type { PageConfig, SiteConfig, ThemeConfig, MenuConfig } from '@/types';
+import type { ProjectState } from '@jsonpages/core';
 
 import siteData from '@/data/config/site.json';
 import themeData from '@/data/config/theme.json';
@@ -84,6 +86,21 @@ function App() {
     menuConfig,
     themeCss: { tenant: tenantCss },
     addSection: addSectionConfig,
+    persistence: {
+      async saveToRepo(state: ProjectState, slug: string) {
+        const res = await fetch('/api/persist', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ projectState: state, slug }),
+        });
+        const body = (await res.json().catch(() => ({}))) as { error?: string; message?: string };
+        if (!res.ok) {
+          const msg = body.error ?? `Save failed: ${res.status}`;
+          alert(msg);
+          throw new Error(msg);
+        }
+      },
+    },
     assets: {
       assetsBaseUrl: '/assets',
       assetsManifest,
@@ -3411,6 +3428,176 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
 
 END_OF_FILE_CONTENT
 # SKIP: src/registry-types.ts è un file binario e non può essere convertito in testo.
+mkdir -p "src/server"
+echo "Creating src/server/persistToRepo.ts..."
+cat << 'END_OF_FILE_CONTENT' > "src/server/persistToRepo.ts"
+/**
+ * Enterprise-grade persist: write JSON to disk and git add/commit/push.
+ * Used by POST /api/persist. Credentials via env (GITHUB_TOKEN); no secrets in code.
+ */
+import fs from 'fs';
+import path from 'path';
+import { simpleGit, type SimpleGit } from 'simple-git';
+
+/** Minimal ProjectState shape for validation (matches Core kernel). */
+export interface PersistBody {
+  projectState: {
+    page: unknown;
+    site: unknown;
+    menu: unknown;
+    theme: unknown;
+  };
+  slug: string;
+}
+
+const SLUG_REGEX = /^[a-z0-9][a-z0-9-]*[a-z0-9]$|^[a-z0-9]$/;
+
+function isNonEmptyObject(v: unknown): v is Record<string, unknown> {
+  return typeof v === 'object' && v !== null && !Array.isArray(v);
+}
+
+export function validatePersistBody(body: unknown): { ok: true; data: PersistBody } | { ok: false; status: number; error: string } {
+  if (!isNonEmptyObject(body) || !isNonEmptyObject(body.projectState)) {
+    return { ok: false, status: 400, error: 'Missing or invalid projectState' };
+  }
+  const { projectState, slug } = body as PersistBody;
+  if (typeof slug !== 'string' || !SLUG_REGEX.test(slug)) {
+    return { ok: false, status: 400, error: 'Invalid slug (use lowercase alphanumeric and hyphens)' };
+  }
+  if (
+    projectState.page == null ||
+    projectState.site == null ||
+    projectState.menu == null ||
+    projectState.theme == null
+  ) {
+    return { ok: false, status: 400, error: 'projectState must include page, site, menu, theme' };
+  }
+  return { ok: true, data: { projectState, slug } };
+}
+
+export interface PersistOptions {
+  /** Absolute path to data dir (e.g. .../src/data). */
+  dataDir: string;
+  /** Git working directory (repo root). Defaults to dataDir's app root. */
+  gitDir: string;
+  /** Optional: inject into origin for push (e.g. GITHUB_TOKEN). */
+  token?: string;
+}
+
+function writeFiles(data: PersistBody, dataDir: string): string[] {
+  const configDir = path.join(dataDir, 'config');
+  const pagesDir = path.join(dataDir, 'pages');
+  const written: string[] = [];
+
+  [configDir, pagesDir].forEach((dir) => {
+    if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+  });
+
+  const { projectState, slug } = data;
+  const sitePath = path.join(configDir, 'site.json');
+  const themePath = path.join(configDir, 'theme.json');
+  const menuPath = path.join(configDir, 'menu.json');
+  const pagePath = path.join(pagesDir, `${slug}.json`);
+
+  fs.writeFileSync(sitePath, JSON.stringify(projectState.site, null, 2), 'utf8');
+  written.push(sitePath);
+  fs.writeFileSync(themePath, JSON.stringify(projectState.theme, null, 2), 'utf8');
+  written.push(themePath);
+  fs.writeFileSync(menuPath, JSON.stringify(projectState.menu, null, 2), 'utf8');
+  written.push(menuPath);
+  fs.writeFileSync(pagePath, JSON.stringify(projectState.page, null, 2), 'utf8');
+  written.push(pagePath);
+
+  return written;
+}
+
+/** Inject token into HTTPS origin for push (no token stored in config). */
+function originWithToken(origin: string, token: string): string {
+  if (origin.startsWith('https://')) {
+    return origin.replace(/^https:\/\/([^@]*@)?/, `https://${token}@`);
+  }
+  return origin;
+}
+
+async function gitAddCommitPush(
+  gitDir: string,
+  relativePaths: string[],
+  commitMessage: string,
+  token?: string
+): Promise<{ success: true } | { success: false; error: string }> {
+  const git: SimpleGit = simpleGit(gitDir);
+  let originalOrigin: string | null = null;
+
+  try {
+    const status = await git.status();
+    if (status.isBare()) {
+      return { success: false, error: 'Repository is bare; cannot commit' };
+    }
+
+    if (token) {
+      const remotes = await git.getRemotes(true);
+      const origin = remotes.origin?.refs?.fetch ?? remotes.origin?.refs?.push;
+      if (origin) {
+        originalOrigin = origin;
+        const authUrl = originWithToken(origin, token);
+        await git.raw(['remote', 'set-url', 'origin', authUrl]);
+      }
+    }
+
+    await git.add(relativePaths);
+    const commitResult = await git.commit(commitMessage);
+    if (commitResult.commit === null && relativePaths.length > 0) {
+      return { success: false, error: 'Nothing to commit (files unchanged or not in repo)' };
+    }
+    await git.push();
+    return { success: true };
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    return { success: false, error: msg };
+  } finally {
+    if (originalOrigin) {
+      try {
+        await git.raw(['remote', 'set-url', 'origin', originalOrigin]);
+      } catch {
+        // best-effort restore; do not mask original error
+      }
+    }
+  }
+}
+
+/**
+ * Write project state to disk and push to remote.
+ * File paths are resolved from dataDir; git paths are relative to gitDir.
+ */
+export async function runPersist(
+  data: PersistBody,
+  options: PersistOptions
+): Promise<{ success: true; message: string } | { success: false; status: number; error: string }> {
+  const { dataDir, gitDir, token } = options;
+
+  if (!fs.existsSync(dataDir)) {
+    return { success: false, status: 500, error: 'Data directory does not exist' };
+  }
+
+  const written = writeFiles(data, dataDir);
+  const relativePaths = written.map((p) => path.relative(gitDir, p)).filter((p) => !p.startsWith('..'));
+  if (relativePaths.length === 0) {
+    return { success: false, status: 500, error: 'Computed paths are outside git directory' };
+  }
+
+  const commitMessage = `jsonpages: persist ${data.slug} @ ${new Date().toISOString().slice(0, 19)}Z`;
+  const result = await gitAddCommitPush(gitDir, relativePaths, commitMessage, token);
+
+  if (result.success) {
+    return { success: true, message: 'Saved and pushed to remote' };
+  }
+  if (result.error.toLowerCase().includes('failed to push') || result.error.toLowerCase().includes('authentication')) {
+    return { success: false, status: 502, error: result.error };
+  }
+  return { success: false, status: 500, error: result.error };
+}
+
+END_OF_FILE_CONTENT
 echo "Creating src/types.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/types.ts"
 import type { MenuItem } from '@jsonpages/core';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonpages/cli",
-  "version": "3.0.28",
+  "version": "3.0.29",
   "description": "JsonPages CLI - Sovereign Projection Engine",
   "type": "module",
   "bin": {