vyriy 0.5.1 → 0.5.3

package/README.md

@@ -25,22 +25,18 @@ yarn global add vyriy
 ## Usage
 
 ```bash
-vyriy [name]           Create a new Vyriy project
-vyriy .                Initialise a new Vyriy project in the current directory
+vyriy create [name]    Create a new Vyriy project
+vyriy create .         Initialise a new Vyriy project in the current directory
+vyriy dist             Prepare dist package metadata without publishing to npm
+vyriy static [dir]     Serve a static directory (defaults to dist)
+vyriy check            Check local environment (Node.js and Yarn versions)
 vyriy --help, -h       Show help
 vyriy --version, -v    Show version
-vyriy --check-env, -c  Check local environment (Node.js and Yarn versions)
-vyriy --dist, -d       Prepare dist package metadata without publishing to npm
-vyriy --dry-run        Print the merged file plan without writing project files
-vyriy --overwrite      Overwrite existing generated paths
-vyriy --skip-existing  Leave existing generated paths untouched
-vyriy --no-install     Create files without installing dependencies
-vyriy --no-verify      Install dependencies without running checks
 ```
 
 ## Commands
 
-### `create` (default)
+### `create`
 
 The interactive wizard collects project details and writes the scaffold:
 
@@ -60,12 +56,22 @@ When generated paths already exist, use `--overwrite` or `--skip-existing` to
 avoid the interactive conflict prompt. Without either flag, `vyriy` asks whether
 to overwrite existing files, skip them, or abort.
 
-### `--check-env`
+Create options:
+
+```bash
+vyriy create --dry-run        Print the merged file plan without writing project files
+vyriy create --overwrite      Overwrite existing generated paths
+vyriy create --skip-existing  Leave existing generated paths untouched
+vyriy create --no-install     Create files without installing dependencies
+vyriy create --no-verify      Install dependencies without running checks
+```
+
+### `check`
 
 Validates Node.js and Yarn versions against the engine requirements declared in
 `package.json`.
 
-### `--dist`
+### `dist`
 
 Prepares every package inside the `dist/` directory for npm publishing:
 
@@ -74,6 +80,11 @@ Prepares every package inside the `dist/` directory for npm publishing:
 - Copies README, LICENSE, and AGENTS.md
 - Makes bin files executable
 
+### `static`
+
+Starts the static server command. The implementation is currently a placeholder
+while `@vyriy/static` grows the reusable server helpers.
+
 ## Presets
 
 Registered presets:

package/args.js

@@ -0,0 +1,40 @@
+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 [command = '', ...commandArgs] = args;
+    if (!command) {
+        return { type: 'help' };
+    }
+    if (command === 'dist') {
+        return { type: 'dist' };
+    }
+    if (command === 'check') {
+        return { type: 'check' };
+    }
+    if (command === 'static') {
+        const directory = commandArgs.find((arg) => !arg.startsWith('-')) ?? 'dist';
+        return { type: 'static', directory };
+    }
+    if (command !== 'create') {
+        return { type: 'unknown', command };
+    }
+    const dryRun = commandArgs.includes('--dry-run');
+    const overwrite = commandArgs.includes('--overwrite');
+    const skipExisting = commandArgs.includes('--skip-existing');
+    const install = !commandArgs.includes('--no-install');
+    const verify = install && !commandArgs.includes('--no-verify');
+    const directory = commandArgs.find((arg) => !arg.startsWith('-')) ?? '';
+    return {
+        type: 'create',
+        directory,
+        dryRun,
+        overwrite,
+        skipExisting,
+        install,
+        verify,
+    };
+};

package/bin/vyriy.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import { cli } from '../cli/index.js';
+import { cli } from '../index.js';
 await cli(process.argv.slice(2));

package/cli.js

@@ -0,0 +1,67 @@
+import { parseArgs } from './args.js';
+import packageJson from './package.json' with { type: 'json' };
+const text = `Vyriy Project Master
+
+Usage:
+  vyriy create [name]    Create a new Vyriy project
+  vyriy create .         Initialize a new Vyriy project in the current directory
+  vyriy dist             Prepare dist package metadata without publishing to npm
+  vyriy static [dir]     Serve a static directory (defaults to dist)
+  vyriy check            Check local environment
+  vyriy --help, -h       Show help
+  vyriy --version, -v    Show version
+
+Create options:
+  vyriy create --dry-run        Print the merged file plan without writing project files
+  vyriy create --overwrite      Overwrite existing generated paths
+  vyriy create --skip-existing  Leave existing generated paths untouched
+  vyriy create --no-install     Create files without installing dependencies
+  vyriy create --no-verify      Install dependencies without running checks
+
+Examples:
+  vyriy create app
+  vyriy create app --dry-run
+  vyriy create .
+  vyriy create . --no-verify
+  vyriy dist
+  vyriy static
+  vyriy static dist
+  vyriy check`;
+export const cli = async (args = []) => {
+    const command = parseArgs(args);
+    switch (command.type) {
+        case 'help':
+            console.log(text);
+            process.exitCode = 0;
+            break;
+        case 'version':
+            console.log(packageJson.version);
+            process.exitCode = 0;
+            break;
+        case 'dist': {
+            const { dist } = await import('@vyriy/dist');
+            process.exitCode = await dist();
+            break;
+        }
+        case 'check': {
+            const { checkEnv } = await import('@vyriy/check');
+            process.exitCode = await checkEnv();
+            break;
+        }
+        case 'static': {
+            const { staticServer } = await import('@vyriy/static');
+            process.exitCode = await staticServer(command);
+            break;
+        }
+        case 'create': {
+            const { create } = await import('@vyriy/create');
+            process.exitCode = await create(command);
+            break;
+        }
+        default:
+            console.error(`Unknown command: ${command.command}\n`);
+            console.log(text);
+            process.exitCode = 1;
+            break;
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vyriy",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Interactive project master for calm cloud-ready applications.",
   "type": "module",
   "bin": "./bin/vyriy.js",
@@ -8,25 +8,31 @@
     "node": ">=24.0.0"
   },
   "packageManager": "yarn@4.15.0",
+  "dependencies": {
+    "@vyriy/check": "0.5.3",
+    "@vyriy/create": "0.5.3",
+    "@vyriy/dist": "0.5.3",
+    "@vyriy/static": "0.5.3"
+  },
   "peerDependencies": {
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/jest": "^30.0.0",
-    "@types/react": "^19.2.15",
+    "@types/react": "^19.2.16",
     "@types/react-dom": "^19.2.3",
     "cross-env": "^10.1.0",
     "eslint": "^10.4.1",
-    "graphql": "^16.14.0",
+    "graphql": "^16.14.1",
     "husky": "^9.1.7",
     "jest": "^30.4.2",
     "npm-run-all2": "^9.0.1",
     "prettier": "^3.8.3",
-    "react": "^19.2.6",
-    "react-dom": "^19.2.6",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
     "rimraf": "^6.1.3",
     "sass": "^1.100.0",
     "serve": "^14.2.6",
-    "storybook": "^10.4.1",
+    "storybook": "^10.4.2",
     "stylelint": "^17.12.0",
     "tsx": "^4.22.4",
     "typescript": "^6.0.3",
@@ -110,5 +116,44 @@
     "type": "git",
     "url": "https://github.com/evheniy/vyriy",
     "directory": "packages/vyriy"
+  },
+  "main": "./index.js",
+  "types": "./index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "import": "./index.js",
+      "default": "./index.js"
+    },
+    "./args": {
+      "types": "./args.d.ts",
+      "import": "./args.js",
+      "default": "./args.js"
+    },
+    "./args.js": {
+      "types": "./args.d.ts",
+      "import": "./args.js",
+      "default": "./args.js"
+    },
+    "./cli": {
+      "types": "./cli.d.ts",
+      "import": "./cli.js",
+      "default": "./cli.js"
+    },
+    "./cli.js": {
+      "types": "./cli.d.ts",
+      "import": "./cli.js",
+      "default": "./cli.js"
+    },
+    "./index": {
+      "types": "./index.d.ts",
+      "import": "./index.js",
+      "default": "./index.js"
+    },
+    "./index.js": {
+      "types": "./index.d.ts",
+      "import": "./index.js",
+      "default": "./index.js"
+    }
   }
 }

package/{cli/types.d.ts → types.d.ts}

@@ -1,5 +1,8 @@
 export type Command = {
-    readonly type: 'help' | 'version' | 'dist' | 'check-env';
+    readonly type: 'help' | 'version' | 'dist' | 'check';
+} | {
+    readonly type: 'static';
+    readonly directory: string;
 } | {
     readonly type: 'create';
     readonly directory: string;
@@ -8,6 +11,9 @@ export type Command = {
     readonly skipExisting: boolean;
     readonly install: boolean;
     readonly verify: boolean;
+} | {
+    readonly type: 'unknown';
+    readonly command: string;
 };
 export type ParseArgs = (args: readonly string[]) => Command;
 export type Cli = (args?: readonly string[]) => Promise<void>;

package/cli/args.js

@@ -1,29 +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' };
-    }
-    if (args.includes('--dist') || args.includes('-d')) {
-        return { type: 'dist' };
-    }
-    if (args.includes('--check-env') || args.includes('-c')) {
-        return { type: 'check-env' };
-    }
-    const dryRun = args.includes('--dry-run');
-    const overwrite = args.includes('--overwrite');
-    const skipExisting = args.includes('--skip-existing');
-    const install = !args.includes('--no-install');
-    const verify = install && !args.includes('--no-verify');
-    const directory = args.find((arg) => !arg.startsWith('-')) ?? '';
-    return {
-        type: 'create',
-        directory,
-        dryRun,
-        overwrite,
-        skipExisting,
-        install,
-        verify,
-    };
-};

package/cli/cli.js

@@ -1,28 +0,0 @@
-import { parseArgs } from './args.js';
-import { help, version, dist, checkEnv, create } from '../commands/index.js';
-export const cli = async (args = []) => {
-    const command = parseArgs(args);
-    switch (command.type) {
-        case 'help':
-            process.exitCode = await help();
-            break;
-        case 'version':
-            process.exitCode = await version();
-            break;
-        case 'dist':
-            process.exitCode = await dist();
-            break;
-        case 'check-env': {
-            process.exitCode = await checkEnv();
-            break;
-        }
-        case 'create':
-            process.exitCode = await create(command);
-            break;
-        default:
-            console.error(`Unknown command.\n`);
-            await help();
-            process.exitCode = 1;
-            break;
-    }
-};

package/commands/check-env.d.ts

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

package/commands/check-env.js

@@ -1,120 +0,0 @@
-import { exec as processExec } from 'node:child_process';
-import { promisify } from 'node:util';
-import packageJson from '../package.json' with { type: 'json' };
-const exec = promisify(processExec);
-const yarnStableHint = 'Try:\n  corepack enable\n  corepack prepare yarn@stable --activate';
-const node = () => {
-    const majorVersion = Number.parseInt(process.versions.node.split('.')[0]);
-    const minimumMajorVersion = Number.parseInt(packageJson.engines.node.match(/(\d+)/)?.[0]);
-    if (majorVersion && majorVersion >= minimumMajorVersion) {
-        return {
-            ok: true,
-            version: process.versions.node,
-            message: `Node.js ${majorVersion}`,
-        };
-    }
-    return {
-        ok: false,
-        version: process.versions.node,
-        message: `Vyriy requires Node.js >= ${minimumMajorVersion}.\n\nCurrent version: ${process.versions.node}\n\nPlease upgrade Node.js and run the command again.`,
-    };
-};
-const corepack = async () => {
-    let currentVersion;
-    try {
-        const { stdout } = await exec('corepack --version');
-        currentVersion = stdout.trim();
-    }
-    catch {
-        return {
-            ok: false,
-            message: `Corepack was not found.\n\nVyriy uses Corepack to install Yarn stable.\n\nInstall a Node.js distribution that includes Corepack and run the command again.`,
-        };
-    }
-    return {
-        ok: true,
-        message: `Corepack ${currentVersion}`,
-    };
-};
-const activateYarnStable = async () => {
-    try {
-        await exec('corepack enable');
-        await exec('corepack prepare yarn@stable --activate');
-    }
-    catch {
-        return {
-            ok: false,
-            message: `Corepack could not activate Yarn stable.\n\n${yarnStableHint}`,
-        };
-    }
-    return {
-        ok: true,
-        message: 'Yarn stable activated',
-    };
-};
-const yarn = async () => {
-    const minimumMajorVersion = Number.parseInt(packageJson.packageManager.match(/(\d+)/)?.[0]);
-    let currentVersion;
-    try {
-        const { stdout } = await exec('yarn --version');
-        currentVersion = stdout.trim();
-    }
-    catch {
-        return {
-            ok: false,
-            message: `Yarn was not found.\n\nVyriy requires Yarn >= ${minimumMajorVersion}.\n\n${yarnStableHint}`,
-        };
-    }
-    const majorVersion = Number.parseInt(currentVersion.match(/(\d+)/)?.[0]);
-    if (majorVersion && majorVersion >= minimumMajorVersion) {
-        return {
-            ok: true,
-            message: `Yarn ${currentVersion}`,
-        };
-    }
-    return {
-        ok: false,
-        message: `Vyriy requires Yarn >= ${minimumMajorVersion}.\n\nCurrent version: ${currentVersion}\n\n${yarnStableHint}`,
-    };
-};
-export const checkEnv = async () => {
-    const nodeResults = node();
-    console.log('Check env:');
-    if (nodeResults.ok) {
-        console.log(' ', nodeResults.message);
-    }
-    else {
-        console.error(nodeResults.message);
-        return 1;
-    }
-    const corepackResults = await corepack();
-    if (corepackResults.ok) {
-        console.log(' ', corepackResults.message);
-    }
-    else {
-        console.error(corepackResults.message);
-        return 1;
-    }
-    let yarnResults = await yarn();
-    if (yarnResults.ok) {
-        console.log(' ', yarnResults.message);
-        return 0;
-    }
-    const yarnStableResults = await activateYarnStable();
-    if (yarnStableResults.ok) {
-        console.log(' ', yarnStableResults.message);
-    }
-    else {
-        console.error(yarnStableResults.message);
-        return 1;
-    }
-    yarnResults = await yarn();
-    if (yarnResults.ok) {
-        console.log(' ', yarnResults.message);
-    }
-    else {
-        console.error(yarnResults.message);
-        return 1;
-    }
-    return 0;
-};

package/commands/create/index.d.ts

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

package/commands/create/index.js

@@ -1,135 +0,0 @@
-import { cwd } from 'node:process';
-import { basename, dirname, resolve } from 'node:path';
-import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
-import { exec as processExec } from 'node:child_process';
-import { promisify } from 'node:util';
-import { checkEnv } from '../check-env.js';
-import { plan } from './plan/index.js';
-import { conflictStrategy as promptConflictStrategy } from './prompt/index.js';
-import { presets } from './preset/index.js';
-const exec = promisify(processExec);
-const getProviderFiles = (providers, provider) => provider === undefined ? {} : (providers[provider] ?? {});
-const isPresetName = (preset) => preset in presets;
-const mergeFiles = (planOption) => {
-    if (!isPresetName(planOption.preset)) {
-        return undefined;
-    }
-    const preset = presets[planOption.preset].preset;
-    return {
-        ...preset.files(planOption),
-        ...getProviderFiles(preset.ci, planOption.ci),
-        ...getProviderFiles(preset.deploy, planOption.deploy),
-    };
-};
-const getSortedFileNames = (files) => Object.keys(files).sort((a, b) => a.localeCompare(b));
-const logFilePlan = (target, files) => {
-    console.log(`\nFile plan (${target}):`);
-    console.log(' ', getSortedFileNames(files).join('\n  '));
-};
-const getExistingFiles = (target, files) => {
-    const existingFiles = getSortedFileNames(files).filter((file) => existsSync(resolve(target, file)));
-    if (existingFiles.length) {
-        console.log('\nExisting files found:\n');
-        existingFiles.forEach((file) => console.log(' ', file));
-    }
-    return existingFiles;
-};
-const resolveConflictStrategy = async (filesExist, overwrite, skipExisting) => {
-    if (!filesExist || overwrite || skipExisting) {
-        return { overwrite, skipExisting };
-    }
-    const strategy = await promptConflictStrategy();
-    if (strategy) {
-        return strategy;
-    }
-    console.error('\nCannot continue without a conflict strategy.\n');
-    console.error('Use one of:\n\n  vyriy --overwrite\n  vyriy --skip-existing\n  vyriy --dry-run');
-    return undefined;
-};
-const writeFiles = (target, files, overwrite) => {
-    console.log(`\nFile creating (${target}):`);
-    getSortedFileNames(files).forEach((file) => {
-        if (!existsSync(resolve(target, file)) || overwrite) {
-            console.log(' ', file);
-            const filePath = resolve(target, file);
-            mkdirSync(dirname(filePath), { recursive: true });
-            writeFileSync(filePath, files[file]);
-        }
-    });
-};
-const verifyProject = async (target) => {
-    console.log('Running checks...');
-    try {
-        await exec(`yarn --cwd ${target} check`);
-    }
-    catch {
-        console.log('Running fixes...');
-        await exec(`yarn --cwd ${target} fix`);
-        console.log('Running checks...');
-        await exec(`yarn --cwd ${target} check`);
-    }
-};
-const installAndVerify = async (target, install, verify) => {
-    if (install) {
-        console.log('Installing dependencies...');
-        await exec(`yarn --cwd ${target} set version berry`);
-        await exec(`yarn --cwd ${target} install`);
-    }
-    else {
-        console.log('Installing dependencies... SKIPPED');
-        console.log('Running checks... SKIPPED');
-        console.log('\nProject files were created.');
-        return 0;
-    }
-    if (verify) {
-        await verifyProject(target);
-    }
-    else {
-        console.log('Running checks... SKIPPED');
-        console.log('\nProject files were created.');
-        return 0;
-    }
-    return 0;
-};
-export const create = async (options) => {
-    const { directory, dryRun, overwrite, skipExisting, install, verify } = options;
-    const checkEnvCode = await checkEnv();
-    if (checkEnvCode) {
-        return checkEnvCode;
-    }
-    const cliPath = cwd();
-    let dirName = 'app';
-    let appPath = resolve(cliPath, dirName);
-    if (directory) {
-        if (directory === '.') {
-            dirName = basename(cliPath);
-            appPath = cliPath;
-        }
-        else {
-            dirName = directory;
-            appPath = resolve(cwd(), dirName);
-        }
-    }
-    const planOption = await plan(dirName, appPath);
-    if (planOption) {
-        const { target } = planOption;
-        const files = mergeFiles(planOption);
-        if (!files) {
-            console.error(`Unknown preset: ${planOption.preset}`);
-            return 1;
-        }
-        if (dryRun) {
-            logFilePlan(target, files);
-            return 0;
-        }
-        console.log(`\nFile checking (${target})...`);
-        const existingFiles = getExistingFiles(target, files);
-        const conflictStrategy = await resolveConflictStrategy(Boolean(existingFiles.length), overwrite, skipExisting);
-        if (!conflictStrategy) {
-            return 1;
-        }
-        writeFiles(target, files, conflictStrategy.overwrite);
-        return installAndVerify(target, install, verify);
-    }
-    return 1;
-};

package/commands/create/plan/index.d.ts

@@ -1,4 +0,0 @@
-export * from './plan.js';
-export * from '../prompt/index.js';
-export * from './question.js';
-export type * from './types.js';

package/commands/create/plan/index.js

@@ -1,3 +0,0 @@
-export * from './plan.js';
-export * from '../prompt/index.js';
-export * from './question.js';

package/commands/create/plan/plan.d.ts

@@ -1,9 +0,0 @@
-export declare const plan: (dirName: string, appPath: string) => Promise<{
-    name: string;
-    description: string;
-    target: string;
-    preset: "ssr" | "base" | "rest" | "api" | "library" | "gql" | "ssg" | "spa" | "mfe";
-    scope: string | undefined;
-    ci: import("../preset/types.js").CiProvider | undefined;
-    deploy: import("../preset/types.js").DeployProvider | undefined;
-} | undefined>;

package/commands/create/plan/plan.js

@@ -1,34 +0,0 @@
-import { stdin, stdout } from 'node:process';
-import { createInterface } from 'node:readline';
-import { presets as appPreset } from '../preset/index.js';
-import { prompt, provider as promptProvider, preset as promptPreset, scope as promptScope } from '../prompt/index.js';
-import { question as createQuestion } from './question.js';
-export const plan = async (dirName, appPath) => {
-    const readline = createInterface({ input: stdin, output: stdout });
-    const question = createQuestion(readline, stdout);
-    try {
-        stdout.write('\nVyriy Project Master\n\n');
-        const name = await prompt(question, 'Project name', dirName);
-        const description = await prompt(question, 'Project description', 'Calm cloud-ready application');
-        const target = await prompt(question, 'Target directory', appPath);
-        const preset = await promptPreset(question, stdout);
-        const scope = await promptScope(question, preset, name);
-        const ci = await promptProvider(question, stdout, 'CI/CD provider', appPreset[preset].preset.ci);
-        const deploy = await promptProvider(question, stdout, 'Deploy provider', appPreset[preset].preset.deploy);
-        const confirmation = (await prompt(question, 'Use this project plan?', 'y')).toLowerCase();
-        return confirmation === 'y'
-            ? {
-                name,
-                description,
-                target,
-                preset,
-                scope,
-                ci,
-                deploy,
-            }
-            : undefined;
-    }
-    finally {
-        readline.close();
-    }
-};

package/commands/create/plan/question.d.ts

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