@jaypie/express 1.2.21 → 1.2.23

package/dist/cjs/expressHandler.d.ts

@@ -5,6 +5,13 @@ export type JaypieHandlerValidate = (req: Request, res: Response) => Promise<boo
 export type ExpressHandlerLocals = (req: Request, res: Response) => Promise<unknown> | unknown;
 export interface ExpressHandlerOptions {
     chaos?: string;
+    /**
+     * When true, the handler's return value is wrapped with
+     * `fabricApiResponse` before `res.json()`. Plain objects become
+     * `{ data: value }`; pre-wrapped `{ data }` or `{ errors }` payloads
+     * pass through unchanged. `null` / `undefined` become `{ data: null }`.
+     */
+    fabric?: boolean;
     locals?: Record<string, unknown | ExpressHandlerLocals>;
     name?: string;
     secrets?: string[];

package/dist/cjs/fabricApiResponse.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Wrap a service return value in the canonical Jaypie API envelope.
+ *
+ * Rules:
+ * - `null` / `undefined` → `{ data: null }`
+ * - `{ data }` with exactly one key → passthrough
+ * - `{ errors }` with exactly one key → passthrough
+ * - everything else (including `{ data, other }`) → `{ data: value }`
+ *
+ * The "only one key, and that key is `data` or `errors`" check prevents
+ * false positives where a domain object happens to contain a `data` field.
+ */
+export declare function fabricApiResponse(result: unknown): unknown;
+export default fabricApiResponse;

package/dist/cjs/index.cjs

@@ -1357,6 +1357,48 @@ var cors_helper = (config) => {
     };
 };
 
+//
+//
+// Helpers
+//
+function isWrappedData(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        !Array.isArray(value) &&
+        Object.keys(value).length === 1 &&
+        "data" in value);
+}
+function isWrappedErrors(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        !Array.isArray(value) &&
+        Object.keys(value).length === 1 &&
+        "errors" in value);
+}
+//
+//
+// Main
+//
+/**
+ * Wrap a service return value in the canonical Jaypie API envelope.
+ *
+ * Rules:
+ * - `null` / `undefined` → `{ data: null }`
+ * - `{ data }` with exactly one key → passthrough
+ * - `{ errors }` with exactly one key → passthrough
+ * - everything else (including `{ data, other }`) → `{ data: value }`
+ *
+ * The "only one key, and that key is `data` or `errors`" check prevents
+ * false positives where a domain object happens to contain a `data` field.
+ */
+function fabricApiResponse(result) {
+    if (result === null || result === undefined)
+        return { data: null };
+    if (isWrappedData(result) || isWrappedErrors(result))
+        return result;
+    return { data: result };
+}
+
 //
 //
 // Helper Functions
@@ -1719,7 +1761,7 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
     //
     // Validate
     //
-    let { chaos, locals, name, secrets, setup = [], teardown = [], unavailable, validate, } = options;
+    let { chaos, fabric, locals, name, secrets, setup = [], teardown = [], unavailable, validate, } = options;
     if (typeof handler !== "function") {
         throw new errors.BadRequestError(`Argument "${handler}" doesn't match type "function"`);
     }
@@ -1873,6 +1915,9 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
             // Process
             //
             response = (await jaypieFunction(req, res, ...params));
+            if (fabric) {
+                response = fabricApiResponse(response);
+            }
             //
             //
             // Error Handling
@@ -1979,19 +2024,37 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
             res: summarizeResponse(res, extras),
         });
         // Construct normalized path for reporting and metrics
-        let path = (req.baseUrl || "") + (req.url || "");
-        if (!path.startsWith("/")) {
-            path = "/" + path;
+        let pathWithQuery = (req.baseUrl || "") + (req.url || "");
+        if (!pathWithQuery.startsWith("/")) {
+            pathWithQuery = "/" + pathWithQuery;
         }
+        const queryIndex = pathWithQuery.indexOf("?");
+        let path = queryIndex >= 0 ? pathWithQuery.slice(0, queryIndex) : pathWithQuery;
+        const rawQuery = queryIndex >= 0 ? pathWithQuery.slice(queryIndex + 1) : "";
         if (path.length > 1 && path.endsWith("/")) {
             path = path.slice(0, -1);
         }
         // Replace UUIDs with :id for better aggregation
         path = path.replace(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/gi, ":id");
+        // Normalize query params (sort alphabetically for stable aggregation)
+        let query = "";
+        if (rawQuery) {
+            const params = new URLSearchParams(rawQuery);
+            params.sort();
+            query = params.toString();
+        }
+        // Capture request content metadata
+        const headers = req.headers || {};
+        const contentType = String(headers["content-type"] || "");
+        const contentLengthHeader = headers["content-length"];
+        const contentLength = contentLengthHeader ? Number(contentLengthHeader) : 0;
         // Add request data to session report
         logger$1.report({
             method: req.method,
             path,
+            query,
+            contentType,
+            contentLength,
             status: String(res.statusCode),
         });
         // Submit metric if Datadog is configured
@@ -2370,6 +2433,7 @@ exports.echoRoute = echoRoute;
 exports.expressHandler = expressHandler;
 exports.expressHttpCodeHandler = httpHandler;
 exports.expressStreamHandler = expressStreamHandler;
+exports.fabricApiResponse = fabricApiResponse;
 exports.forbiddenRoute = forbiddenRoute;
 exports.getCurrentInvoke = getCurrentInvoke;
 exports.getCurrentInvokeUuid = getCurrentInvokeUuid;