vovk-cli 0.0.1-beta.26 → 0.0.1-beta.30

package/dist/getProjectInfo/getConfig.d.mts

@@ -1,8 +1,9 @@
 import type { VovkConfig } from '../types.mjs';
-export default function getConfig({ clientOutDir }: {
+export default function getConfig({ clientOutDir, cwd }: {
     clientOutDir?: string;
+    cwd: string;
 }): Promise<{
     config: Required<VovkConfig>;
     srcRoot: string;
-    configPaths: string[];
+    configAbsolutePaths: string[];
 }>;

package/dist/getProjectInfo/getConfig.mjs

@@ -1,9 +1,9 @@
-import readConfig from './readConfig.mjs';
+import getUserConfig from './getUserConfig.mjs';
 import getRelativeSrcRoot from './getRelativeSrcRoot.mjs';
-export default async function getConfig({ clientOutDir }) {
+export default async function getConfig({ clientOutDir, cwd }) {
     const env = process.env;
-    const { userConfig, configPaths } = await readConfig();
-    const srcRoot = await getRelativeSrcRoot();
+    const { userConfig, configAbsolutePaths } = await getUserConfig({ cwd });
+    const srcRoot = await getRelativeSrcRoot({ cwd });
     const config = {
         modulesDir: env.VOVK_MODULES_DIR ?? userConfig.modulesDir ?? './' + [srcRoot, 'modules'].filter(Boolean).join('/'),
         validateOnClient: env.VOVK_VALIDATE_ON_CLIENT ?? userConfig.validateOnClient ?? null,
@@ -17,12 +17,11 @@ export default async function getConfig({ clientOutDir }) {
         logLevel: env.VOVK_LOG_LEVEL ?? userConfig.logLevel ?? 'debug', // TODO: change to 'warn' when v3 is ready
         prettifyClient: userConfig.prettifyClient ?? false,
         templates: {
-            // TODO individual templates for each validation library
             service: 'vovk-cli/templates/service.ejs',
             controller: 'vovk-cli/templates/controller.ejs',
             worker: 'vovk-cli/templates/worker.ejs',
             ...userConfig.templates,
         },
     };
-    return { config, srcRoot, configPaths };
+    return { config, srcRoot, configAbsolutePaths };
 }

package/dist/getProjectInfo/getConfigAbsolutePaths.d.mts

@@ -0,0 +1,4 @@
+export default function getConfigAbsolutePaths({ cwd, relativePath, }: {
+    cwd: string;
+    relativePath?: string;
+}): Promise<string[]>;

package/dist/getProjectInfo/{getConfigPaths.mjs → getConfigAbsolutePaths.mjs}

@@ -1,7 +1,7 @@
 import fs from 'fs/promises';
 import path from 'path';
-export default async function getConfigPaths(relativePath = '') {
-    const rootDir = path.resolve(process.cwd(), relativePath || '');
+export default async function getConfigAbsolutePaths({ cwd, relativePath, }) {
+    const rootDir = path.resolve(cwd, relativePath || '');
     const baseName = 'vovk.config';
     const extensions = ['cjs', 'mjs', 'js'];
     const dirs = [path.join(rootDir, '.config'), rootDir];

package/dist/getProjectInfo/getRelativeSrcRoot.d.mts

@@ -1 +1,3 @@
-export default function getRelativeSrcRoot(): Promise<"." | "./src">;
+export default function getRelativeSrcRoot({ cwd }: {
+    cwd: string;
+}): Promise<"." | "./src">;

package/dist/getProjectInfo/getRelativeSrcRoot.mjs

@@ -1,7 +1,6 @@
 import path from 'path';
 import directoryExists from './directoryExists.mjs';
-export default async function getRelativeSrcRoot() {
-    const cwd = process.cwd();
+export default async function getRelativeSrcRoot({ cwd }) {
     // Next.js Docs: src/app or src/pages will be ignored if app or pages are present in the root directory.
     if (await directoryExists(path.join(cwd, 'app'))) {
         return '.';

package/dist/getProjectInfo/getUserConfig.d.mts

@@ -0,0 +1,8 @@
+import type { VovkConfig } from '../types.mjs';
+declare function getUserConfig({ cwd, }: {
+    cwd: string;
+}): Promise<{
+    userConfig: VovkConfig;
+    configAbsolutePaths: string[];
+}>;
+export default getUserConfig;

package/dist/getProjectInfo/getUserConfig.mjs

@@ -0,0 +1,19 @@
+import getConfigAbsolutePaths from './getConfigAbsolutePaths.mjs';
+async function getUserConfig({ cwd, }) {
+    const configAbsolutePaths = await getConfigAbsolutePaths({ cwd });
+    let userConfig = {};
+    if (!configAbsolutePaths.length) {
+        return { userConfig, configAbsolutePaths };
+    }
+    const configPath = configAbsolutePaths[0];
+    try {
+        const cacheBuster = Date.now();
+        ({ default: userConfig } = (await import(`${configPath}?cache=${cacheBuster}`)));
+    }
+    catch (e) {
+        // eslint-disable-next-line no-console
+        console.error('🐺 ❌ Error reading config file:', e.message);
+    }
+    return { userConfig, configAbsolutePaths };
+}
+export default getUserConfig;

package/dist/getProjectInfo/index.d.mts

@@ -1,7 +1,8 @@
 export type ProjectInfo = Awaited<ReturnType<typeof getProjectInfo>>;
-export default function getProjectInfo({ port: givenPort, clientOutDir, }?: {
+export default function getProjectInfo({ port: givenPort, clientOutDir, cwd, }?: {
     port?: number;
     clientOutDir?: string;
+    cwd?: string;
 }): Promise<{
     cwd: string;
     port: string;

package/dist/getProjectInfo/index.mjs

@@ -1,12 +1,11 @@
 import path from 'path';
 import getConfig from './getConfig.mjs';
 import getLogger from '../utils/getLogger.mjs';
-export default async function getProjectInfo({ port: givenPort, clientOutDir, } = {}) {
+export default async function getProjectInfo({ port: givenPort, clientOutDir, cwd = process.cwd(), } = {}) {
     const port = givenPort?.toString() ?? process.env.PORT ?? '3000';
     // Make PORT available to the config file at getConfig
     process.env.PORT = port;
-    const cwd = process.cwd();
-    const { config, srcRoot, configPaths } = await getConfig({ clientOutDir });
+    const { config, srcRoot, configAbsolutePaths } = await getConfig({ clientOutDir, cwd });
     const apiEntryPoint = `${config.origin ?? ''}/${config.rootEntry}`;
     const apiDir = path.join(srcRoot, 'app', config.rootEntry);
     const schemaOutImportPath = path.relative(config.clientOutDir, config.schemaOutDir);
@@ -17,8 +16,8 @@ export default async function getProjectInfo({ port: givenPort, clientOutDir, }
         ? path.relative(config.clientOutDir, config.validateOnClient)
         : config.validateOnClient;
     const log = getLogger(config.logLevel);
-    if (configPaths.length > 1) {
-        log.warn(`Multiple config files found. Using the first one: ${configPaths[0]}`);
+    if (configAbsolutePaths.length > 1) {
+        log.warn(`Multiple config files found. Using the first one: ${configAbsolutePaths[0]}`);
     }
     return {
         cwd,

package/dist/index.d.mts

@@ -3,8 +3,17 @@ import type { LogLevelNames } from 'loglevel';
 import type { VovkConfig, VovkEnv } from './types.mjs';
 export type { VovkConfig, VovkEnv };
 export interface InitOptions {
-    yes: boolean;
+    yes?: boolean;
     logLevel: LogLevelNames;
+    useNpm?: boolean;
+    useYarn?: boolean;
+    usePnpm?: boolean;
+    useBun?: boolean;
+    skipInstall?: boolean;
+    updateTsConfig?: boolean;
+    updateScripts?: 'implicit' | 'explicit';
+    validationLibrary?: string;
+    validateOnClient?: boolean;
 }
 export interface NewOptions {
     dryRun: boolean;

package/dist/index.mjs

@@ -75,8 +75,17 @@ program
     .command('init [prefix]')
     .description('Initialize Vovk project')
     .option('-Y, --yes', 'Skip all prompts and use default values')
-    .option('--log-level <level>', 'Set log level', 'info')
-    .action((prefix = '.', options) => Init.main(prefix, options));
+    .option('--log-level <level>', 'Set log level', 'debug') // TODO change to 'info'
+    .option('--use-npm', 'Use npm as package manager')
+    .option('--use-yarn', 'Use yarn as package manager')
+    .option('--use-pnpm', 'Use pnpm as package manager')
+    .option('--use-bun', 'Use bun as package manager')
+    .option('--skip-install', 'Skip installing dependencies')
+    .option('--update-ts-config', 'Update tsconfig.json')
+    .option('--update-scripts <mode>', 'Update package.json scripts (implicit or explicit)')
+    .option('--validation-library <library>', 'Validation library to use')
+    .option('--validate-on-client', 'Validate on client')
+    .action((prefix = '.', options) => new Init().main(prefix, options));
 program
     .command('new [components...]')
     .alias('n')

package/dist/init/checkTSConfigForExperimentalDecorators.d.mts

@@ -0,0 +1 @@
+export default function checkTSConfigForExperimentalDecorators(root: string): Promise<boolean>;

package/dist/init/checkTSConfigForExperimentalDecorators.mjs

@@ -0,0 +1,15 @@
+import path from 'path';
+import fs from 'fs/promises';
+import * as jsonc from 'jsonc-parser';
+export default async function checkTSConfigForExperimentalDecorators(root) {
+    const tsconfigPath = path.resolve(root, 'tsconfig.json');
+    let tsconfigContent;
+    try {
+        tsconfigContent = await fs.readFile(tsconfigPath, 'utf8');
+    }
+    catch (error) {
+        throw new Error(`Failed to read tsconfig.json at ${tsconfigPath}. You can run "npx tsc --init" to create it. ${String(error)}`);
+    }
+    const tsconfig = jsonc.parse(tsconfigContent);
+    return !!tsconfig?.compilerOptions?.experimentalDecorators;
+}

package/dist/init/createConfig.d.mts

@@ -0,0 +1,7 @@
+import type getLogger from '../utils/getLogger.mjs';
+import type { InitOptions } from '../index.mjs';
+export default function createConfig({ root, log, options: { validationLibrary, validateOnClient }, }: {
+    root: string;
+    log: ReturnType<typeof getLogger>;
+    options: Pick<InitOptions, 'validationLibrary' | 'validateOnClient'>;
+}): Promise<void>;

package/dist/init/createConfig.mjs

@@ -0,0 +1,38 @@
+import path from 'path';
+import fs from 'fs/promises';
+import getFileSystemEntryType, { FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
+import getTemplateFilesFromPackage from './getTemplateFilesFromPackage.mjs';
+import prettify from '../utils/prettify.mjs';
+export default async function createConfig({ root, log, options: { validationLibrary, validateOnClient }, }) {
+    const config = {};
+    const dotConfigPath = path.join(root, '.config');
+    const dir = (await getFileSystemEntryType(dotConfigPath)) === FileSystemEntryType.DIRECTORY ? dotConfigPath : root;
+    const isModule = await fs
+        .readFile(path.join(root, 'package.json'), 'utf-8')
+        .then((content) => JSON.parse(content).type === 'module');
+    const configAbsolutePath = path.join(dir, isModule ? 'vovk.config.mjs' : 'vovk.config.js');
+    config.validationLibrary = validationLibrary;
+    if (validateOnClient) {
+        config.validateOnClient = `${validationLibrary}/validateOnClient`;
+    }
+    const templates = {
+        controller: 'vovk-cli/templates/controller.ejs',
+        service: 'vovk-cli/templates/service.ejs',
+        worker: 'vovk-cli/templates/worker.ejs',
+    };
+    if (validationLibrary) {
+        try {
+            const validationTemplates = await getTemplateFilesFromPackage(validationLibrary);
+            Object.assign(templates, validationTemplates);
+        }
+        catch (error) {
+            log.error(`Failed to fetch validation library templates: ${error.message}`);
+        }
+    }
+    config.templates = templates;
+    const configStr = await prettify(`/** @type {import('vovk-cli').VovkConfig} */
+const config = ${JSON.stringify(config, null, 2)};
+${isModule ? '\nexport default config;' : 'module.exports = config;'}`, configAbsolutePath);
+    await fs.writeFile(configAbsolutePath, configStr, 'utf-8');
+    log.info(`Config created at ${configAbsolutePath}`);
+}

package/dist/init/getTemplateFilesFromPackage.d.mts

@@ -0,0 +1,6 @@
+/**
+ * Retrieves a list of files in the 'templates' folder of an NPM package.
+ * @param packageName - The name of the NPM package.
+ * @returns A promise that resolves to an array of file paths.
+ */
+export default function getTemplatesFiles(packageName: string): Promise<Record<string, string>>;

package/dist/init/getTemplateFilesFromPackage.mjs

@@ -0,0 +1,76 @@
+import { createGunzip } from 'zlib';
+import tar from 'tar-stream';
+import { Readable } from 'stream';
+/**
+ * Retrieves a list of files in the 'templates' folder of an NPM package.
+ * @param packageName - The name of the NPM package.
+ * @returns A promise that resolves to an array of file paths.
+ */
+export default async function getTemplatesFiles(packageName) {
+    try {
+        // Fetch package metadata from the npm registry
+        const metadataResponse = await fetch(`https://registry.npmjs.org/${encodeURIComponent(packageName)}`);
+        if (!metadataResponse.ok) {
+            throw new Error(`Failed to fetch package metadata: ${metadataResponse.statusText}`);
+        }
+        const metadata = (await metadataResponse.json());
+        const latestVersion = metadata['dist-tags'].latest;
+        const tarballUrl = metadata.versions[latestVersion].dist.tarball;
+        // Fetch the tarball
+        const tarballResponse = await fetch(tarballUrl);
+        if (!tarballResponse.ok) {
+            throw new Error(`Failed to fetch tarball: ${tarballResponse.statusText}`);
+        }
+        const tarballArrayBuffer = await tarballResponse.arrayBuffer();
+        const tarballBuffer = Buffer.from(tarballArrayBuffer);
+        // Extract the tarball in memory and collect template files
+        const templateFiles = await extractTemplatesFromTarball(tarballBuffer);
+        const entries = templateFiles
+            .filter((fileName) => fileName.startsWith('/templates/') && !fileName.endsWith('/') && fileName.endsWith('.ejs'))
+            .map((fileName) => [fileName.substring('/templates/'.length), `${packageName}${fileName}`]);
+        return Object.fromEntries(entries);
+    }
+    catch (error) {
+        console.error('Error fetching templates files:', error);
+        throw error;
+    }
+}
+/**
+ * Extracts the templates from the tarball buffer.
+ * @param tarballBuffer - The tarball data as a Buffer.
+ * @returns A promise that resolves to an array of template file paths.
+ */
+function extractTemplatesFromTarball(tarballBuffer) {
+    return new Promise((resolve, reject) => {
+        const extract = tar.extract();
+        const files = [];
+        extract.on('entry', (header, stream, next) => {
+            const filePath = header.name;
+            // Check if the file is in the 'templates' folder
+            if (filePath.startsWith('package/templates/')) {
+                files.push(filePath.replace('package/', ''));
+            }
+            stream.on('end', () => next());
+            stream.resume();
+        });
+        extract.on('finish', () => {
+            resolve(files);
+        });
+        extract.on('error', (err) => {
+            reject(err);
+        });
+        // Decompress and extract the tarball buffer
+        const gunzip = createGunzip();
+        gunzip.on('error', reject);
+        const tarballStream = Readable.from(tarballBuffer);
+        tarballStream.pipe(gunzip).pipe(extract);
+    });
+}
+// Example usage
+getTemplatesFiles('your-package-name')
+    .then((files) => {
+    console.log('Files in templates folder:', files);
+})
+    .catch((err) => {
+    console.error('Error:', err);
+});

package/dist/init/index.d.mts

@@ -1,20 +1,9 @@
 #!/usr/bin/env node
-import type { VovkConfig } from '../types.mjs';
 import type { InitOptions } from '../index.mjs';
 import getLogger from '../utils/getLogger.mjs';
-declare abstract class Action<T> {
-    context: Context;
-    data: T;
-    action: () => void;
-    constructor(context: Context);
-    toJSON: () => T;
-}
-declare class Context {
-    actions: Action<unknown>[];
-    vovkConfig: VovkConfig;
+export declare class Init {
+    #private;
     root: string;
     log: ReturnType<typeof getLogger>;
-    static main(prefix: string, { yes, logLevel }: InitOptions): Promise<void>;
+    main(prefix: string, { yes, logLevel, useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, validateOnClient, }: InitOptions): Promise<void>;
 }
-export declare const Init: typeof Context;
-export {};