@webpieces/nx-webpieces-rules 0.3.245 → 0.3.246

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webpieces/nx-webpieces-rules",
-  "version": "0.3.245",
+  "version": "0.3.246",
   "description": "Nx-specific webpieces validation rules and graph tooling. Bundles all @webpieces rule packages with Nx graph validators and an inference plugin.",
   "type": "commonjs",
   "main": "./src/index.js",
@@ -21,11 +21,11 @@
     "README.md"
   ],
   "dependencies": {
-    "@webpieces/ai-hook-rules": "0.3.245",
-    "@webpieces/code-rules": "0.3.245",
-    "@webpieces/eslint-rules": "0.3.245",
-    "@webpieces/pr-gate": "0.3.245",
-    "@webpieces/rules-config": "0.3.245",
+    "@webpieces/ai-hook-rules": "0.3.246",
+    "@webpieces/code-rules": "0.3.246",
+    "@webpieces/eslint-rules": "0.3.246",
+    "@webpieces/pr-gate": "0.3.246",
+    "@webpieces/rules-config": "0.3.246",
     "madge": "8.0.0"
   },
   "peerDependencies": {

package/src/executors/di-graph-generate/executor.js

@@ -23,7 +23,7 @@ const tslib_1 = require("tslib");
 const rules_config_1 = require("@webpieces/rules-config");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
-const analyzer_1 = require("../../lib/di-graph/analyzer");
+const analyzer_strategy_1 = require("../../lib/di-graph/analyzer-strategy");
 const program_1 = require("../../lib/di-graph/program");
 const serializer_1 = require("../../lib/di-graph/serializer");
 const mermaid_1 = require("../../lib/di-graph/mermaid");
@@ -31,7 +31,9 @@ const model_1 = require("../../lib/di-graph/model");
 const toError_1 = require("../../toError");
 const RULE_NAME = 'di-graph';
 // Cheap substring pre-scan: a project whose source never mentions any DI marker
-// gets an empty graph without paying for a ts.Program.
+// gets an empty graph without paying for a ts.Program. Angular markers
+// (@Component/bootstrapApplication) are included so an Angular app that uses no
+// Inversify decorator isn't short-circuited to empty.
 const DI_MARKERS = [
     '@Controller(',
     '@provideSingleton',
@@ -39,25 +41,46 @@ const DI_MARKERS = [
     '@injectable',
     'new ContainerModule',
     '@inject(',
+    '@Component(',
+    'bootstrapApplication',
 ];
-function sourceHasDiMarkers(dir) {
+const ANGULAR_MARKERS = ['@Component(', 'bootstrapApplication'];
+const CONTROLLER_MARKER = '@Controller(';
+/** Recursively read every project .ts file, folding each into `visit`. */
+function forEachSourceFile(dir, visit) {
     if (!fs.existsSync(dir))
-        return false;
+        return;
     for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
         const full = path.join(dir, entry.name);
         if (entry.isDirectory()) {
             if (entry.name === 'node_modules' || entry.name === 'dist')
                 continue;
-            if (sourceHasDiMarkers(full))
-                return true;
+            forEachSourceFile(full, visit);
         }
         else if (entry.name.endsWith('.ts') && !entry.name.endsWith('.d.ts')) {
-            const content = fs.readFileSync(full, 'utf-8');
-            if (DI_MARKERS.some((marker) => content.includes(marker)))
-                return true;
+            visit(fs.readFileSync(full, 'utf-8'));
         }
     }
-    return false;
+}
+function sourceHasDiMarkers(dir) {
+    let found = false;
+    forEachSourceFile(dir, (content) => {
+        if (!found && DI_MARKERS.some((marker) => content.includes(marker)))
+            found = true;
+    });
+    return found;
+}
+/** Pre-scan a project's source for the framework markers used when no tag is set. */
+function detectFrameworkMarkers(dir) {
+    let angular = false;
+    let controller = false;
+    forEachSourceFile(dir, (content) => {
+        if (!angular && ANGULAR_MARKERS.some((marker) => content.includes(marker)))
+            angular = true;
+        if (!controller && content.includes(CONTROLLER_MARKER))
+            controller = true;
+    });
+    return new analyzer_strategy_1.FrameworkMarkers(angular, controller);
 }
 function writeDesignFiles(projectRootAbs, graph) {
     fs.writeFileSync(path.join(projectRootAbs, 'design.json'), (0, serializer_1.toDesignJson)(graph));
@@ -74,10 +97,11 @@ async function runExecutor(_options, context) {
     const projectConfig = context.projectsConfigurations?.projects[projectName];
     const projectRoot = projectConfig?.root ?? '.';
     const projectRootAbs = path.join(context.root, projectRoot);
+    const srcDir = path.join(projectRootAbs, 'src');
     console.log(`\n🧬 Generating DI design graph for ${projectName}\n`);
     // eslint-disable-next-line @webpieces/no-unmanaged-exceptions -- chokepoint: a generator crash must produce an actionable failure, not a stack trace mid-build
     try {
-        if (!sourceHasDiMarkers(path.join(projectRootAbs, 'src'))) {
+        if (!sourceHasDiMarkers(srcDir)) {
             console.log('   No DI markers found — writing empty design graph');
             writeDesignFiles(projectRootAbs, new model_1.DiGraph(projectName));
             return { success: true };
@@ -88,7 +112,13 @@ async function runExecutor(_options, context) {
             writeDesignFiles(projectRootAbs, new model_1.DiGraph(projectName));
             return { success: true };
         }
-        const graph = (0, analyzer_1.buildDiGraph)(program, context.root, projectRoot, projectName);
+        // Select the analyzer by framework: express → Inversify, angular →
+        // Angular, else skip. The explicit `framework:` nx tag wins; a marker
+        // pre-scan corroborates only when the tag is absent.
+        const framework = (0, analyzer_strategy_1.explicitFrameworkTag)(projectConfig?.tags ?? []);
+        const analyzer = (0, analyzer_strategy_1.selectAnalyzer)(framework, detectFrameworkMarkers(srcDir));
+        console.log(`   Analyzer: ${analyzer.constructor.name} (framework tag: ${framework ?? 'none'})`);
+        const graph = analyzer.analyzeProject(program, context.root, projectRoot, projectName);
         writeDesignFiles(projectRootAbs, graph);
         const nodeCount = graph.designs.reduce((sum, d) => sum + d.nodes.length, 0);
         const edgeCount = graph.designs.reduce((sum, d) => sum + d.edges.length, 0);

package/src/executors/di-graph-generate/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/nx-webpieces-rules/src/executors/di-graph-generate/executor.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * DI Graph Generate Executor\n *\n * Per-project: statically analyzes the project's Inversify dependency DAG\n * (constructor injection from controllers — or library top-of-DAG classes —\n * down to leaves) and writes two checked-in files at the project root:\n *\n *   design.json — machine-readable graph (deterministic, sorted)\n *   design.md   — Mermaid diagram rendered by GitHub/IDEs in PRs\n *\n * Runs on every build (cache:false; the build gates on\n * validate-di-graph-unchanged which dependsOn this target). Unrecognized DI\n * patterns become \"unresolved\" nodes rather than failing the build.\n *\n * Config (webpieces.config.json, rule key `di-graph`): mode RUN_EVERY_TIME | OFF.\n *\n * Usage: nx run <project>:di-graph-generate\n */\n\nimport type { ExecutorContext } from '@nx/devkit';\nimport { loadAndValidate } from '@webpieces/rules-config';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport { buildDiGraph } from '../../lib/di-graph/analyzer';\nimport { createProjectProgram } from '../../lib/di-graph/program';\nimport { toDesignJson } from '../../lib/di-graph/serializer';\nimport { toDesignMarkdown } from '../../lib/di-graph/mermaid';\nimport { DiDesign, DiGraph } from '../../lib/di-graph/model';\nimport { toError } from '../../toError';\n\nexport interface DiGraphGenerateOptions {\n    // No options here — config comes from webpieces.config.json at runtime.\n}\n\nexport interface ExecutorResult {\n    success: boolean;\n}\n\nconst RULE_NAME = 'di-graph';\n\n// Cheap substring pre-scan: a project whose source never mentions any DI marker\n// gets an empty graph without paying for a ts.Program.\nconst DI_MARKERS = [\n    '@Controller(',\n    '@provideSingleton',\n    '@provideTransient',\n    '@injectable',\n    'new ContainerModule',\n    '@inject(',\n];\n\nfunction sourceHasDiMarkers(dir: string): boolean {\n    if (!fs.existsSync(dir)) return false;\n    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {\n        const full = path.join(dir, entry.name);\n        if (entry.isDirectory()) {\n            if (entry.name === 'node_modules' || entry.name === 'dist') continue;\n            if (sourceHasDiMarkers(full)) return true;\n        } else if (entry.name.endsWith('.ts') && !entry.name.endsWith('.d.ts')) {\n            const content = fs.readFileSync(full, 'utf-8');\n            if (DI_MARKERS.some((marker: string) => content.includes(marker))) return true;\n        }\n    }\n    return false;\n}\n\nfunction writeDesignFiles(projectRootAbs: string, graph: DiGraph): void {\n    fs.writeFileSync(path.join(projectRootAbs, 'design.json'), toDesignJson(graph));\n    fs.writeFileSync(path.join(projectRootAbs, 'design.md'), toDesignMarkdown(graph));\n}\n\nexport default async function runExecutor(\n    _options: DiGraphGenerateOptions,\n    context: ExecutorContext,\n): Promise<ExecutorResult> {\n    const shared = loadAndValidate(context.root).resolved;\n    const rule = shared.rules.get(RULE_NAME);\n    if (rule && rule.isOff) {\n        console.log(`\\n⏭️  Skipping ${RULE_NAME} generation (mode: OFF)\\n`);\n        return { success: true };\n    }\n\n    const projectName = context.projectName ?? 'project';\n    const projectConfig = context.projectsConfigurations?.projects[projectName];\n    const projectRoot = projectConfig?.root ?? '.';\n    const projectRootAbs = path.join(context.root, projectRoot);\n\n    console.log(`\\n🧬 Generating DI design graph for ${projectName}\\n`);\n\n    // eslint-disable-next-line @webpieces/no-unmanaged-exceptions -- chokepoint: a generator crash must produce an actionable failure, not a stack trace mid-build\n    try {\n        if (!sourceHasDiMarkers(path.join(projectRootAbs, 'src'))) {\n            console.log('   No DI markers found — writing empty design graph');\n            writeDesignFiles(projectRootAbs, new DiGraph(projectName));\n            return { success: true };\n        }\n\n        const program = createProjectProgram(projectRootAbs);\n        if (!program) {\n            console.log('   No usable tsconfig/source — writing empty design graph');\n            writeDesignFiles(projectRootAbs, new DiGraph(projectName));\n            return { success: true };\n        }\n\n        const graph = buildDiGraph(program, context.root, projectRoot, projectName);\n        writeDesignFiles(projectRootAbs, graph);\n\n        const nodeCount = graph.designs.reduce((sum: number, d: DiDesign) => sum + d.nodes.length, 0);\n        const edgeCount = graph.designs.reduce((sum: number, d: DiDesign) => sum + d.edges.length, 0);\n        console.log(\n            `✅ Wrote ${projectRoot}/design.json + design.md ` +\n                `(${graph.designs.length} design(s), ${nodeCount} node(s), ${edgeCount} edge(s))`,\n        );\n        const unresolved = [...new Set(graph.designs.flatMap((d: DiDesign) => d.unresolved))];\n        if (unresolved.length > 0) {\n            console.warn(`⚠️  ${unresolved.length} unresolved token(s)/type(s): ${unresolved.join(', ')}`);\n        }\n        return { success: true };\n    } catch (err: unknown) {\n        const error = toError(err);\n        console.error(`❌ DI graph generation failed for ${projectName}: ${error.message}`);\n        console.error(`   To unblock builds, set rules[\"${RULE_NAME}\"].mode=\"OFF\" in webpieces.config.json.`);\n        return { success: false };\n    }\n}\n"]}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/nx-webpieces-rules/src/executors/di-graph-generate/executor.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * DI Graph Generate Executor\n *\n * Per-project: statically analyzes the project's Inversify dependency DAG\n * (constructor injection from controllers — or library top-of-DAG classes —\n * down to leaves) and writes two checked-in files at the project root:\n *\n *   design.json — machine-readable graph (deterministic, sorted)\n *   design.md   — Mermaid diagram rendered by GitHub/IDEs in PRs\n *\n * Runs on every build (cache:false; the build gates on\n * validate-di-graph-unchanged which dependsOn this target). Unrecognized DI\n * patterns become \"unresolved\" nodes rather than failing the build.\n *\n * Config (webpieces.config.json, rule key `di-graph`): mode RUN_EVERY_TIME | OFF.\n *\n * Usage: nx run <project>:di-graph-generate\n */\n\nimport type { ExecutorContext } from '@nx/devkit';\nimport { loadAndValidate } from '@webpieces/rules-config';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport {\n    explicitFrameworkTag,\n    FrameworkMarkers,\n    selectAnalyzer,\n} from '../../lib/di-graph/analyzer-strategy';\nimport { createProjectProgram } from '../../lib/di-graph/program';\nimport { toDesignJson } from '../../lib/di-graph/serializer';\nimport { toDesignMarkdown } from '../../lib/di-graph/mermaid';\nimport { DiDesign, DiGraph } from '../../lib/di-graph/model';\nimport { toError } from '../../toError';\n\nexport interface DiGraphGenerateOptions {\n    // No options here — config comes from webpieces.config.json at runtime.\n}\n\nexport interface ExecutorResult {\n    success: boolean;\n}\n\nconst RULE_NAME = 'di-graph';\n\n// Cheap substring pre-scan: a project whose source never mentions any DI marker\n// gets an empty graph without paying for a ts.Program. Angular markers\n// (@Component/bootstrapApplication) are included so an Angular app that uses no\n// Inversify decorator isn't short-circuited to empty.\nconst DI_MARKERS = [\n    '@Controller(',\n    '@provideSingleton',\n    '@provideTransient',\n    '@injectable',\n    'new ContainerModule',\n    '@inject(',\n    '@Component(',\n    'bootstrapApplication',\n];\n\nconst ANGULAR_MARKERS = ['@Component(', 'bootstrapApplication'];\nconst CONTROLLER_MARKER = '@Controller(';\n\n/** Recursively read every project .ts file, folding each into `visit`. */\nfunction forEachSourceFile(dir: string, visit: (content: string) => void): void {\n    if (!fs.existsSync(dir)) return;\n    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {\n        const full = path.join(dir, entry.name);\n        if (entry.isDirectory()) {\n            if (entry.name === 'node_modules' || entry.name === 'dist') continue;\n            forEachSourceFile(full, visit);\n        } else if (entry.name.endsWith('.ts') && !entry.name.endsWith('.d.ts')) {\n            visit(fs.readFileSync(full, 'utf-8'));\n        }\n    }\n}\n\nfunction sourceHasDiMarkers(dir: string): boolean {\n    let found = false;\n    forEachSourceFile(dir, (content: string) => {\n        if (!found && DI_MARKERS.some((marker: string) => content.includes(marker))) found = true;\n    });\n    return found;\n}\n\n/** Pre-scan a project's source for the framework markers used when no tag is set. */\nfunction detectFrameworkMarkers(dir: string): FrameworkMarkers {\n    let angular = false;\n    let controller = false;\n    forEachSourceFile(dir, (content: string) => {\n        if (!angular && ANGULAR_MARKERS.some((marker: string) => content.includes(marker))) angular = true;\n        if (!controller && content.includes(CONTROLLER_MARKER)) controller = true;\n    });\n    return new FrameworkMarkers(angular, controller);\n}\n\nfunction writeDesignFiles(projectRootAbs: string, graph: DiGraph): void {\n    fs.writeFileSync(path.join(projectRootAbs, 'design.json'), toDesignJson(graph));\n    fs.writeFileSync(path.join(projectRootAbs, 'design.md'), toDesignMarkdown(graph));\n}\n\nexport default async function runExecutor(\n    _options: DiGraphGenerateOptions,\n    context: ExecutorContext,\n): Promise<ExecutorResult> {\n    const shared = loadAndValidate(context.root).resolved;\n    const rule = shared.rules.get(RULE_NAME);\n    if (rule && rule.isOff) {\n        console.log(`\\n⏭️  Skipping ${RULE_NAME} generation (mode: OFF)\\n`);\n        return { success: true };\n    }\n\n    const projectName = context.projectName ?? 'project';\n    const projectConfig = context.projectsConfigurations?.projects[projectName];\n    const projectRoot = projectConfig?.root ?? '.';\n    const projectRootAbs = path.join(context.root, projectRoot);\n    const srcDir = path.join(projectRootAbs, 'src');\n\n    console.log(`\\n🧬 Generating DI design graph for ${projectName}\\n`);\n\n    // eslint-disable-next-line @webpieces/no-unmanaged-exceptions -- chokepoint: a generator crash must produce an actionable failure, not a stack trace mid-build\n    try {\n        if (!sourceHasDiMarkers(srcDir)) {\n            console.log('   No DI markers found — writing empty design graph');\n            writeDesignFiles(projectRootAbs, new DiGraph(projectName));\n            return { success: true };\n        }\n\n        const program = createProjectProgram(projectRootAbs);\n        if (!program) {\n            console.log('   No usable tsconfig/source — writing empty design graph');\n            writeDesignFiles(projectRootAbs, new DiGraph(projectName));\n            return { success: true };\n        }\n\n        // Select the analyzer by framework: express → Inversify, angular →\n        // Angular, else skip. The explicit `framework:` nx tag wins; a marker\n        // pre-scan corroborates only when the tag is absent.\n        const framework = explicitFrameworkTag(projectConfig?.tags ?? []);\n        const analyzer = selectAnalyzer(framework, detectFrameworkMarkers(srcDir));\n        console.log(`   Analyzer: ${analyzer.constructor.name} (framework tag: ${framework ?? 'none'})`);\n\n        const graph = analyzer.analyzeProject(program, context.root, projectRoot, projectName);\n        writeDesignFiles(projectRootAbs, graph);\n\n        const nodeCount = graph.designs.reduce((sum: number, d: DiDesign) => sum + d.nodes.length, 0);\n        const edgeCount = graph.designs.reduce((sum: number, d: DiDesign) => sum + d.edges.length, 0);\n        console.log(\n            `✅ Wrote ${projectRoot}/design.json + design.md ` +\n                `(${graph.designs.length} design(s), ${nodeCount} node(s), ${edgeCount} edge(s))`,\n        );\n        const unresolved = [...new Set(graph.designs.flatMap((d: DiDesign) => d.unresolved))];\n        if (unresolved.length > 0) {\n            console.warn(`⚠️  ${unresolved.length} unresolved token(s)/type(s): ${unresolved.join(', ')}`);\n        }\n        return { success: true };\n    } catch (err: unknown) {\n        const error = toError(err);\n        console.error(`❌ DI graph generation failed for ${projectName}: ${error.message}`);\n        console.error(`   To unblock builds, set rules[\"${RULE_NAME}\"].mode=\"OFF\" in webpieces.config.json.`);\n        return { success: false };\n    }\n}\n"]}

package/src/lib/di-graph/analyzer-strategy.d.ts

@@ -0,0 +1,47 @@
+/**
+ * DI Analyzer Strategy
+ *
+ * Picks which DI analyzer generates a project's design graph, driven by the
+ * project's `framework` nx tag (see the framework/libType tagging PR):
+ *
+ *   - `express` → {@link InversifyAnalyzer} (roots on `@Controller`)
+ *   - `angular` → {@link AngularAnalyzer}  (roots on the bootstrap/route components)
+ *   - anything else (`react`, `all`, ...) → {@link EmptyAnalyzer} (skip; the
+ *     controller-less library top-of-DAG behavior is deferred for v1)
+ *
+ * The explicit tag is the source of truth. When it is ABSENT (e.g. before the
+ * tagging PR lands), a cheap marker pre-scan corroborates: `@Component(` /
+ * `bootstrapApplication` → angular; `@Controller(` → express. This makes the
+ * committed design.* identical whether selection is tag- or marker-driven.
+ */
+import type * as ts from 'typescript';
+import { DiGraph } from './model';
+/** Which framework a source tree's decorators point at (marker pre-scan fallback). */
+export declare class FrameworkMarkers {
+    angular: boolean;
+    controller: boolean;
+    constructor(angular: boolean, controller: boolean);
+}
+/** Statically analyzes one project's DI dependency DAG into a `DiGraph`. */
+export interface DiAnalyzer {
+    analyzeProject(program: ts.Program, workspaceRoot: string, projectRoot: string, projectName: string): DiGraph;
+}
+/** Inversify (express): one design per `@Controller` root. Library roots deferred (v1). */
+export declare class InversifyAnalyzer implements DiAnalyzer {
+    analyzeProject(program: ts.Program, workspaceRoot: string, projectRoot: string, projectName: string): DiGraph;
+}
+/** Angular: one design per entry component (bootstrap + routed). */
+export declare class AngularAnalyzer implements DiAnalyzer {
+    analyzeProject(program: ts.Program, workspaceRoot: string, projectRoot: string, projectName: string): DiGraph;
+}
+/** Non-angular/non-express projects: an empty graph (skip). */
+export declare class EmptyAnalyzer implements DiAnalyzer {
+    analyzeProject(_program: ts.Program, _workspaceRoot: string, _projectRoot: string, projectName: string): DiGraph;
+}
+/** Extract the explicit `framework:<value>` nx tag, or null when the project has none. */
+export declare function explicitFrameworkTag(tags: readonly string[]): string | null;
+/**
+ * Choose the analyzer for a project. `framework` is the EXPLICIT tag value (or
+ * null); `markers` is only consulted when the tag is absent.
+ */
+export declare function selectAnalyzer(framework: string | null, markers: FrameworkMarkers): DiAnalyzer;

package/src/lib/di-graph/analyzer-strategy.js

@@ -0,0 +1,86 @@
+"use strict";
+/**
+ * DI Analyzer Strategy
+ *
+ * Picks which DI analyzer generates a project's design graph, driven by the
+ * project's `framework` nx tag (see the framework/libType tagging PR):
+ *
+ *   - `express` → {@link InversifyAnalyzer} (roots on `@Controller`)
+ *   - `angular` → {@link AngularAnalyzer}  (roots on the bootstrap/route components)
+ *   - anything else (`react`, `all`, ...) → {@link EmptyAnalyzer} (skip; the
+ *     controller-less library top-of-DAG behavior is deferred for v1)
+ *
+ * The explicit tag is the source of truth. When it is ABSENT (e.g. before the
+ * tagging PR lands), a cheap marker pre-scan corroborates: `@Component(` /
+ * `bootstrapApplication` → angular; `@Controller(` → express. This makes the
+ * committed design.* identical whether selection is tag- or marker-driven.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmptyAnalyzer = exports.AngularAnalyzer = exports.InversifyAnalyzer = exports.FrameworkMarkers = void 0;
+exports.explicitFrameworkTag = explicitFrameworkTag;
+exports.selectAnalyzer = selectAnalyzer;
+const model_1 = require("./model");
+const analyzer_1 = require("./analyzer");
+const angular_analyzer_1 = require("./angular-analyzer");
+const FRAMEWORK_TAG_PREFIX = 'framework:';
+/** Which framework a source tree's decorators point at (marker pre-scan fallback). */
+class FrameworkMarkers {
+    angular;
+    controller;
+    constructor(angular, controller) {
+        this.angular = angular;
+        this.controller = controller;
+    }
+}
+exports.FrameworkMarkers = FrameworkMarkers;
+/** Inversify (express): one design per `@Controller` root. Library roots deferred (v1). */
+class InversifyAnalyzer {
+    analyzeProject(program, workspaceRoot, projectRoot, projectName) {
+        return (0, analyzer_1.buildDiGraph)(program, workspaceRoot, projectRoot, projectName);
+    }
+}
+exports.InversifyAnalyzer = InversifyAnalyzer;
+/** Angular: one design per entry component (bootstrap + routed). */
+class AngularAnalyzer {
+    analyzeProject(program, workspaceRoot, projectRoot, projectName) {
+        return (0, angular_analyzer_1.buildAngularDiGraph)(program, workspaceRoot, projectRoot, projectName);
+    }
+}
+exports.AngularAnalyzer = AngularAnalyzer;
+/** Non-angular/non-express projects: an empty graph (skip). */
+class EmptyAnalyzer {
+    analyzeProject(_program, _workspaceRoot, _projectRoot, projectName) {
+        return new model_1.DiGraph(projectName);
+    }
+}
+exports.EmptyAnalyzer = EmptyAnalyzer;
+/** Extract the explicit `framework:<value>` nx tag, or null when the project has none. */
+function explicitFrameworkTag(tags) {
+    for (const tag of tags) {
+        if (tag.startsWith(FRAMEWORK_TAG_PREFIX)) {
+            const value = tag.slice(FRAMEWORK_TAG_PREFIX.length).trim();
+            if (value.length > 0)
+                return value;
+        }
+    }
+    return null;
+}
+/**
+ * Choose the analyzer for a project. `framework` is the EXPLICIT tag value (or
+ * null); `markers` is only consulted when the tag is absent.
+ */
+function selectAnalyzer(framework, markers) {
+    if (framework === 'express')
+        return new InversifyAnalyzer();
+    if (framework === 'angular')
+        return new AngularAnalyzer();
+    if (framework !== null)
+        return new EmptyAnalyzer();
+    // Tag absent — fall back to marker corroboration.
+    if (markers.angular)
+        return new AngularAnalyzer();
+    if (markers.controller)
+        return new InversifyAnalyzer();
+    return new EmptyAnalyzer();
+}
+//# sourceMappingURL=analyzer-strategy.js.map

package/src/lib/di-graph/analyzer-strategy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"analyzer-strategy.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/nx-webpieces-rules/src/lib/di-graph/analyzer-strategy.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAoDH,oDAQC;AAMD,wCASC;AAxED,mCAAkC;AAClC,yCAA0C;AAC1C,yDAAyD;AAEzD,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAE1C,sFAAsF;AACtF,MAAa,gBAAgB;IACzB,OAAO,CAAU;IACjB,UAAU,CAAU;IAEpB,YAAY,OAAgB,EAAE,UAAmB;QAC7C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;CACJ;AARD,4CAQC;AAOD,2FAA2F;AAC3F,MAAa,iBAAiB;IAC1B,cAAc,CAAC,OAAmB,EAAE,aAAqB,EAAE,WAAmB,EAAE,WAAmB;QAC/F,OAAO,IAAA,uBAAY,EAAC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAC1E,CAAC;CACJ;AAJD,8CAIC;AAED,oEAAoE;AACpE,MAAa,eAAe;IACxB,cAAc,CAAC,OAAmB,EAAE,aAAqB,EAAE,WAAmB,EAAE,WAAmB;QAC/F,OAAO,IAAA,sCAAmB,EAAC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IACjF,CAAC;CACJ;AAJD,0CAIC;AAED,+DAA+D;AAC/D,MAAa,aAAa;IACtB,cAAc,CACV,QAAoB,EACpB,cAAsB,EACtB,YAAoB,EACpB,WAAmB;QAEnB,OAAO,IAAI,eAAO,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;CACJ;AATD,sCASC;AAED,0FAA0F;AAC1F,SAAgB,oBAAoB,CAAC,IAAuB;IACxD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YAC5D,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAC;QACvC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,SAAgB,cAAc,CAAC,SAAwB,EAAE,OAAyB;IAC9E,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,IAAI,iBAAiB,EAAE,CAAC;IAC5D,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,IAAI,eAAe,EAAE,CAAC;IAC1D,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO,IAAI,aAAa,EAAE,CAAC;IAEnD,kDAAkD;IAClD,IAAI,OAAO,CAAC,OAAO;QAAE,OAAO,IAAI,eAAe,EAAE,CAAC;IAClD,IAAI,OAAO,CAAC,UAAU;QAAE,OAAO,IAAI,iBAAiB,EAAE,CAAC;IACvD,OAAO,IAAI,aAAa,EAAE,CAAC;AAC/B,CAAC","sourcesContent":["/**\n * DI Analyzer Strategy\n *\n * Picks which DI analyzer generates a project's design graph, driven by the\n * project's `framework` nx tag (see the framework/libType tagging PR):\n *\n *   - `express` → {@link InversifyAnalyzer} (roots on `@Controller`)\n *   - `angular` → {@link AngularAnalyzer}  (roots on the bootstrap/route components)\n *   - anything else (`react`, `all`, ...) → {@link EmptyAnalyzer} (skip; the\n *     controller-less library top-of-DAG behavior is deferred for v1)\n *\n * The explicit tag is the source of truth. When it is ABSENT (e.g. before the\n * tagging PR lands), a cheap marker pre-scan corroborates: `@Component(` /\n * `bootstrapApplication` → angular; `@Controller(` → express. This makes the\n * committed design.* identical whether selection is tag- or marker-driven.\n */\n\nimport type * as ts from 'typescript';\nimport { DiGraph } from './model';\nimport { buildDiGraph } from './analyzer';\nimport { buildAngularDiGraph } from './angular-analyzer';\n\nconst FRAMEWORK_TAG_PREFIX = 'framework:';\n\n/** Which framework a source tree's decorators point at (marker pre-scan fallback). */\nexport class FrameworkMarkers {\n    angular: boolean;\n    controller: boolean;\n\n    constructor(angular: boolean, controller: boolean) {\n        this.angular = angular;\n        this.controller = controller;\n    }\n}\n\n/** Statically analyzes one project's DI dependency DAG into a `DiGraph`. */\nexport interface DiAnalyzer {\n    analyzeProject(program: ts.Program, workspaceRoot: string, projectRoot: string, projectName: string): DiGraph;\n}\n\n/** Inversify (express): one design per `@Controller` root. Library roots deferred (v1). */\nexport class InversifyAnalyzer implements DiAnalyzer {\n    analyzeProject(program: ts.Program, workspaceRoot: string, projectRoot: string, projectName: string): DiGraph {\n        return buildDiGraph(program, workspaceRoot, projectRoot, projectName);\n    }\n}\n\n/** Angular: one design per entry component (bootstrap + routed). */\nexport class AngularAnalyzer implements DiAnalyzer {\n    analyzeProject(program: ts.Program, workspaceRoot: string, projectRoot: string, projectName: string): DiGraph {\n        return buildAngularDiGraph(program, workspaceRoot, projectRoot, projectName);\n    }\n}\n\n/** Non-angular/non-express projects: an empty graph (skip). */\nexport class EmptyAnalyzer implements DiAnalyzer {\n    analyzeProject(\n        _program: ts.Program,\n        _workspaceRoot: string,\n        _projectRoot: string,\n        projectName: string,\n    ): DiGraph {\n        return new DiGraph(projectName);\n    }\n}\n\n/** Extract the explicit `framework:<value>` nx tag, or null when the project has none. */\nexport function explicitFrameworkTag(tags: readonly string[]): string | null {\n    for (const tag of tags) {\n        if (tag.startsWith(FRAMEWORK_TAG_PREFIX)) {\n            const value = tag.slice(FRAMEWORK_TAG_PREFIX.length).trim();\n            if (value.length > 0) return value;\n        }\n    }\n    return null;\n}\n\n/**\n * Choose the analyzer for a project. `framework` is the EXPLICIT tag value (or\n * null); `markers` is only consulted when the tag is absent.\n */\nexport function selectAnalyzer(framework: string | null, markers: FrameworkMarkers): DiAnalyzer {\n    if (framework === 'express') return new InversifyAnalyzer();\n    if (framework === 'angular') return new AngularAnalyzer();\n    if (framework !== null) return new EmptyAnalyzer();\n\n    // Tag absent — fall back to marker corroboration.\n    if (markers.angular) return new AngularAnalyzer();\n    if (markers.controller) return new InversifyAnalyzer();\n    return new EmptyAnalyzer();\n}\n"]}

package/src/lib/di-graph/analyzer.d.ts

@@ -14,11 +14,134 @@
  * (the tops of the local DAG).
  */
 import * as ts from 'typescript';
-import { DiGraph } from './model';
+import { DiDesign, DiGraph, DiNodeKind, DiScope } from './model';
+import { BindingTable } from './bindings';
+export declare class ParamInjection {
+    expr: ts.Expression | null;
+    multi: boolean;
+    optional: boolean;
+    unmanaged: boolean;
+    constructor(expr: ts.Expression | null, multi: boolean, optional: boolean, unmanaged: boolean);
+}
+export declare function readParamDecorators(param: ts.ParameterDeclaration): ParamInjection;
 export declare function isControllerClass(cls: ts.ClassDeclaration): boolean;
+export declare function findConstructor(cls: ts.ClassDeclaration): ts.ConstructorDeclaration | null;
+/** All class declarations in files under the project root. */
+export declare function projectClasses(program: ts.Program, workspaceRoot: string, projectRoot: string): ts.ClassDeclaration[];
 /**
- * Build the full DI graph for one project: one self-contained `DiDesign` per
- * root — every @Controller class, or (when the project has no controllers)
- * every top-of-DAG DI class. `projectRoot` is workspace-relative.
+ * One normalized injection site, framework-agnostic — produced by a builder's
+ * `collectInjections(cls)` hook and processed by the shared base. Inversify
+ * emits `token`/`type` from constructor params; Angular emits `angularToken`
+ * from constructor params AND `inject()` field initializers.
+ *
+ * Modes:
+ *   - `token`        Inversify `@inject`/`@multiInject`: table lookup; an unbound
+ *                    token becomes an `unresolved` node (no class fallback).
+ *   - `type`         Inversify bare typed param: resolve the declared TYPE to a
+ *                    class (inject-by-type); no table lookup.
+ *   - `angularToken` Angular `inject(T)` / `@Inject(T)` / bare typed ctor param:
+ *                    table lookup FIRST (provider table), then fall back to
+ *                    resolving the token expression as a class, else unresolved.
+ */
+export declare class Injection {
+    mode: 'token' | 'type' | 'angularToken';
+    /** Token/type expression (modes `token`/`angularToken`, or the type identifier for `type`). */
+    expr: ts.Expression | ts.Identifier | null;
+    multi: boolean;
+    optional: boolean;
+    paramName: string;
+    paramType: string;
+    constructor(mode: 'token' | 'type' | 'angularToken', expr: ts.Expression | ts.Identifier | null, paramName: string, paramType: string, multi?: boolean, optional?: boolean);
+}
+/**
+ * Builds ONE self-contained `DiDesign` for a single root. A fresh instance is
+ * created per root so its maps (visited/classIds/usedIds/...) are scoped to
+ * that root's tree — a dependency shared by two roots is therefore walked
+ * (and duplicated) into each root's design, not hidden under whichever root
+ * reached it first.
+ *
+ * Framework-agnostic base: subclasses implement {@link collectInjections} (and
+ * override {@link rootKindOf} for Angular components); everything else — node
+ * ids, leaf/unresolved labeling, token→binding resolution, factory-dep edges,
+ * level assignment — is shared so Inversify and Angular render identically.
+ */
+export declare abstract class DiDesignBuilder {
+    protected readonly checker: ts.TypeChecker;
+    protected readonly table: BindingTable;
+    protected readonly workspaceRoot: string;
+    protected readonly design: DiDesign;
+    private readonly classIds;
+    private readonly leafIds;
+    private readonly unresolvedIds;
+    private readonly usedIds;
+    private readonly visited;
+    constructor(checker: ts.TypeChecker, table: BindingTable, workspaceRoot: string, design: DiDesign);
+    /** Collect the injection sites for one class (constructor params, field inject(), ...). */
+    protected abstract collectInjections(cls: ts.ClassDeclaration): Injection[];
+    /** Node kind for a root/reached class — `controller` (Inversify) or `component` (Angular). */
+    protected rootKindOf(cls: ts.ClassDeclaration): DiNodeKind;
+    addRoot(cls: ts.ClassDeclaration): void;
+    /**
+     * Register (or fetch) the node for a class, returning its stable id.
+     * `scopeHint` carries the scope of the module binding the class was reached
+     * through (e.g. bind(TOKEN).to(X).inSingletonScope() where X is not self-bound).
+     */
+    protected classNode(cls: ts.ClassDeclaration, scopeHint?: DiScope): string;
+    private claimId;
+    /** Scope from the class's own decorator/module binding, if any. */
+    private classScope;
+    /**
+     * Leaf box for a constant/dynamic binding. B0: the box is labeled by the
+     * DECLARED param TYPE (e.g. `FirestoreConfig`, `ClientConfig`) — the DI
+     * contract — while the bound expression (`buildConfigFromEnv(...)` /
+     * `TOKEN (dynamic)`) is kept as `detail`. A dynamic leaf also fans out to
+     * each of its `useFactory` `deps` (Angular; empty for Inversify).
+     */
+    private leafNode;
+    /** Edges from a `useFactory` leaf to each declared `deps: [...]` token (Angular). */
+    private expandFactoryDeps;
+    /**
+     * `unresolved` placeholder box. B0: labeled by the declared param TYPE
+     * (`className`) with the resolving token expression kept as `detail` (and
+     * surfaced in `design.unresolved` for diagnostics).
+     */
+    private unresolvedNode;
+    protected walkClass(cls: ts.ClassDeclaration): void;
+    /** Resolve one injection to a node and record the edge(s). Never throws. */
+    private processInjection;
+    /** Inversify `@inject`/`@multiInject` and Angular `inject()`/`@Inject`/bare token. */
+    private processTokenInjection;
+    private bindingTarget;
+    /** Inversify bare typed param — resolve the declared type directly to a class. */
+    private processTypeInjection;
+}
+/**
+ * Inversify builder: injection sites are constructor params — `@inject`/
+ * `@multiInject` tokens or bare typed (inject-by-type) params.
+ */
+export declare class InversifyDesignBuilder extends DiDesignBuilder {
+    protected collectInjections(cls: ts.ClassDeclaration): Injection[];
+}
+export declare function byClassName(a: ts.ClassDeclaration, b: ts.ClassDeclaration): number;
+/**
+ * Assign each node its BFS shortest-path depth from the design's root (root =
+ * level 0, its direct injections = level 1, ...) and record the deepest level.
+ * A node reached from multiple parents keeps its SHALLOWEST depth. Cycles are
+ * safe: a node is levelled once, the first (shallowest) time BFS reaches it.
+ */
+export declare function assignLevels(design: DiDesign): void;
+/**
+ * Build one self-contained downward design tree for a single root class, using
+ * the builder produced by `makeBuilder` (Inversify or Angular). `rootKind` is
+ * the node kind for the root box (`controller`/`component`/`class`).
+ */
+export declare function buildDesign(root: ts.ClassDeclaration, rootKind: DiNodeKind, workspaceRoot: string, makeBuilder: (design: DiDesign) => DiDesignBuilder): DiDesign;
+/**
+ * Build the full Inversify DI graph for one project: one self-contained
+ * `DiDesign` per @Controller root. `projectRoot` is workspace-relative.
+ *
+ * `includeLibraryRoots` (default false, the v1 executor path) roots ONLY on
+ * @Controller classes; when true, a controller-less project falls back to its
+ * top-of-DAG DI classes (the deferred library behavior, still unit-tested).
  */
-export declare function buildDiGraph(program: ts.Program, workspaceRoot: string, projectRoot: string, projectName: string): DiGraph;
+export declare function buildDiGraph(program: ts.Program, workspaceRoot: string, projectRoot: string, projectName: string, includeLibraryRoots?: boolean): DiGraph;