@tstdl/base 0.90.33 → 0.90.34

package/.eslintrc.json

@@ -86,7 +86,6 @@
     "capitalized-comments": "off",
     "class-methods-use-this": "off",
     "complexity": "off",
-    "consistent-return": ["error", { "treatUndefinedAsUnspecified": true }],
     "dot-location": ["error", "property"],
     "eqeqeq": "off",
     "func-style": ["error", "declaration", { "allowArrowFunctions": true }],

package/examples/api/streaming.d.ts

@@ -1 +1 @@
-export {};
+import '../../polyfills.js';

package/examples/api/streaming.js

@@ -5,6 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 /* eslint-disable max-classes-per-file */
+import '../../polyfills.js';
 import { compileClient } from '../../api/client/client.js';
 import { defineApi } from '../../api/index.js';
 import { apiController, configureApiServer } from '../../api/server/index.js';

package/http/client/http-client.js

@@ -194,17 +194,15 @@ HttpClient = __decorate([
 export { HttpClient };
 function getBuildRequestUrlMiddleware(baseUrl) {
     async function buildUrlParametersMiddleware({ request }, next) {
-        if (!request.mapParameters) {
-            return next();
+        if (request.mapParameters) {
+            mapParameters(request, baseUrl);
         }
-        mapParameters(request, baseUrl);
         return next();
     }
     return buildUrlParametersMiddleware;
 }
 function getAddRequestHeadersMiddleware(defaultHeaders) {
     async function addRequestHeadersMiddleware({ request }, next) {
-        await next();
         const { body, authorization } = request;
         for (const [key, value] of defaultHeaders) {
             request.headers.setIfMissing(key, value);
@@ -238,6 +236,7 @@ function getAddRequestHeadersMiddleware(defaultHeaders) {
                 request.headers.authorization = `Token ${authorization.token}`;
             }
         }
+        return next();
     }
     return addRequestHeadersMiddleware;
 }

package/http/server/node/node-http-server.js

@@ -47,8 +47,10 @@ let NodeHttpServer = class NodeHttpServer extends HttpServer {
         });
     }
     async [disposeAsync]() {
-        await this.close(3000);
-        this.requestIterable.end();
+        if (this.httpServer.listening) {
+            await this.close(3000);
+            this.requestIterable.end();
+        }
     }
     async listen(port) {
         if (this.httpServer.listening) {

package/injector/injector.js

@@ -1,7 +1,7 @@
 import { CancellationSignal, CancellationToken } from '../cancellation/index.js';
 import { CircularBuffer } from '../data-structures/circular-buffer.js';
 import { MultiKeyMap } from '../data-structures/multi-key-map.js';
-import { isAsyncDisposable, isDisposable, isSyncOrAsyncDisposable } from '../disposable/disposable.js';
+import { isSyncOrAsyncDisposable } from '../disposable/disposable.js';
 import { DeferredPromise } from '../promise/deferred-promise.js';
 import { reflectionRegistry } from '../reflection/registry.js';
 import { toArray } from '../utils/array/array.js';
@@ -22,6 +22,7 @@ export class Injector {
     #children = [];
     #disposeToken = new CancellationToken();
     #disposableStack = new AsyncDisposableStack();
+    #disposableStackRegistrations = new Set();
     #registrations = new Map();
     #injectorScopedResolutions = new MultiKeyMap();
     #addDisposeHandler;
@@ -44,6 +45,7 @@ export class Injector {
         };
         this.#disposableStack.defer(() => this.#registrations.clear());
         this.#disposableStack.defer(() => this.#injectorScopedResolutions.clear());
+        this.#disposableStack.defer(() => this.#disposableStackRegistrations.clear());
     }
     /**
      * Globally register a provider for a token
@@ -323,8 +325,9 @@ export class Injector {
             if (isUndefined(result)) {
                 throw new Error('Unsupported provider.');
             }
-            if (isDisposable(result.value) || isAsyncDisposable(result.value)) {
+            if (isSyncOrAsyncDisposable(result.value) && !this.#disposableStackRegistrations.has(result.value)) {
                 this.#disposableStack.use(result.value);
+                this.#disposableStackRegistrations.add(result.value);
             }
             return result.value;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.90.33",
+  "version": "0.90.34",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"