@vibe-forge/tsconfigs 0.8.0 → 0.9.0

package/dist/packages/config/src/load.js

@@ -1,8 +1,20 @@
-import { existsSync } from 'node:fs';
+import { existsSync, statSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
-import { resolve } from 'node:path';
+import { createRequire } from 'node:module';
+import { dirname, extname, resolve } from 'node:path';
 import process from 'node:process';
 import { load } from 'js-yaml';
+import { mergeConfigs } from './merge';
+const CONFIG_FILE_EXTENSIONS = new Set([
+    '.json',
+    '.yaml',
+    '.yml'
+]);
+const PACKAGE_DEFAULT_CONFIG_FILES = [
+    '.ai.config.json',
+    '.ai.config.yaml',
+    '.ai.config.yml'
+];
 const serializeJsonVariables = (value) => (JSON.stringify(Object.entries(value)
     .sort(([left], [right]) => left.localeCompare(right))));
 const resolveConfigCacheKey = (options) => {
@@ -12,54 +24,160 @@ const resolveConfigCacheKey = (options) => {
     return `${cwd}\n${disableDevConfig}\n${jsonVariables}`;
 };
 const resolveConfigPath = (cwd, filePath) => resolve(cwd, filePath);
+const isExistingFilePath = (filePath) => {
+    if (!existsSync(filePath))
+        return false;
+    try {
+        return statSync(filePath).isFile();
+    }
+    catch {
+        return false;
+    }
+};
+const replaceJsonVariables = (content, jsonVariables) => (content.replace(/\$\{(\w+)\}/g, (_, key) => jsonVariables[key] ?? `$\{${key}}`));
 export const buildConfigJsonVariables = (cwd, env = process.env) => ({
     ...env,
     WORKSPACE_FOLDER: cwd,
     __VF_PROJECT_WORKSPACE_FOLDER__: cwd
 });
-const loadJSConfig = async (cwd, paths) => {
-    for (const path of paths) {
-        try {
-            const configPath = resolveConfigPath(cwd, path);
-            if (!existsSync(configPath)) {
-                continue;
-            }
-            // eslint-disable-next-line ts/no-require-imports
-            return (require(configPath)?.default ?? {});
+const isRecord = (value) => (value != null &&
+    typeof value === 'object' &&
+    !Array.isArray(value));
+const toExtendPaths = (value) => {
+    if (typeof value === 'string' && value.trim() !== '') {
+        return [value.trim()];
+    }
+    if (!Array.isArray(value))
+        return [];
+    return value
+        .filter((item) => typeof item === 'string' && item.trim() !== '')
+        .map(item => item.trim());
+};
+const omitExtendField = (value) => {
+    const { extend: _extend, ...rest } = value;
+    return rest;
+};
+const resolveExtendCandidates = (configPath, extendPath) => {
+    const resolvedPath = resolve(dirname(configPath), extendPath);
+    if (extname(resolvedPath) !== '')
+        return [resolvedPath];
+    return [
+        resolvedPath,
+        `${resolvedPath}.json`,
+        `${resolvedPath}.yaml`,
+        `${resolvedPath}.yml`
+    ];
+};
+const parsePackageSpecifier = (specifier) => {
+    if (specifier.trim() === '' ||
+        specifier.startsWith('.') ||
+        specifier.startsWith('/') ||
+        /^[A-Za-z]:[\\/]/.test(specifier)) {
+        return undefined;
+    }
+    const segments = specifier.split('/');
+    if (segments.length === 0)
+        return undefined;
+    if (specifier.startsWith('@')) {
+        const [scope, name, ...rest] = segments;
+        if (!scope || !name)
+            return undefined;
+        return {
+            packageName: `${scope}/${name}`,
+            subpath: rest.length > 0 ? rest.join('/') : undefined
+        };
+    }
+    const [name, ...rest] = segments;
+    if (!name)
+        return undefined;
+    return {
+        packageName: name,
+        subpath: rest.length > 0 ? rest.join('/') : undefined
+    };
+};
+const resolveConfigCandidatesFromBasePath = (basePath) => (extname(basePath) !== ''
+    ? [basePath]
+    : [
+        basePath,
+        `${basePath}.json`,
+        `${basePath}.yaml`,
+        `${basePath}.yml`
+    ]);
+const resolveDependencyExtendPath = (configPath, extendPath) => {
+    const resolver = createRequire(configPath);
+    try {
+        const directResolvedPath = resolver.resolve(extendPath);
+        if (isExistingFilePath(directResolvedPath) &&
+            CONFIG_FILE_EXTENSIONS.has(extname(directResolvedPath).toLowerCase())) {
+            return directResolvedPath;
         }
-        catch (e) {
-            console.error(`Failed to load config file ${path}: ${e}`);
+    }
+    catch { }
+    const parsed = parsePackageSpecifier(extendPath);
+    if (parsed == null)
+        return undefined;
+    try {
+        const packageJsonPath = resolver.resolve(`${parsed.packageName}/package.json`);
+        const packageRoot = dirname(packageJsonPath);
+        if (parsed.subpath == null) {
+            return PACKAGE_DEFAULT_CONFIG_FILES
+                .map(fileName => resolve(packageRoot, fileName))
+                .find(candidate => isExistingFilePath(candidate));
         }
+        return resolveConfigCandidatesFromBasePath(resolve(packageRoot, parsed.subpath))
+            .find(candidate => isExistingFilePath(candidate));
+    }
+    catch {
+        return undefined;
     }
 };
-const loadJSONConfig = async (cwd, paths, jsonVariables) => {
-    for (const path of paths) {
-        try {
-            const configPath = resolveConfigPath(cwd, path);
-            if (!existsSync(configPath)) {
-                continue;
-            }
-            const configContent = await readFile(configPath, 'utf-8');
-            const configResolvedContent = configContent
-                .replace(/\$\{(\w+)\}/g, (_, key) => jsonVariables[key] ?? `$\{${key}}`);
-            return JSON.parse(configResolvedContent);
-        }
-        catch (e) {
-            console.error(`Failed to load config file ${path}: ${e}`);
+const resolveExistingExtendPath = (configPath, extendPath) => (resolveExtendCandidates(configPath, extendPath)
+    .find(candidate => isExistingFilePath(candidate)) ??
+    resolveDependencyExtendPath(configPath, extendPath));
+const readConfigFile = async (configPath, jsonVariables) => {
+    const configContent = await readFile(configPath, 'utf-8');
+    const configResolvedContent = replaceJsonVariables(configContent, jsonVariables);
+    const extension = extname(configPath).toLowerCase();
+    if (extension === '.json') {
+        return JSON.parse(configResolvedContent);
+    }
+    if (extension === '.yaml' || extension === '.yml') {
+        return load(configResolvedContent);
+    }
+    throw new Error(`Unsupported config file extension "${extension || '<none>'}"`);
+};
+const loadResolvedConfigFile = async (configPath, jsonVariables, loadingStack) => {
+    if (loadingStack.has(configPath)) {
+        throw new Error(`Circular config extend detected: ${[
+            ...loadingStack,
+            configPath
+        ].join(' -> ')}`);
+    }
+    const rawConfig = await readConfigFile(configPath, jsonVariables);
+    if (!isRecord(rawConfig)) {
+        throw new Error(`Config file "${configPath}" must resolve to an object`);
+    }
+    const nextLoadingStack = new Set(loadingStack);
+    nextLoadingStack.add(configPath);
+    let mergedExtendedConfig;
+    for (const extendPath of toExtendPaths(rawConfig.extend)) {
+        const extendedConfigPath = resolveExistingExtendPath(configPath, extendPath);
+        if (extendedConfigPath == null) {
+            throw new Error(`Extended config "${extendPath}" not found from "${configPath}"`);
         }
+        const extendedConfig = await loadResolvedConfigFile(extendedConfigPath, jsonVariables, nextLoadingStack);
+        mergedExtendedConfig = mergeConfigs(mergedExtendedConfig, extendedConfig);
     }
+    return mergeConfigs(mergedExtendedConfig, omitExtendField(rawConfig));
 };
-const loadYAMLConfig = async (cwd, paths, jsonVariables) => {
+const loadConfigFromPaths = async (cwd, paths, jsonVariables) => {
     for (const path of paths) {
         try {
             const configPath = resolveConfigPath(cwd, path);
-            if (!existsSync(configPath)) {
+            if (!isExistingFilePath(configPath)) {
                 continue;
             }
-            const configContent = await readFile(configPath, 'utf-8');
-            const configResolvedContent = configContent
-                .replace(/\$\{(\w+)\}/g, (_, key) => jsonVariables[key] ?? `$\{${key}}`);
-            return load(configResolvedContent);
+            return await loadResolvedConfigFile(configPath, jsonVariables, new Set());
         }
         catch (e) {
             console.error(`Failed to load config file ${path}: ${e}`);
@@ -86,30 +204,26 @@ export const loadConfig = (options = {}) => {
         return cachedConfig;
     }
     const cwd = options.cwd ?? process.cwd();
-    const shouldLoadDevConfig = (options.disableDevConfig !== true &&
-        process.env[DISABLE_DEV_CONFIG_ENV] !== '1');
+    const shouldLoadDevConfig = options.disableDevConfig !== true &&
+        process.env[DISABLE_DEV_CONFIG_ENV] !== '1';
     const nextConfig = (async () => [
-        await loadJSONConfig(cwd, [
+        await loadConfigFromPaths(cwd, [
             './.ai.config.json',
-            './infra/.ai.config.json'
-        ], options.jsonVariables ?? {}) ??
-            await loadYAMLConfig(cwd, [
-                './.ai.config.yaml',
-                './.ai.config.yml',
-                './infra/.ai.config.yaml',
-                './infra/.ai.config.yml'
-            ], options.jsonVariables ?? {}),
+            './infra/.ai.config.json',
+            './.ai.config.yaml',
+            './.ai.config.yml',
+            './infra/.ai.config.yaml',
+            './infra/.ai.config.yml'
+        ], options.jsonVariables ?? {}),
         shouldLoadDevConfig
-            ? await loadJSONConfig(cwd, [
+            ? await loadConfigFromPaths(cwd, [
                 './.ai.dev.config.json',
-                './infra/.ai.dev.config.json'
-            ], options.jsonVariables ?? {}) ??
-                await loadYAMLConfig(cwd, [
-                    './.ai.dev.config.yaml',
-                    './.ai.dev.config.yml',
-                    './infra/.ai.dev.config.yaml',
-                    './infra/.ai.dev.config.yml'
-                ], options.jsonVariables ?? {})
+                './infra/.ai.dev.config.json',
+                './.ai.dev.config.yaml',
+                './.ai.dev.config.yml',
+                './infra/.ai.dev.config.yaml',
+                './infra/.ai.dev.config.yml'
+            ], options.jsonVariables ?? {})
             : undefined
     ])();
     configCache.set(cacheKey, nextConfig);

package/dist/packages/config/src/merge.d.ts

@@ -0,0 +1,7 @@
+import type { Config } from '@vibe-forge/types';
+export declare const mergeRecord: <T>(left?: Record<string, T>, right?: Record<string, T>) => {
+    [x: string]: T;
+} | undefined;
+export declare const mergeList: <T>(left?: T[], right?: T[]) => T[] | undefined;
+export declare const mergeUniqueList: <T>(left?: T[], right?: T[]) => T[] | undefined;
+export declare const mergeConfigs: <T extends Partial<Config> | undefined>(left: T, right: T) => T;

package/dist/packages/config/src/merge.js

@@ -0,0 +1,92 @@
+import { mergeAdapterConfigs } from '@vibe-forge/utils';
+const hasOwnKeys = (value) => Object.keys(value).length > 0;
+const isRecord = (value) => (value != null &&
+    typeof value === 'object' &&
+    !Array.isArray(value));
+export const mergeRecord = (left, right) => {
+    if (left == null && right == null)
+        return undefined;
+    return {
+        ...(left ?? {}),
+        ...(right ?? {})
+    };
+};
+export const mergeList = (left, right) => {
+    if (left == null && right == null)
+        return undefined;
+    return [
+        ...(left ?? []),
+        ...(right ?? [])
+    ];
+};
+export const mergeUniqueList = (left, right) => {
+    const merged = mergeList(left, right);
+    return merged == null ? undefined : Array.from(new Set(merged));
+};
+const mergeNotificationEventConfigs = (left, right) => {
+    const keys = new Set([
+        ...Object.keys(left ?? {}),
+        ...Object.keys(right ?? {})
+    ]);
+    if (keys.size === 0)
+        return undefined;
+    const merged = Object.fromEntries(Array.from(keys).map((key) => [
+        key,
+        {
+            ...(left?.[key] ?? {}),
+            ...(right?.[key] ?? {})
+        }
+    ]));
+    return hasOwnKeys(merged) ? merged : undefined;
+};
+const mergeNotifications = (left, right) => {
+    if (left == null && right == null)
+        return undefined;
+    const merged = {
+        ...(left ?? {}),
+        ...(right ?? {}),
+        events: mergeNotificationEventConfigs(left?.events, right?.events)
+    };
+    return hasOwnKeys(merged) ? merged : undefined;
+};
+const mergePermissions = (left, right) => {
+    if (left == null && right == null)
+        return undefined;
+    const merged = {
+        ...(left ?? {}),
+        ...(right ?? {}),
+        allow: mergeList(left?.allow, right?.allow),
+        deny: mergeList(left?.deny, right?.deny),
+        ask: mergeList(left?.ask, right?.ask)
+    };
+    return hasOwnKeys(merged) ? merged : undefined;
+};
+const mergePluginConfigs = (left, right) => {
+    if (!isRecord(left) || !isRecord(right)) {
+        return right ?? left;
+    }
+    return mergeRecord(left, right);
+};
+export const mergeConfigs = (left, right) => {
+    const merged = {
+        ...(left ?? {}),
+        ...(right ?? {}),
+        adapters: mergeAdapterConfigs(left?.adapters, right?.adapters),
+        models: mergeRecord(left?.models, right?.models),
+        modelServices: mergeRecord(left?.modelServices, right?.modelServices),
+        channels: mergeRecord(left?.channels, right?.channels),
+        mcpServers: mergeRecord(left?.mcpServers, right?.mcpServers),
+        defaultIncludeMcpServers: mergeUniqueList(left?.defaultIncludeMcpServers, right?.defaultIncludeMcpServers),
+        defaultExcludeMcpServers: mergeUniqueList(left?.defaultExcludeMcpServers, right?.defaultExcludeMcpServers),
+        permissions: mergePermissions(left?.permissions, right?.permissions),
+        env: mergeRecord(left?.env, right?.env),
+        announcements: mergeList(left?.announcements, right?.announcements),
+        shortcuts: mergeRecord(left?.shortcuts, right?.shortcuts),
+        conversation: mergeRecord(left?.conversation, right?.conversation),
+        notifications: mergeNotifications(left?.notifications, right?.notifications),
+        plugins: mergePluginConfigs(left?.plugins, right?.plugins),
+        enabledPlugins: mergeRecord(left?.enabledPlugins, right?.enabledPlugins),
+        extraKnownMarketplaces: mergeRecord(left?.extraKnownMarketplaces, right?.extraKnownMarketplaces)
+    };
+    return merged;
+};