@jaypie/express 1.1.8 → 1.1.10

package/dist/module.cjs

@@ -39,16 +39,16 @@ const ensureProtocol = (url) => {
   return HTTPS_PROTOCOL + url;
 };
 
-const dynamicOriginCallbackHandler = (origins) => {
-  return (origin, callback) => {
+const dynamicOriginCallbackHandler = (origin) => {
+  return (requestOrigin, callback) => {
     // Handle wildcard origin
-    if (origins === "*") {
+    if (origin === "*") {
       callback(null, true);
       return;
     }
 
     // Allow requests with no origin (like mobile apps, curl, etc)
-    if (!origin) {
+    if (!requestOrigin) {
       callback(null, true);
       return;
     }
@@ -60,8 +60,8 @@ const dynamicOriginCallbackHandler = (origins) => {
     if (process.env.PROJECT_BASE_URL) {
       allowedOrigins.push(ensureProtocol(process.env.PROJECT_BASE_URL));
     }
-    if (origins) {
-      const additionalOrigins = core.force.array(origins);
+    if (origin) {
+      const additionalOrigins = core.force.array(origin);
       allowedOrigins.push(...additionalOrigins);
     }
 
@@ -76,9 +76,9 @@ const dynamicOriginCallbackHandler = (origins) => {
 
     const isAllowed = allowedOrigins.some((allowed) => {
       if (allowed instanceof RegExp) {
-        return allowed.test(origin);
+        return allowed.test(requestOrigin);
       }
-      return origin.includes(allowed);
+      return requestOrigin.includes(allowed);
     });
 
     if (isAllowed) {
@@ -95,10 +95,10 @@ const dynamicOriginCallbackHandler = (origins) => {
 //
 
 const corsHelper = (config = {}) => {
-  const { origins, overrides = {} } = config;
+  const { origin, overrides = {} } = config;
 
   const options = {
-    origin: dynamicOriginCallbackHandler(origins),
+    origin: dynamicOriginCallbackHandler(origin),
     // * The default behavior is to allow any headers and methods so they are not included here
     ...overrides,
   };

package/dist/module.esm.js

@@ -37,16 +37,16 @@ const ensureProtocol = (url) => {
   return HTTPS_PROTOCOL + url;
 };
 
-const dynamicOriginCallbackHandler = (origins) => {
-  return (origin, callback) => {
+const dynamicOriginCallbackHandler = (origin) => {
+  return (requestOrigin, callback) => {
     // Handle wildcard origin
-    if (origins === "*") {
+    if (origin === "*") {
       callback(null, true);
       return;
     }
 
     // Allow requests with no origin (like mobile apps, curl, etc)
-    if (!origin) {
+    if (!requestOrigin) {
       callback(null, true);
       return;
     }
@@ -58,8 +58,8 @@ const dynamicOriginCallbackHandler = (origins) => {
     if (process.env.PROJECT_BASE_URL) {
       allowedOrigins.push(ensureProtocol(process.env.PROJECT_BASE_URL));
     }
-    if (origins) {
-      const additionalOrigins = force.array(origins);
+    if (origin) {
+      const additionalOrigins = force.array(origin);
       allowedOrigins.push(...additionalOrigins);
     }
 
@@ -74,9 +74,9 @@ const dynamicOriginCallbackHandler = (origins) => {
 
     const isAllowed = allowedOrigins.some((allowed) => {
       if (allowed instanceof RegExp) {
-        return allowed.test(origin);
+        return allowed.test(requestOrigin);
       }
-      return origin.includes(allowed);
+      return requestOrigin.includes(allowed);
     });
 
     if (isAllowed) {
@@ -93,10 +93,10 @@ const dynamicOriginCallbackHandler = (origins) => {
 //
 
 const corsHelper = (config = {}) => {
-  const { origins, overrides = {} } = config;
+  const { origin, overrides = {} } = config;
 
   const options = {
-    origin: dynamicOriginCallbackHandler(origins),
+    origin: dynamicOriginCallbackHandler(origin),
     // * The default behavior is to allow any headers and methods so they are not included here
     ...overrides,
   };

package/index.d.ts

@@ -0,0 +1,68 @@
+import { Request, Response, NextFunction } from "express";
+import { JaypieHandlerOptions } from "@jaypie/core";
+
+export const EXPRESS: {
+  PATH: {
+    ANY: "*";
+    ID: "/:id";
+    ROOT: RegExp;
+  };
+};
+
+export interface CorsConfig {
+  origins?: string | string[];
+  overrides?: Record<string, unknown>;
+}
+
+export interface ExpressHandlerOptions extends JaypieHandlerOptions {
+  locals?: Record<string, unknown>;
+  name?: string;
+  setup?: ((req: Request, res: Response) => Promise<void>)[];
+  teardown?: ((req: Request, res: Response) => Promise<void>)[];
+  unavailable?: boolean;
+}
+
+export function cors(
+  config?: CorsConfig,
+): (req: Request, res: Response, next: NextFunction) => void;
+
+export function expressHandler<T>(
+  handler: (req: Request, res: Response, ...params: unknown[]) => Promise<T>,
+  options?: ExpressHandlerOptions,
+): (req: Request, res: Response, ...params: unknown[]) => Promise<T>;
+
+export function expressHttpCodeHandler(
+  statusCode?: number,
+  context?: ExpressHandlerOptions,
+): (req: Request, res: Response) => Promise<Record<string, unknown> | null>;
+
+// Pre-configured routes
+export const badRequestRoute: (
+  req: Request,
+  res: Response,
+) => Promise<Record<string, unknown>>;
+export const echoRoute: (
+  req: Request,
+  res: Response,
+) => Promise<Record<string, unknown>>;
+export const forbiddenRoute: (
+  req: Request,
+  res: Response,
+) => Promise<Record<string, unknown>>;
+export const goneRoute: (
+  req: Request,
+  res: Response,
+) => Promise<Record<string, unknown>>;
+export const methodNotAllowedRoute: (
+  req: Request,
+  res: Response,
+) => Promise<Record<string, unknown>>;
+export const noContentRoute: (req: Request, res: Response) => Promise<null>;
+export const notFoundRoute: (
+  req: Request,
+  res: Response,
+) => Promise<Record<string, unknown>>;
+export const notImplementedRoute: (
+  req: Request,
+  res: Response,
+) => Promise<never>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaypie/express",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "license": "MIT",
   "author": "Finlayson Studio",
   "type": "module",
@@ -13,6 +13,7 @@
     }
   },
   "main": "src/index.js",
+  "types": "index.d.ts",
   "scripts": {
     "build": "rollup --config",
     "format": "npm run format:package && npm run format:lint",
@@ -43,5 +44,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "11eb680bba07d4885cc04dc173165e0b7982b780"
+  "gitHead": "358428010fb0d5f130295fbe38b1aab2c1f89e5f"
 }

package/src/cors.helper.js

@@ -23,16 +23,16 @@ const ensureProtocol = (url) => {
   return HTTPS_PROTOCOL + url;
 };
 
-export const dynamicOriginCallbackHandler = (origins) => {
-  return (origin, callback) => {
+export const dynamicOriginCallbackHandler = (origin) => {
+  return (requestOrigin, callback) => {
     // Handle wildcard origin
-    if (origins === "*") {
+    if (origin === "*") {
       callback(null, true);
       return;
     }
 
     // Allow requests with no origin (like mobile apps, curl, etc)
-    if (!origin) {
+    if (!requestOrigin) {
       callback(null, true);
       return;
     }
@@ -44,8 +44,8 @@ export const dynamicOriginCallbackHandler = (origins) => {
     if (process.env.PROJECT_BASE_URL) {
       allowedOrigins.push(ensureProtocol(process.env.PROJECT_BASE_URL));
     }
-    if (origins) {
-      const additionalOrigins = force.array(origins);
+    if (origin) {
+      const additionalOrigins = force.array(origin);
       allowedOrigins.push(...additionalOrigins);
     }
 
@@ -60,9 +60,9 @@ export const dynamicOriginCallbackHandler = (origins) => {
 
     const isAllowed = allowedOrigins.some((allowed) => {
       if (allowed instanceof RegExp) {
-        return allowed.test(origin);
+        return allowed.test(requestOrigin);
       }
-      return origin.includes(allowed);
+      return requestOrigin.includes(allowed);
     });
 
     if (isAllowed) {
@@ -79,10 +79,10 @@ export const dynamicOriginCallbackHandler = (origins) => {
 //
 
 const corsHelper = (config = {}) => {
-  const { origins, overrides = {} } = config;
+  const { origin, overrides = {} } = config;
 
   const options = {
-    origin: dynamicOriginCallbackHandler(origins),
+    origin: dynamicOriginCallbackHandler(origin),
     // * The default behavior is to allow any headers and methods so they are not included here
     ...overrides,
   };