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

package/dist/getProjectInfo/getConfig/getUserConfig.mjs

@@ -1,26 +1,62 @@
+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 { getConfigAbsolutePaths } from './getConfigAbsolutePaths.mjs';
-import { importUncachedModule } from './importUncachedModule.mjs';
 export async function getUserConfig({ configPath: givenConfigPath, cwd, }) {
     const configAbsolutePaths = await getConfigAbsolutePaths({ configPath: givenConfigPath, cwd });
-    let userConfig;
     if (!configAbsolutePaths.length) {
         return { userConfig: null, configAbsolutePaths };
     }
     const configPath = configAbsolutePaths[0];
-    // TODO explain
-    try {
-        userConfig = await importUncachedModule(configPath);
-    }
-    catch {
+    let userConfig;
+    let lastError;
+    const loaders = [
+        () => loadConfigWithVm(configPath),
+        () => importWithCacheBuster(configPath),
+    ];
+    for (const loader of loaders) {
         try {
-            const cacheBuster = Date.now();
-            const configPathUrl = pathToFileURL(configPath).href;
-            ({ default: userConfig } = (await import(`${configPathUrl}?cache=${cacheBuster}`)));
+            userConfig = await loader();
+            return { userConfig, configAbsolutePaths };
         }
         catch (e) {
-            return { userConfig: null, configAbsolutePaths, error: e };
+            lastError = e;
         }
     }
-    return { userConfig, configAbsolutePaths };
+    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 loadConfigWithVm(configPath) {
+    const source = await readFile(configPath, 'utf8');
+    const moduleUrl = pathToFileURL(configPath).href;
+    const cjsSource = transformDefaultExportToCjs(source);
+    const moduleObj = { exports: {} };
+    const context = {
+        module: moduleObj,
+        exports: moduleObj.exports,
+        require: createRequire(moduleUrl),
+        __dirname: dirname(configPath),
+        __filename: configPath,
+        console,
+        process,
+        Buffer,
+        setTimeout,
+        clearTimeout,
+        setInterval,
+        clearInterval,
+        URL,
+    };
+    runInNewContext(cjsSource, context, { filename: moduleUrl, displayErrors: true });
+    const result = moduleObj.exports;
+    return result?.default ?? result;
+}
+function transformDefaultExportToCjs(source) {
+    return source.replace(/^\s*export\s+default\s+/m, 'module.exports = ');
 }

package/dist/init/createConfig.d.mts

@@ -1,5 +1,7 @@
+import type { VovkStrictConfig } from 'vovk/internal';
 import type { getLogger } from '../utils/getLogger.mjs';
 import type { InitOptions } from '../types.mjs';
+export declare const BUNDLE_BUILD_TSDOWN: ({ entry, outDir }: Parameters<VovkStrictConfig["bundle"]["build"]>[0]) => Promise<void>;
 export declare function createConfig({ root, options: { validationLibrary, bundle, lang, dryRun }, }: {
     root: string;
     log: ReturnType<typeof getLogger>;

package/dist/init/createConfig.mjs

@@ -3,6 +3,19 @@ import fs from 'node:fs/promises';
 import { prettify } from '../utils/prettify.mjs';
 import { getFileSystemEntryType, FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
 import { updateConfigProperty } from '../utils/updateConfigProperty.mjs';
+export const BUNDLE_BUILD_TSDOWN = async ({ entry, outDir }) => {
+    const { build } = await import('tsdown');
+    await build({
+        entry,
+        dts: true,
+        format: ['cjs', 'esm'],
+        hash: false,
+        fixedExtension: true,
+        clean: true,
+        outDir,
+        tsconfig: './tsconfig.bundle.json',
+    });
+};
 export async function createConfig({ root, options: { validationLibrary, bundle, lang, dryRun }, }) {
     const config = {};
     const dotConfigPath = path.join(root, '.config');
@@ -42,21 +55,9 @@ export async function createConfig({ root, options: { validationLibrary, bundle,
     let configStr = await prettify(`// @ts-check
 /** @type {import('vovk').VovkConfig} */
 const config = ${JSON.stringify(config, null, 2)};
-${isModule ? '\nexport config;' : 'module.exports = config;'}`, configAbsolutePath);
+${isModule ? '\nexport default config;' : 'module.exports = config;'}`, configAbsolutePath);
     if (bundle) {
-        configStr = await updateConfigProperty(configStr, ['bundle', 'build'], async ({ entry, outDir }) => {
-            const { build } = await import('tsdown');
-            await build({
-                entry,
-                dts: true,
-                format: ['cjs', 'esm'],
-                hash: false,
-                fixedExtension: true,
-                clean: true,
-                outDir,
-                tsconfig: './tsconfig.bundle.json',
-            });
-        });
+        configStr = await updateConfigProperty(configStr, ['bundle', 'build'], BUNDLE_BUILD_TSDOWN);
     }
     if (!dryRun)
         await fs.writeFile(configAbsolutePath, configStr, 'utf-8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-beta.59",
+  "version": "0.0.1-beta.60",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-beta.87",
+    "vovk": "^3.0.0-beta.89",
     "vovk-ajv": "^0.0.0-beta.4",
     "vovk-client": "^0.0.4-beta.4",
     "vovk-python": "^0.0.1-beta.4",

package/dist/getProjectInfo/getConfig/importUncachedModule.d.mts

@@ -1,2 +0,0 @@
-import './importUncachedModuleWorker.mjs';
-export declare function importUncachedModule<T>(modulePath: string): Promise<T>;

package/dist/getProjectInfo/getConfig/importUncachedModule.mjs

@@ -1,36 +0,0 @@
-// importUncachedModule.js
-import { Worker } from 'node:worker_threads';
-import path from 'node:path';
-import './importUncachedModuleWorker.mjs'; // required for TS compilation
-export function importUncachedModule(modulePath) {
-    return new Promise((resolve, reject) => {
-        // Resolve the path to the worker script
-        const workerPath = path.resolve(import.meta.dirname, 'importUncachedModuleWorker.mjs');
-        // Initialize the worker thread
-        const worker = new Worker(workerPath, {
-            workerData: { modulePath },
-        });
-        // Listen for messages from the worker
-        worker.on('message', (d) => {
-            const data = d;
-            if (data.success) {
-                resolve(data.exportDefault);
-            }
-            else {
-                reject(new Error(data.error));
-            }
-            void worker.terminate();
-        });
-        // Handle errors from the worker
-        worker.on('error', (err) => {
-            reject(err);
-            void worker.terminate();
-        });
-        // Handle worker exit
-        worker.on('exit', (code) => {
-            if (code !== 0) {
-                reject(new Error(`Worker stopped with exit code ${code}`));
-            }
-        });
-    });
-}

package/dist/getProjectInfo/getConfig/importUncachedModuleWorker.d.mts

@@ -1 +0,0 @@
-export {};

package/dist/getProjectInfo/getConfig/importUncachedModuleWorker.mjs

@@ -1,25 +0,0 @@
-import { parentPort, workerData as wData } from 'node:worker_threads';
-import { pathToFileURL } from 'node:url';
-void (async () => {
-    if (!parentPort)
-        return;
-    const workerData = wData;
-    try {
-        // Convert the module path to a file URL
-        const moduleUrl = pathToFileURL(workerData.modulePath).href;
-        // Dynamically import the module
-        const importedModule = (await import(moduleUrl));
-        // Send the module's exports back to the main thread
-        parentPort?.postMessage({
-            success: true,
-            exportDefault: importedModule.default,
-        });
-    }
-    catch (error) {
-        // Send the error back to the main thread
-        parentPort?.postMessage({
-            success: false,
-            error: error.message,
-        });
-    }
-})();