@drunkcod/express-kit 0.0.6 → 0.0.7

package/lib/index.d.ts

@@ -1,6 +1,8 @@
 import type express from 'express';
 export * from '@drunkcod/express-async';
-export * from './loggable';
-export declare function onceAsync<T>(fn: () => Promise<T>): () => Promise<T>;
+export * from './loggable.js';
+type AsyncFn<T> = () => Promise<T>;
+export declare function onceAsync<T>(fn: AsyncFn<T>): AsyncFn<T>;
+export declare function mergeCallsAsync<T>(fn: AsyncFn<T>): AsyncFn<T>;
 type ExpressServer = ReturnType<express.Application['listen']>;
 export declare function registerShutdown<Server extends ExpressServer = ExpressServer>(server: Server, shutdown?: () => Promise<void>): void;

package/lib/index.js

@@ -1,24 +1,6 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.onceAsync = onceAsync;
-exports.registerShutdown = registerShutdown;
-__exportStar(require("@drunkcod/express-async"), exports);
-__exportStar(require("./loggable"), exports);
-function onceAsync(fn) {
+export * from '@drunkcod/express-async';
+export * from './loggable.js';
+export function onceAsync(fn) {
     let p;
     return () => {
         if (p)
@@ -28,6 +10,19 @@ function onceAsync(fn) {
         return p;
     };
 }
+export function mergeCallsAsync(fn) {
+    let p;
+    return async () => {
+        if (!p)
+            p = fn();
+        try {
+            return await p;
+        }
+        finally {
+            p = null;
+        }
+    };
+}
 const closeAsync = (server) => (new Promise((resolve, reject) => {
     server.close((err) => {
         if (err)
@@ -36,7 +31,7 @@ const closeAsync = (server) => (new Promise((resolve, reject) => {
             resolve();
     });
 }));
-function registerShutdown(server, shutdown) {
+export function registerShutdown(server, shutdown) {
     const onShutdown = onceAsync(async () => {
         await closeAsync(server);
         if (shutdown)

package/lib/loggable.js

@@ -1,9 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.at = at;
-exports.asLoggableError = asLoggableError;
-const argis_1 = require("@drunkcod/argis");
-function at(message) {
+import { hasOwn } from "@drunkcod/argis";
+export function at(message) {
     const old = Error.stackTraceLimit;
     try {
         const r = { stack: '' };
@@ -25,13 +21,13 @@ function asLoggableCause(cause) {
             ? { message, stack, cause: asLoggableCause(innerCause), ...rest }
             : { message, stack, ...rest };
     }
-    if ((0, argis_1.hasOwn)(cause, 'cause')) {
+    if (hasOwn(cause, 'cause')) {
         const { cause: innerCause, ...rest } = cause;
         return { ...rest, cause: asLoggableCause(innerCause) };
     }
     return { ...cause };
 }
-function asLoggableError(error) {
+export function asLoggableError(error) {
     if (error instanceof Error)
         return asLoggableCause(error);
     const r = (error && typeof error === 'object') ? asLoggableCause(error) : { message: error };

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@drunkcod/express-kit",
-  "version": "0.0.6",
+  "type": "module",
+  "version": "0.0.7",
   "description": "Express4 utility things",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -10,28 +11,29 @@
   ],
   "scripts": {
     "clean": "rimraf lib",
-    "compile": "npx tsc",
+    "compile": "tsc",
     "test": "jest",
-    "build": "npm-run-all clean compile"
+    "build": "npm-run-all clean compile --silent"
   },
   "keywords": [
     "express"
   ],
-  "author": "Tobbe Gyllebring",
+  "author": "Tobbe Gyllebring <tobbe@drunkcod.com>",
   "license": "MIT",
   "workspaces": [
     "express-async"
   ],
   "dependencies": {
-    "@drunkcod/argis": "^0.0.4"
+    "@drunkcod/argis": "^0.0.4",
+    "@drunkcod/express-async": "^0.0.7"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@types/node": "^22.5.4",
+    "@types/node": "^22.7.4",
     "jest": "^29.7.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^6.0.1",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.5.4"
+    "typescript": "^5.6.2"
   }
 }