@webpieces/dev-config 0.2.69 → 0.2.71

package/architecture/executors/validate-return-types/executor.ts

@@ -0,0 +1,446 @@
+/**
+ * Validate Return Types Executor
+ *
+ * Validates that methods have explicit return type annotations for better code readability.
+ * Instead of relying on TypeScript's type inference, explicit return types make code clearer:
+ *
+ * BAD:  method() { return new MyClass(); }
+ * GOOD: method(): MyClass { return new MyClass(); }
+ * GOOD: async method(): Promise<MyType> { ... }
+ *
+ * Modes:
+ * - OFF: Skip validation entirely
+ * - MODIFIED_NEW: Only validate new methods (detected via git diff)
+ * - MODIFIED: Validate all methods in modified files
+ * - ALL: Validate all methods in all TypeScript files
+ *
+ * Escape hatch: Add webpieces-disable require-return-type comment with justification
+ */
+
+import type { ExecutorContext } from '@nx/devkit';
+import { execSync } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as ts from 'typescript';
+
+export type ReturnTypeMode = 'OFF' | 'MODIFIED_NEW' | 'MODIFIED' | 'ALL';
+
+export interface ValidateReturnTypesOptions {
+    mode?: ReturnTypeMode;
+}
+
+export interface ExecutorResult {
+    success: boolean;
+}
+
+interface MethodViolation {
+    file: string;
+    methodName: string;
+    line: number;
+}
+
+/**
+ * Get changed TypeScript files between base and head (or working tree if head not specified).
+ */
+// webpieces-disable max-lines-new-methods -- Git command handling with untracked files requires multiple code paths
+function getChangedTypeScriptFiles(workspaceRoot: string, base: string, head?: string): string[] {
+    try {
+        const diffTarget = head ? `${base} ${head}` : base;
+        const output = execSync(`git diff --name-only ${diffTarget} -- '*.ts' '*.tsx'`, {
+            cwd: workspaceRoot,
+            encoding: 'utf-8',
+        });
+        const changedFiles = output
+            .trim()
+            .split('\n')
+            .filter((f) => f && !f.includes('.spec.ts') && !f.includes('.test.ts'));
+
+        if (!head) {
+            try {
+                const untrackedOutput = execSync(`git ls-files --others --exclude-standard '*.ts' '*.tsx'`, {
+                    cwd: workspaceRoot,
+                    encoding: 'utf-8',
+                });
+                const untrackedFiles = untrackedOutput
+                    .trim()
+                    .split('\n')
+                    .filter((f) => f && !f.includes('.spec.ts') && !f.includes('.test.ts'));
+                const allFiles = new Set([...changedFiles, ...untrackedFiles]);
+                return Array.from(allFiles);
+            } catch {
+                return changedFiles;
+            }
+        }
+
+        return changedFiles;
+    } catch {
+        return [];
+    }
+}
+
+/**
+ * Get all TypeScript files in the workspace (excluding node_modules, dist, tests).
+ */
+function getAllTypeScriptFiles(workspaceRoot: string): string[] {
+    try {
+        const output = execSync(
+            `find packages apps -type f \\( -name "*.ts" -o -name "*.tsx" \\) | grep -v node_modules | grep -v dist | grep -v ".spec.ts" | grep -v ".test.ts"`,
+            {
+                cwd: workspaceRoot,
+                encoding: 'utf-8',
+            }
+        );
+        return output
+            .trim()
+            .split('\n')
+            .filter((f) => f);
+    } catch {
+        return [];
+    }
+}
+
+/**
+ * Get the diff content for a specific file.
+ */
+function getFileDiff(workspaceRoot: string, file: string, base: string, head?: string): string {
+    try {
+        const diffTarget = head ? `${base} ${head}` : base;
+        const diff = execSync(`git diff ${diffTarget} -- "${file}"`, {
+            cwd: workspaceRoot,
+            encoding: 'utf-8',
+        });
+
+        if (!diff && !head) {
+            const fullPath = path.join(workspaceRoot, file);
+            if (fs.existsSync(fullPath)) {
+                const isUntracked = execSync(`git ls-files --others --exclude-standard "${file}"`, {
+                    cwd: workspaceRoot,
+                    encoding: 'utf-8',
+                }).trim();
+
+                if (isUntracked) {
+                    const content = fs.readFileSync(fullPath, 'utf-8');
+                    const lines = content.split('\n');
+                    return lines.map((line) => `+${line}`).join('\n');
+                }
+            }
+        }
+
+        return diff;
+    } catch {
+        return '';
+    }
+}
+
+/**
+ * Parse diff to find newly added method signatures.
+ */
+function findNewMethodSignaturesInDiff(diffContent: string): Set<string> {
+    const newMethods = new Set<string>();
+    const lines = diffContent.split('\n');
+
+    const patterns = [
+        /^\+\s*(?:export\s+)?(?:async\s+)?function\s+(\w+)\s*\(/,
+        /^\+\s*(?:export\s+)?(?:const|let)\s+(\w+)\s*=\s*(?:async\s*)?\(/,
+        /^\+\s*(?:export\s+)?(?:const|let)\s+(\w+)\s*=\s*(?:async\s+)?function/,
+        /^\+\s*(?:(?:public|private|protected)\s+)?(?:static\s+)?(?:async\s+)?(\w+)\s*\(/,
+    ];
+
+    for (const line of lines) {
+        if (line.startsWith('+') && !line.startsWith('+++')) {
+            for (const pattern of patterns) {
+                const match = line.match(pattern);
+                if (match) {
+                    const methodName = match[1];
+                    if (methodName && !['if', 'for', 'while', 'switch', 'catch', 'constructor'].includes(methodName)) {
+                        newMethods.add(methodName);
+                    }
+                    break;
+                }
+            }
+        }
+    }
+
+    return newMethods;
+}
+
+/**
+ * Check if a line contains a webpieces-disable comment for return type.
+ */
+function hasDisableComment(lines: string[], lineNumber: number): boolean {
+    const startCheck = Math.max(0, lineNumber - 5);
+    for (let i = lineNumber - 2; i >= startCheck; i--) {
+        const line = lines[i]?.trim() ?? '';
+        if (line.startsWith('function ') || line.startsWith('class ') || line.endsWith('}')) {
+            break;
+        }
+        if (line.includes('webpieces-disable') && line.includes('require-return-type')) {
+            return true;
+        }
+    }
+    return false;
+}
+
+/**
+ * Check if a method has an explicit return type annotation.
+ */
+function hasExplicitReturnType(node: ts.MethodDeclaration | ts.FunctionDeclaration | ts.ArrowFunction): boolean {
+    return node.type !== undefined;
+}
+
+interface MethodInfo {
+    name: string;
+    line: number;
+    hasReturnType: boolean;
+    hasDisableComment: boolean;
+}
+
+/**
+ * Parse a TypeScript file and find methods with their return type status.
+ */
+// webpieces-disable max-lines-new-methods -- AST traversal requires inline visitor function
+function findMethodsInFile(filePath: string, workspaceRoot: string): MethodInfo[] {
+    const fullPath = path.join(workspaceRoot, filePath);
+    if (!fs.existsSync(fullPath)) return [];
+
+    const content = fs.readFileSync(fullPath, 'utf-8');
+    const fileLines = content.split('\n');
+    const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
+
+    const methods: MethodInfo[] = [];
+
+    // webpieces-disable max-lines-new-methods -- AST visitor pattern requires handling multiple node types
+    function visit(node: ts.Node): void {
+        let methodName: string | undefined;
+        let startLine: number | undefined;
+        let hasReturnType = false;
+
+        if (ts.isMethodDeclaration(node) && node.name) {
+            methodName = node.name.getText(sourceFile);
+            const start = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+            startLine = start.line + 1;
+            hasReturnType = hasExplicitReturnType(node);
+        } else if (ts.isFunctionDeclaration(node) && node.name) {
+            methodName = node.name.getText(sourceFile);
+            const start = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+            startLine = start.line + 1;
+            hasReturnType = hasExplicitReturnType(node);
+        } else if (ts.isArrowFunction(node)) {
+            if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
+                methodName = node.parent.name.getText(sourceFile);
+                const start = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+                startLine = start.line + 1;
+                hasReturnType = hasExplicitReturnType(node);
+            }
+        }
+
+        if (methodName && startLine !== undefined) {
+            methods.push({
+                name: methodName,
+                line: startLine,
+                hasReturnType,
+                hasDisableComment: hasDisableComment(fileLines, startLine),
+            });
+        }
+
+        ts.forEachChild(node, visit);
+    }
+
+    visit(sourceFile);
+    return methods;
+}
+
+/**
+ * Find methods without explicit return types based on mode.
+ */
+// webpieces-disable max-lines-new-methods -- File iteration with diff parsing and method matching
+function findViolationsForModifiedNew(
+    workspaceRoot: string,
+    changedFiles: string[],
+    base: string,
+    head?: string
+): MethodViolation[] {
+    const violations: MethodViolation[] = [];
+
+    for (const file of changedFiles) {
+        const diff = getFileDiff(workspaceRoot, file, base, head);
+        const newMethodNames = findNewMethodSignaturesInDiff(diff);
+
+        if (newMethodNames.size === 0) continue;
+
+        const methods = findMethodsInFile(file, workspaceRoot);
+
+        for (const method of methods) {
+            if (!newMethodNames.has(method.name)) continue;
+            if (method.hasReturnType) continue;
+            if (method.hasDisableComment) continue;
+
+            violations.push({
+                file,
+                methodName: method.name,
+                line: method.line,
+            });
+        }
+    }
+
+    return violations;
+}
+
+/**
+ * Find all methods without explicit return types in modified files.
+ */
+function findViolationsForModified(workspaceRoot: string, changedFiles: string[]): MethodViolation[] {
+    const violations: MethodViolation[] = [];
+
+    for (const file of changedFiles) {
+        const methods = findMethodsInFile(file, workspaceRoot);
+
+        for (const method of methods) {
+            if (method.hasReturnType) continue;
+            if (method.hasDisableComment) continue;
+
+            violations.push({
+                file,
+                methodName: method.name,
+                line: method.line,
+            });
+        }
+    }
+
+    return violations;
+}
+
+/**
+ * Find all methods without explicit return types in all files.
+ */
+function findViolationsForAll(workspaceRoot: string): MethodViolation[] {
+    const allFiles = getAllTypeScriptFiles(workspaceRoot);
+    return findViolationsForModified(workspaceRoot, allFiles);
+}
+
+/**
+ * Auto-detect the base branch by finding the merge-base with origin/main.
+ */
+function detectBase(workspaceRoot: string): string | null {
+    try {
+        const mergeBase = execSync('git merge-base HEAD origin/main', {
+            cwd: workspaceRoot,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+
+        if (mergeBase) {
+            return mergeBase;
+        }
+    } catch {
+        try {
+            const mergeBase = execSync('git merge-base HEAD main', {
+                cwd: workspaceRoot,
+                encoding: 'utf-8',
+                stdio: ['pipe', 'pipe', 'pipe'],
+            }).trim();
+
+            if (mergeBase) {
+                return mergeBase;
+            }
+        } catch {
+            // Ignore
+        }
+    }
+    return null;
+}
+
+/**
+ * Report violations to console.
+ */
+function reportViolations(violations: MethodViolation[], mode: ReturnTypeMode): void {
+    console.error('');
+    console.error('❌ Methods missing explicit return types!');
+    console.error('');
+    console.error('📚 Explicit return types improve code readability:');
+    console.error('');
+    console.error('   BAD:  method() { return new MyClass(); }');
+    console.error('   GOOD: method(): MyClass { return new MyClass(); }');
+    console.error('   GOOD: async method(): Promise<MyType> { ... }');
+    console.error('');
+
+    for (const v of violations) {
+        console.error(`  ❌ ${v.file}:${v.line}`);
+        console.error(`     Method: ${v.methodName} - missing return type annotation`);
+    }
+    console.error('');
+
+    console.error('   To fix: Add explicit return type after the parameter list');
+    console.error('');
+    console.error('   Escape hatch (use sparingly):');
+    console.error('   // webpieces-disable require-return-type -- [your reason]');
+    console.error('');
+    console.error(`   Current mode: ${mode}`);
+    console.error('');
+}
+
+export default async function runExecutor(
+    options: ValidateReturnTypesOptions,
+    context: ExecutorContext
+): Promise<ExecutorResult> {
+    const workspaceRoot = context.root;
+    const mode: ReturnTypeMode = options.mode ?? 'MODIFIED_NEW';
+
+    if (mode === 'OFF') {
+        console.log('\n⏭️  Skipping return type validation (mode: OFF)');
+        console.log('');
+        return { success: true };
+    }
+
+    console.log('\n📏 Validating Return Types\n');
+    console.log(`   Mode: ${mode}`);
+
+    let violations: MethodViolation[] = [];
+
+    if (mode === 'ALL') {
+        console.log('   Scope: All TypeScript files');
+        console.log('');
+        violations = findViolationsForAll(workspaceRoot);
+    } else {
+        let base = process.env['NX_BASE'];
+        const head = process.env['NX_HEAD'];
+
+        if (!base) {
+            base = detectBase(workspaceRoot) ?? undefined;
+
+            if (!base) {
+                console.log('\n⏭️  Skipping return type validation (could not detect base branch)');
+                console.log('');
+                return { success: true };
+            }
+        }
+
+        console.log(`   Base: ${base}`);
+        console.log(`   Head: ${head ?? 'working tree (includes uncommitted changes)'}`);
+        console.log('');
+
+        const changedFiles = getChangedTypeScriptFiles(workspaceRoot, base, head);
+
+        if (changedFiles.length === 0) {
+            console.log('✅ No TypeScript files changed');
+            return { success: true };
+        }
+
+        console.log(`📂 Checking ${changedFiles.length} changed file(s)...`);
+
+        if (mode === 'MODIFIED_NEW') {
+            violations = findViolationsForModifiedNew(workspaceRoot, changedFiles, base, head);
+        } else if (mode === 'MODIFIED') {
+            violations = findViolationsForModified(workspaceRoot, changedFiles);
+        }
+    }
+
+    if (violations.length === 0) {
+        console.log('✅ All methods have explicit return types');
+        return { success: true };
+    }
+
+    reportViolations(violations, mode);
+
+    return { success: false };
+}

package/architecture/executors/validate-return-types/schema.json

@@ -0,0 +1,15 @@
+{
+    "$schema": "http://json-schema.org/schema",
+    "title": "Validate Return Types Executor",
+    "description": "Validates that methods have explicit return type annotations for better code readability.",
+    "type": "object",
+    "properties": {
+        "mode": {
+            "type": "string",
+            "enum": ["OFF", "MODIFIED_NEW", "MODIFIED", "ALL"],
+            "description": "OFF: skip validation. MODIFIED_NEW: only validate new methods. MODIFIED: validate all methods in modified files. ALL: validate all methods in all files.",
+            "default": "MODIFIED_NEW"
+        }
+    },
+    "required": []
+}

package/executors.json

@@ -64,6 +64,11 @@
             "implementation": "./architecture/executors/validate-code/executor",
             "schema": "./architecture/executors/validate-code/schema.json",
             "description": "Combined validation for new methods, modified methods, and file sizes"
+        },
+        "validate-return-types": {
+            "implementation": "./architecture/executors/validate-return-types/executor",
+            "schema": "./architecture/executors/validate-return-types/schema.json",
+            "description": "Validate methods have explicit return type annotations"
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webpieces/dev-config",
-  "version": "0.2.69",
+  "version": "0.2.71",
   "description": "Development configuration, scripts, and patterns for WebPieces projects",
   "type": "commonjs",
   "bin": {