session-flash 1.0.0 → 1.0.1

package/.travis.yml

@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+  - 18
+  - 20
+  - 22

package/lib/index.cjs

@@ -0,0 +1,62 @@
+'use strict';
+
+const { format } = require('node:util');
+
+function flash(options = {}) {
+  const safe = options.unsafe === undefined ? true : !options.unsafe;
+
+  return function flashMiddleware(req, res, next) {
+    // if (typeof req.flash === 'function' && safe) return next();
+    if (typeof req.flash === 'function' && safe) {
+      return next();
+    }
+
+    Object.defineProperty(req, 'flash', {
+      configurable: true,
+      enumerable: false,
+      writable: false,
+      value: flashHandler.bind(req)
+    });
+
+    next();
+  };
+};
+
+function flashHandler(type, msg) {
+  if (!this.session) {
+    throw new Error(
+      'req.flash() requires session middleware (express-session)'
+    );
+  }
+
+  const store = (this.session.flash ??= Object.create(null));
+
+  // ADD message(s)
+  if (type && arguments.length > 1) {
+    if (arguments.length > 2) {
+      msg = format(...Array.prototype.slice.call(arguments, 1));
+    }
+
+    if (Array.isArray(msg)) {
+      store[type] = store[type] || [];
+      store[type].push(...msg);
+      return store[type].length;
+    }
+
+    return (store[type] = store[type] || []).push(msg);
+  }
+
+  // GET messages of a type
+  if (type) {
+    const messages = store[type] || [];
+    delete store[type];
+    return messages;
+  }
+
+  // GET all messages
+  this.session.flash = Object.create(null);
+  return store;
+}
+
+module.exports = flash;
+module.exports.default = flash;

package/lib/{index.js → index.mjs}

@@ -1,56 +1,54 @@
-'use strict';
-
-const { format } = require('node:util');
-
-module.exports = function flash(options = {}) {
-  const safe = options.unsafe === undefined ? true : !options.unsafe;
-
-  return function flashMiddleware(req, res, next) {
-    if (req.flash && safe) return next();
-
-    Object.defineProperty(req, 'flash', {
-      configurable: true,
-      enumerable: false,
-      writable: false,
-      value: flashHandler.bind(req)
-    });
-
-    next();
-  };
-};
-
-function flashHandler(type, msg) {
-  if (!this.session) {
-    throw new Error(
-      'req.flash() requires session middleware (express-session)'
-    );
-  }
-
-  const store = (this.session.flash ??= Object.create(null));
-
-  // ADD message(s)
-  if (type && arguments.length > 1) {
-    if (arguments.length > 2) {
-      msg = format(...Array.prototype.slice.call(arguments, 1));
-    }
-
-    if (Array.isArray(msg)) {
-      store[type] = store[type] || [];
-      store[type].push(...msg);
-      return store[type].length;
-    }
-
-    return (store[type] = store[type] || []).push(msg);
-  }
-
-  // GET messages of a type
-  if (type) {
-    const messages = store[type] || [];
-    delete store[type];
-    return messages;
-  }
-
-  // GET all messages
-  this.session.flash = Object.create(null);
-  return store;
-}
+import { format } from 'node:util';
+
+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();
+
+    Object.defineProperty(req, 'flash', {
+      configurable: true,
+      enumerable: false,
+      writable: false,
+      value: flashHandler.bind(req)
+    });
+
+    next();
+  };
+};
+
+function flashHandler(type, msg) {
+  if (!this.session) {
+    throw new Error(
+      'req.flash() requires session middleware (express-session)'
+    );
+  }
+
+  const store = (this.session.flash ??= Object.create(null));
+
+  // ADD message(s)
+  if (type && arguments.length > 1) {
+    if (arguments.length > 2) {
+      msg = format(...Array.prototype.slice.call(arguments, 1));
+    }
+
+    if (Array.isArray(msg)) {
+      store[type] = store[type] || [];
+      store[type].push(...msg);
+      return store[type].length;
+    }
+
+    return (store[type] = store[type] || []).push(msg);
+  }
+
+  // GET messages of a type
+  if (type) {
+    const messages = store[type] || [];
+    delete store[type];
+    return messages;
+  }
+
+  // GET all messages
+  this.session.flash = Object.create(null);
+  return store;
+}

package/package.json

@@ -1,18 +1,32 @@
 {
   "name": "session-flash",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Flash message middleware for express.",
-  "keywords": ["session-flash", "express", "flash", "messages"],
+  "main": "./lib/index.cjs",
+  "module": "./lib/index.mjs",
+  "exports": {
+    "require": "./lib/index.cjs",
+    "import": "./lib/index.mjs"
+  },
+  "keywords": [
+    "session-flash",
+    "express",
+    "flash",
+    "messages"
+  ],
   "author": {
     "name": "Andrew Khabweri",
     "email": "andrewkhabweri@gmail.com"
   },
   "license": "MIT",
-  "main": "./lib/index.js",
-  "dependencies": {
+  "dependencies": {},
+  "devDependencies": {
+    "vows": "0.8.x"
+  },
+  "scripts": {
+    "test": "NODE_PATH=lib node_modules/.bin/vows test/*-test.js"
   },
   "engines": {
     "node": ">= 18"
   }
-
 }