session-flash 1.0.4 → 1.0.6

package/README.md

@@ -35,10 +35,6 @@ app.use(session({
 
 app.use(flash());
 
-//HTML escaping enabled by default
-//Disable escaping only if you trust input:
-
-app.use(flash({ unsafe: true }));
 
 
 ```

package/lib/index.d.ts

@@ -1,18 +1,25 @@
+import type { RequestHandler } from "express";
+import "express-serve-static-core";
 
-declare namespace Express {
-    export interface Request {
-        flash(): { [key: string]: string[] };
-        flash(message: string): string[];
-        flash(type: string, message: string[] | string): number;
-        flash(type: string, format: string, ...args: any[]): number;
-    }
+/* Express Request augmentation */
+declare module "express-serve-static-core" {
+  interface Request {
+    flash(): { [key: string]: string[] };
+    flash(type: string): string[];
+    flash(type: string, message: string | string[]): number;
+    flash(type: string, format: string, ...args: unknown[]): number;
+  }
 }
 
+/* session-flash module declaration */
 declare module "session-flash" {
-    import express = require("express");
-    interface IConnectFlashOptions {
-        unsafe?: boolean | undefined;
-    }
-    function e(options?: IConnectFlashOptions): express.RequestHandler;
-    export = e;
-}
+  interface SessionFlashOptions {
+    unsafe?: boolean;
+  }
+
+  function sessionFlash(
+    options?: SessionFlashOptions
+  ): RequestHandler;
+
+  export = sessionFlash;
+}

package/lib/index.mjs

@@ -0,0 +1,65 @@
+'use strict';
+
+import { format } from 'util';
+
+/**
+ * Expose `flash()` function on requests.
+ *
+ * @param {Object} options
+ * @return {Function}
+ * @api public
+ */
+export default function flash(options = {}) {
+  const safe = options.unsafe === undefined ? true : !options.unsafe;
+
+  return function flashMiddleware(req, res, next) {
+    if (req.flash && safe) return next();
+    req.flash = _flash;
+    next();
+  };
+};
+
+/**
+ * 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');
+  }
+
+  const flashStore = (this.session.flash ||= {});
+
+  // SET
+  if (type && msg !== undefined) {
+    // Support util.format
+    if (arguments.length > 2) {
+      msg = format.apply(null, Array.prototype.slice.call(arguments, 1));
+    }
+
+    // Support array of messages
+    if (Array.isArray(msg)) {
+      msg.forEach(val => {
+        (flashStore[type] ||= []).push(val);
+      });
+      return flashStore[type].length;
+    }
+
+    return (flashStore[type] ||= []).push(msg);
+  }
+
+  // GET by type
+  if (type) {
+    const messages = flashStore[type] || [];
+    delete flashStore[type];
+    return messages;
+  }
+
+  // GET all
+  this.session.flash = {};
+  return flashStore;
+}

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "session-flash",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Flash message middleware for express.",
-  "main": "./lib/index.js",
+  "main": "./lib/index.cjs",
+  "module": "./lib/index.mjs",
   "types": "./lib/index.d.ts",
   "exports": {
-    "require": "./lib/index.js"
+    "require": "./lib/index.cjs",
+    "import": "./lib/index.mjs",
+    "types": "./lib/index.d.ts"
   },
   "keywords": [
     "session-flash",
@@ -20,8 +23,6 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "^25.0.3",
-    "typescript": "^5.9.3",
     "vows": "^0.8.3"
   },
   "scripts": {