@living-architecture/riviere-cli 0.8.8 → 0.8.9

package/dist/bin.js

@@ -206,7 +206,7 @@ var require_scope = __commonJS({
       let: new code_1.Name("let"),
       var: new code_1.Name("var")
     };
-    var Scope = class {
+    var Scope2 = class {
       constructor({ prefixes, parent } = {}) {
         this._names = {};
         this._prefixes = prefixes;
@@ -230,7 +230,7 @@ var require_scope = __commonJS({
         return this._names[prefix] = { prefix, index: 0 };
       }
     };
-    exports.Scope = Scope;
+    exports.Scope = Scope2;
     var ValueScopeName = class extends code_1.Name {
       constructor(prefix, nameStr) {
         super(nameStr);
@@ -243,7 +243,7 @@ var require_scope = __commonJS({
     };
     exports.ValueScopeName = ValueScopeName;
     var line = (0, code_1._)`\n`;
-    var ValueScope = class extends Scope {
+    var ValueScope = class extends Scope2 {
       constructor(opts) {
         super(opts);
         this._values = {};
@@ -2980,7 +2980,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve5.call(this, root, ref);
+      let _sch = resolve6.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 resolve5(root, ref) {
+    function resolve6(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 resolve5(baseURI, relativeURI, options) {
+    function resolve6(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: resolve5,
+      resolve: resolve6,
       resolveComponent,
       equal,
       serialize,
@@ -25155,9 +25155,9 @@ Examples:
 
 // src/features/extract/entrypoint/extract.ts
 import { Command as Command21 } from "commander";
-import { Project as Project2 } from "ts-morph";
 
 // ../riviere-extract-ts/dist/domain/component-extraction/extractor.js
+import { Scope } from "ts-morph";
 import { posix } from "node:path";
 
 // ../riviere-extract-ts/dist/domain/predicate-evaluation/evaluate-predicate.js
@@ -25340,11 +25340,15 @@ function extractClasses(sourceFile, filePath, domain2, componentType, rule) {
   return sourceFile.getClasses().filter((c) => evaluatePredicate(c, rule.where)).flatMap((c) => createClassComponent(c, filePath, domain2, componentType));
 }
 function extractMethods(sourceFile, filePath, domain2, componentType, rule) {
-  return sourceFile.getClasses().flatMap((c) => c.getMethods()).filter((m) => evaluatePredicate(m, rule.where)).flatMap((m) => createMethodComponent(m, filePath, domain2, componentType));
+  return sourceFile.getClasses().flatMap((c) => c.getMethods()).filter(isPublicMethod).filter((m) => evaluatePredicate(m, rule.where)).flatMap((m) => createMethodComponent(m, filePath, domain2, componentType));
 }
 function extractFunctions(sourceFile, filePath, domain2, componentType, rule) {
   return sourceFile.getFunctions().filter((f) => evaluatePredicate(f, rule.where)).flatMap((f) => createFunctionComponent(f, filePath, domain2, componentType));
 }
+function isPublicMethod(method) {
+  const scope = method.getScope();
+  return scope !== Scope.Private && scope !== Scope.Protected;
+}
 function createClassComponent(classDecl, filePath, domain2, componentType) {
   const name = classDecl.getName();
   if (name === void 0) {
@@ -29618,9 +29622,34 @@ function formatTimingLine(timings) {
   return `Extraction completed in ${formatSeconds(timings.totalMs)} (call graph: ${formatSeconds(timings.callGraphMs)}, detection: ${formatSeconds(timings.asyncDetectionMs)}, setup: ${formatSeconds(timings.setupMs)})`;
 }
 
+// src/features/extract/infra/ts-morph/create-configured-project.ts
+import { existsSync as existsSync5 } from "node:fs";
+import { resolve as resolve5 } from "node:path";
+import { Project as Project2 } from "ts-morph";
+function createConfiguredProject(configDir, skipTsConfig) {
+  if (skipTsConfig) {
+    return new Project2();
+  }
+  const tsConfigPath = resolve5(configDir, "tsconfig.json");
+  if (!existsSync5(tsConfigPath)) {
+    return new Project2();
+  }
+  return new Project2({
+    tsConfigFilePath: tsConfigPath,
+    skipAddingFilesFromTsConfig: true
+  });
+}
+
+// src/features/extract/queries/load-extraction-project.ts
+function loadExtractionProject(configDir, sourceFilePaths, skipTsConfig) {
+  const project = createConfiguredProject(configDir, skipTsConfig);
+  project.addSourceFilesAtPaths(sourceFilePaths);
+  return project;
+}
+
 // src/features/extract/entrypoint/extract.ts
 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").option("-o, --output <file>", "Write output to file instead of stdout").option("--components-only", "Output only component identity (no metadata enrichment)").option("--enrich <file>", "Read draft components from file and enrich with extraction rules").option("--allow-incomplete", "Output components even when some extraction fields fail").option("--pr", "Extract from files changed in current branch vs base branch").option("--base <branch>", "Override base branch for --pr (default: auto-detect)").option("--files <paths...>", "Extract from specific files").option("--format <type>", "Output format: json (default) or markdown").option("--stats", "Show extraction statistics on stderr").option("--patterns", "Enable pattern-based connection detection").action((options) => {
+  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").option("-o, --output <file>", "Write output to file instead of stdout").option("--components-only", "Output only component identity (no metadata enrichment)").option("--enrich <file>", "Read draft components from file and enrich with extraction rules").option("--allow-incomplete", "Output components even when some extraction fields fail").option("--pr", "Extract from files changed in current branch vs base branch").option("--base <branch>", "Override base branch for --pr (default: auto-detect)").option("--files <paths...>", "Extract from specific files").option("--format <type>", "Output format: json (default) or markdown").option("--stats", "Show extraction statistics on stderr").option("--patterns", "Enable pattern-based connection detection").option("--no-ts-config", "Skip tsconfig.json auto-discovery (disables full type resolution)").action((options) => {
     validateFlagCombinations(options);
     const {
       resolvedConfig,
@@ -29628,8 +29657,7 @@ function createExtractCommand() {
     } = loadAndValidateConfig(options.config);
     const allSourceFilePaths = resolveSourceFiles(resolvedConfig, configDir);
     const sourceFilePaths = resolveFilteredSourceFiles(allSourceFilePaths, options);
-    const project = new Project2();
-    project.addSourceFilesAtPaths(sourceFilePaths);
+    const project = loadExtractionProject(configDir, sourceFilePaths, options.tsConfig === false);
     const draftComponents = (() => {
       if (options.enrich === void 0) {
         return extractComponents(project, sourceFilePaths, resolvedConfig, matchesGlob, configDir);
@@ -29727,7 +29755,7 @@ function parsePackageJson(pkg) {
 }
 function loadPackageJson() {
   if (true) {
-    return { version: "0.8.7" };
+    return { version: "0.8.8" };
   }
   const require2 = createRequire2(import.meta.url);
   return parsePackageJson(require2("../../package.json"));

package/dist/index.js

@@ -205,7 +205,7 @@ var require_scope = __commonJS({
       let: new code_1.Name("let"),
       var: new code_1.Name("var")
     };
-    var Scope = class {
+    var Scope2 = class {
       constructor({ prefixes, parent } = {}) {
         this._names = {};
         this._prefixes = prefixes;
@@ -229,7 +229,7 @@ var require_scope = __commonJS({
         return this._names[prefix] = { prefix, index: 0 };
       }
     };
-    exports.Scope = Scope;
+    exports.Scope = Scope2;
     var ValueScopeName = class extends code_1.Name {
       constructor(prefix, nameStr) {
         super(nameStr);
@@ -242,7 +242,7 @@ var require_scope = __commonJS({
     };
     exports.ValueScopeName = ValueScopeName;
     var line = (0, code_1._)`\n`;
-    var ValueScope = class extends Scope {
+    var ValueScope = class extends Scope2 {
       constructor(opts) {
         super(opts);
         this._values = {};
@@ -2979,7 +2979,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve5.call(this, root, ref);
+      let _sch = resolve6.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 resolve5(root, ref) {
+    function resolve6(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 resolve5(baseURI, relativeURI, options) {
+    function resolve6(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: resolve5,
+      resolve: resolve6,
       resolveComponent,
       equal,
       serialize,
@@ -25181,9 +25181,9 @@ Examples:
 
 // src/features/extract/entrypoint/extract.ts
 import { Command as Command21 } from "commander";
-import { Project as Project2 } from "ts-morph";
 
 // ../riviere-extract-ts/dist/domain/component-extraction/extractor.js
+import { Scope } from "ts-morph";
 import { posix } from "node:path";
 
 // ../riviere-extract-ts/dist/domain/predicate-evaluation/evaluate-predicate.js
@@ -25366,11 +25366,15 @@ function extractClasses(sourceFile, filePath, domain2, componentType, rule) {
   return sourceFile.getClasses().filter((c) => evaluatePredicate(c, rule.where)).flatMap((c) => createClassComponent(c, filePath, domain2, componentType));
 }
 function extractMethods(sourceFile, filePath, domain2, componentType, rule) {
-  return sourceFile.getClasses().flatMap((c) => c.getMethods()).filter((m) => evaluatePredicate(m, rule.where)).flatMap((m) => createMethodComponent(m, filePath, domain2, componentType));
+  return sourceFile.getClasses().flatMap((c) => c.getMethods()).filter(isPublicMethod).filter((m) => evaluatePredicate(m, rule.where)).flatMap((m) => createMethodComponent(m, filePath, domain2, componentType));
 }
 function extractFunctions(sourceFile, filePath, domain2, componentType, rule) {
   return sourceFile.getFunctions().filter((f) => evaluatePredicate(f, rule.where)).flatMap((f) => createFunctionComponent(f, filePath, domain2, componentType));
 }
+function isPublicMethod(method) {
+  const scope = method.getScope();
+  return scope !== Scope.Private && scope !== Scope.Protected;
+}
 function createClassComponent(classDecl, filePath, domain2, componentType) {
   const name = classDecl.getName();
   if (name === void 0) {
@@ -29644,9 +29648,34 @@ function formatTimingLine(timings) {
   return `Extraction completed in ${formatSeconds(timings.totalMs)} (call graph: ${formatSeconds(timings.callGraphMs)}, detection: ${formatSeconds(timings.asyncDetectionMs)}, setup: ${formatSeconds(timings.setupMs)})`;
 }
 
+// src/features/extract/infra/ts-morph/create-configured-project.ts
+import { existsSync as existsSync5 } from "node:fs";
+import { resolve as resolve5 } from "node:path";
+import { Project as Project2 } from "ts-morph";
+function createConfiguredProject(configDir, skipTsConfig) {
+  if (skipTsConfig) {
+    return new Project2();
+  }
+  const tsConfigPath = resolve5(configDir, "tsconfig.json");
+  if (!existsSync5(tsConfigPath)) {
+    return new Project2();
+  }
+  return new Project2({
+    tsConfigFilePath: tsConfigPath,
+    skipAddingFilesFromTsConfig: true
+  });
+}
+
+// src/features/extract/queries/load-extraction-project.ts
+function loadExtractionProject(configDir, sourceFilePaths, skipTsConfig) {
+  const project = createConfiguredProject(configDir, skipTsConfig);
+  project.addSourceFilesAtPaths(sourceFilePaths);
+  return project;
+}
+
 // src/features/extract/entrypoint/extract.ts
 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").option("-o, --output <file>", "Write output to file instead of stdout").option("--components-only", "Output only component identity (no metadata enrichment)").option("--enrich <file>", "Read draft components from file and enrich with extraction rules").option("--allow-incomplete", "Output components even when some extraction fields fail").option("--pr", "Extract from files changed in current branch vs base branch").option("--base <branch>", "Override base branch for --pr (default: auto-detect)").option("--files <paths...>", "Extract from specific files").option("--format <type>", "Output format: json (default) or markdown").option("--stats", "Show extraction statistics on stderr").option("--patterns", "Enable pattern-based connection detection").action((options) => {
+  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").option("-o, --output <file>", "Write output to file instead of stdout").option("--components-only", "Output only component identity (no metadata enrichment)").option("--enrich <file>", "Read draft components from file and enrich with extraction rules").option("--allow-incomplete", "Output components even when some extraction fields fail").option("--pr", "Extract from files changed in current branch vs base branch").option("--base <branch>", "Override base branch for --pr (default: auto-detect)").option("--files <paths...>", "Extract from specific files").option("--format <type>", "Output format: json (default) or markdown").option("--stats", "Show extraction statistics on stderr").option("--patterns", "Enable pattern-based connection detection").option("--no-ts-config", "Skip tsconfig.json auto-discovery (disables full type resolution)").action((options) => {
     validateFlagCombinations(options);
     const {
       resolvedConfig,
@@ -29654,8 +29683,7 @@ function createExtractCommand() {
     } = loadAndValidateConfig(options.config);
     const allSourceFilePaths = resolveSourceFiles(resolvedConfig, configDir);
     const sourceFilePaths = resolveFilteredSourceFiles(allSourceFilePaths, options);
-    const project = new Project2();
-    project.addSourceFilesAtPaths(sourceFilePaths);
+    const project = loadExtractionProject(configDir, sourceFilePaths, options.tsConfig === false);
     const draftComponents = (() => {
       if (options.enrich === void 0) {
         return extractComponents(project, sourceFilePaths, resolvedConfig, matchesGlob, configDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@living-architecture/riviere-cli",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "publishConfig": {
     "access": "public"
   },
@@ -34,8 +34,8 @@
     "yaml": "^2.7.0",
     "@living-architecture/riviere-builder": "0.6.3",
     "@living-architecture/riviere-extract-config": "0.4.3",
-    "@living-architecture/riviere-extract-ts": "0.2.7",
     "@living-architecture/riviere-query": "0.5.3",
+    "@living-architecture/riviere-extract-ts": "0.2.8",
     "@living-architecture/riviere-schema": "0.5.3"
   }
 }