session-flash 1.0.2 → 1.0.4

package/README.md

@@ -35,6 +35,12 @@ app.use(session({
 
 app.use(flash());
 
+//HTML escaping enabled by default
+//Disable escaping only if you trust input:
+
+app.use(flash({ unsafe: true }));
+
+
 ```
 
 With the `flash` middleware in place, all requests will have a `req.flash()` function

package/lib/index.js

@@ -1,66 +1,65 @@
-/**
- * Simple session flash middleware
- * Requires express-session to be set up first
- */
+'use strict';
 
-module.exports = function sessionFlash(options) {
-    options = options || {};
-    const unsafe = options.unsafe === true;
+const { format } = require('util');
 
-    return function (req, res, next) {
-        if (!req.session) {
-            throw new Error("session-flash requires express-session");
-        }
+/**
+ * Expose `flash()` function on requests.
+ *
+ * @param {Object} options
+ * @return {Function}
+ * @api public
+ */
+module.exports = function flash(options = {}) {
+  const safe = options.unsafe === undefined ? true : !options.unsafe;
 
-        if (!req.session.flash) {
-            req.session.flash = {};
-        }
+  return function flashMiddleware(req, res, next) {
+    if (req.flash && safe) return next();
+    req.flash = _flash;
+    next();
+  };
+};
 
-        /**
-         * flash()
-         * flash(type)
-         * flash(type, message)
-         * flash(type, format, ...args)
-         */
-        req.flash = function (type, message) {
-            // flash() → return all messages
-            if (arguments.length === 0) {
-                const flash = req.session.flash;
-                req.session.flash = {};
-                return flash;
-            }
+/**
+ * Queue or retrieve flash messages.
+ *
+ * @param {String} type
+ * @param {String|Array} msg
+ * @return {Array|Object|Number}
+ * @api public
+ */
+function _flash(type, msg) {
+  if (!this.session) {
+    throw new Error('req.flash() requires sessions');
+  }
 
-            // flash(type) → return messages for type
-            if (arguments.length === 1) {
-                const messages = req.session.flash[type] || [];
-                delete req.session.flash[type];
-                return messages;
-            }
+  const flashStore = (this.session.flash ||= {});
 
-            // flash(type, message | format, ...args)
-            let msg;
+  // SET
+  if (type && msg !== undefined) {
+    // Support util.format
+    if (arguments.length > 2) {
+      msg = format.apply(null, Array.prototype.slice.call(arguments, 1));
+    }
 
-            if (typeof message === "string" && arguments.length > 2) {
-                // format string with args
-                const args = Array.prototype.slice.call(arguments, 2);
-                msg = message.replace(/%s/g, () => args.shift());
-            } else {
-                msg = message;
-            }
+    // Support array of messages
+    if (Array.isArray(msg)) {
+      msg.forEach(val => {
+        (flashStore[type] ||= []).push(val);
+      });
+      return flashStore[type].length;
+    }
 
-            if (!Array.isArray(req.session.flash[type])) {
-                req.session.flash[type] = [];
-            }
+    return (flashStore[type] ||= []).push(msg);
+  }
 
-            if (Array.isArray(msg)) {
-                req.session.flash[type].push.apply(req.session.flash[type], msg);
-                return msg.length;
-            } else {
-                req.session.flash[type].push(msg);
-                return 1;
-            }
-        };
+  // GET by type
+  if (type) {
+    const messages = flashStore[type] || [];
+    delete flashStore[type];
+    return messages;
+  }
 
-        next();
-    };
-};
+  // GET all
+  this.session.flash = {};
+  return flashStore;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "session-flash",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Flash message middleware for express.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@types/node": "^25.0.3",
     "typescript": "^5.9.3",
-    "vows": "0.8.x"
+    "vows": "^0.8.3"
   },
   "scripts": {
     "test": "NODE_PATH=lib node_modules/.bin/vows test/*-test.js",

package/tsconfig.json

@@ -1,25 +0,0 @@
-{
-  "compilerOptions": {
-    "allowJs": true,
-    "checkJs": false,
-    "declaration": true,
-    "emitDeclarationOnly": true,
-
-    "rootDir": ".",
-    "outDir": ".",
-
-    "esModuleInterop": true,
-    "moduleResolution": "node",
-    "target": "ES2020",
-    "module": "CommonJS",
-
-    "types": ["node"],
-    "skipLibCheck": true
-  },
-  "include": [
-    "lib/index.js"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
-}