jimpex 8.0.0 → 10.0.0

package/dist/utils/index.d.ts

@@ -2,10 +2,8 @@ export { notUndefined } from './fns/others.js';
 export { createRouteExpression, removeLeadingSlash, removeSlashes, removeTrailingSlash } from './fns/routes.js';
 export { Statuses } from './fns/statuses.js';
 export { escapeForRegExp } from './fns/text.js';
-export { H as Controller, C as ControllerConnectFn, I as ControllerCreator, F as ControllerCreatorFn, a2 as ControllerLike, O as ControllerProvider, Q as ControllerProviderCreator, M as ControllerProviderCreatorFn, K as ControllerProviderRegisterFn, V as Middleware, R as MiddlewareConnectFn, W as MiddlewareCreator, T as MiddlewareCreatorFn, a1 as MiddlewareLike, $ as MiddlewareProvider, a0 as MiddlewareProviderCreator, Z as MiddlewareProviderCreatorFn, X as MiddlewareProviderRegisterFn, y as Provider, z as ProviderCreator, B as ProviderLike, P as ProviderRegisterFn, A as Providers, D as controller, G as controllerCreator, L as controllerProvider, N as controllerProviderCreator, S as middleware, U as middlewareCreator, Y as middlewareProvider, _ as middlewareProviderCreator, v as provider, w as providerCreator, x as providers } from '../jimpex-7eaee271.js';
+export { H as Controller, C as ControllerConnectFn, I as ControllerCreator, F as ControllerCreatorFn, a2 as ControllerLike, O as ControllerProvider, Q as ControllerProviderCreator, M as ControllerProviderCreatorFn, K as ControllerProviderRegisterFn, V as Middleware, R as MiddlewareConnectFn, W as MiddlewareCreator, T as MiddlewareCreatorFn, a1 as MiddlewareLike, $ as MiddlewareProvider, a0 as MiddlewareProviderCreator, Z as MiddlewareProviderCreatorFn, X as MiddlewareProviderRegisterFn, y as Provider, z as ProviderCreator, B as ProviderLike, P as ProviderRegisterFn, A as Providers, D as controller, G as controllerCreator, L as controllerProvider, N as controllerProviderCreator, S as middleware, U as middlewareCreator, Y as middlewareProvider, _ as middlewareProviderCreator, v as provider, w as providerCreator, x as providers } from '../index-C6I3NCC-.js';
 export { default as statuses } from 'statuses';
-import '@homer0/jimple';
-import '@homer0/events-hub';
 import '../types/express.js';
 import 'express';
 import '../types/http.js';
@@ -13,6 +11,9 @@ import 'https';
 import 'http';
 import 'spdy';
 import 'node-fetch';
-import '@homer0/simple-config';
 import '../types/utils.js';
+import '@homer0/path-utils';
 import '@homer0/simple-logger';
+import '@homer0/simple-config';
+import '@homer0/events-hub';
+import '@homer0/jimple';

package/dist/utils/index.js

@@ -17,4 +17,9 @@ var utils_exports = {};
 module.exports = __toCommonJS(utils_exports);
 __reExport(utils_exports, require("./fns"), module.exports);
 __reExport(utils_exports, require("./wrappers"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./fns"),
+  ...require("./wrappers")
+});
 //# sourceMappingURL=index.js.map

package/dist/utils/wrappers.d.mts

@@ -0,0 +1,14 @@
+import '@homer0/jimple';
+export { H as Controller, C as ControllerConnectFn, I as ControllerCreator, F as ControllerCreatorFn, a2 as ControllerLike, O as ControllerProvider, Q as ControllerProviderCreator, M as ControllerProviderCreatorFn, K as ControllerProviderRegisterFn, V as Middleware, R as MiddlewareConnectFn, W as MiddlewareCreator, T as MiddlewareCreatorFn, a1 as MiddlewareLike, $ as MiddlewareProvider, a0 as MiddlewareProviderCreator, Z as MiddlewareProviderCreatorFn, X as MiddlewareProviderRegisterFn, y as Provider, z as ProviderCreator, B as ProviderLike, P as ProviderRegisterFn, A as Providers, D as controller, G as controllerCreator, L as controllerProvider, N as controllerProviderCreator, S as middleware, U as middlewareCreator, Y as middlewareProvider, _ as middlewareProviderCreator, v as provider, w as providerCreator, x as providers } from '../index-Bwf7JHu9.mjs';
+import '../types/express.mjs';
+import '../types/utils.mjs';
+import 'express';
+import '../types/http.mjs';
+import 'https';
+import 'http';
+import 'spdy';
+import 'node-fetch';
+import '@homer0/path-utils';
+import '@homer0/simple-logger';
+import '@homer0/simple-config';
+import '@homer0/events-hub';

package/dist/utils/wrappers.d.ts

@@ -1,13 +1,14 @@
 import '@homer0/jimple';
-export { H as Controller, C as ControllerConnectFn, I as ControllerCreator, F as ControllerCreatorFn, a2 as ControllerLike, O as ControllerProvider, Q as ControllerProviderCreator, M as ControllerProviderCreatorFn, K as ControllerProviderRegisterFn, V as Middleware, R as MiddlewareConnectFn, W as MiddlewareCreator, T as MiddlewareCreatorFn, a1 as MiddlewareLike, $ as MiddlewareProvider, a0 as MiddlewareProviderCreator, Z as MiddlewareProviderCreatorFn, X as MiddlewareProviderRegisterFn, y as Provider, z as ProviderCreator, B as ProviderLike, P as ProviderRegisterFn, A as Providers, D as controller, G as controllerCreator, L as controllerProvider, N as controllerProviderCreator, S as middleware, U as middlewareCreator, Y as middlewareProvider, _ as middlewareProviderCreator, v as provider, w as providerCreator, x as providers } from '../jimpex-7eaee271.js';
+export { H as Controller, C as ControllerConnectFn, I as ControllerCreator, F as ControllerCreatorFn, a2 as ControllerLike, O as ControllerProvider, Q as ControllerProviderCreator, M as ControllerProviderCreatorFn, K as ControllerProviderRegisterFn, V as Middleware, R as MiddlewareConnectFn, W as MiddlewareCreator, T as MiddlewareCreatorFn, a1 as MiddlewareLike, $ as MiddlewareProvider, a0 as MiddlewareProviderCreator, Z as MiddlewareProviderCreatorFn, X as MiddlewareProviderRegisterFn, y as Provider, z as ProviderCreator, B as ProviderLike, P as ProviderRegisterFn, A as Providers, D as controller, G as controllerCreator, L as controllerProvider, N as controllerProviderCreator, S as middleware, U as middlewareCreator, Y as middlewareProvider, _ as middlewareProviderCreator, v as provider, w as providerCreator, x as providers } from '../index-C6I3NCC-.js';
 import '../types/express.js';
 import '../types/utils.js';
 import 'express';
-import '@homer0/events-hub';
 import '../types/http.js';
 import 'https';
 import 'http';
 import 'spdy';
 import 'node-fetch';
-import '@homer0/simple-config';
+import '@homer0/path-utils';
 import '@homer0/simple-logger';
+import '@homer0/simple-config';
+import '@homer0/events-hub';

package/package.json

@@ -2,67 +2,68 @@
   "name": "jimpex",
   "description": "Express as dependency injection container.",
   "homepage": "https://homer0.github.io/jimpex/",
-  "version": "8.0.0",
+  "version": "10.0.0",
   "repository": "homer0/jimpex",
   "author": "Leonardo Apiwan (@homer0) <me@homer0.com>",
   "license": "MIT",
   "dependencies": {
-    "@homer0/api-utils": "^2.0.0",
-    "@homer0/deep-assign": "^2.0.0",
-    "@homer0/deferred": "^2.0.0",
-    "@homer0/env-utils": "^2.0.0",
-    "@homer0/events-hub": "^2.0.0",
-    "@homer0/jimple": "^2.0.0",
-    "@homer0/object-utils": "^2.0.0",
-    "@homer0/package-info": "^2.0.0",
-    "@homer0/path-utils": "^2.0.0",
-    "@homer0/root-file": "^2.0.0",
-    "@homer0/simple-logger": "^2.0.0",
-    "@homer0/simple-config": "^2.0.0",
-    "express": "^4.18.2",
-    "body-parser": "^1.20.1",
+    "@homer0/api-utils": "^3.0.4",
+    "@homer0/deep-assign": "^3.0.4",
+    "@homer0/deferred": "^3.0.4",
+    "@homer0/env-utils": "^3.0.4",
+    "@homer0/events-hub": "^3.0.4",
+    "@homer0/jimple": "^3.0.4",
+    "@homer0/object-utils": "^3.0.4",
+    "@homer0/package-info": "^3.0.4",
+    "@homer0/path-utils": "^3.0.4",
+    "@homer0/root-file": "^3.0.4",
+    "@homer0/simple-config": "^3.0.4",
+    "@homer0/simple-logger": "^3.0.4",
+    "@homer0/ts-async-import": "^1.1.3",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/git": "^10.0.1",
+    "body-parser": "^1.20.2",
     "compression": "^1.7.4",
-    "node-fetch": "^2.6.7",
-    "urijs": "^1.19.11",
+    "express": "^4.19.2",
+    "mime": "^4.0.1",
+    "multer": "1.4.5-lts.1",
+    "node-fetch": "^3.3.2",
+    "semantic-release": "^23.0.7",
+    "spdy": "^4.0.2",
     "statuses": "^2.0.1",
-    "multer": "^1.4.5-lts.1",
-    "mime": "^3.0.0",
-    "spdy": "^4.0.2"
+    "urijs": "^1.19.11"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.3.0",
-    "@commitlint/config-conventional": "^17.3.0",
-    "@homer0/eslint-plugin": "^10.0.0",
-    "@homer0/prettier-config": "^1.1.2",
-    "@homer0/prettier-plugin-jsdoc": "^6.0.0",
-    "@homer0/tsconfig": "^1.0.4",
-    "@semantic-release/changelog": "^6.0.2",
-    "@semantic-release/git": "^10.0.1",
-    "@types/body-parser": "^1.19.2",
-    "@types/compression": "^1.7.2",
-    "@types/express": "^4.17.15",
-    "@types/multer": "^1.4.7",
-    "@types/mime": "^3.0.1",
-    "@types/node-fetch": "^2.6.2",
-    "@types/spdy": "^3.4.5",
-    "@types/statuses": "^2.0.0",
-    "@types/urijs": "^1.19.19",
-    "eslint": "^8.30.0",
+    "@commitlint/cli": "^19.2.1",
+    "@commitlint/config-conventional": "^19.1.0",
+    "@homer0/eslint-plugin": "^12.0.4",
+    "@homer0/prettier-config": "^1.1.3",
+    "@homer0/prettier-plugin-jsdoc": "^8.0.0",
+    "@homer0/tsconfig": "^1.0.15",
+    "@types/body-parser": "^1.19.5",
+    "@types/compression": "^1.7.5",
+    "@types/express": "^4.17.21",
+    "@types/jest": "^29.5.12",
+    "@types/multer": "^1.4.11",
+    "@types/node": "^20.12.5",
+    "@types/spdy": "^3.4.9",
+    "@types/statuses": "^2.0.5",
+    "@types/urijs": "^1.19.25",
+    "eslint": "^8.57.0",
+    "husky": "^9.0.11",
     "is-ci": "^3.0.1",
-    "jest": "^29.3.1",
-    "leasot": "^13.2.0",
-    "lint-staged": "^13.1.0",
-    "husky": "^8.0.2",
-    "semantic-release": "^19.0.5",
-    "ts-jest": "^29.0.3",
+    "jest": "^29.7.0",
+    "leasot": "^13.3.0",
+    "lint-staged": "^15.2.2",
+    "ts-jest": "^29.1.2",
     "ts-node-dev": "^2.0.0",
-    "tsup": "^6.5.0",
-    "typedoc": "0.23.23",
-    "typescript": "^4.9.4"
+    "tsup": "^8.0.2",
+    "typedoc": "0.25.12",
+    "typescript": "^5.4.4"
   },
   "engine-strict": true,
   "engines": {
-    "node": ">=16"
+    "node": ">=18.17 <21"
   },
   "main": "./dist/index.js",
   "module": "./dist/esm/index.js",
@@ -89,7 +90,7 @@
     "docs": "./utils/scripts/docs",
     "todo": "./utils/scripts/todo",
     "example": "./utils/scripts/example",
-    "prepublishOnly": "npm run build",
+    "prepublishOnly": "pnpm run build",
     "prepare": "./utils/scripts/prepare"
   }
 }

package/src/app/jimpex.ts

@@ -8,6 +8,7 @@ import { envUtilsProvider } from '@homer0/env-utils';
 import { packageInfoProvider } from '@homer0/package-info';
 import { pathUtilsProvider } from '@homer0/path-utils';
 import { rootFileProvider } from '@homer0/root-file';
+import { tsAsyncImport } from '@homer0/ts-async-import';
 import { EventsHub } from '@homer0/events-hub';
 import { simpleConfigProvider } from '@homer0/simple-config';
 import compression from 'compression';
@@ -181,7 +182,7 @@ export class Jimpex extends Jimple {
    * @returns The server instance.
    */
   async start(onStart?: JimpexStartCallback): Promise<JimpexServerInstance> {
-    await this._setupConfig();
+    await Promise.all([this._setupConfig(), this._loadESMModules()]);
     const config = this.getConfig();
     const port = config.get<number | undefined>('port');
     if (!port) {
@@ -218,7 +219,7 @@ export class Jimpex extends Jimple {
     onStart?: JimpexStartCallback,
   ): Promise<JimpexServerInstance> {
     if (port) {
-      await this._setupConfig();
+      await Promise.all([this._setupConfig(), this._loadESMModules()]);
       const config = this.getConfig();
       config.set('port', port);
     }
@@ -608,6 +609,18 @@ export class Jimpex extends Jimple {
       await config.loadFromEnv();
     }
   }
+  /**
+   * Loads the ESM modules that are needed by Jimpex. This is called just before the starting
+   * the application so they'll be available for all the services.
+   */
+  protected async _loadESMModules(): Promise<void> {
+    const { default: nodeFetch } =
+      await tsAsyncImport<typeof import('node-fetch')>('node-fetch');
+    const { default: mime } = await tsAsyncImport<typeof import('mime')>('mime');
+
+    this.set('node-fetch', () => nodeFetch);
+    this.set('mime', () => mime);
+  }
   /**
    * Processes the resources from the mount queue (added with {@link Jimpex.mount} and
    * {@link Jimpex.use}), and adds them to the Express application.

package/src/controllers/common/statics.ts

@@ -1,5 +1,5 @@
 import * as path from 'path';
-import * as mime from 'mime';
+import type mime from 'mime';
 import { deepAssignWithOverwrite } from '@homer0/deep-assign';
 import {
   controllerCreator,
@@ -10,6 +10,9 @@ import {
 import type { SendFile } from '../../services';
 import type { Jimpex } from '../../app';
 import type { DeepPartial, ExpressMiddleware, Router, RouterMethod } from '../../types';
+
+type Mime = typeof mime;
+
 /**
  * The definition for each file the controller handles.
  *
@@ -84,6 +87,7 @@ export type StaticsControllerConstructorOptions =
      */
     inject: {
       sendFile: SendFile;
+      mime: Mime;
     };
   };
 /**
@@ -147,6 +151,11 @@ export class StaticsController {
    * The service that serves static files.
    */
   protected readonly _sendFile: SendFile;
+  /**
+   * The MIME type library. Since it's an ESM only module, Jimpex loads it on boot and makes
+   * it available on the container.
+   */
+  protected readonly _mime: Mime;
   /**
    * The controller customization options.
    */
@@ -161,6 +170,7 @@ export class StaticsController {
    */
   constructor({ inject, ...options }: StaticsControllerConstructorOptions) {
     this._sendFile = inject.sendFile;
+    this._mime = inject.mime;
     this._options = this._validateOptions(
       deepAssignWithOverwrite(
         {
@@ -224,7 +234,7 @@ export class StaticsController {
     return (_, res, next) => {
       const extension = path.parse(file.path).ext.substring(1);
       const headers = {
-        'Content-Type': mime.getType(extension) || 'text/html',
+        'Content-Type': this._mime.getType(extension) || 'text/html',
         ...file.headers,
       };
 
@@ -358,6 +368,7 @@ export const staticsController = controllerCreator(
       const ctrl = new StaticsController({
         inject: {
           sendFile: app.get('sendFile'),
+          mime: app.get('mime'),
         },
         ...options,
       });

package/src/controllers/utils/gateway.ts

@@ -737,6 +737,10 @@ export class GatewayController {
         });
 
         if (shouldStream) {
+          if (response.body === null) {
+            throw new Error('The response body is null');
+          }
+
           /**
            * If the response should be streamed, set the status, remove unwanted headers,
            * and pipe it to the application response object.

package/src/services/http/http.ts

@@ -1,8 +1,9 @@
-import fetch, { type RequestInit, type BodyInit } from 'node-fetch';
 import urijs from 'urijs';
+import type { RequestInit, BodyInit } from 'node-fetch';
 import { deepAssignWithOverwrite } from '@homer0/deep-assign';
 import { provider } from '../../utils';
-import { Logger, Request, HTTPResponse } from '../../types';
+import { Logger, Request, HTTPResponse, NodeFetch } from '../../types';
+
 /**
  * The options to customize the service.
  *
@@ -25,6 +26,7 @@ export type HTTPContructorOptions = Partial<HTTPOptions> & {
    */
   inject: {
     logger: Logger;
+    nodeFetch: NodeFetch;
   };
 };
 /**
@@ -89,6 +91,11 @@ export class HTTP {
    * The service used to log information in the terminal.
    */
   protected readonly _logger: Logger;
+  /**
+   * The node-fetch library. Since it's an ESM only module, Jimpex loads it on boot and makes
+   * it available on the container.
+   */
+  protected readonly _nodeFetch: NodeFetch;
   /**
    * The service customization options.
    */
@@ -96,8 +103,9 @@ export class HTTP {
   /**
    * @param options  The options to construct the class.
    */
-  constructor({ inject: { logger }, ...options }: HTTPContructorOptions) {
+  constructor({ inject: { logger, nodeFetch }, ...options }: HTTPContructorOptions) {
     this._logger = logger;
+    this._nodeFetch = nodeFetch;
     this._options = deepAssignWithOverwrite(
       {
         logRequests: false,
@@ -146,7 +154,7 @@ export class HTTP {
       this._logRequest(useURL, fetchOptions);
     }
 
-    const response = await fetch(useURL, fetchOptions);
+    const response = await this._nodeFetch(useURL, fetchOptions);
     if (logRequests) {
       this._logResponse(response);
     }
@@ -279,6 +287,7 @@ export const httpProvider = provider((app) => {
     return new HTTP({
       inject: {
         logger: app.get('logger'),
+        nodeFetch: app.get('node-fetch'),
       },
       logRequests,
     });

package/src/types/http.ts

@@ -1,10 +1,13 @@
 import type { Server as HTTPSServer } from 'https';
 import type { Server as HTTPServer } from 'http';
 import type { ServerOptions as SpdyServerOptions } from 'spdy';
+import type NodeFetchFn from 'node-fetch';
 import type { Express } from './express';
 
 export type { Response as HTTPResponse } from 'node-fetch';
 
+export type NodeFetch = typeof NodeFetchFn;
+
 export type { HTTPSServer, HTTPServer };
 /**
  * @group Jimpex