@tstdl/base 0.85.26 → 0.86.0-beta10

package/examples/pdf/basic.js

@@ -4,14 +4,17 @@ var import_node_path = require("node:path");
 var import_node_url = require("node:url");
 var import_application = require("../../application/application.js");
 var import_browser_service = require("../../browser/browser.service.js");
-var import_container = require("../../container/index.js");
 var import_core = require("../../core.js");
+var import_inject = require("../../injector/inject.js");
+var import_injector = require("../../injector/injector.js");
 var import_pdf_service = require("../../pdf/pdf.service.js");
 var import_module = require("../../templates/module.js");
 var import_file_template_provider = require("../../templates/providers/file.template-provider.js");
 var import_handlebars_template_renderer = require("../../templates/renderers/handlebars.template-renderer.js");
 var import_mjml_template_renderer = require("../../templates/renderers/mjml.template-renderer.js");
+var import_string_template_renderer = require("../../templates/renderers/string.template-renderer.js");
 var import_file_template_resolver = require("../../templates/resolvers/file.template-resolver.js");
+var import_string_template_resolver = require("../../templates/resolvers/string.template-resolver.js");
 const import_meta = {};
 let dirname;
 try {
@@ -22,14 +25,15 @@ try {
 (0, import_core.configureTstdl)();
 (0, import_module.configureTemplates)({
   templateProvider: import_file_template_provider.FileTemplateProvider,
-  templateResolvers: [import_file_template_resolver.FileTemplateResolver],
-  templateRenderers: [import_mjml_template_renderer.MjmlTemplateRenderer, import_handlebars_template_renderer.HandlebarsTemplateRenderer]
+  templateResolvers: [import_file_template_resolver.FileTemplateResolver, import_string_template_resolver.StringTemplateResolver],
+  templateRenderers: [import_mjml_template_renderer.MjmlTemplateRenderer, import_handlebars_template_renderer.HandlebarsTemplateRenderer, import_string_template_renderer.StringTemplateRenderer]
 });
 (0, import_file_template_provider.configureFileTemplateProvider)({ basePath: (0, import_node_path.resolve)(dirname, "templates") });
 (0, import_file_template_resolver.configureFileTemplateResolver)({ basePath: (0, import_node_path.resolve)(dirname.replace("dist", "source"), "templates") });
 async function main() {
-  const browserService = await import_container.container.resolveAsync(import_browser_service.BrowserService);
-  const pdfService = await import_container.container.resolveAsync(import_pdf_service.PdfService);
+  const injector = (0, import_inject.inject)(import_injector.Injector);
+  const browserService = await injector.resolveAsync(import_browser_service.BrowserService);
+  const pdfService = await injector.resolveAsync(import_pdf_service.PdfService);
   const [result1, result2] = await Promise.all([
     pdfService.renderTemplate("hello-name", { name: "Max Mustermann" }),
     pdfService.renderUrl("https://google.de")

package/examples/template/basic.js

@@ -1,15 +1,17 @@
 "use strict";
+var import_node_path = require("node:path");
+var import_node_url = require("node:url");
 var import_application = require("../../application/application.js");
-var import_container = require("../../container/index.js");
 var import_core = require("../../core.js");
+var import_inject = require("../../injector/inject.js");
 var import_templates = require("../../templates/index.js");
 var import_file_template_provider = require("../../templates/providers/file.template-provider.js");
 var import_handlebars_template_renderer = require("../../templates/renderers/handlebars.template-renderer.js");
 var import_jsx_template_renderer = require("../../templates/renderers/jsx.template-renderer.js");
+var import_string_template_renderer = require("../../templates/renderers/string.template-renderer.js");
 var import_file_template_resolver = require("../../templates/resolvers/file.template-resolver.js");
 var import_jsx_template_resolver = require("../../templates/resolvers/jsx.template-resolver.js");
-var import_node_path = require("node:path");
-var import_node_url = require("node:url");
+var import_string_template_resolver = require("../../templates/resolvers/string.template-resolver.js");
 const import_meta = {};
 let dirname;
 try {
@@ -20,13 +22,13 @@ try {
 (0, import_core.configureTstdl)();
 (0, import_templates.configureTemplates)({
   templateProvider: import_file_template_provider.FileTemplateProvider,
-  templateResolvers: [import_file_template_resolver.FileTemplateResolver, import_jsx_template_resolver.JsxTemplateResolver],
-  templateRenderers: [import_handlebars_template_renderer.HandlebarsTemplateRenderer, import_jsx_template_renderer.JsxTemplateRenderer]
+  templateResolvers: [import_file_template_resolver.FileTemplateResolver, import_jsx_template_resolver.JsxTemplateResolver, import_string_template_resolver.StringTemplateResolver],
+  templateRenderers: [import_handlebars_template_renderer.HandlebarsTemplateRenderer, import_jsx_template_renderer.JsxTemplateRenderer, import_string_template_renderer.StringTemplateRenderer]
 });
 (0, import_file_template_provider.configureFileTemplateProvider)({ basePath: (0, import_node_path.resolve)(dirname, "templates") });
 (0, import_file_template_resolver.configureFileTemplateResolver)({ basePath: (0, import_node_path.resolve)(dirname.replace("dist", "source"), "templates") });
 async function test() {
-  const templateService = await import_container.container.resolveAsync(import_templates.TemplateService);
+  const templateService = (0, import_inject.inject)(import_templates.TemplateService);
   const handlebarsResult = await templateService.render("hello-name", { name: "Max Mustermann" });
   const jsxResult = await templateService.render("hello-jsx", { name: "Max Mustermann" });
   console.log({

package/function/log.js

@@ -28,7 +28,7 @@ function wrapLog(fn, options) {
   const log = options?.logger?.trace.bind(options.logger) ?? console.log.bind(console);
   const wrapped = {
     [fnName](...args) {
-      const argString = args.map((arg) => (0, import_type_guards.isPrimitive)(arg) ? arg : (0, import_type_of.typeOf)(arg)).join(", ");
+      const argString = args.map((arg) => (0, import_type_guards.isPrimitive)(arg) ? (0, import_type_guards.isString)(arg) ? `"${arg}"` : String(arg) : (0, import_type_of.typeOf)(arg)).join(", ");
       log(`[call: ${fnName}(${argString})]`);
       return Reflect.apply(fn, this, args);
     }

package/http/client/adapters/undici-http-client.adapter.js

@@ -22,13 +22,14 @@ __export(undici_http_client_adapter_exports, {
   configureUndiciHttpClientAdapter: () => configureUndiciHttpClientAdapter
 });
 module.exports = __toCommonJS(undici_http_client_adapter_exports);
-var import_container = require("../../../container/index.js");
+var import_node_stream = require("node:stream");
+var import_undici = require("undici");
 var import_http_headers = require("../../../http/http-headers.js");
 var import_http_error = require("../../../http/http.error.js");
+var import_injector = require("../../../injector/index.js");
+var import_injector2 = require("../../../injector/injector.js");
 var import_array = require("../../../utils/array/array.js");
 var import_type_guards = require("../../../utils/type-guards.js");
-var import_node_stream = require("node:stream");
-var import_undici = require("undici");
 var import_http_client_response = require("../http-client-response.js");
 var import_http_client_adapter = require("../http-client.adapter.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -108,13 +109,13 @@ let UndiciHttpClientAdapter = class UndiciHttpClientAdapter2 extends import_http
   }
 };
 UndiciHttpClientAdapter = __decorate([
-  (0, import_container.singleton)({ defaultArgumentProvider: () => defaultOptions }),
-  __param(0, (0, import_container.injectArg)()),
+  (0, import_injector.Singleton)({ defaultArgumentProvider: () => defaultOptions }),
+  __param(0, (0, import_injector.InjectArg)()),
   __metadata("design:paramtypes", [Object])
 ], UndiciHttpClientAdapter);
 function configureUndiciHttpClientAdapter(options = {}) {
   defaultOptions = options;
   if (options.register ?? true) {
-    import_container.container.register(import_http_client_adapter.HttpClientAdapter, { useToken: UndiciHttpClientAdapter });
+    import_injector2.Injector.register(import_http_client_adapter.HttpClientAdapter, { useToken: UndiciHttpClientAdapter });
   }
 }

package/http/client/http-client-options.d.ts

@@ -1,13 +1,8 @@
-import type { HttpClientMiddleware } from './http-client.js';
 export declare class HttpClientOptions {
     /**
      * base url for requests when only path is provided
      */
     baseUrl?: string;
-    /**
-     * middlewares to add
-     */
-    middleware?: HttpClientMiddleware[];
     /**
      * enables parsing of response errors with registered error handlers via {@link parseErrorResponse}
      * @default true

package/http/client/http-client-options.js

@@ -26,10 +26,6 @@ class HttpClientOptions {
    * base url for requests when only path is provided
    */
   baseUrl;
-  /**
-   * middlewares to add
-   */
-  middleware;
   /**
    * enables parsing of response errors with registered error handlers via {@link parseErrorResponse}
    * @default true

package/http/client/http-client.d.ts

@@ -1,18 +1,15 @@
-import type { Injectable } from '../../container/index.js';
-import { type resolveArgumentType } from '../../container/index.js';
+import { resolveArgumentType } from '../../injector/index.js';
+import type { Resolvable } from '../../injector/interfaces.js';
 import type { OneOrMany, UndefinableJson } from '../../types.js';
-import type { AsyncMiddleware, AsyncMiddlewareHandler, AsyncMiddlewareNext } from '../../utils/middleware.js';
 import type { HttpMethod, HttpValue } from '../types.js';
 import { HttpClientOptions } from './http-client-options.js';
 import type { HttpClientRequestOptions } from './http-client-request.js';
 import { HttpClientRequest } from './http-client-request.js';
 import type { HttpClientResponse } from './http-client-response.js';
 import { HttpClientAdapter } from './http-client.adapter.js';
-export type HttpClientHandler = AsyncMiddlewareHandler<HttpClientRequest, HttpClientResponse>;
-export type HttpClientMiddleware = AsyncMiddleware<HttpClientRequest, HttpClientResponse>;
-export type HttpClientMiddlewareNext = AsyncMiddlewareNext<HttpClientRequest, HttpClientResponse>;
+import type { HttpClientMiddleware } from './middleware.js';
 export type HttpClientArgument = HttpClientOptions;
-export declare class HttpClient implements Injectable<HttpClientArgument> {
+export declare class HttpClient implements Resolvable<HttpClientArgument> {
     private readonly adapter;
     private readonly headers;
     private readonly middleware;
@@ -20,7 +17,7 @@ export declare class HttpClient implements Injectable<HttpClientArgument> {
     private callHandler;
     readonly options: HttpClientOptions;
     readonly [resolveArgumentType]: HttpClientOptions;
-    constructor(adapter: HttpClientAdapter, options?: HttpClientOptions);
+    constructor(adapter: HttpClientAdapter, options?: HttpClientOptions, middlewares?: HttpClientMiddleware[]);
     addMiddleware(middleware: HttpClientMiddleware): void;
     setDefaultHeader(name: string, value: OneOrMany<HttpValue>): void;
     deleteDefaultHeader(name: string): void;

package/http/client/http-client.js

@@ -22,7 +22,7 @@ __export(http_client_exports, {
 });
 module.exports = __toCommonJS(http_client_exports);
 var import_response = require("../../api/response.js");
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/index.js");
 var import_array = require("../../utils/array/array.js");
 var import_base64 = require("../../utils/base64.js");
 var import_encoding = require("../../utils/encoding.js");
@@ -37,6 +37,7 @@ var import_types = require("../types.js");
 var import_http_client_options = require("./http-client-options.js");
 var import_http_client_request = require("./http-client-request.js");
 var import_http_client_adapter = require("./http-client.adapter.js");
+var import_tokens = require("./tokens.js");
 var __decorate = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -63,10 +64,10 @@ let HttpClient = class HttpClient2 {
   internalMiddleware;
   callHandler;
   options;
-  constructor(adapter, options = {}) {
+  constructor(adapter, options = {}, middlewares = []) {
     this.adapter = adapter;
     this.options = options;
-    this.middleware = [...options.middleware ?? []];
+    this.middleware = middlewares;
     this.headers = new import_http_headers.HttpHeaders();
     this.internalMiddleware = [
       getBuildRequestUrlMiddleware(options.baseUrl),
@@ -224,10 +225,12 @@ let HttpClient = class HttpClient2 {
   }
 };
 HttpClient = __decorate([
-  (0, import_container.singleton)(),
-  __param(1, (0, import_container.optional)()),
-  __param(1, (0, import_container.injectArg)()),
-  __metadata("design:paramtypes", [import_http_client_adapter.HttpClientAdapter, import_http_client_options.HttpClientOptions])
+  (0, import_injector.Singleton)(),
+  __param(1, (0, import_injector.Optional)()),
+  __param(1, (0, import_injector.InjectArg)()),
+  __param(2, (0, import_injector.InjectAll)(import_tokens.HTTP_CLIENT_MIDDLEWARE)),
+  __param(2, (0, import_injector.Optional)()),
+  __metadata("design:paramtypes", [import_http_client_adapter.HttpClientAdapter, import_http_client_options.HttpClientOptions, Array])
 ], HttpClient);
 function getBuildRequestUrlMiddleware(baseUrl) {
   async function buildUrlParametersMiddleware(request, next) {

package/http/client/middleware.d.ts

@@ -0,0 +1,6 @@
+import type { AsyncMiddleware, AsyncMiddlewareHandler, AsyncMiddlewareNext } from '../../utils/middleware.js';
+import type { HttpClientRequest } from './http-client-request.js';
+import type { HttpClientResponse } from './http-client-response.js';
+export type HttpClientHandler = AsyncMiddlewareHandler<HttpClientRequest, HttpClientResponse>;
+export type HttpClientMiddleware = AsyncMiddleware<HttpClientRequest, HttpClientResponse>;
+export type HttpClientMiddlewareNext = AsyncMiddlewareNext<HttpClientRequest, HttpClientResponse>;

package/http/client/middleware.js

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var middleware_exports = {};
+module.exports = __toCommonJS(middleware_exports);

package/http/client/module.d.ts

@@ -1,7 +1,12 @@
 import type { Type } from '../../types.js';
 import { HttpClientOptions } from './http-client-options.js';
 import { HttpClientAdapter } from './http-client.adapter.js';
+import type { HttpClientMiddleware } from './middleware.js';
 export type HttpClientModuleConfig = HttpClientOptions & {
     adapter?: Type<HttpClientAdapter>;
+    /**
+     * middlewares to add
+     */
+    middleware?: HttpClientMiddleware[];
 };
-export declare function configureHttpClient({ adapter, ...rest }: HttpClientModuleConfig): void;
+export declare function configureHttpClient({ adapter, middleware, ...rest }: HttpClientModuleConfig): void;

package/http/client/module.js

@@ -21,20 +21,25 @@ __export(module_exports, {
   configureHttpClient: () => configureHttpClient
 });
 module.exports = __toCommonJS(module_exports);
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/injector.js");
 var import_type_guards = require("../../utils/type-guards.js");
 var import_http_client_options = require("./http-client-options.js");
 var import_http_client_adapter = require("./http-client.adapter.js");
+var import_tokens = require("./tokens.js");
 let options = {};
-function configureHttpClient({ adapter, ...rest }) {
+function configureHttpClient({ adapter, middleware, ...rest }) {
   if ((0, import_type_guards.isDefined)(adapter)) {
-    import_container.container.register(import_http_client_adapter.HttpClientAdapter, { useToken: adapter });
+    import_injector.Injector.register(import_http_client_adapter.HttpClientAdapter, { useToken: adapter });
   }
   options = {
     ...options,
     baseUrl: rest.baseUrl ?? options.baseUrl,
-    middleware: [...options.middleware ?? [], ...rest.middleware ?? []],
     enableErrorHandling: rest.enableErrorHandling ?? options.enableErrorHandling
   };
-  import_container.container.register(import_http_client_options.HttpClientOptions, { useValue: options });
+  if ((0, import_type_guards.isDefined)(middleware)) {
+    for (const m of middleware) {
+      import_injector.Injector.register(import_tokens.HTTP_CLIENT_MIDDLEWARE, { useToken: m }, { multi: true });
+    }
+  }
+  import_injector.Injector.register(import_http_client_options.HttpClientOptions, { useValue: options });
 }

package/http/client/tokens.d.ts

@@ -0,0 +1,2 @@
+import type { HttpClientMiddleware } from './middleware.js';
+export declare const HTTP_CLIENT_MIDDLEWARE: import("../../injector/token.js").InjectionToken<HttpClientMiddleware, never>;

package/http/client/tokens.js

@@ -0,0 +1,25 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var tokens_exports = {};
+__export(tokens_exports, {
+  HTTP_CLIENT_MIDDLEWARE: () => HTTP_CLIENT_MIDDLEWARE
+});
+module.exports = __toCommonJS(tokens_exports);
+var import_token = require("../../injector/token.js");
+const HTTP_CLIENT_MIDDLEWARE = (0, import_token.injectionToken)("HttpClientMiddleware");

package/http/server/node/module.js

@@ -21,9 +21,9 @@ __export(module_exports, {
   configureNodeHttpServer: () => configureNodeHttpServer
 });
 module.exports = __toCommonJS(module_exports);
-var import_container = require("../../../container/index.js");
+var import_injector = require("../../../injector/injector.js");
 var import_http_server = require("../http-server.js");
 var import_node_http_server = require("./node-http-server.js");
 function configureNodeHttpServer() {
-  import_container.container.registerSingleton(import_http_server.HttpServer, { useToken: import_node_http_server.NodeHttpServer });
+  import_injector.Injector.registerSingleton(import_http_server.HttpServer, { useToken: import_node_http_server.NodeHttpServer });
 }

package/http/server/node/node-http-server.d.ts

@@ -1,7 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
 import * as Http from 'node:http';
-import type { AfterResolve } from '../../../container/index.js';
-import { afterResolve } from '../../../container/index.js';
 import type { AsyncDisposable } from '../../../disposable/index.js';
 import { disposeAsync } from '../../../disposable/index.js';
 import { Logger } from '../../../logger/index.js';
@@ -11,7 +9,7 @@ export type NodeHttpServerContext = {
     nodeRequest: Http.IncomingMessage;
     nodeResponse: Http.ServerResponse;
 };
-export declare class NodeHttpServer extends HttpServer<NodeHttpServerContext> implements AsyncDisposable, AfterResolve {
+export declare class NodeHttpServer extends HttpServer<NodeHttpServerContext> implements AsyncDisposable {
     private readonly httpServer;
     private readonly sockets;
     private readonly requestIterable;
@@ -19,7 +17,6 @@ export declare class NodeHttpServer extends HttpServer<NodeHttpServerContext> im
     private untrackConnectedSockets?;
     get connectedSocketsCount(): number;
     constructor(logger: Logger);
-    [afterResolve](): void;
     [disposeAsync](): Promise<void>;
     listen(port: number): Promise<void>;
     close(timeout: number): Promise<void>;

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

@@ -32,11 +32,10 @@ __export(node_http_server_exports, {
 });
 module.exports = __toCommonJS(node_http_server_exports);
 var Http = __toESM(require("node:http"), 1);
-var import_container = require("../../../container/index.js");
-var import_core = require("../../../core.js");
 var import_disposable = require("../../../disposable/index.js");
 var import_http_headers = require("../../../http/http-headers.js");
 var import_http_query = require("../../../http/http-query.js");
+var import_injector = require("../../../injector/index.js");
 var import_logger = require("../../../logger/index.js");
 var import_cancellation_token = require("../../../utils/cancellation-token.js");
 var import_encoding = require("../../../utils/encoding.js");
@@ -87,9 +86,6 @@ let NodeHttpServer = class NodeHttpServer2 extends import_http_server.HttpServer
       this.requestIterable.feed({ request, response });
     });
   }
-  [import_container.afterResolve]() {
-    import_core.disposer.add(() => this[import_disposable.disposeAsync]);
-  }
   async [import_disposable.disposeAsync]() {
     await this.close(3e3);
     this.requestIterable.end();
@@ -170,8 +166,8 @@ let NodeHttpServer = class NodeHttpServer2 extends import_http_server.HttpServer
   }
 };
 NodeHttpServer = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.resolveArg)("NodeHttpServer")),
+  (0, import_injector.Singleton)(),
+  __param(0, (0, import_injector.ResolveArg)("NodeHttpServer")),
   __metadata("design:paramtypes", [import_logger.Logger])
 ], NodeHttpServer);
 function getResponder(httpResponse) {

package/image-service/imgproxy/imgproxy-image-service.d.ts

@@ -1,5 +1,5 @@
-import type { Injectable } from '../../container/index.js';
-import { type resolveArgumentType } from '../../container/index.js';
+import { resolveArgumentType } from '../../injector/index.js';
+import type { Resolvable } from '../../injector/interfaces.js';
 import type { ImageOptions } from '../image-service.js';
 import { ImageService } from '../image-service.js';
 export type ImgproxyImageServiceConfig = {
@@ -8,12 +8,10 @@ export type ImgproxyImageServiceConfig = {
     salt: string;
     signatureSize: number;
 };
-export declare const IMGPROXY_IMAGE_SERVICE_CONFIG: import("../../container/index.js").InjectionToken<ImgproxyImageServiceConfig, any>;
-export declare class ImgproxyImageService extends ImageService implements Injectable<ImgproxyImageServiceConfig> {
-    private readonly endpoint;
-    private readonly keyBytes;
-    private readonly saltBytes;
-    private readonly signatureSize;
+export declare const IMGPROXY_IMAGE_SERVICE_CONFIG: import("../../injector/index.js").InjectionToken<ImgproxyImageServiceConfig, never>;
+export declare class ImgproxyImageService extends ImageService implements Resolvable<ImgproxyImageServiceConfig> {
+    #private;
+    readonly endpoint: string;
     readonly [resolveArgumentType]: ImgproxyImageServiceConfig;
     constructor(endpoint: string, key: string, salt: string, signatureSize: number);
     getUrl(resourceUri: string, options?: ImageOptions): Promise<string>;

package/image-service/imgproxy/imgproxy-image-service.js

@@ -23,7 +23,8 @@ __export(imgproxy_image_service_exports, {
   configureImgproxyImageService: () => configureImgproxyImageService
 });
 module.exports = __toCommonJS(imgproxy_image_service_exports);
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/index.js");
+var import_injector2 = require("../../injector/injector.js");
 var import_base64 = require("../../utils/base64.js");
 var import_binary = require("../../utils/binary.js");
 var import_cryptography = require("../../utils/cryptography.js");
@@ -49,18 +50,18 @@ var __param = function(paramIndex, decorator) {
     decorator(target, key, paramIndex);
   };
 };
-const IMGPROXY_IMAGE_SERVICE_CONFIG = (0, import_container.injectionToken)("ImgproxyImageServiceConfig");
+const IMGPROXY_IMAGE_SERVICE_CONFIG = (0, import_injector.injectionToken)("ImgproxyImageServiceConfig");
 let ImgproxyImageService = class ImgproxyImageService2 extends import_image_service.ImageService {
+  #keyBytes;
+  #saltBytes;
+  #signatureSize;
   endpoint;
-  keyBytes;
-  saltBytes;
-  signatureSize;
   constructor(endpoint, key, salt, signatureSize) {
     super();
     this.endpoint = endpoint;
-    this.signatureSize = signatureSize;
-    this.keyBytes = (0, import_encoding.decodeHex)(key);
-    this.saltBytes = (0, import_encoding.decodeHex)(salt);
+    this.#signatureSize = signatureSize;
+    this.#keyBytes = (0, import_encoding.decodeHex)(key);
+    this.#saltBytes = (0, import_encoding.decodeHex)(salt);
   }
   async getUrl(resourceUri, options = {}) {
     const encodedResourceUri = (0, import_base64.encodeBase64Url)((0, import_encoding.encodeUtf8)(resourceUri));
@@ -83,18 +84,18 @@ let ImgproxyImageService = class ImgproxyImageService2 extends import_image_serv
     }
     const processingOptionsString = processingOptions.join("/");
     const path = `/${[processingOptionsString, encodedResourceUri].join("/")}`;
-    const signature = await signString(this.keyBytes, this.saltBytes, path, this.signatureSize);
+    const signature = await signString(this.#keyBytes, this.#saltBytes, path, this.#signatureSize);
     return `${this.endpoint}/${signature}${path}`;
   }
 };
 ImgproxyImageService = __decorate([
-  (0, import_container.singleton)({
+  (0, import_injector.Singleton)({
     defaultArgumentProvider: (context) => context.resolve(IMGPROXY_IMAGE_SERVICE_CONFIG)
   }),
-  __param(0, (0, import_container.injectArg)("endpoint")),
-  __param(1, (0, import_container.injectArg)("key")),
-  __param(2, (0, import_container.injectArg)("salt")),
-  __param(3, (0, import_container.injectArg)("signatureSize")),
+  __param(0, (0, import_injector.InjectArg)("endpoint")),
+  __param(1, (0, import_injector.InjectArg)("key")),
+  __param(2, (0, import_injector.InjectArg)("salt")),
+  __param(3, (0, import_injector.InjectArg)("signatureSize")),
   __metadata("design:paramtypes", [String, String, String, Number])
 ], ImgproxyImageService);
 async function signString(keyBytes, saltBytes, target, size = 32) {
@@ -130,8 +131,8 @@ function convertOrigin(origin) {
   }
 }
 function configureImgproxyImageService(defaultConfig, register = true) {
-  import_container.container.register(IMGPROXY_IMAGE_SERVICE_CONFIG, { useValue: defaultConfig });
+  import_injector2.Injector.register(IMGPROXY_IMAGE_SERVICE_CONFIG, { useValue: defaultConfig });
   if (register) {
-    import_container.container.registerSingleton(import_image_service.ImageService, { useToken: ImgproxyImageService });
+    import_injector2.Injector.registerSingleton(import_image_service.ImageService, { useToken: ImgproxyImageService });
   }
 }

package/injector/decorators.d.ts

@@ -1,14 +1,14 @@
 import type { Decorator } from '../reflection/index.js';
-import type { Constructor, OneOrMany, Simplify, TypedOmit } from '../types.js';
+import type { Constructor, OneOrMany, Record, Simplify, TypedOmit } from '../types.js';
 import type { Provider } from './provider.js';
 import type { InjectionToken } from './token.js';
 import type { ArgumentProvider, ForwardRefInjectionToken, Mapper, RegistrationOptions } from './types.js';
-type InjectDecorator = Decorator<'accessor' | 'constructorParameter'>;
-export type InjectableOptions<T, A> = RegistrationOptions<T, A> & {
+export type InjectDecorator = Decorator<'accessor' | 'constructorParameter'>;
+export type InjectableOptions<T, A, C extends Record = Record> = RegistrationOptions<T, A, C> & {
     /** aliases (tokens) for the class. Useful for example for circular dependencies when you can't use the class itself as a token */
     alias?: OneOrMany<InjectionToken>;
     /** custom provider. Useful for example if initialization is required */
-    provider?: Provider<T, A>;
+    provider?: Provider<T, A, C>;
 };
 export type InjectableOptionsWithoutLifecycle<T, A> = Simplify<TypedOmit<InjectableOptions<T, A>, 'lifecycle'>>;
 /**
@@ -21,7 +21,7 @@ export declare function ReplaceClass<T>(constructor: Constructor<T>): ClassDecor
  * Globally registers the class for injection
  * @param options registration options
  */
-export declare function Injectable<T = any, A = any>(options?: InjectableOptions<T, A>): ClassDecorator;
+export declare function Injectable<T = any, A = any, C extends Record = Record>(options?: InjectableOptions<T, A, C>): ClassDecorator;
 /**
  * registers the class in the global container with singleton lifecycle. Decorated class is not modified in any way
  * @param options registration options
@@ -39,6 +39,13 @@ export declare function Scoped<T = any, A = any>(lifecycle: 'resolution' | 'inje
  * @param mapperOrKey map the resolved value. If {@link PropertyKey} is provided, that property of the resolved value will be injected
  */
 export declare function Inject<T, A>(token?: InjectionToken<T, A>, argument?: A, mapperOrKey?: Mapper<T> | keyof T): InjectDecorator;
+/**
+ * sets the token used to resolve the parameter. Resolves all providers
+ * @param token token used for resolving
+ * @param argument resolve argument
+ * @param mapperOrKey map the resolved value. If {@link PropertyKey} is provided, that property of the resolved value will be injected
+ */
+export declare function InjectAll<T, A>(token?: InjectionToken<T, A>, argument?: A, mapperOrKey?: Mapper<T> | keyof T): InjectDecorator;
 /**
  * sets the argument used for resolving the parameter
  * @param argument
@@ -72,4 +79,3 @@ export declare function Optional(): InjectDecorator;
  * @param argument resolve argument
  */
 export declare function ForwardRef<T extends object, A>(token: ForwardRefInjectionToken<T>, argument?: A): InjectDecorator;
-export {};

package/injector/decorators.js

@@ -21,6 +21,7 @@ __export(decorators_exports, {
   ForwardArg: () => ForwardArg,
   ForwardRef: () => ForwardRef,
   Inject: () => Inject,
+  InjectAll: () => InjectAll,
   InjectArg: () => InjectArg,
   Injectable: () => Injectable,
   Optional: () => Optional,
@@ -75,6 +76,19 @@ function Inject(token, argument, mapperOrKey) {
   }
   return createInjectDecorator(injectMetadata);
 }
+function InjectAll(token, argument, mapperOrKey) {
+  const injectMetadata = { resolveAll: true };
+  if ((0, import_type_guards.isDefined)(token)) {
+    injectMetadata.injectToken = token;
+  }
+  if ((0, import_type_guards.isDefined)(argument)) {
+    injectMetadata.resolveArgumentProvider = () => argument;
+  }
+  if ((0, import_type_guards.isDefined)(mapperOrKey)) {
+    injectMetadata.mapper = (0, import_type_guards.isFunction)(mapperOrKey) ? mapperOrKey : (value) => value[mapperOrKey];
+  }
+  return createInjectDecorator(injectMetadata);
+}
 function ResolveArg(argument) {
   return ResolveArgProvider(() => argument);
 }

package/injector/index.d.ts

@@ -0,0 +1,11 @@
+export * from './decorators.js';
+export * from './inject.js';
+export * from './injector.js';
+export * from './interfaces.js';
+export * from './provider.js';
+export * from './resolve-chain.js';
+export * from './resolve.error.js';
+export * from './symbols.js';
+export * from './token.js';
+export * from './type-info.js';
+export * from './types.js';

package/injector/index.js

@@ -0,0 +1,28 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var injector_exports = {};
+module.exports = __toCommonJS(injector_exports);
+__reExport(injector_exports, require("./decorators.js"), module.exports);
+__reExport(injector_exports, require("./inject.js"), module.exports);
+__reExport(injector_exports, require("./injector.js"), module.exports);
+__reExport(injector_exports, require("./interfaces.js"), module.exports);
+__reExport(injector_exports, require("./provider.js"), module.exports);
+__reExport(injector_exports, require("./resolve-chain.js"), module.exports);
+__reExport(injector_exports, require("./resolve.error.js"), module.exports);
+__reExport(injector_exports, require("./symbols.js"), module.exports);
+__reExport(injector_exports, require("./token.js"), module.exports);
+__reExport(injector_exports, require("./type-info.js"), module.exports);
+__reExport(injector_exports, require("./types.js"), module.exports);