Expose EnvironmentValues accessors

... for various environment keys.

Author: helje5

Sources/express/BasicAuth.swift

@@ -3,14 +3,15 @@
 //  Macro
 //
 //  Created by Helge Heß on 6/3/16.
-//  Copyright © 2020-2023 ZeeZide GmbH. All rights reserved.
+//  Copyright © 2020-2025 ZeeZide GmbH. All rights reserved.
 //
 
 #if canImport(Foundation)
   import Foundation
 #endif
 import http
 import protocol MacroCore.EnvironmentKey
+import struct   MacroCore.EnvironmentValues
 
 public enum BasicAuthModule {}
 public typealias expressBasicAuth = BasicAuthModule
@@ -245,6 +246,14 @@ private enum BasicAuthUserKey: EnvironmentKey {
   static let loggingKey   = "user"
 }
 
+public extension EnvironmentValues {
+  
+  var authenticatedBasicAuthUser : String {
+    get { return self[BasicAuthUserKey.self] }
+    set { return self[BasicAuthUserKey.self] = newValue }
+  }
+}
+
 public extension IncomingMessage {
 
   /**

Sources/express/Express.swift

@@ -10,6 +10,7 @@ import struct   Logging.Logger
 import enum     MacroCore.process
 import enum     MacroCore.EventListenerSet
 import protocol MacroCore.EnvironmentKey
+import struct   MacroCore.EnvironmentValues
 import class    http.IncomingMessage
 import class    http.ServerResponse
 
@@ -357,6 +358,39 @@ enum ExpressExtKey {
   }
 }
 
+public extension EnvironmentValues {
+  
+  var app: Express? {
+    get { self[ExpressExtKey.App.self] }
+    set { self[ExpressExtKey.App.self] = newValue }
+  }
+  var request: IncomingMessage? {
+    get { self[ExpressExtKey.RequestKey.self] }
+    set { self[ExpressExtKey.RequestKey.self] = newValue }
+  }
+  var route: Route? {
+    get { self[ExpressExtKey.RouteKey.self] }
+    set { self[ExpressExtKey.RouteKey.self] = newValue }
+  }
+  var baseURL: String? {
+    get { self[ExpressExtKey.BaseURL.self] }
+    set { self[ExpressExtKey.BaseURL.self] = newValue }
+  }
+  var params: IncomingMessage.Params {
+    get { self[ExpressExtKey.Params.self] }
+    set { self[ExpressExtKey.Params.self] = newValue }
+  }
+  var query: IncomingMessage.Query? {
+    get { self[ExpressExtKey.Query.self] }
+    set { self[ExpressExtKey.Query.self] = newValue }
+  }
+  var locals: ServerResponse.Locals {
+    get { self[ExpressExtKey.Locals.self] }
+    set { self[ExpressExtKey.Locals.self] = newValue }
+  }
+}
+
+
 // MARK: - App access helper
 
 public extension Dictionary where Key : ExpressibleByStringLiteral {