@jsonpages/cli 3.0.27 → 3.0.29

package/assets/src_tenant_alpha.sh

@@ -29,7 +29,8 @@ echo "Creating src/App.tsx..."
 cat << 'END_OF_FILE_CONTENT' > "src/App.tsx"
 /**
  * Thin Entry Point (Tenant).
- * Loads from localStorage draft when present (same key as Core autosave), else from file.
+ * 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,14 +41,13 @@ 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';
 
-// Tenant data (file-backed fallback)
 import siteData from '@/data/config/site.json';
 import themeData from '@/data/config/theme.json';
 import menuData from '@/data/config/menu.json';
 import homeData from '@/data/pages/home.json';
 
-// Tenant CSS
 import tenantCss from './index.css?inline';
 
 const themeConfig = themeData as unknown as ThemeConfig;
@@ -59,6 +59,8 @@ const filePages: Record<string, PageConfig> = {
 };
 const fileSiteConfig = siteData as unknown as SiteConfig;
 
+const MAX_UPLOAD_SIZE_BYTES = 5 * 1024 * 1024; // 5MB, must match server
+
 function getInitialData() {
   return getHydratedData(TENANT_ID, filePages, fileSiteConfig);
 }
@@ -67,17 +69,6 @@ function App() {
   const [{ pages, siteConfig }] = useState(getInitialData);
   const [assetsManifest, setAssetsManifest] = useState<LibraryImageEntry[]>([]);
 
-  // #region agent log
-  useEffect(() => {
-    fetch('http://127.0.0.1:7588/ingest/86d71502-47e1-433c-9b6d-5a1390d00813',{method:'POST',headers:{'Content-Type':'application/json','X-Debug-Session-Id':'34bba5'},body:JSON.stringify({sessionId:'34bba5',location:'App.tsx',message:'App mounted',data:{},timestamp:Date.now(),hypothesisId:'H1,H3'})}).catch(()=>{});
-    const onSubmit = (e: Event) => {
-      fetch('http://127.0.0.1:7588/ingest/86d71502-47e1-433c-9b6d-5a1390d00813',{method:'POST',headers:{'Content-Type':'application/json','X-Debug-Session-Id':'34bba5'},body:JSON.stringify({sessionId:'34bba5',location:'App.tsx:submit',message:'form submit captured',data:{targetTag:(e.target as HTMLElement)?.tagName},timestamp:Date.now(),hypothesisId:'H4'})}).catch(()=>{});
-    };
-    document.addEventListener('submit', onSubmit, true);
-    return () => document.removeEventListener('submit', onSubmit, true);
-  }, []);
-  // #endregion
-
   useEffect(() => {
     fetch('/api/list-assets')
       .then((r) => (r.ok ? r.json() : []))
@@ -96,50 +87,59 @@ function App() {
     themeCss: { tenant: tenantCss },
     addSection: addSectionConfig,
     persistence: {
-      async flushUploadedAssets(urls: string[]): Promise<Record<string, string>> {
-        const res = await fetch('/api/flush-uploaded-assets', {
+      async saveToRepo(state: ProjectState, slug: string) {
+        const res = await fetch('/api/persist', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ urls }),
+          body: JSON.stringify({ projectState: state, slug }),
         });
-        if (!res.ok) throw new Error(`Flush failed: ${res.status}`);
-        const { urlMap } = (await res.json()) as { urlMap?: Record<string, string> };
-        return urlMap ?? {};
+        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,
       async onAssetUpload(file: File): Promise<string> {
-      // #region agent log
-      fetch('http://127.0.0.1:7588/ingest/86d71502-47e1-433c-9b6d-5a1390d00813',{method:'POST',headers:{'Content-Type':'application/json','X-Debug-Session-Id':'34bba5'},body:JSON.stringify({sessionId:'34bba5',location:'App.tsx:onAssetUpload',message:'onAssetUpload entry',data:{fileName:file.name},timestamp:Date.now(),hypothesisId:'H2,H5'})}).catch(()=>{});
-      // #endregion
-      const base64 = await new Promise<string>((resolve, reject) => {
-        const reader = new FileReader();
-        reader.onload = () => {
-          const dataUrl = reader.result as string;
-          const base64 = dataUrl.includes(',') ? dataUrl.split(',')[1] : '';
-          resolve(base64 || '');
-        };
-        reader.onerror = () => reject(reader.error);
-        reader.readAsDataURL(file);
-      });
-      const res = await fetch('/api/upload-asset', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ filename: file.name, mimeType: file.type || undefined, data: base64 }),
-      });
-      if (!res.ok) {
-        const err = await res.json().catch(() => ({}));
-        throw new Error((err as { error?: string }).error || `Upload failed: ${res.status}`);
-      }
-      const { url } = (await res.json()) as { url: string };
-      // In-memory upload only: do not update assetsManifest here to avoid reload.
-      // Preview in Upload tab uses this URL; Library tab will get new items on next list-assets load.
-      // Disk write can be added later on Save.
-      return url;
+        if (!file.type.startsWith('image/')) {
+          throw new Error('Invalid file type. Allowed: JPEG, PNG, WebP, GIF, SVG, AVIF.');
+        }
+        if (file.size > MAX_UPLOAD_SIZE_BYTES) {
+          throw new Error(`File too large. Maximum size is ${MAX_UPLOAD_SIZE_BYTES / 1024 / 1024}MB.`);
+        }
+        const base64 = await new Promise<string>((resolve, reject) => {
+          const reader = new FileReader();
+          reader.onload = () => {
+            const dataUrl = reader.result as string;
+            const b64 = dataUrl.includes(',') ? dataUrl.split(',')[1] : '';
+            resolve(b64 || '');
+          };
+          reader.onerror = () => reject(reader.error);
+          reader.readAsDataURL(file);
+        });
+        const res = await fetch('/api/upload-asset', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({
+            filename: file.name,
+            mimeType: file.type || undefined,
+            data: base64,
+          }),
+        });
+        const body = (await res.json().catch(() => ({}))) as { url?: string; error?: string };
+        if (!res.ok) {
+          throw new Error(body.error || `Upload failed: ${res.status}`);
+        }
+        if (typeof body.url !== 'string') {
+          throw new Error('Invalid server response: missing url');
+        }
+        return body.url;
+      },
     },
-  },
   };
 
   return <JsonPagesEngine config={config} />;
@@ -1070,11 +1070,6 @@ export const ImageBreak: React.FC<{ data: ImageBreakData; settings?: ImageBreakS
               </div>
             )}
           </div>
-          {data.label && (
-            <div className="jp-section-label sr-only" data-jp-field="label">
-              {data.label}
-            </div>
-          )}
         </>
       ) : (
         <div className="flex flex-col items-center justify-center py-24 text-[var(--local-text-muted)]">
@@ -1097,19 +1092,16 @@ END_OF_FILE_CONTENT
 echo "Creating src/components/image-break/schema.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/image-break/schema.ts"
 import { z } from 'zod';
-import { BaseSectionData } from '@/lib/base-schemas';
-
-const ImageSelectionSchema = z.object({
-  url: z.string(),
-  alt: z.string().optional(),
-}).describe('ui:image-picker');
+import { BaseSectionData, ImageSelectionSchema } from '@/lib/base-schemas';
 
 export const ImageBreakSchema = BaseSectionData.extend({
-  label: z.string().optional().describe('ui:text'),
   image: ImageSelectionSchema.default({ url: '', alt: '' }),
-  caption: z.string().optional().describe('ui:textarea'),
+  caption: z.string().optional().describe('ui:text'),
 });
 
+export const ImageBreakSettingsSchema = z.object({
+  height: z.enum(['sm', 'md', 'lg', 'full']).default('md').describe('ui:select'),
+});
 END_OF_FILE_CONTENT
 echo "Creating src/components/image-break/types.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/components/image-break/types.ts"
@@ -2503,18 +2495,7 @@ cat << 'END_OF_FILE_CONTENT' > "src/data/pages/home.json"
       },
       "settings": {}
     },
-    {
-      "id": "image-break-1",
-      "type": "image-break",
-      "data": {
-        "image": {
-          "url": "https://images.unsplash.com/photo-1464226184884-fa280b87c399?w=800",
-          "alt": "Verdure fresche dall'orto"
-        },
-        "caption": "Il nostro orto a pochi passi dalla cucina — raccolto ogni mattina all'alba"
-      },
-      "settings": {}
-    },
+    
     {
       "id": "problem-statement",
       "type": "problem-statement",
@@ -3268,6 +3249,17 @@ echo "Creating src/lib/base-schemas.ts..."
 cat << 'END_OF_FILE_CONTENT' > "src/lib/base-schemas.ts"
 import { z } from 'zod';
 
+/**
+ * Image picker field: object { url, alt? } with ui:image-picker for Form Factory.
+ * Use in section data and resolve with resolveAssetUrl(url, tenantId) in View.
+ */
+export const ImageSelectionSchema = z
+  .object({
+    url: z.string(),
+    alt: z.string().optional(),
+  }) 
+  .describe('ui:image-picker');
+
 /**
  * Base schemas shared by section capsules (CIP governance).
  * Capsules extend these for consistent anchorId, array items, and settings.
@@ -3436,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,29 +1,29 @@
-{
-  "name": "@jsonpages/cli",
-  "version": "3.0.27",
-  "description": "JsonPages CLI - Sovereign Projection Engine",
-  "type": "module",
-  "bin": {
-    "jsonpages": "./src/index.js"
-  },
-  "files": [
-    "src",
-    "assets/src_tenant_alpha.sh"
-  ],
-  "scripts": {
-    "build": "tsc -p ."
-  },
-  "dependencies": {
-    "@jsonpages/stack": "^1.0.0",
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
-    "execa": "^9.0.2",
-    "fs-extra": "^11.2.0",
-    "ora": "^8.0.1"
-  },
-  "devDependencies": {
-    "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.13.1",
-    "typescript": "^5.7.3"
-  }
-}
+{
+  "name": "@jsonpages/cli",
+  "version": "3.0.29",
+  "description": "JsonPages CLI - Sovereign Projection Engine",
+  "type": "module",
+  "bin": {
+    "jsonpages": "./src/index.js"
+  },
+  "files": [
+    "src",
+    "assets/src_tenant_alpha.sh"
+  ],
+  "scripts": {
+    "build": "tsc -p ."
+  },
+  "dependencies": {
+    "@jsonpages/stack": "^1.0.0",
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "execa": "^9.0.2",
+    "fs-extra": "^11.2.0",
+    "ora": "^8.0.1"
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^22.13.1",
+    "typescript": "^5.7.3"
+  }
+}