vyriy 0.3.9 → 0.4.1

package/checks/node/node.js

@@ -1,22 +0,0 @@
-const getMajorVersion = (version) => {
-    const majorVersion = /^v?(\d+)/.exec(version)?.[1];
-    return majorVersion ? Number.parseInt(majorVersion, 10) : undefined;
-};
-export const checkNodeVersion = ({ minimumMajor = 24, version = process.version } = {}) => {
-    const majorVersion = getMajorVersion(version);
-    const normalizedVersion = version.replace(/^v/, '');
-    if (majorVersion && majorVersion >= minimumMajor) {
-        return {
-            ok: true,
-            name: 'Node.js',
-            version: normalizedVersion,
-            message: `Node.js ${normalizedVersion}`,
-        };
-    }
-    return {
-        ok: false,
-        name: 'Node.js',
-        version: normalizedVersion,
-        message: `Vyriy requires Node.js >= ${minimumMajor}.\n\nCurrent version: ${normalizedVersion}\n\nPlease upgrade Node.js and run the command again.`,
-    };
-};

package/checks/node/types.d.ts

@@ -1,11 +0,0 @@
-export type EnvironmentCheckResult = {
-    readonly ok: boolean;
-    readonly name: string;
-    readonly version?: string;
-    readonly message: string;
-};
-export type CheckNodeVersionOptions = {
-    readonly version?: string;
-    readonly minimumMajor?: number;
-};
-export type CheckNodeVersion = (options?: CheckNodeVersionOptions) => EnvironmentCheckResult;

package/checks/yarn/index.d.ts

@@ -1,2 +0,0 @@
-export * from './yarn.js';
-export type * from './types.js';

package/checks/yarn/index.js

@@ -1 +0,0 @@
-export * from './yarn.js';

package/checks/yarn/types.d.ts

@@ -1,7 +0,0 @@
-import { EnvironmentCheckResult } from '../node/index.js';
-export type CheckYarnVersionOptions = {
-    readonly version?: string;
-    readonly minimumMajor?: number;
-    readonly run?: () => Promise<string>;
-};
-export type CheckYarnVersion = (options?: CheckYarnVersionOptions) => Promise<EnvironmentCheckResult>;

package/checks/yarn/yarn.d.ts

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

package/checks/yarn/yarn.js

@@ -1,40 +0,0 @@
-import { execFile } from 'node:child_process';
-import { promisify } from 'node:util';
-const execFileAsync = promisify(execFile);
-const getMajorVersion = (version) => {
-    const majorVersion = /^(\d+)/.exec(version.trim())?.[1];
-    return majorVersion ? Number.parseInt(majorVersion, 10) : undefined;
-};
-const getYarnVersion = async () => {
-    const { stdout } = await execFileAsync('yarn', ['--version']);
-    return stdout.trim();
-};
-export const checkYarnVersion = async ({ minimumMajor = 4, run = getYarnVersion, version } = {}) => {
-    let currentVersion = version;
-    try {
-        currentVersion ??= await run();
-    }
-    catch {
-        return {
-            ok: false,
-            name: 'Yarn',
-            message: 'Yarn was not found.\n\nVyriy requires Yarn >= 4.\n\nTry:\n  corepack enable\n  yarn set version stable',
-        };
-    }
-    const normalizedVersion = currentVersion.trim();
-    const majorVersion = getMajorVersion(normalizedVersion);
-    if (majorVersion && majorVersion >= minimumMajor) {
-        return {
-            ok: true,
-            name: 'Yarn',
-            version: normalizedVersion,
-            message: `Yarn ${normalizedVersion}`,
-        };
-    }
-    return {
-        ok: false,
-        name: 'Yarn',
-        version: normalizedVersion,
-        message: `Vyriy requires Yarn >= ${minimumMajor}.\n\nCurrent version: ${normalizedVersion}\n\nTry:\n  corepack enable\n  yarn set version stable`,
-    };
-};

package/cli/args/args.js

@@ -1,40 +0,0 @@
-export const parseArgs = (args) => {
-    if (args.includes('--help') || args.includes('-h')) {
-        return { type: 'help' };
-    }
-    if (args.includes('--version') || args.includes('-v')) {
-        return { type: 'version' };
-    }
-    const dryRun = args.includes('--dry-run');
-    const install = !args.includes('--no-install');
-    const verify = install && (args.includes('--verify') || (!args.includes('--no-verify') && !args.includes('--install-only')));
-    const yes = args.includes('--yes') || args.includes('-y');
-    const overwrite = args.includes('--overwrite');
-    const skipExisting = args.includes('--skip-existing');
-    const positionalArgs = args.filter((arg) => !arg.startsWith('-'));
-    const [command, projectName] = positionalArgs;
-    const options = {
-        dryRun,
-        install,
-        yes,
-        overwrite,
-        verify,
-        skipExisting,
-    };
-    if (!command) {
-        return { type: 'new', ...options };
-    }
-    switch (command) {
-        case 'new':
-            return { type: 'new', projectName, ...options };
-        case '.':
-        case 'init':
-            return { type: 'init', ...options };
-        case 'doctor':
-            return { type: 'doctor' };
-        case 'publish':
-            return { type: 'publish' };
-        default:
-            return { type: 'unknown', command };
-    }
-};

package/cli/args/index.d.ts

@@ -1,2 +0,0 @@
-export * from './args.js';
-export type * from './types.js';

package/cli/args/index.js

@@ -1 +0,0 @@
-export * from './args.js';

package/cli/args/types.d.ts

@@ -1,24 +0,0 @@
-export type VyriyCliCommand = {
-    readonly type: 'new';
-    readonly projectName?: string;
-    readonly dryRun: boolean;
-    readonly install: boolean;
-    readonly yes: boolean;
-    readonly overwrite: boolean;
-    readonly verify: boolean;
-    readonly skipExisting: boolean;
-} | {
-    readonly type: 'init';
-    readonly dryRun: boolean;
-    readonly install: boolean;
-    readonly yes: boolean;
-    readonly overwrite: boolean;
-    readonly verify: boolean;
-    readonly skipExisting: boolean;
-} | {
-    readonly type: 'doctor' | 'help' | 'publish' | 'version';
-} | {
-    readonly type: 'unknown';
-    readonly command: string;
-};
-export type ParseArgs = (args: readonly string[]) => VyriyCliCommand;

package/commands/doctor/doctor.d.ts

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

package/commands/doctor/doctor.js

@@ -1,9 +0,0 @@
-import { createDoctorReport, printDoctorReport } from '../../doctor/index.js';
-export const runDoctorCommand = async ({ output = console } = {}) => {
-    const report = await createDoctorReport();
-    output.log(printDoctorReport(report));
-    return {
-        code: report.hasErrors ? 1 : 0,
-        checks: report.checks,
-    };
-};

package/commands/doctor/index.d.ts

@@ -1,2 +0,0 @@
-export * from './doctor.js';
-export type * from './types.js';

package/commands/doctor/index.js

@@ -1 +0,0 @@
-export * from './doctor.js';

package/commands/doctor/types.d.ts

@@ -1,8 +0,0 @@
-import { DoctorCheck } from '../../doctor/index.js';
-export type RunDoctorCommandOptions = {
-    readonly output?: Pick<typeof console, 'log' | 'error'>;
-};
-export type RunDoctorCommand = (options?: RunDoctorCommandOptions) => Promise<{
-    readonly code: number;
-    readonly checks: readonly DoctorCheck[];
-}>;

package/commands/init/index.d.ts

@@ -1,2 +0,0 @@
-export * from './init.js';
-export type * from './types.js';

package/commands/init/index.js

@@ -1 +0,0 @@
-export * from './init.js';

package/commands/init/init.d.ts

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

package/commands/init/init.js

@@ -1,7 +0,0 @@
-import path from 'node:path';
-import { cwd as getCwd } from 'node:process';
-import { runNewCommand } from '../new/index.js';
-export const runInitCommand = async ({ cwd = getCwd(), ...options } = {}) => runNewCommand({
-    ...options,
-    projectName: path.basename(cwd),
-});

package/commands/init/types.d.ts

@@ -1,5 +0,0 @@
-import { RunNewCommandOptions } from '../new/index.js';
-export type RunInitCommandOptions = Omit<RunNewCommandOptions, 'projectName'> & {
-    readonly cwd?: string;
-};
-export type RunInitCommand = (options?: RunInitCommandOptions) => Promise<number>;

package/commands/new/index.d.ts

@@ -1,2 +0,0 @@
-export * from './new.js';
-export type * from './types.js';

package/commands/new/index.js

@@ -1 +0,0 @@
-export * from './new.js';

package/commands/new/new.d.ts

@@ -1,3 +0,0 @@
-import { ConflictResolution, RunNewCommand } from './types.js';
-export declare const askConflictResolutionDefault: () => Promise<ConflictResolution>;
-export declare const runNewCommand: RunNewCommand;

package/commands/new/new.js

@@ -1,189 +0,0 @@
-import { stdin, stdout } from 'node:process';
-import { createInterface } from 'node:readline/promises';
-import { createDoctorReport, printDoctorReport } from '../../doctor/index.js';
-import { createFilePlan, printFilePlan, writeFilePlan } from '../../file-plan/index.js';
-import { createProjectFiles } from '../../presets/index.js';
-import { askProjectPlan as askProjectPlanDefault } from '../../prompts/project-plan/index.js';
-import { createProjectPlanFromPreset, printProjectPlan } from '../../project-plan/index.js';
-import { runCommand } from '../../shared/index.js';
-const defaultYesPreset = 'empty';
-const getConflicts = (filePlan) => filePlan.filter((item) => item.status === 'conflict');
-const logConflicts = (output, conflicts, method) => {
-    output[method]('\nExisting files found:\n');
-    for (const conflict of conflicts) {
-        output[method](`  ! ${conflict.path}`);
-    }
-};
-const printConflictPrompt = (output) => {
-    output.log('\nWhat should Vyriy do?');
-    output.log('  1. overwrite existing files');
-    output.log('  2. skip existing files');
-    output.log('  3. abort');
-};
-const failOnNonInteractiveConflicts = (output, conflicts) => {
-    logConflicts(output, conflicts, 'error');
-    output.error('\nCannot continue in non-interactive mode without a conflict strategy.\n');
-    output.error('Use one of:\n\n  vyriy --overwrite\n  vyriy --skip-existing\n  vyriy --dry-run');
-    return 1;
-};
-const createResolvedFilePlan = async (plan, projectFiles, resolution) => createFilePlan(plan.targetDirectory, projectFiles, {
-    overwrite: resolution === 'overwrite',
-    skipExisting: resolution === 'skip',
-});
-const formatCommand = (command, args) => [command, ...args].join(' ');
-const printFailedPostGenerationCommand = ({ args, command, intro, output, projectDirectory, }) => {
-    const commandText = formatCommand(command, args);
-    output.error(`\n${intro}\n`);
-    output.error(`Failed command:\n  ${commandText}\n`);
-    output.error(`Project directory:\n  ${projectDirectory}\n`);
-    output.error(`You can inspect it and run manually:\n  cd ${projectDirectory}\n  ${commandText}`);
-};
-const runPostGenerationCommands = async ({ install, output, projectDirectory, verify, }) => {
-    if (!install) {
-        output.log('Installing dependencies... SKIPPED');
-        output.log('Running checks... SKIPPED');
-        output.log('\nProject files were created.');
-        return 0;
-    }
-    try {
-        await runCommand({
-            args: ['install'],
-            command: 'yarn',
-            cwd: projectDirectory,
-        });
-    }
-    catch {
-        printFailedPostGenerationCommand({
-            args: ['install'],
-            command: 'yarn',
-            intro: 'Project files were created, but dependency installation failed.',
-            output,
-            projectDirectory,
-        });
-        return 1;
-    }
-    output.log('Installing dependencies... OK');
-    if (!verify) {
-        output.log('Running checks... SKIPPED');
-        output.log('\nProject files were created and dependencies were installed.');
-        return 0;
-    }
-    try {
-        await runCommand({
-            args: ['fix'],
-            command: 'yarn',
-            cwd: projectDirectory,
-        });
-        await runCommand({
-            args: ['check'],
-            command: 'yarn',
-            cwd: projectDirectory,
-        });
-    }
-    catch {
-        printFailedPostGenerationCommand({
-            args: ['check'],
-            command: 'yarn',
-            intro: 'Project files were created and dependencies were installed, but verification failed.',
-            output,
-            projectDirectory,
-        });
-        return 1;
-    }
-    output.log('Running checks... OK');
-    output.log('\nProject is ready.');
-    return 0;
-};
-const resolveInteractiveConflicts = async (plan, projectFiles, output, conflicts, askConflictResolution) => {
-    logConflicts(output, conflicts, 'log');
-    printConflictPrompt(output);
-    const resolution = await askConflictResolution();
-    if (resolution === 'abort') {
-        output.log('Project generation aborted.');
-        return { result: 1, status: 'failed' };
-    }
-    const filePlan = await createResolvedFilePlan(plan, projectFiles, resolution);
-    if (getConflicts(filePlan).length > 0) {
-        output.error('Cannot continue with unresolved file conflicts.');
-        return { result: 1, status: 'failed' };
-    }
-    return { filePlan, status: 'resolved' };
-};
-export const askConflictResolutionDefault = async () => {
-    const readline = createInterface({ input: stdin, output: stdout });
-    try {
-        const answer = (await readline.question('What should Vyriy do?\n\n 1. overwrite existing files,\n\n 2. skip existing files,\n\n 3. abort (abort): '))
-            .trim()
-            .toLowerCase();
-        if (answer === '1' || answer === 'overwrite') {
-            return 'overwrite';
-        }
-        if (answer === '2' || answer === 'skip') {
-            return 'skip';
-        }
-        return 'abort';
-    }
-    finally {
-        readline.close();
-    }
-};
-export const runNewCommand = async ({ askConflictResolution = askConflictResolutionDefault, askProjectPlan = askProjectPlanDefault, dryRun = false, install = true, output = console, overwrite = false, projectName = 'my-app', skipExisting = false, verify = true, yes = false, } = {}) => {
-    if (overwrite && skipExisting) {
-        output.error('Cannot use --overwrite and --skip-existing together.');
-        return 1;
-    }
-    const report = await createDoctorReport();
-    output.log(printDoctorReport(report));
-    if (report.hasErrors) {
-        output.error('\nPlease install Node.js 24+ and run the command again.');
-        return 1;
-    }
-    const plan = yes
-        ? createProjectPlanFromPreset({
-            apiStyle: 'rest',
-            ciProvider: 'none',
-            description: 'Calm cloud-ready application.',
-            packageScope: `@${projectName}`,
-            preset: defaultYesPreset,
-            projectName,
-            targetDirectory: projectName,
-        })
-        : await askProjectPlan({
-            defaults: {
-                projectName,
-                targetDirectory: projectName,
-            },
-        });
-    if (!plan) {
-        output.log('Project planning cancelled.');
-        return 1;
-    }
-    output.log(`\n${printProjectPlan(plan)}`);
-    const projectFiles = createProjectFiles(plan);
-    let filePlan = await createFilePlan(plan.targetDirectory, projectFiles, { overwrite, skipExisting });
-    let conflicts = filePlan.filter((item) => item.status === 'conflict');
-    output.log(`\n${printFilePlan(filePlan)}`);
-    if (dryRun) {
-        output.log('\nNo files will be written in dry-run mode.');
-        return conflicts.length > 0 ? 1 : 0;
-    }
-    if (conflicts.length > 0 && yes) {
-        return failOnNonInteractiveConflicts(output, conflicts);
-    }
-    if (conflicts.length > 0) {
-        const resolved = await resolveInteractiveConflicts(plan, projectFiles, output, conflicts, askConflictResolution);
-        if (resolved.status === 'failed') {
-            return resolved.result;
-        }
-        filePlan = resolved.filePlan;
-        output.log(`\n${printFilePlan(resolved.filePlan)}`);
-    }
-    await writeFilePlan(plan.targetDirectory, filePlan);
-    output.log('\nCreating project files... OK');
-    return runPostGenerationCommands({
-        install,
-        output,
-        projectDirectory: plan.targetDirectory,
-        verify: install && verify,
-    });
-};

package/commands/new/types.d.ts

@@ -1,15 +0,0 @@
-import { PromptProjectPlan } from '../../prompts/project-plan/index.js';
-export type ConflictResolution = 'overwrite' | 'skip' | 'abort';
-export type RunNewCommandOptions = {
-    readonly projectName?: string;
-    readonly askProjectPlan?: PromptProjectPlan;
-    readonly askConflictResolution?: () => Promise<ConflictResolution>;
-    readonly output?: Pick<typeof console, 'log' | 'error'>;
-    readonly dryRun?: boolean;
-    readonly install?: boolean;
-    readonly yes?: boolean;
-    readonly overwrite?: boolean;
-    readonly verify?: boolean;
-    readonly skipExisting?: boolean;
-};
-export type RunNewCommand = (options?: RunNewCommandOptions) => Promise<number>;

package/commands/publish/index.d.ts

@@ -1,2 +0,0 @@
-export * from './publish.js';
-export type * from './types.js';

package/commands/publish/index.js

@@ -1 +0,0 @@
-export * from './publish.js';

package/commands/publish/publish.d.ts

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

package/doctor/checkCorepack.d.ts

@@ -1,2 +0,0 @@
-import { DoctorCheck, DoctorCheckOptions } from './types.js';
-export declare const checkCorepack: ({ execCommand, }?: DoctorCheckOptions) => Promise<DoctorCheck>;

package/doctor/checkCorepack.js

@@ -1,24 +0,0 @@
-import { execCommand as execCommandDefault } from '../shared/index.js';
-export const checkCorepack = async ({ execCommand = execCommandDefault, } = {}) => {
-    try {
-        const version = await execCommand('corepack', ['--version']);
-        return {
-            name: 'corepack',
-            label: 'Corepack',
-            group: 'Package manager',
-            level: 'ok',
-            version,
-            message: 'Corepack available',
-        };
-    }
-    catch {
-        return {
-            name: 'corepack',
-            label: 'Corepack',
-            group: 'Package manager',
-            level: 'warning',
-            message: 'Corepack was not found',
-            detail: 'Yarn fixes cannot be run automatically without Corepack.',
-        };
-    }
-};

package/doctor/checkGit.d.ts

@@ -1,2 +0,0 @@
-import { DoctorCheck, DoctorCheckOptions } from './types.js';
-export declare const checkGit: ({ execCommand }?: DoctorCheckOptions) => Promise<DoctorCheck>;

package/doctor/checkGit.js

@@ -1,23 +0,0 @@
-import { execCommand as execCommandDefault } from '../shared/index.js';
-export const checkGit = async ({ execCommand = execCommandDefault } = {}) => {
-    try {
-        await execCommand('git', ['--version']);
-        return {
-            name: 'git',
-            label: 'Git',
-            group: 'Git',
-            level: 'ok',
-            message: 'Git available',
-        };
-    }
-    catch {
-        return {
-            name: 'git',
-            label: 'Git',
-            group: 'Git',
-            level: 'warning',
-            message: 'Git was not found',
-            detail: 'Git initialization will be skipped.',
-        };
-    }
-};

package/doctor/checkNodeVersion.d.ts

@@ -1,5 +0,0 @@
-import { DoctorCheck } from './types.js';
-export declare const checkNodeVersion: ({ minimumMajor, version, }?: {
-    readonly minimumMajor?: number;
-    readonly version?: string;
-}) => DoctorCheck;

package/doctor/checkNodeVersion.js

@@ -1,24 +0,0 @@
-import { getMajorVersion } from '../shared/index.js';
-export const checkNodeVersion = ({ minimumMajor = 24, version = process.version, } = {}) => {
-    const normalizedVersion = version.replace(/^v/, '');
-    const majorVersion = getMajorVersion(normalizedVersion);
-    if (majorVersion !== undefined && majorVersion >= minimumMajor) {
-        return {
-            name: 'node',
-            label: 'Node.js',
-            group: 'Runtime',
-            level: 'ok',
-            version: normalizedVersion,
-            message: `Node.js ${normalizedVersion}`,
-        };
-    }
-    return {
-        name: 'node',
-        label: 'Node.js',
-        group: 'Runtime',
-        level: 'error',
-        version: normalizedVersion,
-        message: `Node.js ${normalizedVersion} detected`,
-        detail: `Vyriy requires Node.js ${minimumMajor} or newer.`,
-    };
-};

package/doctor/checkYarn.d.ts

@@ -1,10 +0,0 @@
-import { DoctorCheck, DoctorCheckOptions } from './types.js';
-export declare const yarnStableFix: {
-    readonly label: "Enable Yarn using Corepack";
-    readonly command: "corepack enable\ncorepack prepare yarn@stable --activate";
-    readonly safeToRun: true;
-};
-export declare const checkYarn: ({ execCommand, minimumMajor, version, }?: DoctorCheckOptions & {
-    readonly minimumMajor?: number;
-    readonly version?: string;
-}) => Promise<DoctorCheck>;

package/doctor/checkYarn.js

@@ -1,45 +0,0 @@
-import { execCommand as execCommandDefault, getMajorVersion } from '../shared/index.js';
-export const yarnStableFix = {
-    label: 'Enable Yarn using Corepack',
-    command: 'corepack enable\ncorepack prepare yarn@stable --activate',
-    safeToRun: true,
-};
-export const checkYarn = async ({ execCommand = execCommandDefault, minimumMajor = 4, version, } = {}) => {
-    let currentVersion = version;
-    try {
-        currentVersion ??= await execCommand('yarn', ['--version']);
-    }
-    catch {
-        return {
-            name: 'yarn',
-            label: 'Yarn',
-            group: 'Package manager',
-            level: 'warning',
-            message: 'Yarn was not found',
-            detail: 'Vyriy uses Yarn 4 for generated projects.',
-            fix: yarnStableFix,
-        };
-    }
-    const normalizedVersion = currentVersion.trim();
-    const majorVersion = getMajorVersion(normalizedVersion);
-    if (majorVersion !== undefined && majorVersion >= minimumMajor) {
-        return {
-            name: 'yarn',
-            label: 'Yarn',
-            group: 'Package manager',
-            level: 'ok',
-            version: normalizedVersion,
-            message: `Yarn ${normalizedVersion}`,
-        };
-    }
-    return {
-        name: 'yarn',
-        label: 'Yarn',
-        group: 'Package manager',
-        level: 'warning',
-        version: normalizedVersion,
-        message: `Yarn ${normalizedVersion} detected`,
-        detail: `Vyriy recommends Yarn ${minimumMajor}.`,
-        fix: yarnStableFix,
-    };
-};

package/doctor/createDoctorReport.d.ts

@@ -1,2 +0,0 @@
-import { DoctorCheckOptions, DoctorReport } from './types.js';
-export declare const createDoctorReport: (options?: DoctorCheckOptions) => Promise<DoctorReport>;

package/doctor/createDoctorReport.js

@@ -1,17 +0,0 @@
-import { checkCorepack } from './checkCorepack.js';
-import { checkGit } from './checkGit.js';
-import { checkNodeVersion } from './checkNodeVersion.js';
-import { checkYarn } from './checkYarn.js';
-export const createDoctorReport = async (options = {}) => {
-    const checks = [
-        checkNodeVersion(),
-        await checkCorepack(options),
-        await checkYarn(options),
-        await checkGit(options),
-    ];
-    return {
-        checks,
-        hasErrors: checks.some((check) => check.level === 'error'),
-        hasWarnings: checks.some((check) => check.level === 'warning'),
-    };
-};

package/doctor/index.d.ts

@@ -1,7 +0,0 @@
-export * from './checkCorepack.js';
-export * from './checkGit.js';
-export * from './checkNodeVersion.js';
-export * from './checkYarn.js';
-export * from './createDoctorReport.js';
-export * from './printDoctorReport.js';
-export type * from './types.js';

package/doctor/index.js

@@ -1,6 +0,0 @@
-export * from './checkCorepack.js';
-export * from './checkGit.js';
-export * from './checkNodeVersion.js';
-export * from './checkYarn.js';
-export * from './createDoctorReport.js';
-export * from './printDoctorReport.js';

package/doctor/printDoctorReport.d.ts

@@ -1,2 +0,0 @@
-import { DoctorReport } from './types.js';
-export declare const printDoctorReport: (report: DoctorReport) => string;