sitevision-cli 1.0.0-beta.9 → 1.0.1

package/dist/commands/build.js

@@ -1,192 +1,13 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React from 'react';
-import { render, Box, Text, useInput } from 'ink';
-import { StatusIndicator } from '../components/StatusIndicator.js';
-import { WebpackRunner, hasLocalWebpackConfig } from '../utils/webpack-runner.js';
-import { hasSitevisionScripts, runSitevisionScriptsBuild, getDelegatedZipPath, checkSitevisionScriptsCompatibility, } from '../utils/sitevision-scripts-runner.js';
-import { copyStaticToBuild, copySrcToBuild, cleanBuild, formatFileSize, createBuildZip, getZipSize, zipExists, } from '../utils/zip.js';
-import { isBundledApp, getAppType, getFullAppId, } from '../utils/project-detection.js';
-export function BuildScreen({ projectRoot, manifest, createZip = true, onBack, }) {
-    const [state, setState] = React.useState({
-        status: 'cleaning',
-        message: 'Cleaning build directory...',
-    });
-    useInput((input, key) => {
-        if (onBack &&
-            (key.escape || input === 'q') &&
-            (state.status === 'success' || state.status === 'error')) {
-            onBack();
-        }
-    });
-    const isBundled = isBundledApp(manifest);
-    React.useEffect(() => {
-        async function runBuild() {
-            try {
-                // Step 1: Clean build directory
-                setState({ status: 'cleaning', message: 'Cleaning build directory...' });
-                cleanBuild(projectRoot);
-                // Step 2: Build or copy files
-                if (isBundled && !hasLocalWebpackConfig(projectRoot)) {
-                    // No project-local webpack config: delegate the whole build to
-                    // @sitevision/sitevision-scripts, which compiles + zips to
-                    // dist/<appId>.zip (the path the CLI's sign/deploy already use).
-                    if (!hasSitevisionScripts(projectRoot)) {
-                        setState({
-                            status: 'error',
-                            error: 'No webpack.config.js found and @sitevision/sitevision-scripts is not installed. Run npm install.',
-                        });
-                        return;
-                    }
-                    // Warn if the installed sitevision-scripts is outside the range
-                    // the delegated build was validated against.
-                    const warning = checkSitevisionScriptsCompatibility(projectRoot).warning;
-                    setState({
-                        status: 'building',
-                        message: 'Building via sitevision-scripts...',
-                        warning,
-                    });
-                    const sitevisionResult = await runSitevisionScriptsBuild(projectRoot);
-                    if (!sitevisionResult.success) {
-                        setState({
-                            status: 'error',
-                            error: `${sitevisionResult.error}\n${sitevisionResult.output.slice(-1000)}`,
-                            warning,
-                        });
-                        return;
-                    }
-                    // sitevision-scripts already produced the zip; report it directly.
-                    const zipPath = getDelegatedZipPath(projectRoot, manifest.id);
-                    if (!zipExists(zipPath)) {
-                        setState({
-                            status: 'error',
-                            error: `Build reported success but no zip was found at ${zipPath}.`,
-                            warning,
-                        });
-                        return;
-                    }
-                    setState({
-                        status: 'success',
-                        message: 'Build complete',
-                        zipPath,
-                        zipSize: getZipSize(zipPath),
-                        warning,
-                    });
-                    return;
-                }
-                if (isBundled) {
-                    // Project ships its own webpack config: build it in-process.
-                    if (!WebpackRunner.isWebpackAvailable(projectRoot)) {
-                        setState({
-                            status: 'error',
-                            error: 'webpack not found. Run npm install to install dependencies.',
-                        });
-                        return;
-                    }
-                    setState({ status: 'building', message: 'Compiling with webpack...' });
-                    const appType = getAppType(manifest);
-                    const runner = new WebpackRunner(projectRoot, {
-                        mode: 'production',
-                        cssPrefix: manifest.id,
-                        restApp: appType === 'rest',
-                    });
-                    const result = await runner.run();
-                    await runner.close();
-                    if (!result.success) {
-                        setState({
-                            status: 'error',
-                            error: result.errors?.join('\n') || 'Build failed',
-                            result,
-                        });
-                        return;
-                    }
-                    // Copy static files after webpack build
-                    setState({ status: 'copying', message: 'Copying static files...' });
-                    copyStaticToBuild(projectRoot);
-                    setState(prev => ({ ...prev, result }));
-                }
-                else {
-                    // Non-bundled app: just copy files
-                    setState({ status: 'copying', message: 'Copying source files...' });
-                    copySrcToBuild(projectRoot);
-                    copyStaticToBuild(projectRoot);
-                }
-                // Step 3: Create zip if requested
-                if (createZip) {
-                    setState({ status: 'zipping', message: 'Creating zip archive...' });
-                    const appId = getFullAppId(manifest.id);
-                    const zipPath = await createBuildZip(projectRoot, appId);
-                    const zipSize = getZipSize(zipPath);
-                    setState(prev => ({
-                        ...prev,
-                        status: 'success',
-                        message: 'Build complete',
-                        zipPath,
-                        zipSize,
-                    }));
-                }
-                else {
-                    setState(prev => ({
-                        ...prev,
-                        status: 'success',
-                        message: 'Build complete',
-                    }));
-                }
-            }
-            catch (error) {
-                setState({
-                    status: 'error',
-                    error: error instanceof Error ? error.message : String(error),
-                });
-            }
-        }
-        runBuild();
-    }, [projectRoot, manifest, isBundled, createZip]);
-    const getStatusIndicator = () => {
-        switch (state.status) {
-            case 'cleaning':
-            case 'building':
-            case 'copying':
-            case 'zipping':
-                return 'running';
-            case 'success':
-                return 'success';
-            case 'error':
-                return 'error';
-        }
-    };
-    const getStatusLabel = () => {
-        switch (state.status) {
-            case 'cleaning':
-                return 'Cleaning';
-            case 'building':
-                return 'Building';
-            case 'copying':
-                return 'Copying files';
-            case 'zipping':
-                return 'Creating zip';
-            case 'success':
-                return 'Build complete';
-            case 'error':
-                return 'Build failed';
-        }
-    };
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(StatusIndicator, { status: getStatusIndicator(), label: getStatusLabel(), message: state.message }) }), state.warning && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "yellow", children: ["\u26A0 ", state.warning] }) })), state.status === 'success' && state.result?.stats && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { dimColor: true, children: ["Compiled in ", state.result.stats.time, "ms"] }), state.result.stats.assets &&
-                        state.result.stats.assets.length > 0 && (_jsxs(Text, { dimColor: true, children: ["Assets: ", state.result.stats.assets.join(', ')] }))] })), state.status === 'success' && state.zipPath && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, marginTop: 1, children: [_jsxs(Text, { color: "green", children: ["\u2713 Created: ", state.zipPath] }), state.zipSize !== undefined && (_jsxs(Text, { dimColor: true, children: [" Size: ", formatFileSize(state.zipSize)] }))] })), state.result?.warnings && state.result.warnings.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "yellow", children: "Warnings:" }), state.result.warnings.slice(0, 5).map((warning, i) => (_jsx(Text, { color: "yellow", dimColor: true, children: warning.substring(0, 200) }, i))), state.result.warnings.length > 5 && (_jsxs(Text, { color: "yellow", dimColor: true, children: ["...and ", state.result.warnings.length - 5, " more"] }))] })), state.status === 'error' && state.error && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(Text, { color: "red", children: state.error }) })), onBack && (state.status === 'success' || state.status === 'error') && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press q or Esc to return to menu" }) }))] }));
-}
+import { jsx as _jsx } from "react/jsx-runtime";
+import { render } from 'ink';
+import { TaskScreen } from './TaskScreen.js';
+import { startBuild } from '../utils/tasks.js';
 export const buildCommand = {
     name: 'build',
     description: 'Build the application for production',
     requiresProject: true,
-    flags: {
-        'no-zip': {
-            type: 'boolean',
-            description: 'Skip creating the zip archive',
-            default: false,
-        },
-    },
     async execute({ project, flags }) {
-        const createZip = !flags['no-zip'];
-        const { waitUntilExit } = render(_jsx(BuildScreen, { projectRoot: project.root, manifest: project.manifest, createZip: createZip }));
-        await waitUntilExit();
+        const task = startBuild(project, { zip: flags['zip'] !== false });
+        await render(_jsx(TaskScreen, { task: task })).waitUntilExit();
     },
 };

package/dist/commands/deploy.js

@@ -1,55 +1,82 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React from 'react';
-import { render, Box, Text, useInput } from 'ink';
+import { useEffect, useState } from 'react';
+import { render, Box, Text, useApp, useInput, useStdin } from 'ink';
+import { TaskScreen } from './TaskScreen.js';
+import { useFinish } from './use-finish.js';
+import { resolveDeployPasswordForCli } from './dev.js';
 import { StatusIndicator } from '../components/StatusIndicator.js';
-import { deployApp, deployProduction } from '../utils/sitevision-api.js';
-import { getZipPath, getSignedZipPath, getAppType, } from '../utils/project-detection.js';
-import { zipExists } from '../utils/zip.js';
-import { promptPassword, promptYesNo } from '../utils/password-prompt.js';
-import { setDeployPassword, deleteSessionCookie } from '../utils/keychain.js';
-import { resolveOAuth2AccessToken } from '../utils/oauth2-auth.js';
 import { AuthLoginScreen } from '../components/AuthLoginScreen.js';
-export function DeployScreen({ projectRoot, manifest, devProperties, force, production, activate, onBack, onRetryCredentials, }) {
-    const [state, setState] = React.useState({
-        status: 'deploying',
-        message: production ? 'Deploying to production...' : 'Deploying to dev...',
-    });
-    // 'init' resolves cached credentials, 'login' shows the Ink login screen,
-    // 'deploy' runs the upload. Token/cookie login now happens here, so both the
-    // TUI and the standalone command reach it.
-    const [phase, setPhase] = React.useState('init');
-    const [credential, setCredential] = React.useState({
+import { deleteSessionCookie, deleteOAuth2RefreshToken, } from '../utils/keychain.js';
+import { resolveOAuth2AccessToken } from '../utils/oauth2-auth.js';
+import { startDeploy, useTasks } from '../utils/tasks.js';
+import { toDeployConfig } from '../utils/workspace.js';
+import { say } from '../utils/debug.js';
+/** Standalone `svc deploy`: log in if needed, then run the shell's deploy task. */
+export function DeployScreen({ project, force, production, activate, }) {
+    const devProperties = project.devProperties;
+    const { exit } = useApp();
+    // Undefined, not false, on a pipe; and useInput reads undefined as active.
+    const interactive = Boolean(useStdin().isRawModeSupported);
+    // 'init' resolves cached credentials, 'login' shows the login screen,
+    // 'deploy' starts the task.
+    const [phase, setPhase] = useState('init');
+    const [credential, setCredential] = useState({
         accessToken: devProperties.accessToken,
         sessionCookie: devProperties.sessionCookie,
     });
-    const deployStartedRef = React.useRef(false);
-    useInput((input, key) => {
-        if (state.status !== 'deploying') {
-            if (onBack && (key.escape || input === 'q')) {
-                onBack();
-            }
-            if (onRetryCredentials && state.status === 'error' && input === 'r') {
-                onRetryCredentials();
-            }
+    const [task, setTask] = useState();
+    // Anything that goes wrong before there is a task to show it.
+    const [failure, setFailure] = useState();
+    const authMethod = devProperties.authMethod ?? 'basic';
+    // OAuth2 and cookie can re-authenticate in place, given a terminal to do it in.
+    const canRelogin = interactive && (authMethod === 'oauth2' || authMethod === 'cookie');
+    const live = useTasks().find(t => t.id === task?.id) ?? task;
+    const failed = Boolean(failure) || live?.status === 'error';
+    useFinish(failure && !task ? 'error' : undefined, canRelogin);
+    // A browser login needs a terminal; without one only env credentials work.
+    const startLogin = () => {
+        if (interactive) {
+            setPhase('login');
         }
-    });
-    // Decide once whether we can deploy straight away or must log in first.
-    React.useEffect(() => {
-        const authMethod = devProperties.authMethod ?? 'basic';
-        if (authMethod === 'basic' || devProperties.sessionCookie) {
-            setPhase('deploy');
-            return;
+        else {
+            setFailure('No stored login and no terminal to log in from. Set SITEVISION_ACCESS_TOKEN or SITEVISION_SESSION_COOKIE.');
         }
+    };
+    // Drop the stored credential and log in again: the usual fix for an expired
+    // session or token, which Sitevision reports as a 400 rather than a 401.
+    const retryWithFreshLogin = () => {
+        const { domain, username } = devProperties;
         if (authMethod === 'cookie') {
-            // env/keychain cookie is already loaded in devProperties; none here.
-            setPhase('login');
+            deleteSessionCookie(domain, username);
+        }
+        else if (devProperties.oauth2?.clientId) {
+            deleteOAuth2RefreshToken(domain, devProperties.oauth2.clientId);
+        }
+        setCredential({});
+        setFailure(undefined);
+        setTask(undefined);
+        setPhase('login');
+    };
+    useInput((input, key) => {
+        if (!failed)
             return;
+        if (input === 'r')
+            retryWithFreshLogin();
+        if (key.escape || input === 'q')
+            exit();
+    }, { isActive: canRelogin });
+    // Decide once whether to deploy straight away or log in first.
+    useEffect(() => {
+        if (authMethod === 'basic' || credential.sessionCookie) {
+            setPhase('deploy');
         }
-        if (authMethod === 'oauth2') {
-            if (devProperties.accessToken) {
-                setPhase('deploy');
-                return;
-            }
+        else if (authMethod === 'cookie') {
+            startLogin();
+        }
+        else if (credential.accessToken) {
+            setPhase('deploy');
+        }
+        else {
             void (async () => {
                 const token = await resolveOAuth2AccessToken(devProperties);
                 if (token) {
@@ -57,196 +84,52 @@ export function DeployScreen({ projectRoot, manifest, devProperties, force, prod
                     setPhase('deploy');
                 }
                 else {
-                    setPhase('login');
+                    startLogin();
                 }
             })();
-            return;
         }
-        setPhase('deploy');
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-    React.useEffect(() => {
-        if (phase !== 'deploy' || deployStartedRef.current)
+    useEffect(() => {
+        if (phase !== 'deploy' || task)
+            return;
+        const complete = toDeployConfig({ ...devProperties, ...credential });
+        if ('error' in complete) {
+            setFailure(complete.error);
             return;
-        deployStartedRef.current = true;
-        async function runDeploy() {
-            try {
-                const appType = getAppType(manifest);
-                const authMethod = devProperties.authMethod ?? 'basic';
-                // Credential resolved in the init effect / login screen.
-                const { accessToken, sessionCookie } = credential;
-                // A stale session fails without a clean 401 — clear the stored cookie
-                // so the next run re-authenticates. Skip when SITEVISION_SESSION_COOKIE
-                // is set: detection re-reads it first, so clearing would just replay
-                // the same dead cookie in a loop.
-                const clearStaleCookie = (result) => {
-                    if (result.authExpired &&
-                        authMethod === 'cookie' &&
-                        !process.env['SITEVISION_SESSION_COOKIE'] &&
-                        devProperties.domain &&
-                        devProperties.username) {
-                        deleteSessionCookie(devProperties.domain, devProperties.username);
-                    }
-                };
-                if (production) {
-                    // Production deployment requires a signed zip
-                    const signedZipPath = getSignedZipPath(projectRoot, manifest);
-                    if (!zipExists(signedZipPath)) {
-                        setState({
-                            status: 'error',
-                            error: `Signed zip not found: ${signedZipPath}\nRun 'sign' first to create the signed zip.`,
-                        });
-                        return;
-                    }
-                    const config = {
-                        domain: devProperties.domain,
-                        siteName: devProperties.siteName,
-                        addonName: devProperties.addonName,
-                        username: devProperties.username,
-                        password: devProperties.password,
-                        accessToken,
-                        sessionCookie,
-                        useHTTP: devProperties.useHTTPForDevDeploy,
-                        activate,
-                    };
-                    const result = await deployProduction(signedZipPath, config, appType);
-                    if (!result.success) {
-                        clearStaleCookie(result);
-                        setState({
-                            status: 'error',
-                            error: result.error || 'Deployment failed',
-                        });
-                        return;
-                    }
-                    setState({
-                        status: 'success',
-                        message: result.message || 'Deployed to production successfully',
-                        executableId: result.executableId,
-                    });
-                }
-                else {
-                    // Dev deployment can use unsigned zip
-                    const zipPath = getZipPath(projectRoot, manifest);
-                    if (!zipExists(zipPath)) {
-                        setState({
-                            status: 'error',
-                            error: `Zip not found: ${zipPath}\nRun 'build' first to create the zip.`,
-                        });
-                        return;
-                    }
-                    const config = {
-                        domain: devProperties.domain,
-                        siteName: devProperties.siteName,
-                        addonName: devProperties.addonName,
-                        username: devProperties.username,
-                        password: devProperties.password,
-                        accessToken,
-                        sessionCookie,
-                        useHTTP: devProperties.useHTTPForDevDeploy,
-                    };
-                    const result = await deployApp(zipPath, config, appType, force);
-                    if (!result.success) {
-                        clearStaleCookie(result);
-                        setState({
-                            status: 'error',
-                            error: result.error || 'Deployment failed',
-                        });
-                        return;
-                    }
-                    setState({
-                        status: 'success',
-                        message: 'Deployed to dev successfully',
-                        executableId: result.executableId,
-                    });
-                }
-            }
-            catch (error) {
-                setState({
-                    status: 'error',
-                    error: error instanceof Error ? error.message : String(error),
-                });
-            }
         }
-        runDeploy();
+        setTask(startDeploy(project, complete.config, { force, production, activate }));
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [phase]);
-    if (phase === 'login' && state.status !== 'error') {
-        return (_jsx(AuthLoginScreen, { method: (devProperties.authMethod ?? 'basic') === 'cookie'
-                ? 'cookie'
-                : 'oauth2', devProperties: devProperties, onComplete: cred => {
-                setCredential(cred);
+    }, [phase, task]);
+    if (phase === 'login' && !failure) {
+        return (_jsx(AuthLoginScreen, { method: authMethod === 'cookie' ? 'cookie' : 'oauth2', devProperties: devProperties, onComplete: next => {
+                setCredential(next);
                 setPhase('deploy');
-            }, onError: message => {
-                setState({ status: 'error', error: message });
-            }, onCancel: () => {
-                if (onBack) {
-                    onBack();
-                }
-                else {
-                    setState({ status: 'error', error: 'Login cancelled.' });
-                }
+            }, onError: setFailure, onCancel: () => {
+                setFailure('Login cancelled.');
             } }));
     }
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(StatusIndicator, { status: state.status === 'deploying' ? 'running' : state.status, label: state.status === 'deploying'
-                        ? 'Deploying'
-                        : state.status === 'success'
-                            ? 'Deployed'
-                            : 'Failed', message: state.message }) }), state.status === 'success' && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { color: "green", children: [production ? 'Production deployment' : 'Dev deployment', " complete"] }), state.executableId && (_jsxs(Text, { dimColor: true, children: ["Executable ID: ", state.executableId] })), force && _jsx(Text, { dimColor: true, children: "(Force mode - overwrote existing)" }), activate && production && _jsx(Text, { dimColor: true, children: "(Activated)" })] })), state.status === 'error' && state.error && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(Text, { color: "red", children: state.error }) })), state.status !== 'deploying' && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [state.status === 'error' && onRetryCredentials && (_jsx(Text, { dimColor: true, children: "Press r to retry with new credentials" })), onBack && _jsx(Text, { dimColor: true, children: "Press q or Esc to return to menu" })] }))] }));
+    const retryHint = failed && canRelogin && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: "yellow", children: "This can happen when your session or token has expired." }), _jsx(Text, { dimColor: true, children: "Press r to log in again with fresh credentials, q to quit" })] }));
+    if (task) {
+        return (_jsx(TaskScreen, { task: task, stay: canRelogin, children: retryHint }));
+    }
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(StatusIndicator, { status: failure ? 'error' : 'running', label: failure ? 'Failed' : 'Preparing', message: failure }), retryHint] }));
 }
 export const deployCommand = {
     name: 'deploy',
     description: 'Deploy the application',
     requiresProject: true,
-    flags: {
-        force: {
-            type: 'boolean',
-            description: 'Force deployment (overwrite existing)',
-            alias: 'f',
-            default: false,
-        },
-        production: {
-            type: 'boolean',
-            description: 'Deploy to production (requires signed app)',
-            alias: 'p',
-            default: false,
-        },
-        activate: {
-            type: 'boolean',
-            description: 'Activate the app after production deployment',
-            alias: 'a',
-            default: false,
-        },
-    },
     async execute({ project, flags }) {
-        // Check if dev properties are configured
-        if (!project.hasDevProperties || !project.devProperties) {
-            console.log('\n\x1b[33mDeployment credentials not configured.\x1b[0m');
-            console.log('Create a .dev_properties.json file with domain, siteName, addonName, and username, then run setup.\n');
+        const complete = toDeployConfig(project.devProperties);
+        if ('error' in complete) {
+            say(`\n\x1b[33m${complete.error}\x1b[0m\n`);
+            process.exitCode = 1;
             return;
         }
-        // Basic auth prompts for a password here; OAuth2 and cookie resolve or log
-        // in inside DeployScreen (Ink-native), so both the TUI and this command
-        // share one login path. env/--flag token/cookie are already loaded.
-        const authMethod = project.devProperties.authMethod ?? 'basic';
-        if (authMethod === 'basic' && !project.devProperties.password) {
-            const { domain, username } = project.devProperties;
-            console.log('');
-            const password = await promptPassword(`Deploy password for ${username}@${domain}: `);
-            if (!password) {
-                console.log('\x1b[31mError: Password is required\x1b[0m');
-                return;
-            }
-            const remember = await promptYesNo('Save password to OS keychain? (y/N): ');
-            if (remember && domain && username) {
-                setDeployPassword(domain, username, password);
-            }
-            project.devProperties.password = password;
-        }
-        const production = Boolean(flags['production']);
-        const force = Boolean(flags['force']);
-        const activate = Boolean(flags['activate']);
+        // OAuth2 and cookie log in inside DeployScreen; basic asks here.
+        if (!(await resolveDeployPasswordForCli(project.devProperties)))
+            return;
         // Production deploys use the already-signed zip; `sign` is run separately.
-        const { waitUntilExit } = render(_jsx(DeployScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: project.devProperties, force: force, production: production, activate: activate }));
-        await waitUntilExit();
+        await render(_jsx(DeployScreen, { project: project, force: Boolean(flags['force']), production: Boolean(flags['production']), activate: Boolean(flags['activate']) })).waitUntilExit();
     },
 };