sitevision-cli 1.0.0-beta.32 → 1.0.0-beta.33

package/package.json

@@ -1,7 +1,22 @@
 {
 	"name": "sitevision-cli",
-	"version": "1.0.0-beta.32",
+	"version": "1.0.0-beta.33",
+	"description": "Build, sign and deploy Sitevision apps from the terminal",
 	"license": "MIT",
+	"author": "Rasmus Söderström",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/xrasod/SitevisionCli.git"
+	},
+	"homepage": "https://github.com/xrasod/SitevisionCli#readme",
+	"bugs": "https://github.com/xrasod/SitevisionCli/issues",
+	"keywords": [
+		"sitevision",
+		"cli",
+		"webapp",
+		"restapp",
+		"deploy"
+	],
 	"bin": {
 		"svc": "dist/cli.js"
 	},
@@ -10,9 +25,10 @@
 		"node": ">=22"
 	},
 	"scripts": {
-		"build": "tsc",
+		"build": "node -e \"fs.rmSync('dist',{recursive:true,force:true})\" && tsc && node -e \"fs.chmodSync('dist/cli.js',0o755)\"",
 		"dev": "tsc --watch",
 		"test": "prettier --check . && xo && ava",
+		"prepublishOnly": "npm test && npm run build",
 		"release": "./scripts/publish.sh",
 		"release:beta": "./scripts/publish-beta.sh"
 	},
@@ -52,7 +68,12 @@
 		],
 		"nodeArguments": [
 			"--import=tsx"
-		]
+		],
+		"environmentVariables": {
+			"FORCE_COLOR": "0",
+			"SVC_NO_KEYCHAIN": "memory",
+			"XDG_CONFIG_HOME": "test/.xdg"
+		}
 	},
 	"prettier": "@vdemedes/prettier-config"
 }

package/readme.md

@@ -60,7 +60,7 @@ and `p` to deploy and activate.
 | `1`–`4`         | Overview · Config · Versions · Log                  |
 | `/`             | Command palette                                     |
 | `?`             | Help: every key in one place                        |
-| `,`             | Settings (language, intro animation)                |
+| `,`             | Settings (language, update check, hints)            |
 | `Tab` / `Esc`   | Switch pane / back                                  |
 | `q`             | Quit                                                |
 
@@ -72,17 +72,24 @@ that apply. `svc --minimal` gives a compact layout for small panes.
 
 ```bash
 svc                                   # interactive shell
-svc build                             # build to dist/<id>.zip
+svc build [--no-zip]                  # build to dist/<id>.zip
 svc sign                              # sign to dist/<id>-signed.zip
 svc deploy [--force]                  # deploy the zip
 svc deploy --production [--activate]  # deploy the signed zip
 svc dev [--signed]                    # build + deploy on change
 svc watch [--signed]                  # build on change, no deploy
 svc info                              # project information
+svc setup-signing [--global]          # save the signing username and certificate
 ```
 
-Direct commands use the base environment. `--token` and `--cookie` pass an
-OAuth2 token or session cookie for one run.
+Short flags: `-f` force, `-p` production, `-a` activate, `-s` signed. An unknown
+flag is an error.
+
+Direct commands use the base environment, run without a terminal, and exit
+non-zero when a step fails, so `svc build && svc sign && svc deploy -p -a` is
+safe in CI. `SITEVISION_DEPLOY_PASSWORD` and `SITEVISION_SIGNING_PASSWORD`
+supply the passwords; `SITEVISION_ACCESS_TOKEN` and `SITEVISION_SESSION_COOKIE`
+pass an OAuth2 token or session cookie for one run.
 
 ## Configuration
 

package/dist/app.d.ts

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

package/dist/app.js

@@ -1,321 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-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';
-import { DevPropertiesForm } from './components/DevPropertiesForm.js';
-import { PasswordInput } from './components/PasswordInput.js';
-import { KeychainPasswordChoice } from './components/KeychainPasswordChoice.js';
-import { decideSigningStep } from './utils/signing-step.js';
-import { DevScreen } from './commands/dev.js';
-import { BuildScreen } from './commands/build.js';
-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';
-const NONBASIC_DEV_UNSUPPORTED = '\x1b[33mdev/watch support only basic auth. Use `svc deploy` for OAuth2/cookie.\x1b[0m';
-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('');
-    const [devPassword, setDevPassword] = useState('');
-    // When true, skip the keychain "use saved / enter new" choice and go straight
-    // to manual entry (e.g. the saved password just failed and we're retrying).
-    const [signingRetry, setSigningRetry] = useState(false);
-    // Read the saved signing password from the keychain once (keychain access is
-    // slow and this component re-renders frequently).
-    const signingUsername = project.devProperties?.signingUsername;
-    const storedSigningPassword = useMemo(() => (signingUsername ? getSigningPassword(signingUsername) : null), [signingUsername]);
-    // Map a signing-capable command to the screen it lands on once the signing
-    // password is resolved.
-    const signedDestination = (command = currentCommand) => {
-        if (command === 'dev-signed')
-            return 'dev';
-        if (command === 'watch-signed')
-            return 'watch';
-        return 'sign';
-    };
-    // Decide the next step once a signing password is needed: proceed if we already
-    // have one this session, offer the keychain choice if one is saved, otherwise
-    // prompt for manual entry.
-    const routeToSigningStep = (command = currentCommand) => {
-        const step = decideSigningStep({
-            hasSessionPassword: Boolean(signingPassword),
-            hasStoredPassword: Boolean(storedSigningPassword),
-            isRetry: signingRetry,
-        });
-        if (step === 'proceed') {
-            setState(signedDestination(command));
-        }
-        else if (step === 'choice') {
-            setState('signing-password-choice');
-        }
-        else {
-            setState('signing-password-input');
-        }
-    };
-    // Check if dev password is available (either from file or session)
-    const hasDevPassword = Boolean(project.devProperties?.password || devPassword);
-    // OAuth2 / cookie configs authenticate with a token or session resolved at
-    // deploy time, so they need no basic password. `svc dev`/`watch` stay basic.
-    const authMethod = project.devProperties?.authMethod ?? 'basic';
-    const isTokenAuth = authMethod === 'oauth2' || authMethod === 'cookie';
-    const deployAuthReady = isTokenAuth || hasDevPassword;
-    // Get effective dev properties with session password if needed
-    const getEffectiveDevProperties = () => {
-        if (!project.devProperties)
-            return undefined;
-        // Non-basic configs authenticate by token/cookie — never graft a password.
-        if (isTokenAuth)
-            return project.devProperties;
-        if (project.devProperties.password)
-            return project.devProperties;
-        return { ...project.devProperties, password: devPassword };
-    };
-    const handleDevPasswordSubmit = (password, remember) => {
-        setDevPassword(password);
-        if (remember &&
-            project.devProperties?.domain &&
-            project.devProperties.username &&
-            password) {
-            saveDeployPassword(project.devProperties.domain, project.devProperties.username, password);
-        }
-        // Continue to the intended command
-        if (currentCommand === 'dev' || currentCommand === 'dev-signed') {
-            if (currentCommand === 'dev-signed') {
-                routeToSigningStep();
-            }
-            else {
-                setState('dev');
-            }
-        }
-        else if (currentCommand.startsWith('deploy')) {
-            setState('deploy');
-        }
-    };
-    const handleUseSavedSigning = () => {
-        if (storedSigningPassword) {
-            setSigningPassword(storedSigningPassword);
-        }
-        setState(signedDestination());
-    };
-    const handleEnterNewSigning = () => {
-        setState('signing-password-input');
-    };
-    const handleSigningPasswordSubmit = (password, remember) => {
-        setSigningPassword(password);
-        if (remember && project.devProperties?.signingUsername && password) {
-            saveSigningPassword(project.devProperties.signingUsername, password);
-        }
-        setState(signedDestination());
-    };
-    const handleCommandSelect = (command) => {
-        setCurrentCommand(command);
-        // Fresh selection from the menu — re-offer the saved keychain password.
-        setSigningRetry(false);
-        switch (command) {
-            case 'info':
-                setState('info');
-                break;
-            case 'setup-signing':
-                setState('setup-signing');
-                break;
-            case 'change-auth':
-                if (!project.hasDevProperties || !project.devProperties) {
-                    console.log('\x1b[31mDevelopment properties not configured. Create a .dev_properties.json file first.\x1b[0m');
-                    return;
-                }
-                setState('change-auth-method');
-                break;
-            case 'dev':
-                if (!project.hasDevProperties || !project.devProperties) {
-                    console.log('\x1b[31mDevelopment properties not configured. Create a .dev_properties.json file first.\x1b[0m');
-                    return;
-                }
-                if (isTokenAuth) {
-                    console.log(NONBASIC_DEV_UNSUPPORTED);
-                    return;
-                }
-                if (!hasDevPassword) {
-                    setState('dev-password-input');
-                }
-                else {
-                    setState('dev');
-                }
-                break;
-            case 'dev-signed':
-                if (!project.hasDevProperties || !project.devProperties) {
-                    console.log('\x1b[31mDevelopment properties not configured. Create a .dev_properties.json file first.\x1b[0m');
-                    return;
-                }
-                if (!project.hasSigningProperties) {
-                    console.log('\x1b[31mSigning credentials not configured. Run svc setup-signing first.\x1b[0m');
-                    return;
-                }
-                if (isTokenAuth) {
-                    console.log(NONBASIC_DEV_UNSUPPORTED);
-                    return;
-                }
-                // Need both dev password and signing password
-                if (!hasDevPassword) {
-                    setState('dev-password-input');
-                }
-                else {
-                    routeToSigningStep(command);
-                }
-                break;
-            case 'watch':
-                // Build/sign-only: no deploy and no signing, so no credentials needed.
-                setState('watch');
-                break;
-            case 'watch-signed':
-                if (!project.hasDevProperties || !project.devProperties) {
-                    console.log('\x1b[31mDevelopment properties not configured. Create a .dev_properties.json file first.\x1b[0m');
-                    return;
-                }
-                if (!project.hasSigningProperties) {
-                    console.log('\x1b[31mSigning credentials not configured. Run svc setup-signing first.\x1b[0m');
-                    return;
-                }
-                if (isTokenAuth) {
-                    console.log(NONBASIC_DEV_UNSUPPORTED);
-                    return;
-                }
-                routeToSigningStep(command);
-                break;
-            case 'sign':
-                if (!project.hasDevProperties || !project.devProperties) {
-                    console.log('\x1b[31mDevelopment properties not configured. Create a .dev_properties.json file first.\x1b[0m');
-                    return;
-                }
-                if (!project.hasSigningProperties) {
-                    console.log('\x1b[31mSigning credentials not configured. Run svc setup-signing first.\x1b[0m');
-                    return;
-                }
-                routeToSigningStep(command);
-                break;
-            case 'build':
-                setState('build');
-                break;
-            case 'deploy':
-            case 'deploy-force':
-            case 'deploy-production':
-                if (!project.hasDevProperties || !project.devProperties) {
-                    console.log('\x1b[31mDevelopment properties not configured. Create a .dev_properties.json file first.\x1b[0m');
-                    return;
-                }
-                if (!deployAuthReady) {
-                    setState('dev-password-input');
-                }
-                else {
-                    setState('deploy');
-                }
-                break;
-        }
-    };
-    if (state === 'change-auth-method') {
-        return (_jsx(DevPropertiesForm, { projectRoot: project.root, initialProperties: project.devProperties, packageJson: project.packageJson, authOnly: true, onComplete: () => {
-                reloadProject();
-                setState('menu');
-            }, onCancel: () => setState('menu') }));
-    }
-    if (state === 'setup') {
-        return (_jsx(SetupFlow, { project: project, onReload: reloadProject, onComplete: () => setState('menu') }));
-    }
-    if (state === 'menu') {
-        return _jsx(MainMenu, { project: project, onSelect: handleCommandSelect });
-    }
-    if (state === 'info') {
-        return _jsx(InfoScreen, { project: project, onBack: () => setState('menu') });
-    }
-    if (state === 'dev-password-input') {
-        return (_jsx(PasswordInput, { label: "Enter Development Password (usually Sitevision Cloud Password)", showRememberOption: Boolean(project.devProperties?.domain && project.devProperties?.username), onSubmit: handleDevPasswordSubmit, onCancel: () => setState('menu') }, "dev-password"));
-    }
-    if (state === 'signing-password-choice') {
-        return (_jsx(KeychainPasswordChoice, { onUseSaved: handleUseSavedSigning, onEnterNew: handleEnterNewSigning, onCancel: () => setState('menu') }, "signing-password-choice"));
-    }
-    if (state === 'signing-password-input') {
-        return (_jsx(PasswordInput, { label: "Enter Signing Password (developer.sitevision.se)", showRememberOption: Boolean(project.devProperties?.signingUsername), defaultRemember: Boolean(storedSigningPassword), rememberLabel: storedSigningPassword
-                ? 'Update saved password in OS keychain: '
-                : 'Save to OS keychain: ', onSubmit: handleSigningPasswordSubmit, onCancel: () => setState('menu') }, "signing-password"));
-    }
-    if (state === 'dev') {
-        return (_jsx(DevScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: getEffectiveDevProperties(), signed: currentCommand === 'dev-signed', onBack: () => setState('menu'), onRetryCredentials: () => {
-                setDevPassword('');
-                if (project.devProperties)
-                    project.devProperties.password = undefined;
-                if (currentCommand === 'dev-signed') {
-                    setSigningPassword('');
-                    // The saved password may be what failed — don't re-offer it.
-                    setSigningRetry(true);
-                }
-                setState('dev-password-input');
-            }, signingCredentials: currentCommand === 'dev-signed' &&
-                project.devProperties?.signingUsername
-                ? {
-                    username: project.devProperties.signingUsername,
-                    password: signingPassword,
-                    certificateName: project.devProperties.certificateName,
-                }
-                : undefined }));
-    }
-    if (state === 'watch') {
-        const watchSigned = currentCommand === 'watch-signed';
-        return (_jsx(DevScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: project.devProperties, signed: watchSigned, deploy: false, onBack: () => setState('menu'), onRetryCredentials: watchSigned
-                ? () => {
-                    setSigningPassword('');
-                    // The saved password may be what failed — don't re-offer it.
-                    setSigningRetry(true);
-                    routeToSigningStep('watch-signed');
-                }
-                : undefined, signingCredentials: watchSigned && project.devProperties?.signingUsername
-                ? {
-                    username: project.devProperties.signingUsername,
-                    password: signingPassword,
-                    certificateName: project.devProperties.certificateName,
-                }
-                : undefined }));
-    }
-    if (state === 'build') {
-        return (_jsx(BuildScreen, { projectRoot: project.root, manifest: project.manifest, createZip: true, onBack: () => setState('menu') }));
-    }
-    if (state === 'sign') {
-        return (_jsx(SignScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: project.devProperties, password: signingPassword, onBack: () => setState('menu'), onRetryCredentials: () => {
-                setSigningPassword('');
-                setState('signing-password-input');
-            } }));
-    }
-    if (state === 'deploy') {
-        return (_jsx(DeployScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: getEffectiveDevProperties(), force: currentCommand === 'deploy-force', production: currentCommand === 'deploy-production', activate: currentCommand === 'deploy-production', onBack: () => setState('menu'), onRetryCredentials: () => {
-                setDevPassword('');
-                if (project.devProperties)
-                    project.devProperties.password = undefined;
-                setState('dev-password-input');
-            }, onChangeAuthMethod: () => setState('change-auth-method') }));
-    }
-    if (state === 'setup-signing') {
-        return (_jsx(SigningPropertiesForm, { projectRoot: project.root, onComplete: () => {
-                // Re-detect so the newly written signing credentials are reflected
-                // in memory (hasSigningProperties, keychain password) without a restart.
-                reloadProject();
-                setState('menu');
-            }, onCancel: () => setState('menu') }));
-    }
-    return null;
-}

package/dist/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/commands/build.d.ts

@@ -1,12 +0,0 @@
-import React from 'react';
-import { type Command } from './types.js';
-import type { SitevisionManifest } from '../types/index.js';
-interface BuildScreenProps {
-    projectRoot: string;
-    manifest: SitevisionManifest;
-    createZip?: boolean;
-    onBack?: () => void;
-}
-export declare function BuildScreen({ projectRoot, manifest, createZip, onBack, }: BuildScreenProps): React.JSX.Element;
-export declare const buildCommand: Command;
-export {};

package/dist/commands/deploy.d.ts

@@ -1,17 +0,0 @@
-import React from 'react';
-import { type Command } from './types.js';
-import type { SitevisionManifest, DevProperties } from '../types/index.js';
-interface DeployScreenProps {
-    projectRoot: string;
-    manifest: SitevisionManifest;
-    devProperties: DevProperties;
-    force: boolean;
-    production: boolean;
-    activate: boolean;
-    onBack?: () => void;
-    onRetryCredentials?: () => void;
-    onChangeAuthMethod?: () => void;
-}
-export declare function DeployScreen({ projectRoot, manifest, devProperties, force, production, activate, onBack, onRetryCredentials, onChangeAuthMethod, }: DeployScreenProps): React.JSX.Element;
-export declare const deployCommand: Command;
-export {};

package/dist/commands/dev.d.ts

@@ -1,14 +0,0 @@
-import React from 'react';
-import { type Command } from './types.js';
-import { type DevOptions } from '../utils/tasks.js';
-import type { ProjectInfo, SigningCredentials } from '../types/index.js';
-interface DevScreenProps {
-    project: ProjectInfo;
-    options: DevOptions;
-}
-/** Standalone `svc dev` / `svc watch`: one task, its log, Ctrl+C or q to stop. */
-export declare function DevScreen({ project, options }: DevScreenProps): React.JSX.Element;
-/** Resolve signing credentials for signed dev/watch, prompting if needed. */
-export declare function resolveSigningForCli(project: ProjectInfo): Promise<SigningCredentials | undefined>;
-export declare const devCommand: Command;
-export {};

package/dist/commands/index.d.ts

@@ -1,4 +0,0 @@
-import { type Command } from './types.js';
-export declare const commands: Command[];
-export declare function getCommand(name: string): Command | undefined;
-export declare function getAllCommands(): Command[];

package/dist/commands/info.d.ts

@@ -1,2 +0,0 @@
-import { type Command } from './types.js';
-export declare const infoCommand: Command;

package/dist/commands/setup-signing.d.ts

@@ -1,2 +0,0 @@
-import { type Command } from './types.js';
-export declare const setupSigningCommand: Command;

package/dist/commands/sign.d.ts

@@ -1,14 +0,0 @@
-import React from 'react';
-import { type Command } from './types.js';
-import type { SitevisionManifest, DevProperties } from '../types/index.js';
-interface SignScreenProps {
-    projectRoot: string;
-    manifest: SitevisionManifest;
-    devProperties: DevProperties;
-    password: string;
-    onBack?: () => void;
-    onRetryCredentials?: () => void;
-}
-export declare function SignScreen({ projectRoot, manifest, devProperties, password, onBack, onRetryCredentials, }: SignScreenProps): React.JSX.Element;
-export declare const signCommand: Command;
-export {};

package/dist/commands/types.d.ts

@@ -1,18 +0,0 @@
-import { type ProjectInfo } from '../utils/project-detection.js';
-export interface CommandContext {
-    project: ProjectInfo;
-    flags: Record<string, any>;
-    args: string[];
-}
-export interface Command {
-    name: string;
-    description: string;
-    requiresProject: boolean;
-    flags?: Record<string, {
-        type: 'string' | 'boolean';
-        description: string;
-        alias?: string;
-        default?: any;
-    }>;
-    execute: (context: CommandContext) => Promise<void>;
-}

package/dist/commands/watch.d.ts

@@ -1,2 +0,0 @@
-import { type Command } from './types.js';
-export declare const watchCommand: Command;

package/dist/components/AnimatedLogo.d.ts

@@ -1,10 +0,0 @@
-interface Props {
-    art?: string[];
-    onDone: () => void;
-}
-/**
- * One-shot startup flair: wipes the big wordmark in left-to-right while a
- * rainbow gradient drifts across it, then calls `onDone`. Purely decorative.
- */
-export declare function AnimatedLogo({ art, onDone }: Props): import("react").JSX.Element;
-export {};

package/dist/components/AuthLoginScreen.d.ts

@@ -1,21 +0,0 @@
-import React from 'react';
-import type { DevProperties } from '../types/index.js';
-interface Credential {
-    accessToken?: string;
-    sessionCookie?: string;
-}
-interface Props {
-    method: 'oauth2' | 'cookie';
-    devProperties: DevProperties;
-    onComplete: (credential: Credential) => void;
-    onError: (message: string) => void;
-    onCancel: () => void;
-}
-/**
- * Ink-native interactive login for OAuth2 and session-cookie auth. Drives the
- * browser and (for cookie) the "press Enter to capture" handoff through Ink's
- * own input, so it works inside the TUI as well as the standalone command —
- * neither needs to own raw stdin the way the old console prompt did.
- */
-export declare function AuthLoginScreen({ method, devProperties, onComplete, onError, onCancel, }: Props): React.JSX.Element;
-export {};

package/dist/components/DevPropertiesForm.d.ts

@@ -1,11 +0,0 @@
-import type { DevProperties, PackageJson } from '../types/index.js';
-interface Props {
-    projectRoot: string;
-    initialProperties?: DevProperties;
-    packageJson: PackageJson;
-    authOnly?: boolean;
-    onComplete: () => void;
-    onCancel: () => void;
-}
-export declare function DevPropertiesForm({ projectRoot, initialProperties, packageJson, authOnly, onComplete, onCancel, }: Props): import("react").JSX.Element;
-export {};