@valkyrjaio/sindri 26.1.0 → 26.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@valkyrjaio/sindri",
-    "version": "26.1.0",
+    "version": "26.2.0",
     "description": "The Valkyrja Sindri build tool.",
     "homepage": "https://www.valkyrja.io/sindri",
     "keywords": [
@@ -8,6 +8,13 @@
         "sindri",
         "valkyrja"
     ],
+    "bugs": {
+        "url": "https://github.com/valkyrjaio/sindri-ts/issues"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/valkyrjaio/sindri-ts.git"
+    },
     "license": "MIT",
     "author": {
         "name": "Melech Mizrachi",
@@ -21,7 +28,7 @@
         }
     },
     "bin": {
-        "sindri": "dist/bin/sindri.js"
+        "sindri": "dist/bin/sindri.cjs"
     },
     "files": [
         "dist",
@@ -31,10 +38,12 @@
         "node": ">=22"
     },
     "dependencies": {
-        "@valkyrjaio/valkyrja": "^26.1.0",
+        "@valkyrjaio/valkyrja": "^26.2.0",
         "ts-morph": "^28.0.0"
     },
     "scripts": {
+        "build": "esbuild bin/sindri.ts --bundle --platform=node --format=cjs --outfile=dist/bin/sindri.cjs --banner:js='#!/usr/bin/env node'",
+        "prepublishOnly": "npm run build",
         "typescript": "cd .github/ci/typescript && npm run check",
         "typescript-outdated-check": "cd .github/ci/typescript && npm install && npm outdated",
         "typescript-outdated-check-major-release": "cd .github/ci/typescript && npm install && npm outdated",
@@ -59,5 +68,8 @@
         "root-and-suggested-outdated-check": "cd .github/ci/root-and-suggested && npm install && npm outdated",
         "root-and-suggested-outdated-check-major-release": "cd .github/ci/root-and-suggested && npm install && npm outdated",
         "root-and-suggested-npm-update": "cd .github/ci/root-and-suggested && npm update"
+    },
+    "devDependencies": {
+        "esbuild": "^0.28.1"
     }
 }

package/src/Sindri/Ast/Abstract/AstReader.ts

@@ -627,7 +627,7 @@ export abstract class AstReader {
 
         const fqn = fqnColonCase.substring(0, pos);
         const caseName = fqnColonCase.substring(pos + 2);
-        const className = fqn.split('\\').pop() ?? fqn;
+        const className = fqn.slice(fqn.lastIndexOf('\\') + 1);
 
         return ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(className), caseName);
     }
@@ -636,7 +636,7 @@ export abstract class AstReader {
      * Build a `ClassName.methodName` property access from a HandlerData.
      */
     protected buildHandlerExpr(handler: HandlerData): ts.PropertyAccessExpression {
-        const className = handler.class.split('\\').pop() ?? handler.class;
+        const className = handler.class.slice(handler.class.lastIndexOf('\\') + 1);
 
         return ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(className), handler.method);
     }
@@ -647,7 +647,7 @@ export abstract class AstReader {
     }
 
     protected buildNewExpr(className: string, args: ts.Expression[]): ts.NewExpression {
-        const shortName = className.split('\\').pop() ?? className;
+        const shortName = className.slice(className.lastIndexOf('\\') + 1);
 
         return ts.factory.createNewExpression(ts.factory.createIdentifier(shortName), undefined, args);
     }
@@ -671,7 +671,7 @@ export abstract class AstReader {
     }
 
     protected buildClassIdentifierArrayExpr(classes: readonly string[]): ts.ArrayLiteralExpression {
-        const elements = classes.map((c) => ts.factory.createIdentifier(c.split('\\').pop() ?? c));
+        const elements = classes.map((c) => ts.factory.createIdentifier(c.slice(c.lastIndexOf('\\') + 1)));
         return ts.factory.createArrayLiteralExpression(elements);
     }
 

package/src/Sindri/Ast/CliRouteAttributeReader.ts

@@ -73,7 +73,7 @@ export class CliRouteAttributeReader extends RouteAttributeReader implements Cli
         }
 
         const updatedName = this.updateName(name, method, useMap, currentFilePath, currentClass);
-        const [routeMatchedMiddleware, routeDispatchedMiddleware, throwableCaughtMiddleware, exitedMiddleware] =
+        const [routeMatchedMiddleware, routeDispatchedMiddleware, throwableCaughtMiddleware, processExitingMiddleware] =
             this.updateMiddleware(
                 method,
                 useMap,
@@ -93,7 +93,7 @@ export class CliRouteAttributeReader extends RouteAttributeReader implements Cli
             routeMatchedMiddleware,
             routeDispatchedMiddleware,
             throwableCaughtMiddleware,
-            exitedMiddleware,
+            processExitingMiddleware,
             this.parameterReader.updateArguments(method, useMap, currentFilePath, currentClass),
             this.parameterReader.updateOptions(method, useMap, currentFilePath, currentClass),
         );
@@ -130,7 +130,7 @@ export class CliRouteAttributeReader extends RouteAttributeReader implements Cli
         routeMatchedMiddleware: string[],
         routeDispatchedMiddleware: string[],
         throwableCaughtMiddleware: string[],
-        exitedMiddleware: string[],
+        processExitingMiddleware: string[],
     ): [string[], string[], string[], string[]] {
         for (const decorator of this.findDecoratorsOnNode(method, 'Middleware', useMap, currentFilePath)) {
             const mwName = this.extractExprValue(
@@ -144,7 +144,7 @@ export class CliRouteAttributeReader extends RouteAttributeReader implements Cli
                 continue;
             }
 
-            [routeMatchedMiddleware, routeDispatchedMiddleware, throwableCaughtMiddleware, exitedMiddleware] =
+            [routeMatchedMiddleware, routeDispatchedMiddleware, throwableCaughtMiddleware, processExitingMiddleware] =
                 this.classifyMiddleware(
                     mwName,
                     useMap,
@@ -152,11 +152,11 @@ export class CliRouteAttributeReader extends RouteAttributeReader implements Cli
                     routeMatchedMiddleware,
                     routeDispatchedMiddleware,
                     throwableCaughtMiddleware,
-                    exitedMiddleware,
+                    processExitingMiddleware,
                 );
         }
 
-        return [routeMatchedMiddleware, routeDispatchedMiddleware, throwableCaughtMiddleware, exitedMiddleware];
+        return [routeMatchedMiddleware, routeDispatchedMiddleware, throwableCaughtMiddleware, processExitingMiddleware];
     }
 
     protected classifyMiddleware(
@@ -166,7 +166,7 @@ export class CliRouteAttributeReader extends RouteAttributeReader implements Cli
         routeMatchedMiddleware: string[],
         routeDispatchedMiddleware: string[],
         throwableCaughtMiddleware: string[],
-        exitedMiddleware: string[],
+        processExitingMiddleware: string[],
     ): [string[], string[], string[], string[]] {
         if (this.classImplementsInterface(mwName, 'RouteMatchedMiddlewareContract', useMap, currentFilePath)) {
             routeMatchedMiddleware = [...routeMatchedMiddleware, mwName];
@@ -180,11 +180,11 @@ export class CliRouteAttributeReader extends RouteAttributeReader implements Cli
             throwableCaughtMiddleware = [...throwableCaughtMiddleware, mwName];
         }
 
-        if (this.classImplementsInterface(mwName, 'ExitedMiddlewareContract', useMap, currentFilePath)) {
-            exitedMiddleware = [...exitedMiddleware, mwName];
+        if (this.classImplementsInterface(mwName, 'ProcessExitingMiddlewareContract', useMap, currentFilePath)) {
+            processExitingMiddleware = [...processExitingMiddleware, mwName];
         }
 
-        return [routeMatchedMiddleware, routeDispatchedMiddleware, throwableCaughtMiddleware, exitedMiddleware];
+        return [routeMatchedMiddleware, routeDispatchedMiddleware, throwableCaughtMiddleware, processExitingMiddleware];
     }
 
     protected buildRouteExpr(data: CliRouteData): ts.Expression {
@@ -213,7 +213,7 @@ export class CliRouteAttributeReader extends RouteAttributeReader implements Cli
             this.buildClassArrayExpr(data.routeMatchedMiddleware),
             this.buildClassArrayExpr(data.routeDispatchedMiddleware),
             this.buildClassArrayExpr(data.throwableCaughtMiddleware),
-            this.buildClassArrayExpr(data.exitedMiddleware),
+            this.buildClassArrayExpr(data.processExitingMiddleware),
         ];
     }
 }

package/src/Sindri/Ast/ConfigReader.ts

@@ -65,7 +65,7 @@ export class ConfigReader extends AstReader implements ConfigReaderContract {
             if (ts.isExpressionStatement(stmt) && ts.isCallExpression(stmt.expression)) {
                 const call = stmt.expression;
 
-                if (ts.isIdentifier(call.expression) && call.expression.text === 'super') {
+                if (call.expression.kind === ts.SyntaxKind.SuperKeyword) {
                     return call.arguments;
                 }
             }
@@ -133,13 +133,14 @@ export class ConfigReader extends AstReader implements ConfigReaderContract {
             return arg.text;
         }
 
-        // process.cwd() → use the file directory as a proxy
+        // process.cwd() resolves to the current working directory, which is the application root
+        // that sindri is run from (the same directory the application itself runs from).
         if (ts.isCallExpression(arg) && ts.isPropertyAccessExpression(arg.expression)) {
             const obj = arg.expression.expression;
             const prop = arg.expression.name;
 
             if (ts.isIdentifier(obj) && obj.text === 'process' && ts.isIdentifier(prop) && prop.text === 'cwd') {
-                return fileDir;
+                return process.cwd();
             }
         }
 
@@ -150,9 +151,8 @@ export class ConfigReader extends AstReader implements ConfigReaderContract {
 
         if (
             ts.isPropertyAccessExpression(arg) &&
-            ts.isPropertyAccessExpression(arg.expression) &&
-            ts.isMetaProperty(arg.expression.expression) &&
-            arg.expression.expression.name.text === 'meta'
+            ts.isMetaProperty(arg.expression) &&
+            arg.expression.name.text === 'meta'
         ) {
             return fileDir;
         }

package/src/Sindri/Ast/Contract/HttpRouteMiddlewareReaderContract.ts

@@ -38,7 +38,7 @@ export interface HttpRouteMiddlewareReaderContract {
         routeDispatchedMiddleware: string[],
         throwableCaughtMiddleware: string[],
         sendingResponseMiddleware: string[],
-        terminatedMiddleware: string[],
+        responseSentMiddleware: string[],
     ): [string[], string[], string[], string[], string[]];
 
     updateRequestStruct(

package/src/Sindri/Ast/Data/CliRouteData.ts

@@ -23,7 +23,7 @@ export class CliRouteData implements CliRouteDataContract {
         readonly routeMatchedMiddleware: readonly string[] = [],
         readonly routeDispatchedMiddleware: readonly string[] = [],
         readonly throwableCaughtMiddleware: readonly string[] = [],
-        readonly exitedMiddleware: readonly string[] = [],
+        readonly processExitingMiddleware: readonly string[] = [],
         args: readonly CliArgumentParameterData[] = [],
         readonly options: readonly CliOptionParameterData[] = [],
     ) {

package/src/Sindri/Ast/Data/Contract/CliRouteDataContract.ts

@@ -19,7 +19,7 @@ export interface CliRouteDataContract {
     readonly routeMatchedMiddleware: readonly string[];
     readonly routeDispatchedMiddleware: readonly string[];
     readonly throwableCaughtMiddleware: readonly string[];
-    readonly exitedMiddleware: readonly string[];
+    readonly processExitingMiddleware: readonly string[];
     readonly arguments: readonly CliArgumentParameterDataContract[];
     readonly options: readonly CliOptionParameterDataContract[];
 }

package/src/Sindri/Ast/Data/Contract/HttpRouteDataContract.ts

@@ -20,7 +20,7 @@ export interface HttpRouteDataContract {
     readonly routeDispatchedMiddleware: readonly string[];
     readonly throwableCaughtMiddleware: readonly string[];
     readonly sendingResponseMiddleware: readonly string[];
-    readonly terminatedMiddleware: readonly string[];
+    readonly responseSentMiddleware: readonly string[];
     readonly requestStruct: string | null;
     readonly responseStruct: string | null;
     readonly isDynamic: boolean;

package/src/Sindri/Ast/Data/HttpRouteData.ts

@@ -21,7 +21,7 @@ export class HttpRouteData implements HttpRouteDataContract {
         readonly routeDispatchedMiddleware: readonly string[] = [],
         readonly throwableCaughtMiddleware: readonly string[] = [],
         readonly sendingResponseMiddleware: readonly string[] = [],
-        readonly terminatedMiddleware: readonly string[] = [],
+        readonly responseSentMiddleware: readonly string[] = [],
         readonly requestStruct: string | null = null,
         readonly responseStruct: string | null = null,
         readonly isDynamic: boolean = false,

package/src/Sindri/Ast/HttpRouteAttributeReader.ts

@@ -188,7 +188,7 @@ export class HttpRouteAttributeReader extends RouteAttributeReader implements Ht
             routeDispatchedMiddleware,
             throwableCaughtMiddleware,
             sendingResponseMiddleware,
-            terminatedMiddleware,
+            responseSentMiddleware,
         ] = this.middlewareReader.updateMiddleware(
             method,
             useMap,
@@ -210,7 +210,7 @@ export class HttpRouteAttributeReader extends RouteAttributeReader implements Ht
             routeDispatchedMiddleware,
             throwableCaughtMiddleware,
             sendingResponseMiddleware,
-            terminatedMiddleware,
+            responseSentMiddleware,
             this.middlewareReader.updateRequestStruct(method, useMap, currentFilePath, currentClass),
             this.middlewareReader.updateResponseStruct(method, useMap, currentFilePath, currentClass),
             resolvedIsDynamic,

package/src/Sindri/Ast/HttpRouteMiddlewareReader.ts

@@ -75,7 +75,7 @@ export class HttpRouteMiddlewareReader extends AstReader implements HttpRouteMid
         routeDispatchedMiddleware: string[],
         throwableCaughtMiddleware: string[],
         sendingResponseMiddleware: string[],
-        terminatedMiddleware: string[],
+        responseSentMiddleware: string[],
     ): [string[], string[], string[], string[], string[]] {
         for (const decorator of this.findDecoratorsOnNode(method, 'Middleware', useMap, namespace)) {
             const mwName = this.extractExprValue(this.getDecoratorArg(decorator, 0), useMap, namespace, currentClass);
@@ -89,7 +89,7 @@ export class HttpRouteMiddlewareReader extends AstReader implements HttpRouteMid
                 routeDispatchedMiddleware,
                 throwableCaughtMiddleware,
                 sendingResponseMiddleware,
-                terminatedMiddleware,
+                responseSentMiddleware,
             ] = this.classifyMiddleware(
                 mwName,
                 useMap,
@@ -98,7 +98,7 @@ export class HttpRouteMiddlewareReader extends AstReader implements HttpRouteMid
                 routeDispatchedMiddleware,
                 throwableCaughtMiddleware,
                 sendingResponseMiddleware,
-                terminatedMiddleware,
+                responseSentMiddleware,
             );
         }
 
@@ -107,7 +107,7 @@ export class HttpRouteMiddlewareReader extends AstReader implements HttpRouteMid
             routeDispatchedMiddleware,
             throwableCaughtMiddleware,
             sendingResponseMiddleware,
-            terminatedMiddleware,
+            responseSentMiddleware,
         ];
     }
 
@@ -151,7 +151,7 @@ export class HttpRouteMiddlewareReader extends AstReader implements HttpRouteMid
             this.buildClassIdentifierArrayExpr(data.routeDispatchedMiddleware),
             this.buildClassIdentifierArrayExpr(data.throwableCaughtMiddleware),
             this.buildClassIdentifierArrayExpr(data.sendingResponseMiddleware),
-            this.buildClassIdentifierArrayExpr(data.terminatedMiddleware),
+            this.buildClassIdentifierArrayExpr(data.responseSentMiddleware),
         ];
     }
 
@@ -181,7 +181,7 @@ export class HttpRouteMiddlewareReader extends AstReader implements HttpRouteMid
         routeDispatchedMiddleware: string[],
         throwableCaughtMiddleware: string[],
         sendingResponseMiddleware: string[],
-        terminatedMiddleware: string[],
+        responseSentMiddleware: string[],
     ): [string[], string[], string[], string[], string[]] {
         if (this.classImplementsInterface(mwName, 'RouteMatchedMiddlewareContract', useMap, currentFilePath)) {
             routeMatchedMiddleware = [...routeMatchedMiddleware, mwName];
@@ -199,8 +199,8 @@ export class HttpRouteMiddlewareReader extends AstReader implements HttpRouteMid
             sendingResponseMiddleware = [...sendingResponseMiddleware, mwName];
         }
 
-        if (this.classImplementsInterface(mwName, 'TerminatedMiddlewareContract', useMap, currentFilePath)) {
-            terminatedMiddleware = [...terminatedMiddleware, mwName];
+        if (this.classImplementsInterface(mwName, 'ResponseSentMiddlewareContract', useMap, currentFilePath)) {
+            responseSentMiddleware = [...responseSentMiddleware, mwName];
         }
 
         return [
@@ -208,7 +208,7 @@ export class HttpRouteMiddlewareReader extends AstReader implements HttpRouteMid
             routeDispatchedMiddleware,
             throwableCaughtMiddleware,
             sendingResponseMiddleware,
-            terminatedMiddleware,
+            responseSentMiddleware,
         ];
     }
 }

package/src/Sindri/Constant/SindriInfo.ts

@@ -8,8 +8,8 @@
  */
 
 export class SindriInfo {
-    static readonly VERSION = '26.1.0' as const;
-    static readonly VERSION_BUILD_DATE_TIME = 'June 17 2026 22:16:53 MST' as const;
+    static readonly VERSION = '26.2.0' as const;
+    static readonly VERSION_BUILD_DATE_TIME = 'July 25 2026 00:19:15 MST' as const;
     static readonly ICON = `\
     ██████████
     ████  ████

package/src/Sindri/Generate/Abstract/GenerateDataFromAst.ts

@@ -189,6 +189,12 @@ export abstract class GenerateDataFromAst {
         }
 
         for (const entry of entries) {
+            // Never descend into dependency directories — application source never lives there,
+            // and a matching class name in node_modules must not shadow the real one.
+            if (entry.isDirectory() && entry.name === 'node_modules') {
+                continue;
+            }
+
             const fullPath = path.join(dir, entry.name);
 
             if (entry.isDirectory()) {

package/src/Sindri/Generator/Abstract/AstFileGenerator.ts

@@ -26,7 +26,7 @@ export abstract class AstFileGenerator {
 
         const fqn = fqnColonCase.substring(0, pos);
         const caseName = fqnColonCase.substring(pos + 2);
-        const className = fqn.split('\\').pop() ?? fqn;
+        const className = fqn.slice(fqn.lastIndexOf('\\') + 1);
 
         return ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(className), caseName);
     }

package/src/Sindri/Generator/Ast/Container/AstContainerDataFileGenerator.ts

@@ -70,7 +70,7 @@ export class AstContainerDataFileGenerator extends AstFileGenerator implements C
             const keyExpr = this.buildEnumCaseExpr(serviceId);
             const printedKey = this.printer.printNode(ts.EmitHint.Unspecified, keyExpr, this.dummySourceFile);
 
-            const shortProviderClass = providerClass.split('\\').pop() ?? providerClass;
+            const shortProviderClass = providerClass.slice(providerClass.lastIndexOf('\\') + 1);
 
             const formattedKey = serviceId.includes('::') ? `[${printedKey}]` : `['${printedKey}']`;