vovk-cli 0.0.1-beta.60 → 0.0.1-beta.62

package/README.md

@@ -7,30 +7,30 @@
     </picture>
   </a>
   <br>
-  <strong>Back-end for Next.js (beta)</strong>
+  <strong>Back-end Framework for Next.js App Router</strong>
   <br />
-  <a href="https://vovk.dev/about">About Vovk.ts</a>
-  &nbsp;
+  <a href="https://vovk.dev/">Documentation</a>
+  &nbsp;&nbsp;
   <a href="https://vovk.dev/quick-install">Quick Start</a>
-  &nbsp;
-  <a href="https://github.com/finom/vovk">Github Repo</a>
+  &nbsp;&nbsp;
+  <a href="https://vovk.dev/performance">Performance</a>
 </p>
 
 ---
 
 ## vovk-cli [![npm version](https://badge.fury.io/js/vovk-cli.svg)](https://www.npmjs.com/package/vovk-cli)
 
-The Vovk.ts [CLI](https://vovk.dev/cli) that will be used as a devDependency in a Vovk.ts app.
+Vovk.ts CLI that will be used as a devDependency in a Vovk.ts app.
 
 ```sh
 npm install -D vovk-cli
 ```
 
-- [vovk dev](https://vovk.dev/dev) - starts the development script that watches the changes in [controllers](https://vovk.dev/controller) and regenerates the [schema](https://vovk.dev/schema) and [client](https://vovk.dev/typescript).
-- [vovk generate](https://vovk.dev/generate) - generates the client based on the schema.
-- [vovk bundle](https://vovk.dev/bundle) - bundles the client with [tsdown](https://tsdown.dev/).
-- [vovk init](https://vovk.dev/init) - initializes Vovk.ts project.
-- [vovk new](https://vovk.dev/new) - generates a new controller, service or a custom module.
+- [vovk dev](https://vovk.dev/dev) - starts the development script that watches the changes in [controllers](https://vovk.dev/controller) and regenerates the [schema](https://vovk.dev/schema) and [client](https://vovk.dev/typescript)
+- [vovk generate](https://vovk.dev/generate) - generates the client based on the schema
+- [vovk bundle](https://vovk.dev/bundle) - bundles the client with [tsdown](https://tsdown.dev/)
+- [vovk init](https://vovk.dev/init) - initializes a new Vovk.ts project
+- [vovk new](https://vovk.dev/new) - generates a new controller, service or a custom module
 
 ```sh
 npx vovk-cli --help

package/dist/generate/generate.mjs

@@ -38,13 +38,14 @@ const getIncludedSegmentNames = (config, fullSchema, configKey, cliGenerateOptio
 };
 function logClientGenerationResults({ results, log, isEnsuringClient = false, forceNothingWrittenLog = false, clientType = 'Composed', startTime, fromTemplates, }) {
     const writtenResults = results.filter(({ written }) => written);
+    const origins = _.uniq(results.map((result) => result.origin).filter((origin) => !!origin));
     const duration = Date.now() - startTime;
     const groupedByDir = _.groupBy(writtenResults, ({ outAbsoluteDir }) => outAbsoluteDir);
     const logOrDebug = forceNothingWrittenLog ? log.info : log.debug;
     if (writtenResults.length) {
         for (const [outAbsoluteDir, dirResults] of Object.entries(groupedByDir)) {
             const templateNames = _.uniq(dirResults.map(({ templateName }) => templateName));
-            log.info(`${clientType} client${isEnsuringClient ? ' placeholder' : ''} is generated to ${chalkHighlightThing(normalizeOutTemplatePath(outAbsoluteDir, dirResults[0].package))} from template${templateNames.length !== 1 ? 's' : ''} ${chalkHighlightThing(templateNames.map((s) => `"${s}"`).join(', '))} in ${duration}ms`);
+            log.info(`${clientType} client${isEnsuringClient ? ' placeholder' : ''} is generated to ${chalkHighlightThing(normalizeOutTemplatePath(outAbsoluteDir, dirResults[0].package))} from template${templateNames.length !== 1 ? 's' : ''} ${chalkHighlightThing(templateNames.map((s) => `"${s}"`).join(', '))}${origins.length && !isEnsuringClient ? ` with origin${origins.length !== 1 ? 's' : ''} ${chalkHighlightThing(origins.join(', '))}` : ''} in ${duration}ms`);
         }
     }
     else if (fromTemplates.length) {
@@ -191,6 +192,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 templateName,
                 outAbsoluteDir,
                 package: packageJson,
+                origin,
             };
         }));
         if (composedClientTemplateFiles.length) {
@@ -272,6 +274,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     written,
                     templateName,
                     package: packageJson,
+                    origin,
                 };
             }));
             const outAbsoluteDir = path.resolve(cwd, outCwdRelativeDir);
@@ -282,6 +285,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 templateName,
                 outAbsoluteDir,
                 package: results[0]?.package || {}, // TODO: Might be wrong in Python segmented client (unknown use case)
+                origin: results[0]?.origin || '',
             };
         }));
         if (segmentedClientTemplateFiles.length) {

package/dist/getProjectInfo/getConfig/getUserConfig.mjs

@@ -1,9 +1,10 @@
+import { pathToFileURL } from 'node:url';
 import { readFile } from 'node:fs/promises';
 import { createRequire } from 'node:module';
-import { dirname } from 'node:path';
-import { runInNewContext } from 'node:vm';
-import { pathToFileURL } from 'node:url';
+import { dirname, extname } from 'node:path';
+import vm from 'node:vm';
 import { getConfigAbsolutePaths } from './getConfigAbsolutePaths.mjs';
+const isVMModulesEnabled = typeof vm.SourceTextModule !== 'undefined';
 export async function getUserConfig({ configPath: givenConfigPath, cwd, }) {
     const configAbsolutePaths = await getConfigAbsolutePaths({ configPath: givenConfigPath, cwd });
     if (!configAbsolutePaths.length) {
@@ -12,10 +13,7 @@ export async function getUserConfig({ configPath: givenConfigPath, cwd, }) {
     const configPath = configAbsolutePaths[0];
     let userConfig;
     let lastError;
-    const loaders = [
-        () => loadConfigWithVm(configPath),
-        () => importWithCacheBuster(configPath),
-    ];
+    const loaders = await getLoadersForExtension(configPath);
     for (const loader of loaders) {
         try {
             userConfig = await loader();
@@ -27,36 +25,119 @@ export async function getUserConfig({ configPath: givenConfigPath, cwd, }) {
     }
     return { userConfig: null, configAbsolutePaths, error: lastError };
 }
-async function importWithCacheBuster(configPath) {
-    const cacheBuster = Date.now();
-    const configPathUrl = pathToFileURL(configPath).href;
-    const { default: userConfig } = (await import(`${configPathUrl}?cache=${cacheBuster}`));
-    return userConfig;
+async function getLoadersForExtension(configPath) {
+    const ext = extname(configPath).toLowerCase();
+    const code = await readFile(configPath, 'utf-8');
+    const hasDynamicImport = /\bimport\s*\(/.test(code);
+    // If config has dynamic imports and flag is not enabled, skip VM loaders entirely
+    const canUseVM = isVMModulesEnabled || !hasDynamicImport;
+    switch (ext) {
+        case '.mjs':
+            return canUseVM
+                ? [() => importWithVMModule(configPath, code), () => importWithCacheBuster(configPath)]
+                : [() => importWithCacheBuster(configPath)];
+        case '.cjs':
+            return canUseVM
+                ? [() => importWithVMCommonJS(configPath, code), () => importWithCacheBuster(configPath)]
+                : [() => importWithCacheBuster(configPath)];
+        case '.js':
+        default:
+            return canUseVM
+                ? [
+                    () => importWithVMCommonJS(configPath, code),
+                    () => importWithVMModule(configPath, code),
+                    () => importWithCacheBuster(configPath),
+                ]
+                : [() => importWithCacheBuster(configPath)];
+    }
 }
-async function loadConfigWithVm(configPath) {
-    const source = await readFile(configPath, 'utf8');
-    const moduleUrl = pathToFileURL(configPath).href;
-    const cjsSource = transformDefaultExportToCjs(source);
+function createDynamicImportHandler(context) {
+    return async (specifier) => {
+        const imported = await import(specifier);
+        const exportNames = Object.keys(imported);
+        const syntheticModule = new vm.SyntheticModule(exportNames, function () {
+            for (const name of exportNames) {
+                this.setExport(name, imported[name]);
+            }
+        }, { context, identifier: specifier });
+        await syntheticModule.link(() => {
+            throw new Error('Nested linking not supported');
+        });
+        await syntheticModule.evaluate();
+        return syntheticModule;
+    };
+}
+async function importWithVMCommonJS(configPath, code) {
+    const require = createRequire(configPath);
     const moduleObj = { exports: {} };
-    const context = {
+    const contextObject = {
         module: moduleObj,
         exports: moduleObj.exports,
-        require: createRequire(moduleUrl),
-        __dirname: dirname(configPath),
+        require,
         __filename: configPath,
+        __dirname: dirname(configPath),
         console,
         process,
         Buffer,
+        URL,
+        URLSearchParams,
         setTimeout,
-        clearTimeout,
         setInterval,
+        setImmediate,
+        clearTimeout,
         clearInterval,
-        URL,
+        clearImmediate,
     };
-    runInNewContext(cjsSource, context, { filename: moduleUrl, displayErrors: true });
-    const result = moduleObj.exports;
-    return result?.default ?? result;
+    const context = vm.createContext(contextObject);
+    const script = new vm.Script(code, {
+        filename: configPath,
+        importModuleDynamically: createDynamicImportHandler(context),
+    });
+    script.runInContext(context);
+    return moduleObj.exports;
 }
-function transformDefaultExportToCjs(source) {
-    return source.replace(/^\s*export\s+default\s+/m, 'module.exports = ');
+async function importWithVMModule(configPath, code) {
+    if (!isVMModulesEnabled) {
+        throw new Error('vm.SourceTextModule not available');
+    }
+    const configUrl = pathToFileURL(configPath).href;
+    const context = vm.createContext({
+        console,
+        process,
+        Buffer,
+        URL,
+        URLSearchParams,
+        setTimeout,
+        setInterval,
+        setImmediate,
+        clearTimeout,
+        clearInterval,
+        clearImmediate,
+    });
+    const module = new vm.SourceTextModule(code, {
+        context,
+        identifier: configUrl,
+        initializeImportMeta(meta) {
+            meta.url = configUrl;
+        },
+        importModuleDynamically: createDynamicImportHandler(context),
+    });
+    await module.link(async (specifier) => {
+        const imported = await import(specifier);
+        const exportNames = Object.keys(imported);
+        const syntheticModule = new vm.SyntheticModule(exportNames, function () {
+            for (const name of exportNames) {
+                this.setExport(name, imported[name]);
+            }
+        }, { context, identifier: specifier });
+        return syntheticModule;
+    });
+    await module.evaluate();
+    return module.namespace.default;
+}
+async function importWithCacheBuster(configPath) {
+    const cacheBuster = Date.now();
+    const configPathUrl = pathToFileURL(configPath).href;
+    const { default: userConfig } = (await import(`${configPathUrl}?cache=${cacheBuster}`));
+    return userConfig;
 }

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env -S node --experimental-vm-modules --disable-warning=ExperimentalWarning
 import 'dotenv/config';
 import type { VovkEnv } from './types.mjs';
 export type { VovkEnv };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env -S node --experimental-vm-modules --disable-warning=ExperimentalWarning
 import path from 'node:path';
 import { readFileSync } from 'node:fs';
 import 'dotenv/config';

package/dist/init/index.mjs

@@ -223,7 +223,7 @@ export class Init {
             }
         }
         bundle ??= await confirm({
-            message: 'Do you want to set up "tsdown" to bundle TypeScript client?',
+            message: 'Do you want to set up "tsdown" and tsconfig.bundle.json to bundle TypeScript client?',
             default: true,
         });
         updateScripts ??= !pkgJson

package/dist/new/render.mjs

@@ -46,7 +46,7 @@ export async function render(codeTemplate, { cwd, config, withService, segmentNa
     };
     const parsed = matter((await ejs.render(codeTemplate, { t }, { async: true, filename: templateFileName })).trim());
     const { outDir, fileName, sourceName, compiledName } = parsed.data;
-    const code = empty ? (sourceName ? `export class ${sourceName} {}` : '') : parsed.content;
+    const code = empty ? (sourceName ? `export default class ${sourceName} {}` : '') : parsed.content;
     return {
         outDir,
         fileName,

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-beta.60",
+  "version": "0.0.1-beta.62",
+  "description": "CLI tool for managing Vovk.ts projects",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -12,11 +13,12 @@
     "build": "rm -rf dist tsconfig.build.tsbuildinfo && tsc -P tsconfig.build.json",
     "postbuild": "chmod +x ./dist/index.mjs",
     "pre-test": "npm run build",
-    "test-only": "npm run pre-test && node --experimental-transform-types --experimental-strip-types --test --test-only test/spec/**/*.mts",
-    "test": "npm run pre-test && node --experimental-transform-types --experimental-strip-types --test --test-concurrency=1 test/spec/**/*.mts",
+    "test-only": "npm run pre-test && node --experimental-transform-types --experimental-strip-types --experimental-vm-modules --test --test-only test/spec/**/*.mts",
+    "test": "npm run pre-test && node --experimental-transform-types --experimental-strip-types --experimental-vm-modules --test --test-concurrency=1 test/spec/**/*.mts",
     "tsc": "tsc --noEmit",
     "ncu": "npm-check-updates -u -x commander,node-pty",
-    "npm-publish": "npm publish"
+    "npm-publish": "npm publish",
+    "clear-test-cache": "rm -rf ./tmp_*"
   },
   "repository": {
     "type": "git",
@@ -35,7 +37,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-beta.89",
+    "vovk": "^3.0.0-beta.98",
     "vovk-ajv": "^0.0.0-beta.4",
     "vovk-client": "^0.0.4-beta.4",
     "vovk-python": "^0.0.1-beta.4",