Cleanup imports

Disambiguate `__dirname`, which is still not quite right.

Author: helje5

Sources/connect/Connect.swift

@@ -3,7 +3,7 @@
 //  Noze.io / Macro
 //
 //  Created by Helge Heß on 5/3/16.
-//  Copyright © 2016-2020 ZeeZide GmbH. All rights reserved.
+//  Copyright © 2016-2025 ZeeZide GmbH. All rights reserved.
 //
 
 import class http.Server
@@ -194,6 +194,7 @@ public extension Connect {
 }
 
 import func MacroCore.__dirname
+// TBD: can we make those internal? They produce ambiguities.
 
 #if swift(>=5.3)
   @inlinable

Sources/express/View.swift

@@ -2,10 +2,12 @@
 //  View.swift
 //  MacroExpress
 //
-//  Created by Helge Heß on 07.09.25.
+//  Created by Helge Heß on 09/07/25.
+//  Copyright © 2025 ZeeZide GmbH. All rights reserved.
 //
 
-import Macro
+import MacroCore
+import fs
 
 public extension SettingsHolder {
 
@@ -22,11 +24,10 @@ public extension SettingsHolder {
   /**
    * The views directory for templates set by `app.set("views", "views")`.
    */
-  @inlinable
   var views : [ String ] {
     switch settings["views"] {
       case .none:
-        return [ process.env["EXPRESS_VIEWS"] ??  __dirname() + "/views" ]
+        return [ process.env["EXPRESS_VIEWS"] ?? __dirname() + "/views" ]
       case let v as String: return [ v ]
       case let v as [ String ]: return v
       case .some(let v):
@@ -59,7 +60,7 @@ extension Express {
 
     /// The render function for the extension specified in ``ext`` (i.e. passed
     /// explicitly to the render function, like `render("index.mustache")`.
-    public let engine   : ExpressEngine?
+    public var engine   : ExpressEngine?
 
     /// All known engines
     private let engines : [ String : ExpressEngine ]
@@ -69,7 +70,7 @@ extension Express {
 
     public required init(name: String, options: Express) {
       self.name          = name
-      self.ext           = Macro.path.extname(name)
+      self.ext           = fs.path.extname(name)
       self.engines       = options.engines
       self.root          = options.views
       self.defaultEngine = options.defaultEngine

Sources/express/dirname.swift

@@ -0,0 +1,22 @@
+//
+//  dirname.swift
+//  MacroExpress
+//
+//  Created by Helge Heß on 09/07/25.
+//  Copyright © 2025 ZeeZide GmbH. All rights reserved.
+//
+
+// Disambiguate __dirname (connect vs MacroCore, maybe connect should be 
+// internal?)
+
+import func MacroCore.__dirname
+
+#if swift(>=5.3)
+  func __dirname(caller: String = #filePath) -> String {
+    return MacroCore.__dirname(caller: caller)
+  }
+#else
+  func __dirname(caller: String = #file) -> String {
+    return MacroCore.__dirname(caller: caller)
+  }
+#endif