Merge branch 'develop'

Author: helje5

.editorconfig

@@ -0,0 +1,8 @@
+[*]
+indent_style = space
+indent_size = 4
+tab_width = 8
+max_line_length = 80
+trim_trailing_whitespace = false
+end_of_line = lf
+insert_final_newline = true

.github/workflows/swift.yml

@@ -14,8 +14,7 @@ jobs:
       matrix:
         image:
           - swift:5.9.2-focal
-          - swift:5.10-jammy
-          - swift:6.0-noble
+          - swift:6.1-noble
     container: ${{ matrix.image }}
     steps:
       - name: Checkout Repository

Package.swift

@@ -25,9 +25,9 @@ let package = Package(
     // A lot of packages for demonstration purposes, only add what you
     // actually need in your own project.
     .package(url: "https://github.com/Macro-swift/Macro.git",
-             from: "1.0.1"),
+             from: "1.0.4"),
     .package(url: "https://github.com/Macro-swift/MacroExpress.git",
-             from: "1.0.2"),
+             from: "1.0.7"),
     .package(url: "https://github.com/Macro-swift/MacroLambda.git",
              from: "0.5.0"),
     .package(url: "https://github.com/AlwaysRightInstitute/cows",

Sources/express-simple/main.swift

@@ -14,11 +14,11 @@ import cows         // @AlwaysRightInstitute
 let app = express()
 
 app.use(
-  logger("dev"),
-  bodyParser.urlencoded(),
-  cookieParser(),
-  session(),
-  serveStatic(__dirname() + "/public")
+    logger("dev"),
+    bodyParser.urlencoded(),
+    cookieParser(),
+    session(),
+    serveStatic(__dirname() + "/public")
 )
 
 // MARK: - Express Settings
@@ -62,6 +62,22 @@ app.post("/form") { req, res in
     res.render("form", options)
 }
 
+app.get("/multer") { _, res in
+    res.render("multer")
+}
+app.post("/multer", multer().array("file", 10)) { req, res, _ in
+    req.log.info("Got files:", req.files["file"])
+    res.render("multer", [
+      "files": req.files["file"]?.map {
+         [ "name":     $0.originalName,
+           "size":     $0.buffer?.length ?? 0,
+           "mimeType": $0.mimeType ]
+      } ?? [],
+      "hasFiles": !(req.files["file"]?.isEmpty ?? true)
+    ])
+}
+
+
 
 // MARK: - JSON & Cookies
 

Sources/express-simple/views/header.mustache

@@ -24,7 +24,7 @@
         <div class="panel">
           <a href="/"><img align="right" src="images/logo256x256.png"
                            width="128" height="128" /></a>
-          <h2>Macro</h2>
+          <h2><a href="/">Macro</a></h2>
           <blockquote>{{tagline}}</blockquote>
         </div>
       </div>

Sources/express-simple/views/index.html

@@ -10,6 +10,7 @@
   <div class="menu-centered">
     <ul class="menu">
       <li><a href="/form">Form Demo</a></li>
+      <li><a href="/multer">Multer Demo</a></li>
       <li><a href="https://github.com/Macro-swift">Macro.swift</a></li>
     </ul>
   </div>

Sources/express-simple/views/multer.html

@@ -0,0 +1,46 @@
+{{> header}}
+
+  <form action="/multer" method="POST" enctype="multipart/form-data">
+    <div class="row">
+      <div class="medium-6 medium-centered columns">
+        <p>
+        Macro comes w/ the `multer` module that is
+        roughly designed after the Node 
+        <a href="https://github.com/expressjs/multer#readme" 
+           target="ext">multer</a>.
+        </p>
+      </div>
+    </div>
+            
+    <div class="row">
+      <div class="medium-6 medium-centered columns">
+        <label>
+          <input type="file" id="filename" name="file"
+                 multiple="multiple" />
+        </label>
+        <p class="help-text">Upload some files.</p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="medium-6 medium-centered columns">
+        <input type="submit" class="button" value="Submit" />
+      </div>
+    </div>
+    <div class="row">
+      <div class="medium-6 medium-centered columns">
+        <hr />
+        {{^files}}No files uploaded.{{/}}
+        {{#hasFiles}}
+          Files:
+          <ul>
+          {{#files}}
+            <li>{{name}}<br />#{{size}} bytes, {{mimeType}}</li>
+          {{/files}}
+          </ul>
+        {{/hasFiles}}
+      </div>
+    </div>
+  </form>
+  
+  <pre>{{debug}}</pre>
+{{> footer}}