@living-architecture/riviere-cli 0.8.11 → 0.8.13

package/dist/bin.js

@@ -28853,50 +28853,48 @@ function traceNonComponent(project, componentIndex, source, typeName, calledMeth
 }
 
 // ../riviere-extract-ts/dist/features/extraction/domain/connection-detection/async-detection/detect-publish-connections.js
-function detectPublishConnections(project, components, options) {
+function detectPublishConnections(components, options) {
   const publishers = components.filter((c) => c.type === "eventPublisher");
   const events = components.filter((c) => c.type === "event");
   const repository = options.repository;
-  return publishers.flatMap((publisher) => extractPublisherLinks(project, publisher, events, options, repository));
-}
-function extractPublisherLinks(project, publisher, events, options, repository) {
-  const publishedEventType = publisher.metadata["publishedEventType"];
-  if (typeof publishedEventType === "string") {
+  return publishers.flatMap((publisher) => {
+    const publishedEventType = publisher.metadata["publishedEventType"];
     const sourceLocation = {
       repository,
       filePath: publisher.location.file,
       lineNumber: publisher.location.line
     };
-    return resolvePublishTarget(publisher, publishedEventType, events, options, sourceLocation);
-  }
-  const classDecl = findClassInProject(project, publisher);
-  if (classDecl === void 0) {
-    return [];
-  }
-  const methods = classDecl.getMethods();
-  return methods.flatMap((method) => {
-    const firstParam = method.getParameters()[0];
-    if (firstParam === void 0) {
-      return [];
+    if (typeof publishedEventType !== "string") {
+      return [handleMissingMetadata(publisher, options, sourceLocation)];
     }
-    const paramType = firstParam.getType();
-    const paramTypeName = stripGenericArgs(paramType.getText(firstParam));
-    const sourceLocation = {
-      repository,
-      filePath: publisher.location.file,
-      lineNumber: method.getStartLineNumber()
-    };
-    return resolvePublishTarget(publisher, paramTypeName, events, options, sourceLocation);
+    return resolvePublishTarget(publisher, publishedEventType, events, options, sourceLocation);
   });
 }
-function resolvePublishTarget(publisher, paramTypeName, events, options, sourceLocation) {
-  const matchingEvents = events.filter((e) => e.metadata["eventName"] === paramTypeName);
+function handleMissingMetadata(publisher, options, sourceLocation) {
+  if (options.strict) {
+    throw new ConnectionDetectionError({
+      file: sourceLocation.filePath,
+      line: sourceLocation.lineNumber,
+      typeName: publisher.name,
+      reason: 'eventPublisher is missing required "publishedEventType" metadata'
+    });
+  }
+  return {
+    source: componentIdentity(publisher),
+    target: "_unresolved",
+    type: "async",
+    sourceLocation,
+    _uncertain: `eventPublisher "${publisher.name}" is missing required "publishedEventType" metadata`
+  };
+}
+function resolvePublishTarget(publisher, publishedEventType, events, options, sourceLocation) {
+  const matchingEvents = events.filter((e) => e.metadata["eventName"] === publishedEventType);
   if (matchingEvents.length === 0) {
-    return [handleNoMatch(publisher, paramTypeName, options, sourceLocation)];
+    return [handleNoMatch(publisher, publishedEventType, options, sourceLocation)];
   }
   if (matchingEvents.length > 1) {
     return [
-      handleAmbiguousMatch(publisher, paramTypeName, matchingEvents.length, options, sourceLocation)
+      handleAmbiguousMatch(publisher, publishedEventType, matchingEvents.length, options, sourceLocation)
     ];
   }
   return matchingEvents.map((event) => ({
@@ -28906,13 +28904,13 @@ function resolvePublishTarget(publisher, paramTypeName, events, options, sourceL
     sourceLocation
   }));
 }
-function handleAmbiguousMatch(publisher, paramTypeName, matchCount, options, sourceLocation) {
+function handleAmbiguousMatch(publisher, publishedEventType, matchCount, options, sourceLocation) {
   if (options.strict) {
     throw new ConnectionDetectionError({
       file: sourceLocation.filePath,
       line: sourceLocation.lineNumber,
       typeName: publisher.name,
-      reason: `parameter type "${paramTypeName}" matches ${matchCount} Event components (ambiguous)`
+      reason: `publishedEventType "${publishedEventType}" matches ${matchCount} Event components (ambiguous)`
     });
   }
   return {
@@ -28920,16 +28918,16 @@ function handleAmbiguousMatch(publisher, paramTypeName, matchCount, options, sou
     target: "_unresolved",
     type: "async",
     sourceLocation,
-    _uncertain: `ambiguous: ${matchCount} events match parameter type: ${paramTypeName}`
+    _uncertain: `ambiguous: ${matchCount} events match publishedEventType: ${publishedEventType}`
   };
 }
-function handleNoMatch(publisher, paramTypeName, options, sourceLocation) {
+function handleNoMatch(publisher, publishedEventType, options, sourceLocation) {
   if (options.strict) {
     throw new ConnectionDetectionError({
       file: sourceLocation.filePath,
       line: sourceLocation.lineNumber,
       typeName: publisher.name,
-      reason: `parameter type "${paramTypeName}" does not match any Event component`
+      reason: `publishedEventType "${publishedEventType}" does not match any Event component`
     });
   }
   return {
@@ -28937,7 +28935,7 @@ function handleNoMatch(publisher, paramTypeName, options, sourceLocation) {
     target: "_unresolved",
     type: "async",
     sourceLocation,
-    _uncertain: `no event found for parameter type: ${paramTypeName}`
+    _uncertain: `no event found for publishedEventType: ${publishedEventType}`
   };
 }
 
@@ -29246,8 +29244,7 @@ function deduplicateCrossStrategy(links) {
   }
   return [...seen.values()];
 }
-function detectConnections(project, components, options, globMatcher) {
-  const totalStart = performance.now();
+function detectPerModuleConnections(project, components, options, globMatcher) {
   const setupStart = performance.now();
   const componentIndex = new ComponentIndex(components);
   const sourceFilePaths = computeFilteredFilePaths(project, options.moduleGlobs, globMatcher);
@@ -29261,43 +29258,50 @@ function detectConnections(project, components, options, globMatcher) {
     repository
   });
   const callGraphMs = performance.now() - callGraphStart;
+  const patterns = options.patterns ?? [];
+  const { configurableLinks, configurableMs } = runConfigurableDetection(project, patterns, components, componentIndex, strict, repository);
+  return {
+    links: [...syncLinks, ...configurableLinks],
+    timings: {
+      callGraphMs,
+      configurableMs,
+      setupMs
+    }
+  };
+}
+function detectCrossModuleConnections(allComponents, options) {
+  const strict = options.allowIncomplete !== true;
+  const repository = options.repository;
   const asyncStart = performance.now();
-  const publishLinks = detectPublishConnections(project, components, {
+  const publishLinks = detectPublishConnections(allComponents, {
     strict,
     repository
   });
-  const subscribeLinks = detectSubscribeConnections(components, {
+  const subscribeLinks = detectSubscribeConnections(allComponents, {
     strict,
     repository
   });
   const asyncDetectionMs = performance.now() - asyncStart;
-  const patterns = options.patterns ?? [];
-  const { configurableLinks, configurableMs } = patterns.length > 0 ? (() => {
-    const configurableStart = performance.now();
-    const links = detectConfigurableConnections(project, patterns, components, componentIndex, {
-      strict,
-      repository
-    });
+  return {
+    links: [...publishLinks, ...subscribeLinks],
+    timings: { asyncDetectionMs }
+  };
+}
+function runConfigurableDetection(project, patterns, components, componentIndex, strict, repository) {
+  if (patterns.length === 0) {
     return {
-      configurableLinks: links,
-      configurableMs: performance.now() - configurableStart
+      configurableLinks: [],
+      configurableMs: 0
     };
-  })() : {
-    configurableLinks: [],
-    configurableMs: 0
-  };
-  const totalMs = performance.now() - totalStart;
-  const allLinks = [...syncLinks, ...publishLinks, ...subscribeLinks, ...configurableLinks];
-  const deduplicatedLinks = deduplicateCrossStrategy(allLinks);
+  }
+  const configurableStart = performance.now();
+  const links = detectConfigurableConnections(project, patterns, components, componentIndex, {
+    strict,
+    repository
+  });
   return {
-    links: deduplicatedLinks,
-    timings: {
-      callGraphMs,
-      asyncDetectionMs,
-      configurableMs,
-      setupMs,
-      totalMs
-    }
+    configurableLinks: links,
+    configurableMs: performance.now() - configurableStart
   };
 }
 
@@ -30159,7 +30163,7 @@ function detectConnectionsPerModule(moduleContexts, enrichedComponents, reposito
     if (moduleComponents.length === 0) {
       continue;
     }
-    const result = detectConnections(
+    const result = detectPerModuleConnections(
       ctx.project,
       moduleComponents,
       {
@@ -30170,10 +30174,28 @@ function detectConnectionsPerModule(moduleContexts, enrichedComponents, reposito
       matchesGlob
     );
     links.push(...result.links);
-    timings.push(result.timings);
+    timings.push({
+      callGraphMs: result.timings.callGraphMs,
+      asyncDetectionMs: 0,
+      configurableMs: result.timings.configurableMs,
+      setupMs: result.timings.setupMs,
+      totalMs: result.timings.callGraphMs + result.timings.configurableMs + result.timings.setupMs
+    });
   }
+  const crossResult = detectCrossModuleConnections(enrichedComponents, {
+    allowIncomplete,
+    repository: repositoryName
+  });
+  links.push(...crossResult.links);
+  timings.push({
+    callGraphMs: 0,
+    asyncDetectionMs: crossResult.timings.asyncDetectionMs,
+    configurableMs: 0,
+    setupMs: 0,
+    totalMs: crossResult.timings.asyncDetectionMs
+  });
   return {
-    links,
+    links: deduplicateCrossStrategy(links),
     timings
   };
 }
@@ -30421,7 +30443,7 @@ function parsePackageJson(pkg) {
 }
 function loadPackageJson() {
   if (true) {
-    return { version: "0.8.10" };
+    return { version: "0.8.12" };
   }
   const require2 = createRequire2(import.meta.url);
   return parsePackageJson(require2("../../package.json"));

package/dist/index.js

@@ -28877,50 +28877,48 @@ function traceNonComponent(project, componentIndex, source, typeName, calledMeth
 }
 
 // ../riviere-extract-ts/dist/features/extraction/domain/connection-detection/async-detection/detect-publish-connections.js
-function detectPublishConnections(project, components, options) {
+function detectPublishConnections(components, options) {
   const publishers = components.filter((c) => c.type === "eventPublisher");
   const events = components.filter((c) => c.type === "event");
   const repository = options.repository;
-  return publishers.flatMap((publisher) => extractPublisherLinks(project, publisher, events, options, repository));
-}
-function extractPublisherLinks(project, publisher, events, options, repository) {
-  const publishedEventType = publisher.metadata["publishedEventType"];
-  if (typeof publishedEventType === "string") {
+  return publishers.flatMap((publisher) => {
+    const publishedEventType = publisher.metadata["publishedEventType"];
     const sourceLocation = {
       repository,
       filePath: publisher.location.file,
       lineNumber: publisher.location.line
     };
-    return resolvePublishTarget(publisher, publishedEventType, events, options, sourceLocation);
-  }
-  const classDecl = findClassInProject(project, publisher);
-  if (classDecl === void 0) {
-    return [];
-  }
-  const methods = classDecl.getMethods();
-  return methods.flatMap((method) => {
-    const firstParam = method.getParameters()[0];
-    if (firstParam === void 0) {
-      return [];
+    if (typeof publishedEventType !== "string") {
+      return [handleMissingMetadata(publisher, options, sourceLocation)];
     }
-    const paramType = firstParam.getType();
-    const paramTypeName = stripGenericArgs(paramType.getText(firstParam));
-    const sourceLocation = {
-      repository,
-      filePath: publisher.location.file,
-      lineNumber: method.getStartLineNumber()
-    };
-    return resolvePublishTarget(publisher, paramTypeName, events, options, sourceLocation);
+    return resolvePublishTarget(publisher, publishedEventType, events, options, sourceLocation);
   });
 }
-function resolvePublishTarget(publisher, paramTypeName, events, options, sourceLocation) {
-  const matchingEvents = events.filter((e) => e.metadata["eventName"] === paramTypeName);
+function handleMissingMetadata(publisher, options, sourceLocation) {
+  if (options.strict) {
+    throw new ConnectionDetectionError({
+      file: sourceLocation.filePath,
+      line: sourceLocation.lineNumber,
+      typeName: publisher.name,
+      reason: 'eventPublisher is missing required "publishedEventType" metadata'
+    });
+  }
+  return {
+    source: componentIdentity(publisher),
+    target: "_unresolved",
+    type: "async",
+    sourceLocation,
+    _uncertain: `eventPublisher "${publisher.name}" is missing required "publishedEventType" metadata`
+  };
+}
+function resolvePublishTarget(publisher, publishedEventType, events, options, sourceLocation) {
+  const matchingEvents = events.filter((e) => e.metadata["eventName"] === publishedEventType);
   if (matchingEvents.length === 0) {
-    return [handleNoMatch(publisher, paramTypeName, options, sourceLocation)];
+    return [handleNoMatch(publisher, publishedEventType, options, sourceLocation)];
   }
   if (matchingEvents.length > 1) {
     return [
-      handleAmbiguousMatch(publisher, paramTypeName, matchingEvents.length, options, sourceLocation)
+      handleAmbiguousMatch(publisher, publishedEventType, matchingEvents.length, options, sourceLocation)
     ];
   }
   return matchingEvents.map((event) => ({
@@ -28930,13 +28928,13 @@ function resolvePublishTarget(publisher, paramTypeName, events, options, sourceL
     sourceLocation
   }));
 }
-function handleAmbiguousMatch(publisher, paramTypeName, matchCount, options, sourceLocation) {
+function handleAmbiguousMatch(publisher, publishedEventType, matchCount, options, sourceLocation) {
   if (options.strict) {
     throw new ConnectionDetectionError({
       file: sourceLocation.filePath,
       line: sourceLocation.lineNumber,
       typeName: publisher.name,
-      reason: `parameter type "${paramTypeName}" matches ${matchCount} Event components (ambiguous)`
+      reason: `publishedEventType "${publishedEventType}" matches ${matchCount} Event components (ambiguous)`
     });
   }
   return {
@@ -28944,16 +28942,16 @@ function handleAmbiguousMatch(publisher, paramTypeName, matchCount, options, sou
     target: "_unresolved",
     type: "async",
     sourceLocation,
-    _uncertain: `ambiguous: ${matchCount} events match parameter type: ${paramTypeName}`
+    _uncertain: `ambiguous: ${matchCount} events match publishedEventType: ${publishedEventType}`
   };
 }
-function handleNoMatch(publisher, paramTypeName, options, sourceLocation) {
+function handleNoMatch(publisher, publishedEventType, options, sourceLocation) {
   if (options.strict) {
     throw new ConnectionDetectionError({
       file: sourceLocation.filePath,
       line: sourceLocation.lineNumber,
       typeName: publisher.name,
-      reason: `parameter type "${paramTypeName}" does not match any Event component`
+      reason: `publishedEventType "${publishedEventType}" does not match any Event component`
     });
   }
   return {
@@ -28961,7 +28959,7 @@ function handleNoMatch(publisher, paramTypeName, options, sourceLocation) {
     target: "_unresolved",
     type: "async",
     sourceLocation,
-    _uncertain: `no event found for parameter type: ${paramTypeName}`
+    _uncertain: `no event found for publishedEventType: ${publishedEventType}`
   };
 }
 
@@ -29270,8 +29268,7 @@ function deduplicateCrossStrategy(links) {
   }
   return [...seen.values()];
 }
-function detectConnections(project, components, options, globMatcher) {
-  const totalStart = performance.now();
+function detectPerModuleConnections(project, components, options, globMatcher) {
   const setupStart = performance.now();
   const componentIndex = new ComponentIndex(components);
   const sourceFilePaths = computeFilteredFilePaths(project, options.moduleGlobs, globMatcher);
@@ -29285,43 +29282,50 @@ function detectConnections(project, components, options, globMatcher) {
     repository
   });
   const callGraphMs = performance.now() - callGraphStart;
+  const patterns = options.patterns ?? [];
+  const { configurableLinks, configurableMs } = runConfigurableDetection(project, patterns, components, componentIndex, strict, repository);
+  return {
+    links: [...syncLinks, ...configurableLinks],
+    timings: {
+      callGraphMs,
+      configurableMs,
+      setupMs
+    }
+  };
+}
+function detectCrossModuleConnections(allComponents, options) {
+  const strict = options.allowIncomplete !== true;
+  const repository = options.repository;
   const asyncStart = performance.now();
-  const publishLinks = detectPublishConnections(project, components, {
+  const publishLinks = detectPublishConnections(allComponents, {
     strict,
     repository
   });
-  const subscribeLinks = detectSubscribeConnections(components, {
+  const subscribeLinks = detectSubscribeConnections(allComponents, {
     strict,
     repository
   });
   const asyncDetectionMs = performance.now() - asyncStart;
-  const patterns = options.patterns ?? [];
-  const { configurableLinks, configurableMs } = patterns.length > 0 ? (() => {
-    const configurableStart = performance.now();
-    const links = detectConfigurableConnections(project, patterns, components, componentIndex, {
-      strict,
-      repository
-    });
+  return {
+    links: [...publishLinks, ...subscribeLinks],
+    timings: { asyncDetectionMs }
+  };
+}
+function runConfigurableDetection(project, patterns, components, componentIndex, strict, repository) {
+  if (patterns.length === 0) {
     return {
-      configurableLinks: links,
-      configurableMs: performance.now() - configurableStart
+      configurableLinks: [],
+      configurableMs: 0
     };
-  })() : {
-    configurableLinks: [],
-    configurableMs: 0
-  };
-  const totalMs = performance.now() - totalStart;
-  const allLinks = [...syncLinks, ...publishLinks, ...subscribeLinks, ...configurableLinks];
-  const deduplicatedLinks = deduplicateCrossStrategy(allLinks);
+  }
+  const configurableStart = performance.now();
+  const links = detectConfigurableConnections(project, patterns, components, componentIndex, {
+    strict,
+    repository
+  });
   return {
-    links: deduplicatedLinks,
-    timings: {
-      callGraphMs,
-      asyncDetectionMs,
-      configurableMs,
-      setupMs,
-      totalMs
-    }
+    configurableLinks: links,
+    configurableMs: performance.now() - configurableStart
   };
 }
 
@@ -30183,7 +30187,7 @@ function detectConnectionsPerModule(moduleContexts, enrichedComponents, reposito
     if (moduleComponents.length === 0) {
       continue;
     }
-    const result = detectConnections(
+    const result = detectPerModuleConnections(
       ctx.project,
       moduleComponents,
       {
@@ -30194,10 +30198,28 @@ function detectConnectionsPerModule(moduleContexts, enrichedComponents, reposito
       matchesGlob
     );
     links.push(...result.links);
-    timings.push(result.timings);
+    timings.push({
+      callGraphMs: result.timings.callGraphMs,
+      asyncDetectionMs: 0,
+      configurableMs: result.timings.configurableMs,
+      setupMs: result.timings.setupMs,
+      totalMs: result.timings.callGraphMs + result.timings.configurableMs + result.timings.setupMs
+    });
   }
+  const crossResult = detectCrossModuleConnections(enrichedComponents, {
+    allowIncomplete,
+    repository: repositoryName
+  });
+  links.push(...crossResult.links);
+  timings.push({
+    callGraphMs: 0,
+    asyncDetectionMs: crossResult.timings.asyncDetectionMs,
+    configurableMs: 0,
+    setupMs: 0,
+    totalMs: crossResult.timings.asyncDetectionMs
+  });
   return {
-    links,
+    links: deduplicateCrossStrategy(links),
     timings
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@living-architecture/riviere-cli",
-  "version": "0.8.11",
+  "version": "0.8.13",
   "publishConfig": {
     "access": "public"
   },
@@ -32,10 +32,10 @@
     "glob": "^11.0.2",
     "ts-morph": "^24.0.0",
     "yaml": "^2.7.0",
-    "@living-architecture/riviere-builder": "0.6.5",
-    "@living-architecture/riviere-extract-ts": "0.2.10",
-    "@living-architecture/riviere-extract-config": "0.4.5",
-    "@living-architecture/riviere-schema": "0.5.5",
-    "@living-architecture/riviere-query": "0.5.5"
+    "@living-architecture/riviere-builder": "0.6.6",
+    "@living-architecture/riviere-extract-ts": "0.2.12",
+    "@living-architecture/riviere-schema": "0.5.6",
+    "@living-architecture/riviere-query": "0.5.6",
+    "@living-architecture/riviere-extract-config": "0.4.6"
   }
 }