@living-architecture/riviere-cli 0.7.21 → 0.7.22

package/dist/bin.js

@@ -2980,7 +2980,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve3.call(this, root, ref);
+      let _sch = resolve4.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a2 = root.localRefs) === null || _a2 === void 0 ? void 0 : _a2[ref];
         const { schemaId } = this.opts;
@@ -3007,7 +3007,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve3(root, ref) {
+    function resolve4(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -3582,7 +3582,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve3(baseURI, relativeURI, options) {
+    function resolve4(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse3(baseURI, schemelessOptions), parse3(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -3809,7 +3809,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve: resolve3,
+      resolve: resolve4,
       resolveComponent,
       equal,
       serialize,
@@ -6890,6 +6890,16 @@ var InternalSchemaValidationError = class extends Error {
     this.name = "InternalSchemaValidationError";
   }
 };
+var ModuleRefNotFoundError = class extends Error {
+  ref;
+  filePath;
+  constructor(ref, filePath) {
+    super(`Cannot resolve module reference '${ref}'. File not found: ${filePath}`);
+    this.name = "ModuleRefNotFoundError";
+    this.ref = ref;
+    this.filePath = filePath;
+  }
+};
 
 // src/commands/builder/add-component.ts
 import { Command } from "commander";
@@ -25228,15 +25238,15 @@ Examples:
 
 // src/commands/extract/extract.ts
 import {
-  existsSync as existsSync2,
-  readFileSync as readFileSync2
+  existsSync as existsSync3,
+  readFileSync as readFileSync3
 } from "node:fs";
 import {
   dirname as dirname4,
-  resolve as resolve2
+  resolve as resolve3
 } from "node:path";
 import { Command as Command21 } from "commander";
-import { parse as parseYaml2 } from "yaml";
+import { parse as parseYaml3 } from "yaml";
 import { globSync } from "glob";
 import { Project } from "ts-morph";
 
@@ -25263,11 +25273,27 @@ var extraction_config_schema_default = {
       description: "Module definitions for component extraction",
       minItems: 1,
       items: {
-        $ref: "#/$defs/module"
+        oneOf: [
+          { $ref: "#/$defs/module" },
+          { $ref: "#/$defs/moduleRef" }
+        ]
       }
     }
   },
   $defs: {
+    moduleRef: {
+      type: "object",
+      description: "Reference to an external module definition file",
+      required: ["$ref"],
+      additionalProperties: false,
+      properties: {
+        $ref: {
+          type: "string",
+          description: "File path to a module definition (relative to this config file)",
+          minLength: 1
+        }
+      }
+    },
     module: {
       type: "object",
       description: "A module defines extraction rules for a path pattern",
@@ -27626,6 +27652,41 @@ function createConfigLoader(configDir) {
   };
 }
 
+// src/commands/extract/expand-module-refs.ts
+import {
+  existsSync as existsSync2,
+  readFileSync as readFileSync2
+} from "node:fs";
+import { resolve as resolve2 } from "node:path";
+import { parse as parseYaml2 } from "yaml";
+function isModuleRef(value) {
+  return typeof value === "object" && value !== null && "$ref" in value && typeof value.$ref === "string";
+}
+function hasModulesArray2(value) {
+  return typeof value === "object" && value !== null && "modules" in value && Array.isArray(value.modules);
+}
+function expandModuleRefs(config2, configDir) {
+  if (!hasModulesArray2(config2)) {
+    return config2;
+  }
+  const expandedModules = config2.modules.map((item) => {
+    if (!isModuleRef(item)) {
+      return item;
+    }
+    const refPath = resolve2(configDir, item.$ref);
+    if (!existsSync2(refPath)) {
+      throw new ModuleRefNotFoundError(item.$ref, refPath);
+    }
+    const content = readFileSync2(refPath, "utf-8");
+    const parsed = parseYaml2(content);
+    return parsed;
+  });
+  return {
+    ...config2,
+    modules: expandedModules
+  };
+}
+
 // src/commands/extract/extract.ts
 function compareByCodePoint(a, b) {
   if (a < b) return -1;
@@ -27655,7 +27716,7 @@ function parseConfigFile(content) {
   try {
     return {
       success: true,
-      data: parseYaml2(content)
+      data: parseYaml3(content)
     };
   } catch (error48) {
     const message = error48 instanceof Error ? error48.message : "Unknown parse error";
@@ -27665,9 +27726,29 @@ function parseConfigFile(content) {
     };
   }
 }
+function tryExpandModuleRefs(data, configDir) {
+  try {
+    return {
+      success: true,
+      data: expandModuleRefs(data, configDir)
+    };
+  } catch (error48) {
+    if (error48 instanceof ModuleRefNotFoundError) {
+      return {
+        success: false,
+        error: error48.message
+      };
+    }
+    const message = error48 instanceof Error ? error48.message : "Unknown error during module expansion";
+    return {
+      success: false,
+      error: message
+    };
+  }
+}
 function createExtractCommand() {
   return new Command21("extract").description("Extract architectural components from source code").requiredOption("--config <path>", "Path to extraction config file").option("--dry-run", "Show component counts per domain without full output").action((options) => {
-    if (!existsSync2(options.config)) {
+    if (!existsSync3(options.config)) {
       console.log(
         JSON.stringify(
           formatError2("CONFIG_NOT_FOUND" /* ConfigNotFound */, `Config file not found: ${options.config}`)
@@ -27675,7 +27756,7 @@ function createExtractCommand() {
       );
       process.exit(1);
     }
-    const content = readFileSync2(options.config, "utf-8");
+    const content = readFileSync3(options.config, "utf-8");
     const parseResult = parseConfigFile(content);
     if (!parseResult.success) {
       console.log(
@@ -27685,8 +27766,22 @@ function createExtractCommand() {
       );
       process.exit(1);
     }
-    if (!isValidExtractionConfig(parseResult.data)) {
-      const validationResult = validateExtractionConfig(parseResult.data);
+    const configDir = dirname4(resolve3(options.config));
+    const expansionResult = tryExpandModuleRefs(parseResult.data, configDir);
+    if (!expansionResult.success) {
+      console.log(
+        JSON.stringify(
+          formatError2(
+            "VALIDATION_ERROR" /* ValidationError */,
+            `Error expanding module references: ${expansionResult.error}`
+          )
+        )
+      );
+      process.exit(1);
+    }
+    const expandedData = expansionResult.data;
+    if (!isValidExtractionConfig(expandedData)) {
+      const validationResult = validateExtractionConfig(expandedData);
       console.log(
         JSON.stringify(
           formatError2(
@@ -27698,11 +27793,10 @@ ${formatValidationErrors2(validationResult.errors)}`
       );
       process.exit(1);
     }
-    const unresolvedConfig = parseResult.data;
-    const configDir = dirname4(resolve2(options.config));
+    const unresolvedConfig = expandedData;
     const configLoader = createConfigLoader(configDir);
     const resolvedConfig = resolveConfig(unresolvedConfig, configLoader);
-    const sourceFilePaths = resolvedConfig.modules.flatMap((module) => globSync(module.path, { cwd: configDir })).map((filePath) => resolve2(configDir, filePath));
+    const sourceFilePaths = resolvedConfig.modules.flatMap((module) => globSync(module.path, { cwd: configDir })).map((filePath) => resolve3(configDir, filePath));
     if (sourceFilePaths.length === 0) {
       const patterns = resolvedConfig.modules.map((m) => m.path).join(", ");
       console.log(
@@ -27792,4 +27886,7 @@ program.parseAsync().catch((error48) => {
 /* istanbul ignore next -- @preserve: unreachable with valid FindTarget type; defensive fallback */
 /* v8 ignore next -- @preserve defensive for non-Error throws */
 /* v8 ignore start -- @preserve: trivial comparator, Map keys guarantee a !== b */
+/* v8 ignore start -- @preserve: dry-run output formatting; tested via CLI integration */
 /* v8 ignore next -- @preserve: yaml library always throws Error instances; defensive guard */
+/* v8 ignore next -- @preserve: error is always Error from yaml parser; defensive guard */
+/* v8 ignore start -- @preserve: dry-run path tested via CLI integration */

package/dist/index.js

@@ -2979,7 +2979,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve3.call(this, root, ref);
+      let _sch = resolve4.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a2 = root.localRefs) === null || _a2 === void 0 ? void 0 : _a2[ref];
         const { schemaId } = this.opts;
@@ -3006,7 +3006,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve3(root, ref) {
+    function resolve4(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -3581,7 +3581,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve3(baseURI, relativeURI, options) {
+    function resolve4(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse3(baseURI, schemelessOptions), parse3(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -3808,7 +3808,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve: resolve3,
+      resolve: resolve4,
       resolveComponent,
       equal,
       serialize,
@@ -6889,6 +6889,16 @@ var InternalSchemaValidationError = class extends Error {
     this.name = "InternalSchemaValidationError";
   }
 };
+var ModuleRefNotFoundError = class extends Error {
+  ref;
+  filePath;
+  constructor(ref, filePath) {
+    super(`Cannot resolve module reference '${ref}'. File not found: ${filePath}`);
+    this.name = "ModuleRefNotFoundError";
+    this.ref = ref;
+    this.filePath = filePath;
+  }
+};
 
 // src/commands/builder/add-component.ts
 import { Command } from "commander";
@@ -25245,15 +25255,15 @@ Examples:
 
 // src/commands/extract/extract.ts
 import {
-  existsSync as existsSync2,
-  readFileSync as readFileSync2
+  existsSync as existsSync3,
+  readFileSync as readFileSync3
 } from "node:fs";
 import {
   dirname as dirname4,
-  resolve as resolve2
+  resolve as resolve3
 } from "node:path";
 import { Command as Command21 } from "commander";
-import { parse as parseYaml2 } from "yaml";
+import { parse as parseYaml3 } from "yaml";
 import { globSync } from "glob";
 import { Project } from "ts-morph";
 
@@ -25280,11 +25290,27 @@ var extraction_config_schema_default = {
       description: "Module definitions for component extraction",
       minItems: 1,
       items: {
-        $ref: "#/$defs/module"
+        oneOf: [
+          { $ref: "#/$defs/module" },
+          { $ref: "#/$defs/moduleRef" }
+        ]
       }
     }
   },
   $defs: {
+    moduleRef: {
+      type: "object",
+      description: "Reference to an external module definition file",
+      required: ["$ref"],
+      additionalProperties: false,
+      properties: {
+        $ref: {
+          type: "string",
+          description: "File path to a module definition (relative to this config file)",
+          minLength: 1
+        }
+      }
+    },
     module: {
       type: "object",
       description: "A module defines extraction rules for a path pattern",
@@ -27643,6 +27669,41 @@ function createConfigLoader(configDir) {
   };
 }
 
+// src/commands/extract/expand-module-refs.ts
+import {
+  existsSync as existsSync2,
+  readFileSync as readFileSync2
+} from "node:fs";
+import { resolve as resolve2 } from "node:path";
+import { parse as parseYaml2 } from "yaml";
+function isModuleRef(value) {
+  return typeof value === "object" && value !== null && "$ref" in value && typeof value.$ref === "string";
+}
+function hasModulesArray2(value) {
+  return typeof value === "object" && value !== null && "modules" in value && Array.isArray(value.modules);
+}
+function expandModuleRefs(config2, configDir) {
+  if (!hasModulesArray2(config2)) {
+    return config2;
+  }
+  const expandedModules = config2.modules.map((item) => {
+    if (!isModuleRef(item)) {
+      return item;
+    }
+    const refPath = resolve2(configDir, item.$ref);
+    if (!existsSync2(refPath)) {
+      throw new ModuleRefNotFoundError(item.$ref, refPath);
+    }
+    const content = readFileSync2(refPath, "utf-8");
+    const parsed = parseYaml2(content);
+    return parsed;
+  });
+  return {
+    ...config2,
+    modules: expandedModules
+  };
+}
+
 // src/commands/extract/extract.ts
 function compareByCodePoint(a, b) {
   if (a < b) return -1;
@@ -27672,7 +27733,7 @@ function parseConfigFile(content) {
   try {
     return {
       success: true,
-      data: parseYaml2(content)
+      data: parseYaml3(content)
     };
   } catch (error48) {
     const message = error48 instanceof Error ? error48.message : "Unknown parse error";
@@ -27682,9 +27743,29 @@ function parseConfigFile(content) {
     };
   }
 }
+function tryExpandModuleRefs(data, configDir) {
+  try {
+    return {
+      success: true,
+      data: expandModuleRefs(data, configDir)
+    };
+  } catch (error48) {
+    if (error48 instanceof ModuleRefNotFoundError) {
+      return {
+        success: false,
+        error: error48.message
+      };
+    }
+    const message = error48 instanceof Error ? error48.message : "Unknown error during module expansion";
+    return {
+      success: false,
+      error: message
+    };
+  }
+}
 function createExtractCommand() {
   return new Command21("extract").description("Extract architectural components from source code").requiredOption("--config <path>", "Path to extraction config file").option("--dry-run", "Show component counts per domain without full output").action((options) => {
-    if (!existsSync2(options.config)) {
+    if (!existsSync3(options.config)) {
       console.log(
         JSON.stringify(
           formatError2("CONFIG_NOT_FOUND" /* ConfigNotFound */, `Config file not found: ${options.config}`)
@@ -27692,7 +27773,7 @@ function createExtractCommand() {
       );
       process.exit(1);
     }
-    const content = readFileSync2(options.config, "utf-8");
+    const content = readFileSync3(options.config, "utf-8");
     const parseResult = parseConfigFile(content);
     if (!parseResult.success) {
       console.log(
@@ -27702,8 +27783,22 @@ function createExtractCommand() {
       );
       process.exit(1);
     }
-    if (!isValidExtractionConfig(parseResult.data)) {
-      const validationResult = validateExtractionConfig(parseResult.data);
+    const configDir = dirname4(resolve3(options.config));
+    const expansionResult = tryExpandModuleRefs(parseResult.data, configDir);
+    if (!expansionResult.success) {
+      console.log(
+        JSON.stringify(
+          formatError2(
+            "VALIDATION_ERROR" /* ValidationError */,
+            `Error expanding module references: ${expansionResult.error}`
+          )
+        )
+      );
+      process.exit(1);
+    }
+    const expandedData = expansionResult.data;
+    if (!isValidExtractionConfig(expandedData)) {
+      const validationResult = validateExtractionConfig(expandedData);
       console.log(
         JSON.stringify(
           formatError2(
@@ -27715,11 +27810,10 @@ ${formatValidationErrors2(validationResult.errors)}`
       );
       process.exit(1);
     }
-    const unresolvedConfig = parseResult.data;
-    const configDir = dirname4(resolve2(options.config));
+    const unresolvedConfig = expandedData;
     const configLoader = createConfigLoader(configDir);
     const resolvedConfig = resolveConfig(unresolvedConfig, configLoader);
-    const sourceFilePaths = resolvedConfig.modules.flatMap((module) => globSync(module.path, { cwd: configDir })).map((filePath) => resolve2(configDir, filePath));
+    const sourceFilePaths = resolvedConfig.modules.flatMap((module) => globSync(module.path, { cwd: configDir })).map((filePath) => resolve3(configDir, filePath));
     if (sourceFilePaths.length === 0) {
       const patterns = resolvedConfig.modules.map((m) => m.path).join(", ");
       console.log(
@@ -27809,4 +27903,7 @@ export {
 /* istanbul ignore next -- @preserve: unreachable with valid FindTarget type; defensive fallback */
 /* v8 ignore next -- @preserve defensive for non-Error throws */
 /* v8 ignore start -- @preserve: trivial comparator, Map keys guarantee a !== b */
+/* v8 ignore start -- @preserve: dry-run output formatting; tested via CLI integration */
 /* v8 ignore next -- @preserve: yaml library always throws Error instances; defensive guard */
+/* v8 ignore next -- @preserve: error is always Error from yaml parser; defensive guard */
+/* v8 ignore start -- @preserve: dry-run path tested via CLI integration */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@living-architecture/riviere-cli",
-  "version": "0.7.21",
+  "version": "0.7.22",
   "publishConfig": {
     "access": "public"
   },
@@ -32,10 +32,10 @@
     "glob": "^11.0.2",
     "ts-morph": "^24.0.0",
     "yaml": "^2.7.0",
+    "@living-architecture/riviere-extract-config": "0.3.2",
     "@living-architecture/riviere-builder": "0.5.21",
-    "@living-architecture/riviere-extract-config": "0.3.1",
-    "@living-architecture/riviere-extract-ts": "0.1.24",
-    "@living-architecture/riviere-schema": "0.4.21",
-    "@living-architecture/riviere-query": "0.4.21"
+    "@living-architecture/riviere-extract-ts": "0.1.25",
+    "@living-architecture/riviere-query": "0.4.21",
+    "@living-architecture/riviere-schema": "0.4.21"
   }
 }