@solid-stack/mason 1.0.22 → 1.0.24

package/dist/index.js

@@ -1,7 +1,7 @@
 import fs4 from 'fs';
 import path2 from 'path';
 import * as p14 from '@clack/prompts';
-import pc15 from 'picocolors';
+import pc14 from 'picocolors';
 import { fileURLToPath } from 'url';
 import { execSync } from 'child_process';
 import { createHash } from 'crypto';
@@ -112,17 +112,17 @@ function writeFileSafely(absolutePath, content, options = {}) {
 function printGeneratedFiles(files, isDryRun = false) {
   console.log("");
   if (isDryRun) {
-    p14.log.warn(pc15.yellow(pc15.bold("[DRY RUN PREVIEW] No files were written to disk.")));
+    p14.log.warn(pc14.yellow(pc14.bold("[DRY RUN PREVIEW] No files were written to disk.")));
   }
   for (const f of files) {
     if (f.action === "created") {
-      p14.log.success(`${pc15.bold(f.relativePath)} ${pc15.dim("(created)")}`);
+      p14.log.success(`${pc14.bold(f.relativePath)} ${pc14.dim("(created)")}`);
     } else if (f.action === "overwritten") {
-      p14.log.warn(`${pc15.bold(f.relativePath)} ${pc15.dim("(overwritten)")}`);
+      p14.log.warn(`${pc14.bold(f.relativePath)} ${pc14.dim("(overwritten)")}`);
     } else if (f.action === "skipped") {
-      p14.log.info(`${pc15.dim(f.relativePath)} ${pc15.dim("(skipped - already exists, pass -o to overwrite)")}`);
+      p14.log.info(`${pc14.dim(f.relativePath)} ${pc14.dim("(skipped - already exists, pass -o to overwrite)")}`);
     } else {
-      p14.log.info(`${pc15.bold(f.relativePath)} ${pc15.dim("(preview)")}`);
+      p14.log.info(`${pc14.bold(f.relativePath)} ${pc14.dim("(preview)")}`);
     }
   }
 }
@@ -332,13 +332,13 @@ function handleCancel(result) {
 }
 function printBanner() {
   console.log("");
-  p14.intro(pc15.bgCyan(pc15.black(" @solid-stack/mason ")));
+  p14.intro(pc14.bgCyan(pc14.black(" @solid-stack/mason ")));
 }
 async function promptProperties(options = {}) {
   const properties = options.defaults ? [...options.defaults] : [];
   if (properties.length > 0) {
     const summary = properties.map((p16) => `${p16.name}: ${p16.type}${p16.optional ? "?" : ""}`).join(", ");
-    p14.log.info(pc15.dim(`Pre-configured fields: ${summary}`));
+    p14.log.info(pc14.dim(`Pre-configured fields: ${summary}`));
     const addMore = handleCancel(
       await p14.confirm({
         message: "Would you like to add custom fields/properties?",
@@ -349,7 +349,7 @@ async function promptProperties(options = {}) {
       return properties;
     }
   }
-  p14.log.info(pc15.cyan("Enter properties (leave name blank when finished):"));
+  p14.log.info(pc14.cyan("Enter properties (leave name blank when finished):"));
   while (true) {
     const name = handleCancel(
       await p14.text({
@@ -397,7 +397,7 @@ async function promptProperties(options = {}) {
       optional
     });
     p14.log.success(
-      pc15.green(`Added: ${name.trim()}${optional ? "?" : ""}: ${finalType.trim()}`)
+      pc14.green(`Added: ${name.trim()}${optional ? "?" : ""}: ${finalType.trim()}`)
     );
   }
   return properties;
@@ -631,7 +631,7 @@ function installNpmPackages(projectRoot, packages, pm) {
       installCmd = `npm install ${packages.join(" ")}`;
       break;
   }
-  p14.log.info(`Installing missing dependencies with ${manager}: ${pc15.cyan(packages.join(", "))}`);
+  p14.log.info(`Installing missing dependencies with ${manager}: ${pc14.cyan(packages.join(", "))}`);
   execSync(installCmd, {
     cwd: projectRoot,
     stdio: "inherit"
@@ -2348,7 +2348,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
     }
   }
   const s = p14.spinner();
-  s.start(`Generating feature '${pc15.cyan(normalizedName)}'...`);
+  s.start(`Generating feature '${pc14.cyan(normalizedName)}'...`);
   const options = {
     name: normalizedName,
     projectRoot,
@@ -2395,7 +2395,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
   s.stop("Feature scaffolded successfully!");
   printGeneratedFiles(files, options.dryRun);
   p14.outro(
-    pc15.green(
+    pc14.green(
       `\u2713 Feature '${normalizedName}' initialized in ${path2.relative(projectRoot, targetDir)} (uncommitted, unregistered)`
     )
   );
@@ -2551,7 +2551,7 @@ async function runSharedCommand(sharedNameArg, flags = {}) {
     );
   }
   const s = p14.spinner();
-  s.start(`Generating shared module '${pc15.cyan(normalizedName)}'...`);
+  s.start(`Generating shared module '${pc14.cyan(normalizedName)}'...`);
   const files = generateShared({
     name: normalizedName,
     description,
@@ -2565,7 +2565,7 @@ async function runSharedCommand(sharedNameArg, flags = {}) {
   s.stop("Shared module generated successfully!");
   printGeneratedFiles(files, Boolean(flags.dryRun));
   p14.outro(
-    pc15.green(
+    pc14.green(
       `\u2713 Shared module '${normalizedName}' initialized in ${path2.relative(projectRoot, targetDir)} (uncommitted, unregistered)`
     )
   );
@@ -2693,7 +2693,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
     }
   }
   const s = p14.spinner();
-  s.start(`Generating use case '${pc15.cyan(ucName)}'...`);
+  s.start(`Generating use case '${pc14.cyan(ucName)}'...`);
   const options = {
     name: ucName,
     feature,
@@ -2725,7 +2725,7 @@ async function runUseCaseCommand(useCaseNameArg, flags = {}) {
   }
   s.stop("Use case generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p14.outro(pc15.green(`Use case '${ucName}' created in feature '${feature}'!`));
+  p14.outro(pc14.green(`Use case '${ucName}' created in feature '${feature}'!`));
 }
 async function runDomainCommand(domainNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2796,7 +2796,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
     });
   }
   const s = p14.spinner();
-  s.start(`Generating domain model '${pc15.cyan(entityName)}'...`);
+  s.start(`Generating domain model '${pc14.cyan(entityName)}'...`);
   const options = {
     name: entityName,
     feature,
@@ -2809,7 +2809,7 @@ async function runDomainCommand(domainNameArg, flags = {}) {
   const file = generateDomain(options);
   s.stop("Domain model generated successfully!");
   printGeneratedFiles([file], options.dryRun);
-  p14.outro(pc15.green(`Domain model '${entityName}' created in feature '${feature}'!`));
+  p14.outro(pc14.green(`Domain model '${entityName}' created in feature '${feature}'!`));
 }
 async function runInfrastructureCommand(classNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -2978,7 +2978,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
     registerInProvider = !flags.noProvider;
   }
   const s = p14.spinner();
-  s.start(`Generating infrastructure class '${pc15.cyan(className)}'...`);
+  s.start(`Generating infrastructure class '${pc14.cyan(className)}'...`);
   const files = [];
   const options = {
     name: className,
@@ -3013,7 +3013,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   }
   s.stop("Infrastructure class generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p14.outro(pc15.green(`Infrastructure class '${className}' created!`));
+  p14.outro(pc14.green(`Infrastructure class '${className}' created!`));
 }
 async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -3126,7 +3126,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
     }
   }
   const s = p14.spinner();
-  s.start(`Generating interface '${pc15.cyan(ifaceName)}'...`);
+  s.start(`Generating interface '${pc14.cyan(ifaceName)}'...`);
   const files = [];
   const options = {
     name: ifaceName,
@@ -3175,7 +3175,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
   }
   s.stop("Interface generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p14.outro(pc15.green(`Interface '${ifaceName}' created in feature '${feature}'!`));
+  p14.outro(pc14.green(`Interface '${ifaceName}' created in feature '${feature}'!`));
 }
 async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   const projectRoot = findProjectRoot();
@@ -3292,7 +3292,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
     }
   }
   const s = p14.spinner();
-  s.start(`Generating HTTP handler '${pc15.cyan(className)}'...`);
+  s.start(`Generating HTTP handler '${pc14.cyan(className)}'...`);
   const options = {
     name: className,
     feature,
@@ -3310,7 +3310,7 @@ async function runHttpHandlerCommand(handlerNameArg, flags = {}) {
   const files = generateHttpHandler(options);
   s.stop("HTTP handler generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p14.outro(pc15.green(`HTTP handler '${className}' created in feature '${feature}'!`));
+  p14.outro(pc14.green(`HTTP handler '${className}' created in feature '${feature}'!`));
 }
 function generateInjectableCode(className, dependencies = [], methods = [], implementsInterface) {
   const formattedDeps = dependencies.map((dep) => ({
@@ -3466,7 +3466,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
     );
   }
   const s = p14.spinner();
-  s.start(`Generating injectable '${pc15.cyan(className)}'...`);
+  s.start(`Generating injectable '${pc14.cyan(className)}'...`);
   const options = {
     name: className,
     feature,
@@ -3480,7 +3480,7 @@ async function runInjectableCommand(classNameArg, flags = {}) {
   const files = generateInjectable(options);
   s.stop("Injectable class generated successfully!");
   printGeneratedFiles(files, options.dryRun);
-  p14.outro(pc15.green(`Injectable '${className}' created successfully!`));
+  p14.outro(pc14.green(`Injectable '${className}' created successfully!`));
 }
 async function runInteractiveMenu(flags = {}) {
   printBanner();
@@ -3594,7 +3594,7 @@ async function handleCreate(type, name, flags = {}) {
       break;
     default:
       p14.log.error(
-        pc15.red(
+        pc14.red(
           `Unknown component type: "${type}". Allowed types: feature, shared, usecase, domain, infrastructure, interface, httpHandler, injectable.`
         )
       );
@@ -3714,19 +3714,19 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     );
   }
   if (type !== "shared" && type !== "feature") {
-    p14.log.error(pc15.red(`Invalid module type: "${typeArg}". Must be "shared" or "feature".`));
+    p14.log.error(pc14.red(`Invalid module type: "${typeArg}". Must be "shared" or "feature".`));
     process.exit(1);
   }
   const registryBase = getRegistryBase(projectRoot, flags.registry);
   const s = p14.spinner();
-  s.start(`Connecting to registry at ${pc15.dim(registryBase)}...`);
+  s.start(`Connecting to registry at ${pc14.dim(registryBase)}...`);
   let index;
   try {
     index = await fetchRegistryIndex(registryBase);
     s.stop("Registry index loaded.");
   } catch (err) {
-    s.stop(pc15.red("Failed to load registry index."));
-    p14.log.error(pc15.red(err.message || String(err)));
+    s.stop(pc14.red("Failed to load registry index."));
+    p14.log.error(pc14.red(err.message || String(err)));
     process.exit(1);
   }
   const availableList = type === "shared" ? index.shared : index.features;
@@ -3750,9 +3750,9 @@ async function handleImport(typeArg, nameArg, flags = {}) {
   }
   if (!candidateNames.includes(name)) {
     const closest = findClosestMatch(name, candidateNames);
-    p14.log.error(pc15.red(`\u274C Module '${name}' not found in the ${type} registry.`));
+    p14.log.error(pc14.red(`\u274C Module '${name}' not found in the ${type} registry.`));
     if (closest) {
-      p14.log.info(pc15.yellow(`Did you mean '${pc15.cyan(closest)}'?`));
+      p14.log.info(pc14.yellow(`Did you mean '${pc14.cyan(closest)}'?`));
     }
     process.exit(1);
   }
@@ -3764,7 +3764,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     try {
       manifest = await fetchModuleManifest(registryBase, modType, modName);
     } catch (err) {
-      p14.log.error(pc15.red(`Failed to fetch manifest for ${modType} '${modName}': ${err.message}`));
+      p14.log.error(pc14.red(`Failed to fetch manifest for ${modType} '${modName}': ${err.message}`));
       process.exit(1);
     }
     nodes.set(key, {
@@ -3804,7 +3804,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
   buildTopologicalOrder(rootKey);
   const resolutions = /* @__PURE__ */ new Map();
   const globalAliasMap = /* @__PURE__ */ new Map();
-  p14.log.step(`Importing ${type}: ${pc15.cyan(name)}...`);
+  p14.log.step(`Importing ${type}: ${pc14.cyan(name)}...`);
   for (const key of orderedKeys) {
     const node = nodes.get(key);
     const { type: modType, name: registryName, manifest } = node;
@@ -3837,7 +3837,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     if (programmaticPointTo) {
       if (!checkModuleExists(projectRoot, modType, programmaticPointTo)) {
         p14.log.error(
-          pc15.red(
+          pc14.red(
             `Module '${programmaticPointTo}' specified in --point-to does not exist in ${folder}.`
           )
         );
@@ -3873,7 +3873,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     }
     const existingDir = getExistingModuleDir(projectRoot, modType, registryName);
     if (!existingDir) {
-      p14.log.info(`  \u21B3 Resolving required ${modType} dependency: ${pc15.cyan(registryName)}`);
+      p14.log.info(`  \u21B3 Resolving required ${modType} dependency: ${pc14.cyan(registryName)}`);
       resolutions.set(key, {
         type: modType,
         registryName,
@@ -4104,7 +4104,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     const isOverwrite = Boolean(flags.overwrite || res.action === "overwrite");
     if (key !== rootKey) {
       p14.log.step(
-        `Importing ${res.type}: ${pc15.cyan(res.targetName)}${res.targetName !== res.registryName ? pc15.dim(` (from ${res.registryName})`) : ""}...`
+        `Importing ${res.type}: ${pc14.cyan(res.targetName)}${res.targetName !== res.registryName ? pc14.dim(` (from ${res.registryName})`) : ""}...`
       );
     }
     if (res.action === "overwrite" && !flags.dryRun) {
@@ -4123,7 +4123,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       const localFilePath = path2.join(targetDir, file);
       if (fs4.existsSync(localFilePath) && !isOverwrite) {
         p14.log.warn(
-          `  \u21B3 Skipping existing file: ${pc15.dim(path2.relative(projectRoot, localFilePath))} (use --overwrite to replace)`
+          `  \u21B3 Skipping existing file: ${pc14.dim(path2.relative(projectRoot, localFilePath))} (use --overwrite to replace)`
         );
         continue;
       }
@@ -4135,13 +4135,13 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       }
       const displayPath = path2.relative(projectRoot, localFilePath);
       totalWrittenFiles.push(displayPath);
-      p14.log.message(`  ${pc15.green("+")} ${displayPath}`);
+      p14.log.message(`  ${pc14.green("+")} ${displayPath}`);
     }
   }
   const missingNpm = getMissingNpmPackages(projectRoot, Array.from(requiredNpmPackages));
   if (missingNpm.length > 0) {
     if (flags.skipInstall || flags.dryRun) {
-      p14.log.info(`Required npm dependencies to install: ${pc15.cyan(missingNpm.join(", "))}`);
+      p14.log.info(`Required npm dependencies to install: ${pc14.cyan(missingNpm.join(", "))}`);
     } else {
       try {
         installNpmPackages(projectRoot, missingNpm);
@@ -4155,13 +4155,13 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     }
   }
   if (flags.dryRun) {
-    p14.log.info(pc15.yellow("Dry run complete: No files were written to disk."));
+    p14.log.info(pc14.yellow("Dry run complete: No files were written to disk."));
   } else {
     const rootRes = resolutions.get(rootKey);
     const baseDir = getModuleBaseDir(projectRoot, type);
     const displayTarget = path2.relative(projectRoot, path2.join(baseDir, rootRes.targetName));
     p14.log.success(
-      pc15.green(
+      pc14.green(
         `Successfully imported ${type} '${name}' (${totalWrittenFiles.length} file${totalWrittenFiles.length === 1 ? "" : "s"} placed in ${displayTarget})`
       )
     );
@@ -4410,6 +4410,350 @@ function discoverAllFeatures(projectRoot) {
     dir: path2.join(featuresBase, e.name)
   })).sort((a, b) => a.name.localeCompare(b.name));
 }
+function extractClassMethods(content, className) {
+  let clean = "";
+  let inLineComment = false;
+  let inBlockComment = false;
+  let inString = null;
+  let escaped = false;
+  for (let i = 0; i < content.length; i++) {
+    const c = content[i];
+    const next = content[i + 1];
+    if (inLineComment) {
+      if (c === "\n") {
+        inLineComment = false;
+        clean += "\n";
+      } else {
+        clean += " ";
+      }
+      continue;
+    }
+    if (inBlockComment) {
+      if (c === "*" && next === "/") {
+        inBlockComment = false;
+        clean += "  ";
+        i++;
+      } else {
+        clean += c === "\n" ? "\n" : " ";
+      }
+      continue;
+    }
+    if (inString) {
+      clean += c === "\n" ? "\n" : " ";
+      if (escaped) {
+        escaped = false;
+      } else if (c === "\\") {
+        escaped = true;
+      } else if (c === inString) {
+        inString = null;
+      }
+      continue;
+    }
+    if (c === "/" && next === "/") {
+      inLineComment = true;
+      clean += "  ";
+      i++;
+      continue;
+    }
+    if (c === "/" && next === "*") {
+      inBlockComment = true;
+      clean += "  ";
+      i++;
+      continue;
+    }
+    if (c === '"' || c === "'" || c === "`") {
+      inString = c;
+      clean += " ";
+      continue;
+    }
+    clean += c;
+  }
+  const classDeclRegex = new RegExp(`(?:export\\s+(?:default\\s+)?)?class\\s+${className}\\b[^{]*\\{`);
+  const match = classDeclRegex.exec(clean);
+  if (!match) return null;
+  const classBodyStart = match.index + match[0].length - 1;
+  const methods = [];
+  let depth = 1;
+  let parenDepth = 0;
+  let atMemberStart = true;
+  const methodRegex = /^\s*(?:@[a-zA-Z0-9_$]+(?:\([^)]*\))?\s+)*(?:(public|private|protected|static)\s+)*(?:(async)\s+)?(?:(get|set)\s+)?(#?[a-zA-Z0-9_$]+)\s*(?:<[^>]+>)?\s*\(/;
+  const arrowRegex = /^\s*(?:(public|private|protected|static)\s+)?(#?[a-zA-Z0-9_$]+)\s*=\s*(?:async\s*)?\(/;
+  for (let i = classBodyStart + 1; i < clean.length && depth > 0; i++) {
+    const c = clean[i];
+    if (c === "{") {
+      depth++;
+      atMemberStart = false;
+      continue;
+    }
+    if (c === "}") {
+      depth--;
+      if (depth === 1) {
+        atMemberStart = true;
+      }
+      continue;
+    }
+    if (depth === 1) {
+      if (c === ";") {
+        atMemberStart = true;
+        parenDepth = 0;
+        continue;
+      }
+      if (c === "(") {
+        parenDepth++;
+      } else if (c === ")") {
+        parenDepth = Math.max(0, parenDepth - 1);
+      }
+      if (atMemberStart && parenDepth === 0) {
+        if (/\s/.test(c)) continue;
+        const slice = clean.slice(i);
+        const methodMatch = slice.match(methodRegex);
+        if (methodMatch) {
+          const fullMatch = methodMatch[0];
+          const beforeParen = fullMatch.slice(0, fullMatch.lastIndexOf("(")).trim();
+          const tokens = beforeParen.split(/\s+/).filter(Boolean);
+          const rawName = tokens[tokens.length - 1] || "";
+          const methodName = rawName.replace(/<.*$/, "");
+          const controlKeywords = ["if", "for", "while", "switch", "catch", "with"];
+          if (!controlKeywords.includes(methodName)) {
+            const isPrivate = tokens.includes("private") || tokens.includes("protected") || methodName.startsWith("#");
+            const isAsync = tokens.includes("async");
+            const isPublic = !isPrivate;
+            const lineNum = content.slice(0, i).split("\n").length;
+            const lineCode = content.split("\n")[lineNum - 1]?.trim() || "";
+            methods.push({
+              name: methodName,
+              isAsync,
+              isPublic,
+              line: lineNum,
+              code: lineCode
+            });
+            i += fullMatch.length - 1;
+            parenDepth = 1;
+            atMemberStart = false;
+            continue;
+          }
+        }
+        const arrowMatch = slice.match(arrowRegex);
+        if (arrowMatch) {
+          const fullMatch = arrowMatch[0];
+          const beforeEquals = fullMatch.split("=")[0].trim();
+          const tokens = beforeEquals.split(/\s+/).filter(Boolean);
+          const rawName = tokens[tokens.length - 1] || "";
+          const isPrivate = tokens.includes("private") || tokens.includes("protected") || rawName.startsWith("#");
+          const isAsync = fullMatch.includes("async");
+          const isPublic = !isPrivate;
+          const lineNum = content.slice(0, i).split("\n").length;
+          const lineCode = content.split("\n")[lineNum - 1]?.trim() || "";
+          methods.push({
+            name: rawName,
+            isAsync,
+            isPublic,
+            line: lineNum,
+            code: lineCode
+          });
+          i += fullMatch.length - 1;
+          parenDepth = 1;
+          atMemberStart = false;
+          continue;
+        }
+        atMemberStart = false;
+      }
+    }
+  }
+  return methods;
+}
+function checkUseCaseShape(featureName, filePath, relativePath, content, addViolation) {
+  const fileName = path2.basename(filePath);
+  const lines = content.split(/\r?\n/);
+  const classMatch = content.match(/(?:export\s+(?:default\s+)?)?class\s+([A-Za-z0-9_]+)/);
+  if (!classMatch) {
+    addViolation({
+      feature: featureName,
+      layer: "useCases",
+      file: filePath,
+      relativePath,
+      line: 1,
+      category: "Use Case Shape Violation",
+      code: lines[0]?.trim() || "",
+      ruleId: "U_SHAPE_CLASS",
+      severity: "error",
+      advice: `Use case file '${fileName}' must define and export a class.`,
+      fixExample: {
+        bad: "// Missing class definition",
+        good: `export class ${fileName.replace(/\.(ts|js)$/, "")} { ... }`
+      }
+    });
+    return;
+  }
+  const className = classMatch[1];
+  let classLine = 1;
+  for (let i = 0; i < lines.length; i++) {
+    if (new RegExp(`(?:export\\s+(?:default\\s+)?)?class\\s+${className}\\b`).test(lines[i])) {
+      classLine = i + 1;
+      break;
+    }
+  }
+  if (!/@MakeInjectable\b/.test(content)) {
+    addViolation({
+      feature: featureName,
+      layer: "useCases",
+      file: filePath,
+      relativePath,
+      line: classLine,
+      category: "Use Case Shape Violation",
+      code: lines[classLine - 1]?.trim() || `class ${className}`,
+      ruleId: "U_SHAPE_DECORATOR",
+      severity: "error",
+      advice: `Use case class '${className}' in '${fileName}' must be decorated with @MakeInjectable.`,
+      fixExample: {
+        bad: lines[classLine - 1]?.trim() || `class ${className}`,
+        good: `@MakeInjectable
+export class ${className} { ... }`
+      }
+    });
+  }
+  const hasAsyncExecute = /(?:public\s+)?async\s+execute\s*(?:<[^>]+>)?\s*\(/.test(content);
+  if (!hasAsyncExecute) {
+    const hasSyncExecute = /(?:public\s+)?execute\s*(?:<[^>]+>)?\s*\(/.test(content);
+    addViolation({
+      feature: featureName,
+      layer: "useCases",
+      file: filePath,
+      relativePath,
+      line: classLine,
+      category: "Use Case Shape Violation",
+      code: lines[classLine - 1]?.trim() || `class ${className}`,
+      ruleId: "U_SHAPE_EXECUTE",
+      severity: "error",
+      advice: hasSyncExecute ? `Use case class '${className}' in '${fileName}' must have an 'async execute' method (found synchronous 'execute').` : `Use case class '${className}' in '${fileName}' must implement an 'async execute(...)' method.`,
+      fixExample: {
+        bad: hasSyncExecute ? "execute(props: ...) { ... }" : `class ${className} { ... }`,
+        good: "async execute(props: ...): Promise<...> { ... }"
+      }
+    });
+  }
+  const classMethods = extractClassMethods(content, className);
+  if (classMethods) {
+    const extraPublicMethods = classMethods.filter(
+      (m) => m.isPublic && m.name !== "constructor" && m.name !== "execute"
+    );
+    for (const m of extraPublicMethods) {
+      addViolation({
+        feature: featureName,
+        layer: "useCases",
+        file: filePath,
+        relativePath,
+        line: m.line,
+        category: "Use Case Shape Violation",
+        code: m.code || `public ${m.name}(...)`,
+        ruleId: "U_SHAPE_ONLY_EXECUTE",
+        severity: "error",
+        advice: `Use case class '${className}' in '${fileName}' has disallowed public method '${m.name}'. The only allowed public methods are constructor and async execute. Extract extra methods into their own use cases, or make them private.`,
+        fixExample: {
+          bad: m.code || `${m.name}(...) { ... }`,
+          good: `// Extract '${m.name}' into its own dedicated Use Case, or make it private if it is internal helper logic:
+private ${m.name}(...) { ... }`
+        }
+      });
+    }
+  }
+}
+function checkServiceShape(featureName, filePath, relativePath, content, addViolation) {
+  const fileName = path2.basename(filePath);
+  const lines = content.split(/\r?\n/);
+  const classMatch = content.match(/(?:export\s+(?:default\s+)?)?class\s+([A-Za-z0-9_]+)/);
+  if (!classMatch) {
+    addViolation({
+      feature: featureName,
+      layer: "services",
+      file: filePath,
+      relativePath,
+      line: 1,
+      category: "Service Shape Violation",
+      code: lines[0]?.trim() || "",
+      ruleId: "S_SHAPE_CLASS",
+      severity: "error",
+      advice: `Service file '${fileName}' must define and export a class.`,
+      fixExample: {
+        bad: "// Missing class definition",
+        good: `export class ${fileName.replace(/\.(ts|js)$/, "")} { ... }`
+      }
+    });
+    return;
+  }
+  const className = classMatch[1];
+  let classLine = 1;
+  for (let i = 0; i < lines.length; i++) {
+    if (new RegExp(`(?:export\\s+(?:default\\s+)?)?class\\s+${className}\\b`).test(lines[i])) {
+      classLine = i + 1;
+      break;
+    }
+  }
+  if (!/@MakeInjectable\b/.test(content)) {
+    addViolation({
+      feature: featureName,
+      layer: "services",
+      file: filePath,
+      relativePath,
+      line: classLine,
+      category: "Service Shape Violation",
+      code: lines[classLine - 1]?.trim() || `class ${className}`,
+      ruleId: "S_SHAPE_DECORATOR",
+      severity: "error",
+      advice: `Service class '${className}' in '${fileName}' must be decorated with @MakeInjectable.`,
+      fixExample: {
+        bad: lines[classLine - 1]?.trim() || `class ${className}`,
+        good: `@MakeInjectable
+export class ${className} { ... }`
+      }
+    });
+  }
+  const hasAsyncExecute = /(?:public\s+)?async\s+execute\s*(?:<[^>]+>)?\s*\(/.test(content);
+  if (!hasAsyncExecute) {
+    const hasSyncExecute = /(?:public\s+)?execute\s*(?:<[^>]+>)?\s*\(/.test(content);
+    addViolation({
+      feature: featureName,
+      layer: "services",
+      file: filePath,
+      relativePath,
+      line: classLine,
+      category: "Service Shape Violation",
+      code: lines[classLine - 1]?.trim() || `class ${className}`,
+      ruleId: "S_SHAPE_EXECUTE",
+      severity: "error",
+      advice: hasSyncExecute ? `Service class '${className}' in '${fileName}' must have an 'async execute' method (found synchronous 'execute').` : `Service class '${className}' in '${fileName}' must implement an 'async execute(...)' method.`,
+      fixExample: {
+        bad: hasSyncExecute ? "execute(props: ...) { ... }" : `class ${className} { ... }`,
+        good: "async execute(props: ...): Promise<...> { ... }"
+      }
+    });
+  }
+  const classMethods = extractClassMethods(content, className);
+  if (classMethods) {
+    const extraPublicMethods = classMethods.filter(
+      (m) => m.isPublic && m.name !== "constructor" && m.name !== "execute"
+    );
+    for (const m of extraPublicMethods) {
+      addViolation({
+        feature: featureName,
+        layer: "services",
+        file: filePath,
+        relativePath,
+        line: m.line,
+        category: "Service Shape Violation",
+        code: m.code || `public ${m.name}(...)`,
+        ruleId: "S_SHAPE_ONLY_EXECUTE",
+        severity: "error",
+        advice: `Service class '${className}' in '${fileName}' has disallowed public method '${m.name}'. The only allowed public methods are constructor and async execute. If a service has multiple public methods, those should be on their own services instead of being cramped in a single service.`,
+        fixExample: {
+          bad: m.code || `${m.name}(...) { ... }`,
+          good: `// Extract '${m.name}' into its own dedicated Service, or make it private if it is internal helper logic:
+private ${m.name}(...) { ... }`
+        }
+      });
+    }
+  }
+}
 function lintCodebase(options = {}) {
   const startTime = Date.now();
   const projectRoot = options.projectRoot || findProjectRoot(options.targetDir || process.cwd());
@@ -4427,13 +4771,9 @@ function lintCodebase(options = {}) {
       featureResult.passed = false;
     }
     if (failFast) {
-      const errorMsg = `[FAIL FAST] Dependency rule violation detected:
-   Feature:     ${v.feature}
-   Category:    ${v.category}
-   Rule:        ${v.ruleId}
-   Location:    ${v.relativePath}:${v.line}
-   Code:        ${v.code}
-   Explanation: ${v.advice}`;
+      const errorMsg = `Dependency rule violation detected in ${v.relativePath}:${v.line}:
+[${v.category}] ${v.advice}
+Code: ${v.code}`;
       throw new DependencyRuleError(errorMsg, [v], true);
     }
   };
@@ -4457,6 +4797,14 @@ function lintCodebase(options = {}) {
       if (!layer) continue;
       const content = fs4.readFileSync(file, "utf-8");
       const statements = extractImportStatements(content);
+      const baseName = path2.basename(file);
+      const isBarrel = baseName === "index.ts" || baseName === "index.js";
+      if (layer === "useCases" && !isBarrel) {
+        checkUseCaseShape(feat.name, file, relPath, content, addViolation);
+      }
+      if (layer === "services" && !isBarrel) {
+        checkServiceShape(feat.name, file, relPath, content, addViolation);
+      }
       if (layer === "domain") {
         const lines = content.split(/\r?\n/);
         for (let i = 0; i < lines.length; i++) {
@@ -4867,6 +5215,24 @@ function lintCodebase(options = {}) {
               }
             });
           }
+          if (target.targetLayer === "services") {
+            addViolation({
+              feature: feat.name,
+              layer,
+              file,
+              relativePath: relPath,
+              line: stmt.line,
+              category: "Presentation Layer Violation",
+              code: stmt.rawCode,
+              ruleId: "P4_DIRECT_SERVICE",
+              severity: "error",
+              advice: "Presentation handlers must not depend on services directly. They must use use cases, and use cases will then depend on the service.",
+              fixExample: {
+                bad: stmt.rawCode,
+                good: "// Inject a Use Case via static deps instead of a Service."
+              }
+            });
+          }
         }
       }
     }
@@ -4921,87 +5287,23 @@ ${compiledDetails}
 }
 
 // src/commands/lint.ts
-function printLintBanner(mode) {
-  console.log("");
-  const title = " Mason Clean Architecture Dependency Linter ";
-  const line = "\u2501".repeat(title.length + 2);
-  console.log(pc15.cyan(` \u250F${line}\u2513`));
-  console.log(` ${pc15.cyan("\u2503")} ${pc15.bgCyan(pc15.black(title))} ${pc15.cyan("\u2503")}`);
-  console.log(pc15.cyan(` \u2517${line}\u251B`));
-  const modeText = mode === "failFast" ? `${pc15.yellow("Fail-Fast")} ${pc15.dim("(default: stops at first error)")}` : `${pc15.magenta("Complete")} ${pc15.dim("(--complete: compiles all errors)")}`;
-  console.log(` Mode: ${modeText}`);
-  console.log("");
-}
-function formatViolation(v, showFixHint = true) {
+function formatViolation(v) {
   const lines = [];
-  const categoryBadge = pc15.red(pc15.bold(`[${v.category}]`));
-  const location = pc15.white(`${v.relativePath}:${pc15.yellow(String(v.line))}`);
-  lines.push(`   ${categoryBadge} ${location}`);
-  lines.push(`   ${pc15.dim("Rule ID:")} ${pc15.yellow(v.ruleId)}`);
-  lines.push(`   ${pc15.dim("Code:")}    ${pc15.magenta(v.code)}`);
-  lines.push(`   ${pc15.dim("Advice:")}  ${pc15.cyan(v.advice)}`);
-  if (showFixHint && v.fixExample) {
-    lines.push(`   ${pc15.dim("Example:")}`);
-    lines.push(`     ${pc15.red(`- ${v.fixExample.bad}`)}`);
-    lines.push(`     ${pc15.green(`+ ${v.fixExample.good}`)}`);
-  }
-  return lines.join("\n");
-}
-function formatFeatureResult(res, options = {}) {
-  const lines = [];
-  if (res.passed) {
-    lines.push(
-      ` ${pc15.green("\u2714")} ${pc15.bold(res.featureName)} ${pc15.dim(
-        `(${res.scannedFilesCount} files checked - clean)`
-      )}`
-    );
-    return lines.join("\n");
-  }
-  const countBadge = pc15.red(
-    `(${res.violations.length} violation${res.violations.length > 1 ? "s" : ""})`
+  lines.push(pc14.underline(pc14.cyan(v.relativePath)) + pc14.dim(":") + pc14.yellow(String(v.line)));
+  const gutter = `${String(v.line).padStart(4, " ")} | `;
+  lines.push(pc14.dim(gutter) + v.code);
+  const categoryShort = v.category.replace(" Violation", "");
+  lines.push(
+    "       " + pc14.red(pc14.bold("\u2716")) + " " + pc14.red(`[${categoryShort}]`) + " " + v.advice
   );
-  lines.push(`
- ${pc15.red("\u2716")} ${pc15.bold(pc15.white(res.featureName))} ${countBadge}`);
-  lines.push(`   ${pc15.dim("Path:")} ${res.featureDir}`);
-  lines.push("");
-  for (const v of res.violations) {
-    lines.push(formatViolation(v, options.fixHint !== false));
-    lines.push("");
+  if (v.fixExample?.good) {
+    lines.push("       " + pc14.dim("\u2192") + " " + pc14.dim(v.fixExample.good));
   }
   return lines.join("\n");
 }
-function printTerminalReport(summary, options = {}) {
-  for (const res of summary.results) {
-    const formatted = formatFeatureResult(res, options);
-    if (formatted.trim()) {
-      console.log(formatted);
-    }
-  }
-  console.log("\u2501".repeat(70));
-  const statusIcon = summary.totalViolations === 0 ? pc15.green("\u2714 PASS") : pc15.red("\u2716 FAIL");
-  console.log(
-    ` ${statusIcon}  ${pc15.bold("Dependency Rules Audit Result")}  ${pc15.dim(
-      `(${summary.durationMs}ms)`
-    )}`
-  );
-  console.log(
-    `   ${pc15.bold("Features:")}   ${pc15.cyan(String(summary.totalFeatures))} total  |  ${pc15.green(
-      String(summary.cleanFeatures)
-    )} clean  |  ${summary.violatedFeatures > 0 ? pc15.red(String(summary.violatedFeatures)) : pc15.green("0")} with violations`
-  );
-  console.log(
-    `   ${pc15.bold("Violations:")} ${summary.totalViolations > 0 ? pc15.red(pc15.bold(String(summary.totalViolations))) : pc15.green("0")} rule violations found`
-  );
-  console.log("\u2501".repeat(70));
-  console.log("");
-}
 async function handleLint(flags = {}) {
   const complete = Boolean(flags.complete);
-  const mode = complete ? "complete" : "failFast";
   const quiet = Boolean(flags.quiet);
-  if (!quiet) {
-    printLintBanner(mode);
-  }
   const options = {
     complete,
     quiet,
@@ -5012,14 +5314,23 @@ async function handleLint(flags = {}) {
   };
   try {
     const summary = lintCodebase(options);
-    if (!quiet) {
-      printTerminalReport(summary, options);
-    }
     if (summary.totalViolations > 0) {
+      if (!quiet) {
+        console.log("");
+        for (const v of summary.allViolations) {
+          console.log(formatViolation(v));
+          console.log("");
+        }
+        console.log(
+          pc14.red(
+            `\u2716 Dependency rules check failed with ${summary.totalViolations} error${summary.totalViolations > 1 ? "s" : ""} across ${summary.violatedFeatures} feature${summary.violatedFeatures > 1 ? "s" : ""} (${summary.totalFeatures} features scanned).`
+          )
+        );
+        console.log("");
+      }
       const errorHeader = `Dependency rule audit failed with ${summary.totalViolations} violation(s) across ${summary.violatedFeatures} feature(s):`;
       const compiledDetails = summary.allViolations.map(
         (v, i) => `${i + 1}. [${v.category}] ${v.relativePath}:${v.line}
-   Rule:   ${v.ruleId}
    Code:   ${v.code}
    Advice: ${v.advice}`
       ).join("\n\n");
@@ -5030,20 +5341,22 @@ ${compiledDetails}
     }
     if (!quiet) {
       console.log(
-        pc15.green(`\u2714 All dependency rules are being followed! (${summary.totalFeatures} features checked)`)
+        pc14.green(
+          `\u2714 Dependency rules verified across ${summary.totalFeatures} feature${summary.totalFeatures === 1 ? "" : "s"}.`
+        )
       );
-      console.log("");
     }
     return summary;
   } catch (err) {
     if (err instanceof DependencyRuleError && err.isFailFast) {
       if (!quiet) {
-        console.log(pc15.red(`
-\u2716 [FAIL FAST] Terminating on first detected dependency rule violation:`));
+        console.log("");
         const v = err.violations[0];
         if (v) {
-          console.log(formatViolation(v, options.fixHint !== false));
+          console.log(formatViolation(v));
+          console.log("");
         }
+        console.log(pc14.red(`\u2716 Dependency rules check failed (1 error).`));
         console.log("");
       }
     }
@@ -5057,7 +5370,7 @@ function createCli() {
   cli.command("[...args]", "Interactive scaffolding and import wizard").option("-d, --dry-run", "Preview changes without writing to disk").option("-o, --overwrite", "Overwrite existing files").option("-y, --yes", "Accept defaults and skip interactive prompts").option("--registry", "Run in registry mode").option("--point-to <mapping>", "Point a dependency to an existing local module (e.g. --point-to time:mytime)").option("--alias <mapping>", "Import a dependency fresh under an alias name (e.g. --alias time:time-mason)").option("--tests", "Include test files (use --no-tests to exclude)").action(async (args, flags) => {
     if (args && args.length > 0) {
       p14.log.error(
-        pc15.red(
+        pc14.red(
           `Unknown command: "${args.join(" ")}". Use --help to list available commands.`
         )
       );
@@ -5176,6 +5489,12 @@ function createCli() {
         targetDir: target || flags.target || flags.dest
       });
     } catch (err) {
+      if (err instanceof DependencyRuleError) {
+        if (process.env.VITEST) {
+          throw err;
+        }
+        process.exit(1);
+      }
       handleCliError(err);
     }
   });
@@ -5210,7 +5529,7 @@ function handleCliError(err) {
     process.exit(0);
   }
   const message = err instanceof Error ? err.message : String(err);
-  p14.log.error(pc15.red(`Error: ${message}`));
+  p14.log.error(pc14.red(`Error: ${message}`));
   if (process.env.VITEST) {
     throw err;
   }