aicm 0.9.0 → 0.9.1

package/dist/utils/config.d.ts

@@ -1,7 +1,11 @@
 import { Config, Rules } from "../types";
-interface ConfigWithMeta extends Config {
-    __ruleSources?: Record<string, string>;
-    __originalPresetPaths?: Record<string, string>;
+export interface RuleMetadata {
+    ruleSources: Record<string, string>;
+    originalPresetPaths: Record<string, string>;
+}
+export interface ConfigResult {
+    config: Config;
+    metadata: RuleMetadata;
 }
 export interface PresetPathInfo {
     fullPath: string;
@@ -9,17 +13,18 @@ export interface PresetPathInfo {
 }
 export declare function getFullPresetPath(presetPath: string): PresetPathInfo | null;
 /**
- * Load a preset file and return its rules and mcpServers
+ * Load a preset file and return its contents
  */
 export declare function loadPreset(presetPath: string): {
     rules: Rules;
     mcpServers?: import("../types").MCPServers;
+    presets?: string[];
 } | null;
 /**
  * Load the aicm config using cosmiconfigSync, supporting both aicm.json and package.json.
  * Returns the config object or null if not found.
  */
-export declare function loadAicmConfigCosmiconfig(): ConfigWithMeta | null;
+export declare function loadAicmConfigCosmiconfig(): Config | null;
 /**
  * Get the configuration from aicm.json or package.json (using cosmiconfigSync) and merge with any presets
  */
@@ -36,4 +41,3 @@ export declare function getOriginalPresetPath(config: Config, ruleName: string):
  * Save the configuration to the aicm.json file
  */
 export declare function saveConfig(config: Config): boolean;
-export {};

package/dist/utils/config.js

@@ -15,32 +15,52 @@ const node_path_1 = __importDefault(require("node:path"));
 const cosmiconfig_1 = require("cosmiconfig");
 const CONFIG_FILE = "aicm.json";
 function getFullPresetPath(presetPath) {
+    // If it's a local file with .json extension and exists, return as is
     if (presetPath.endsWith(".json") && fs_extra_1.default.pathExistsSync(presetPath)) {
         return { fullPath: presetPath, originalPath: presetPath };
     }
     try {
         let absolutePresetPath;
+        // Handle npm package with explicit JSON path
         if (presetPath.endsWith(".json")) {
             absolutePresetPath = require.resolve(presetPath, {
                 paths: [__dirname, process.cwd()],
             });
         }
+        // Handle npm package without explicit JSON path (add aicm.json)
         else {
+            // For npm packages, ensure we properly handle scoped packages (@org/pkg)
             const presetPathWithConfig = node_path_1.default.join(presetPath, "aicm.json");
-            absolutePresetPath = require.resolve(presetPathWithConfig, {
-                paths: [__dirname, process.cwd()],
-            });
+            try {
+                absolutePresetPath = require.resolve(presetPathWithConfig, {
+                    paths: [__dirname, process.cwd()],
+                });
+            }
+            catch (_a) {
+                // If direct resolution fails, try as a package name
+                absolutePresetPath = require.resolve(presetPath, {
+                    paths: [__dirname, process.cwd()],
+                });
+                // If we found the package but not the config file, look for aicm.json
+                if (fs_extra_1.default.existsSync(absolutePresetPath)) {
+                    const packageDir = node_path_1.default.dirname(absolutePresetPath);
+                    const configPath = node_path_1.default.join(packageDir, "aicm.json");
+                    if (fs_extra_1.default.existsSync(configPath)) {
+                        absolutePresetPath = configPath;
+                    }
+                }
+            }
         }
         return fs_extra_1.default.existsSync(absolutePresetPath)
             ? { fullPath: absolutePresetPath, originalPath: presetPath }
             : null;
     }
-    catch (_a) {
+    catch (_b) {
         return null;
     }
 }
 /**
- * Load a preset file and return its rules and mcpServers
+ * Load a preset file and return its contents
  */
 function loadPreset(presetPath) {
     const pathInfo = getFullPresetPath(presetPath);
@@ -59,71 +79,122 @@ function loadPreset(presetPath) {
     if (!preset.rules || typeof preset.rules !== "object") {
         throw new Error(`Error loading preset: Invalid format in ${presetPath} - missing or invalid 'rules' object`);
     }
-    return { rules: preset.rules, mcpServers: preset.mcpServers };
+    return {
+        rules: preset.rules,
+        mcpServers: preset.mcpServers,
+        presets: preset.presets,
+    };
 }
+// Global metadata storage
+let currentMetadata = null;
+// Track processed presets to avoid circular references
+const processedPresets = new Set();
 /**
- * Process presets and merge their rules and mcpServers into the config
+ * Process presets and return a new config with merged rules and metadata
  */
 function processPresets(config) {
+    // Create a deep copy of the config to avoid mutations
+    const newConfig = JSON.parse(JSON.stringify(config));
+    const metadata = {
+        ruleSources: {},
+        originalPresetPaths: {},
+    };
+    // Clear processed presets tracking set when starting from the top level
+    processedPresets.clear();
+    return processPresetsInternal(newConfig, metadata);
+}
+/**
+ * Internal function to process presets recursively
+ */
+function processPresetsInternal(config, metadata) {
     if (!config.presets || !Array.isArray(config.presets)) {
-        return;
+        return { config, metadata };
     }
     for (const presetPath of config.presets) {
+        const pathInfo = getFullPresetPath(presetPath);
+        if (!pathInfo) {
+            throw new Error(`Error loading preset: "${presetPath}". Make sure the package is installed in your project.`);
+        }
+        // Skip if we've already processed this preset (prevents circular references)
+        if (processedPresets.has(pathInfo.fullPath)) {
+            console.warn(`Skipping already processed preset: ${presetPath}`);
+            continue;
+        }
+        // Mark this preset as processed
+        processedPresets.add(pathInfo.fullPath);
         const preset = loadPreset(presetPath);
         if (!preset)
             continue;
-        const pathInfo = getFullPresetPath(presetPath);
-        if (!pathInfo)
-            continue;
-        mergePresetRules(config, preset.rules, pathInfo);
+        // Process nested presets first (depth-first)
+        if (preset.presets && preset.presets.length > 0) {
+            // Create a temporary config with just the presets from this preset
+            const presetConfig = {
+                rules: {},
+                presets: preset.presets,
+                ides: [],
+            };
+            // Recursively process the nested presets
+            const { config: nestedConfig } = processPresetsInternal(presetConfig, metadata);
+            Object.assign(preset.rules, nestedConfig.rules);
+        }
+        const { updatedConfig, updatedMetadata } = mergePresetRules(config, preset.rules, pathInfo, metadata);
+        Object.assign(config.rules, updatedConfig.rules);
+        Object.assign(metadata.ruleSources, updatedMetadata.ruleSources);
+        Object.assign(metadata.originalPresetPaths, updatedMetadata.originalPresetPaths);
         if (preset.mcpServers) {
-            mergePresetMcpServers(config, preset.mcpServers);
+            config.mcpServers = mergePresetMcpServers(config.mcpServers || {}, preset.mcpServers);
         }
     }
+    return { config, metadata };
 }
 /**
- * Merge preset rules into the config
+ * Merge preset rules into the config without mutation
  */
-function mergePresetRules(config, presetRules, pathInfo) {
+function mergePresetRules(config, presetRules, pathInfo, metadata) {
+    const updatedRules = { ...config.rules };
+    const updatedMetadata = {
+        ruleSources: { ...metadata.ruleSources },
+        originalPresetPaths: { ...metadata.originalPresetPaths },
+    };
     for (const [ruleName, rulePath] of Object.entries(presetRules)) {
         // Cancel if set to false in config
         if (Object.prototype.hasOwnProperty.call(config.rules, ruleName) &&
             config.rules[ruleName] === false) {
-            delete config.rules[ruleName];
-            if (config.__ruleSources)
-                delete config.__ruleSources[ruleName];
-            if (config.__originalPresetPaths)
-                delete config.__originalPresetPaths[ruleName];
+            delete updatedRules[ruleName];
+            delete updatedMetadata.ruleSources[ruleName];
+            delete updatedMetadata.originalPresetPaths[ruleName];
             continue;
         }
         // Only add if not already defined in config (override handled by config)
         if (!Object.prototype.hasOwnProperty.call(config.rules, ruleName)) {
-            config.rules[ruleName] = rulePath;
-            config.__ruleSources = config.__ruleSources || {};
-            config.__ruleSources[ruleName] = pathInfo.fullPath;
-            config.__originalPresetPaths = config.__originalPresetPaths || {};
-            config.__originalPresetPaths[ruleName] = pathInfo.originalPath;
+            updatedRules[ruleName] = rulePath;
+            updatedMetadata.ruleSources[ruleName] = pathInfo.fullPath;
+            updatedMetadata.originalPresetPaths[ruleName] = pathInfo.originalPath;
         }
     }
+    return {
+        updatedConfig: { ...config, rules: updatedRules },
+        updatedMetadata,
+    };
 }
 /**
- * Merge preset mcpServers into the config
+ * Merge preset mcpServers without mutation
  */
-function mergePresetMcpServers(config, presetMcpServers) {
-    if (!config.mcpServers)
-        config.mcpServers = {};
+function mergePresetMcpServers(configMcpServers, presetMcpServers) {
+    const newMcpServers = { ...configMcpServers };
     for (const [serverName, serverConfig] of Object.entries(presetMcpServers)) {
         // Cancel if set to false in config
-        if (Object.prototype.hasOwnProperty.call(config.mcpServers, serverName) &&
-            config.mcpServers[serverName] === false) {
-            delete config.mcpServers[serverName];
+        if (Object.prototype.hasOwnProperty.call(newMcpServers, serverName) &&
+            newMcpServers[serverName] === false) {
+            delete newMcpServers[serverName];
             continue;
         }
         // Only add if not already defined in config (override handled by config)
-        if (!Object.prototype.hasOwnProperty.call(config.mcpServers, serverName)) {
-            config.mcpServers[serverName] = serverConfig;
+        if (!Object.prototype.hasOwnProperty.call(newMcpServers, serverName)) {
+            newMcpServers[serverName] = serverConfig;
         }
     }
+    return newMcpServers;
 }
 /**
  * Load the aicm config using cosmiconfigSync, supporting both aicm.json and package.json.
@@ -156,22 +227,24 @@ function getConfig() {
     if (!config) {
         throw new Error(`No config found in ${process.cwd()}, create one using "aicm init"`);
     }
-    processPresets(config);
-    return config;
+    const { config: processedConfig, metadata } = processPresets(config);
+    // Store metadata for later access
+    currentMetadata = metadata;
+    return processedConfig;
 }
 /**
  * Get the source preset path for a rule if it came from a preset
  */
 function getRuleSource(config, ruleName) {
     var _a;
-    return (_a = config.__ruleSources) === null || _a === void 0 ? void 0 : _a[ruleName];
+    return (_a = currentMetadata === null || currentMetadata === void 0 ? void 0 : currentMetadata.ruleSources) === null || _a === void 0 ? void 0 : _a[ruleName];
 }
 /**
  * Get the original preset path for a rule if it came from a preset
  */
 function getOriginalPresetPath(config, ruleName) {
     var _a;
-    return (_a = config.__originalPresetPaths) === null || _a === void 0 ? void 0 : _a[ruleName];
+    return (_a = currentMetadata === null || currentMetadata === void 0 ? void 0 : currentMetadata.originalPresetPaths) === null || _a === void 0 ? void 0 : _a[ruleName];
 }
 /**
  * Save the configuration to the aicm.json file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicm",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "A TypeScript CLI tool for managing AI IDE rules across different projects and teams",
   "main": "dist/api.js",
   "types": "dist/api.d.ts",