Use new NeXTless Macro API

Simpler code is always good ;-)

Author: helje5

AppLogic/Package.swift

@@ -20,7 +20,7 @@ let package = Package(
              from: "1.0.8"),
 
     .package(url: "https://github.com/Macro-swift/MacroExpress.git",
-             from: "1.0.0"),
+             from: "1.0.2"),
 
     .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
   ],

LighterExamples.xcodeproj/project.pbxproj

@@ -94,6 +94,7 @@
 		E87B412C28A3DCAD00576D8A /* BodiesApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BodiesApp.swift; sourceTree = "<group>"; };
 		E87B412D28A3DCAD00576D8A /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
 		E87D45FE28A3C341008E04EA /* NavViewMain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavViewMain.swift; sourceTree = "<group>"; };
+		E8924C3129DA2873008BD781 /* Lighter */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Lighter; path = ../Lighter; sourceTree = "<group>"; };
 		E8AF70C928A3DDE9008444B2 /* BodiesDB-001.sql */ = {isa = PBXFileReference; lastKnownFileType = text; path = "BodiesDB-001.sql"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -128,6 +129,7 @@
 		E8224F8228A005CF00246A1F = {
 			isa = PBXGroup;
 			children = (
+				E8924C3129DA2873008BD781 /* Lighter */,
 				E8224FDB28A0557000246A1F /* README.md */,
 				E8224FDD28A0557000246A1F /* LICENSE */,
 				E8224FDC28A0557000246A1F /* CONTRIBUTING.md */,

Package.swift

@@ -16,7 +16,7 @@ var package = Package(
              from: "1.0.8"),
 
     .package(url: "https://github.com/Macro-swift/MacroExpress.git",
-             from: "1.0.0"),
+             from: "1.0.2"),
 
     .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
   ],

Sources/NorthwindWebAPI/Products.swift

@@ -25,7 +25,7 @@ func products(req: IncomingMessage, res: ServerResponse, next: Next) throws {
     "limit"          : limit,
     "lowerLimit"     : (limit - 10) > 1 ? (limit - 10) : 1,
     "higherLimit"    : limit + limit
-  ])
+  ] as [String : Any])
 }
 
 /// This is the endpoint which drives the page for a single product.

Sources/NorthwindWebAPI/README.md

@@ -58,7 +58,7 @@ let app = express()
 
 // Map `/api/products` to a handler which fetches all "products" from the DB.
 // Access using: curl http://localhost:1337/api/products | jq .
-app.get("/api/products") { _, res, _ in
+app.get("/api/products") { _, res in
   res.send(try db.products.fetch())
 }
 
@@ -68,7 +68,7 @@ app.get(db, prefix: "/api/")
 app // Those hook up the HTML pages/templates.
   .get("/products.html", products)
   .get("/products/:id/", product)
-  .get("/") { _, res, _ in res.render("index") }
+  .get("/") { _, res in res.render("index") }
 
 app.listen(1337) // start server
 ```

Sources/NorthwindWebAPI/main.swift

@@ -18,7 +18,7 @@ app.set("views", __dirname() + "/views")
 
 // This is an explicit registration for a specific record fetch.
 // curl http://localhost:1337/api/products | jq .
-app.get("/api/products") { _, res, _ in
+app.get("/api/products") { _, res in
   res.send(try db.products.fetch())
 }
 
@@ -32,7 +32,7 @@ app
   .get("/products.html", products)
   .get("/products/:id/",  product)
 
-app.get("/") { _, res, _ in
+app.get("/") { _, res in
   res.render("index")
 }
 

Sources/NorthwindWebAPI/views/index.html

@@ -57,7 +57,7 @@ <h2 class="ui header">Server Setup</h2>
 let app = express()
 
 app
-  .get("/products") { _, res, _ in
+  .get("/products") { _, res in
     res.send(try db.products.fetch())
   }
   .listen(1337)