sitevision-cli 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/app.d.ts

@@ -2,5 +2,5 @@ import { type ProjectInfo } from './utils/project-detection.js';
 type Props = {
     project: ProjectInfo;
 };
-export default function App({ project }: Props): import("react").JSX.Element | null;
+export default function App({ project: initialProject }: Props): import("react").JSX.Element | null;
 export {};

package/dist/app.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useMemo, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
+import { detectProject } from './utils/project-detection.js';
 import { MainMenu } from './components/MainMenu.js';
 import { InfoScreen } from './components/InfoScreen.js';
 import { SetupFlow } from './components/SetupFlow.js';
@@ -12,7 +13,22 @@ import { DeployScreen } from './commands/deploy.js';
 import { SignScreen } from './commands/sign.js';
 import { SigningPropertiesForm } from './components/SigningPropertiesForm.js';
 import { getSigningPassword, setDeployPassword as saveDeployPassword, setSigningPassword as saveSigningPassword, } from './utils/keychain.js';
-export default function App({ project }) {
+export default function App({ project: initialProject }) {
+    // The project is loaded once at startup, but setup flows write new values to
+    // disk and the OS keychain. Hold it in state so we can re-detect after setup
+    // and pick up those changes (e.g. saved passwords) without restarting the CLI.
+    const [project, setProject] = useState(initialProject);
+    const reloadProject = useCallback(() => {
+        try {
+            const refreshed = detectProject(initialProject.root);
+            if (refreshed)
+                setProject(refreshed);
+        }
+        catch {
+            // Re-detection failed (e.g. manifest became unparseable mid-session) —
+            // keep the existing in-memory project rather than crashing.
+        }
+    }, [initialProject.root]);
     const [state, setState] = useState('setup');
     const [currentCommand, setCurrentCommand] = useState('');
     const [signingPassword, setSigningPassword] = useState('');
@@ -185,7 +201,7 @@ export default function App({ project }) {
         }
     };
     if (state === 'setup') {
-        return _jsx(SetupFlow, { project: project, onComplete: () => setState('menu') });
+        return (_jsx(SetupFlow, { project: project, onReload: reloadProject, onComplete: () => setState('menu') }));
     }
     if (state === 'menu') {
         return _jsx(MainMenu, { project: project, onSelect: handleCommandSelect });
@@ -260,9 +276,9 @@ export default function App({ project }) {
     }
     if (state === 'setup-signing') {
         return (_jsx(SigningPropertiesForm, { projectRoot: project.root, onComplete: () => {
-                // We can't easily update project info here without full reload,
-                // but since we are just returning to menu, it's fine.
-                // The user might need to restart CLI or we implement a reload mechanism.
+                // Re-detect so the newly written signing credentials are reflected
+                // in memory (hasSigningProperties, keychain password) without a restart.
+                reloadProject();
                 setState('menu');
             }, onCancel: () => setState('menu') }));
     }

package/dist/components/SetupFlow.d.ts

@@ -1,7 +1,8 @@
 import { type ProjectInfo } from '../utils/project-detection.js';
 interface Props {
     project: ProjectInfo;
+    onReload: () => void;
     onComplete: () => void;
 }
-export declare function SetupFlow({ project, onComplete }: Props): import("react").JSX.Element | null;
+export declare function SetupFlow({ project, onReload, onComplete }: Props): import("react").JSX.Element | null;
 export {};

package/dist/components/SetupFlow.js

@@ -7,7 +7,7 @@ import { ProcessOutputComponent } from './ProcessOutput.js';
 import { StatusIndicator } from './StatusIndicator.js';
 import { DevPropertiesForm } from './DevPropertiesForm.js';
 import { SigningPropertiesForm } from './SigningPropertiesForm.js';
-export function SetupFlow({ project, onComplete }) {
+export function SetupFlow({ project, onReload, onComplete }) {
     const [step, setStep] = useState('check-node-modules');
     const [runner, setRunner] = useState(null);
     const [commandStatus, setCommandStatus] = useState('running');
@@ -84,6 +84,9 @@ export function SetupFlow({ project, onComplete }) {
         else if (step === 'confirm-password-migration') {
             if (input === 'y' || input === 'Y') {
                 migrateLegacyPassword(project);
+                // The file was rewritten (plaintext stripped, password moved to
+                // keychain) — re-detect so hasLegacyPassword/password reflect that.
+                onReload();
                 setStep('check-signing-properties');
             }
             else if (input === 'n' || input === 'N') {
@@ -102,17 +105,19 @@ export function SetupFlow({ project, onComplete }) {
     // Setup Dev Properties Form
     if (step === 'setup-dev-properties') {
         return (_jsx(DevPropertiesForm, { projectRoot: project.root, initialProperties: project.devProperties, packageJson: project.packageJson, onComplete: () => {
-                // Manually update project state locally if possible, or just proceed
-                // Since we can't easily update 'project' prop from here without reloading,
-                // we just move to next step. The file is written.
-                project.hasDevProperties = true; // Optimization/Hack to pass check
+                // Re-detect from disk/keychain so devProperties (incl. the keychain
+                // password) populate in memory — otherwise the rest of this flow and
+                // the menu would see stale state until the CLI is restarted.
+                onReload();
                 setStep('check-signing-properties');
             }, onCancel: () => setStep('check-signing-properties') }));
     }
     // Setup Signing Properties Form
     if (step === 'setup-signing-properties') {
         return (_jsx(SigningPropertiesForm, { projectRoot: project.root, onComplete: () => {
-                project.hasSigningProperties = true; // Optimization/Hack
+                // Re-detect so signing credentials are reflected in memory before
+                // the info screen / menu render.
+                onReload();
                 setStep('show-info');
             }, onCancel: () => setStep('show-info') }));
     }

package/dist/utils/jsonc.d.ts

@@ -0,0 +1,19 @@
+/**
+ * JSONC helpers.
+ *
+ * Sitevision's own manifest documentation shows manifest.json with line and
+ * block comments (e.g. `"name": { // Multilingual-manifest requires SV 10.1`),
+ * so real-world manifests copied from the docs contain them. Strict JSON.parse
+ * rejects those, so we strip comments before parsing.
+ */
+/**
+ * Remove line comments (//...) and block comments from a JSON string, leaving
+ * everything inside string literals untouched (so values like
+ * `"https://example.com"` survive).
+ */
+export declare function stripJsonComments(input: string): string;
+/**
+ * Parse a JSON string that may contain comments (JSONC). Throws the underlying
+ * SyntaxError if the content is invalid even after comments are removed.
+ */
+export declare function parseJsonc<T>(input: string): T;

package/dist/utils/jsonc.js

@@ -0,0 +1,74 @@
+/**
+ * JSONC helpers.
+ *
+ * Sitevision's own manifest documentation shows manifest.json with line and
+ * block comments (e.g. `"name": { // Multilingual-manifest requires SV 10.1`),
+ * so real-world manifests copied from the docs contain them. Strict JSON.parse
+ * rejects those, so we strip comments before parsing.
+ */
+/**
+ * Remove line comments (//...) and block comments from a JSON string, leaving
+ * everything inside string literals untouched (so values like
+ * `"https://example.com"` survive).
+ */
+export function stripJsonComments(input) {
+    let result = '';
+    let inString = false;
+    let inLineComment = false;
+    let inBlockComment = false;
+    for (let i = 0; i < input.length; i++) {
+        const char = input[i];
+        const next = input[i + 1];
+        if (inLineComment) {
+            if (char === '\n') {
+                inLineComment = false;
+                result += char;
+            }
+            continue;
+        }
+        if (inBlockComment) {
+            if (char === '*' && next === '/') {
+                inBlockComment = false;
+                i++;
+            }
+            continue;
+        }
+        if (inString) {
+            result += char;
+            // Copy escaped characters verbatim so an escaped quote (\") does not
+            // end the string early.
+            if (char === '\\') {
+                result += next ?? '';
+                i++;
+            }
+            else if (char === '"') {
+                inString = false;
+            }
+            continue;
+        }
+        if (char === '"') {
+            inString = true;
+            result += char;
+            continue;
+        }
+        if (char === '/' && next === '/') {
+            inLineComment = true;
+            i++;
+            continue;
+        }
+        if (char === '/' && next === '*') {
+            inBlockComment = true;
+            i++;
+            continue;
+        }
+        result += char;
+    }
+    return result;
+}
+/**
+ * Parse a JSON string that may contain comments (JSONC). Throws the underlying
+ * SyntaxError if the content is invalid even after comments are removed.
+ */
+export function parseJsonc(input) {
+    return JSON.parse(stripJsonComments(input));
+}

package/dist/utils/project-detection.js

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { getDeployPassword, setDeployPassword } from './keychain.js';
+import { parseJsonc } from './jsonc.js';
 // =============================================================================
 // LOCALIZED TEXT
 // =============================================================================
@@ -182,12 +183,12 @@ export function detectProject(cwd = process.cwd()) {
         for (const p of manifestPaths) {
             if (fs.existsSync(p)) {
                 manifestPath = p;
-                // A present-but-unparseable manifest is a real, fixable error (a stray
-                // comment, a trailing comma, …). Surface it rather than silently
-                // reporting "Not a Sitevision project". JSON has no comments — strip
-                // any `//` annotations from manifest.json.
+                // Manifests may contain comments (Sitevision's own docs show them), so
+                // parse as JSONC. A still-unparseable manifest is a real, fixable
+                // error — surface it rather than silently reporting "Not a Sitevision
+                // project".
                 try {
-                    manifest = JSON.parse(fs.readFileSync(p, 'utf-8'));
+                    manifest = parseJsonc(fs.readFileSync(p, 'utf-8'));
                 }
                 catch (error) {
                     throw new ManifestParseError(p, error);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sitevision-cli",
-	"version": "1.0.0-beta.3",
+	"version": "1.0.0-beta.4",
 	"license": "MIT",
 	"bin": {
 		"svc": "dist/cli.js"