imcp 0.1.4 → 0.1.5

package/src/utils/macroExpressionUtils.ts

@@ -1,104 +0,0 @@
-import { Logger } from './logger.js';
-import { getPythonPackagePath, getSystemPythonPackageDirectory, getBrowserPath, getGlobalNPMPackagePath } from './osUtils.js';
-import { ServerInstallOptions } from '../core/metadatas/types.js'; // Adjusted path
-import { SystemSettingsManager } from '../core/loaders/SystemSettingsManager.js';
-import * as fsSync from 'fs';
-import * as path from 'path';
-import { execSync } from 'child_process';
-
-export const MACRO_EXPRESSIONS = {
-    PYTHON_PACKAGE: '${PYTHON_PACKAGE}',
-    NPMPATH: '${NPMPATH}',
-    BROWSER_PATH: '${BROWSER_PATH}',
-} as const;
-
-// Define a map for macro keys to their resolver functions
-export const MacroResolverFunctions: {
-    [key: string]: (finalConfig: any, options: ServerInstallOptions) => Promise<string | undefined>;
-} = {
-    [MACRO_EXPRESSIONS.PYTHON_PACKAGE]: resolvePythonPackageMacro,
-    [MACRO_EXPRESSIONS.NPMPATH]: resolveNpmPathMacro,
-    [MACRO_EXPRESSIONS.BROWSER_PATH]: resolveBrowserPathMacro,
-};
-
-/**
- * Resolves the path for the ${PYTHON_PACKAGE} macro.
- * It considers the pythonEnv setting and falls back to system Python.
- * Also updates finalConfig.command if it's 'python' and pythonEnv is used.
- * @param finalConfig The configuration object (mutated for command).
- * @param options Server installation options.
- * @returns The resolved Python package path or undefined.
- */
-export async function resolvePythonPackageMacro(finalConfig: any, options: ServerInstallOptions): Promise<string | undefined> {
-    const pythonEnv = options.settings?.pythonEnv;
-    if (pythonEnv) {
-        Logger.debug(`Python environment specified for ${MACRO_EXPRESSIONS.PYTHON_PACKAGE}: ${pythonEnv}`);
-        const pythonDir = getPythonPackagePath(pythonEnv);
-        if (pythonDir) {
-            if (finalConfig.command === 'python') {
-                Logger.debug(`Replacing command 'python' with specified pythonEnv: ${pythonEnv} due to ${MACRO_EXPRESSIONS.PYTHON_PACKAGE} resolution`);
-                finalConfig.command = pythonEnv;
-            }
-            return pythonDir;
-        }
-        Logger.debug(`Could not determine directory for pythonEnv: ${pythonEnv}. ${MACRO_EXPRESSIONS.PYTHON_PACKAGE} will not be replaced using this path.`);
-        return undefined;
-    } else {
-        Logger.debug(`No Python environment specified. Attempting to find system Python for ${MACRO_EXPRESSIONS.PYTHON_PACKAGE}.`);
-        const pythonDir = await getSystemPythonPackageDirectory();
-        if (pythonDir) {
-            return pythonDir;
-        }
-        Logger.debug(`Could not find system Python directory for ${MACRO_EXPRESSIONS.PYTHON_PACKAGE}.`);
-        return undefined;
-    }
-}
-
-/**
- * Resolves the actual NPM module path.
- * It checks a provided path, then NVM, then global npm.
- * @param providedNpmPath An optional, pre-configured NPM path.
- * @returns The resolved NPM module path or undefined if an error occurs.
- */
-export function resolveNpmModulePath(providedNpmPath: string | undefined): string {
-    if (providedNpmPath) {
-        return `${providedNpmPath}/node_modules`;
-    }
-
-    const globalNpmPath = getGlobalNPMPackagePath();
-    Logger.debug(`Resolved ${MACRO_EXPRESSIONS.NPMPATH} via global npm to: ${globalNpmPath}`);
-    return globalNpmPath;
-}
-
-/**
- * Resolves the path to an NPM module for the ${NPMPATH} macro.
- * Uses the resolveNpmModulePath function.
- * @param _finalConfig Not used by this resolver.
- * @param options Server installation options, may contain npmPath.
- * @returns The resolved NPM path or undefined if an error occurs.
- */
-export async function resolveNpmPathMacro(_finalConfig: any, options: ServerInstallOptions): Promise<string | undefined> {
-    Logger.debug(`Resolving ${MACRO_EXPRESSIONS.NPMPATH}. Provided npmPath from settings: ${options.settings?.npmPath}`);
-    try {
-        return resolveNpmModulePath(options.settings?.npmPath);
-    } catch (error) {
-        Logger.error(`Failed to resolve ${MACRO_EXPRESSIONS.NPMPATH}:`, error);
-        return undefined;
-    }
-}
-
-/**
- * Resolves the path for the ${BROWSER_PATH} macro.
- * @returns The system's browser path or undefined.
- */
-export async function resolveBrowserPathMacro(): Promise<string | undefined> {
-    Logger.debug(`Resolving ${MACRO_EXPRESSIONS.BROWSER_PATH}`);
-    try {
-        const browserPath = await getBrowserPath();
-        Logger.debug(`Resolved ${MACRO_EXPRESSIONS.BROWSER_PATH} to: ${browserPath}`);
-        return browserPath;
-    } catch (error) {
-        Logger.error(`Failed to get system browser path for ${MACRO_EXPRESSIONS.BROWSER_PATH}:`, error);
-        return undefined;
-    }
-}