@aponiajs/common 0.3.18 → 0.3.20

package/dist/index.d.mts

@@ -73,6 +73,7 @@ declare function provideAlias<T>(provide: Token<T>, useExisting: Token<T>): Alia
 //#region src/module.d.ts
 interface ModuleDefinition {
   readonly id: string;
+  readonly instanceId?: symbol;
   readonly imports: readonly ModuleDefinition[];
   readonly controllers: readonly ControllerDefinition[];
   readonly providers: readonly Provider[];
@@ -80,6 +81,7 @@ interface ModuleDefinition {
 }
 interface ModuleOptions {
   readonly id: string;
+  readonly instanceId?: symbol;
   readonly imports?: readonly ModuleDefinition[];
   readonly controllers?: readonly ControllerDefinition[];
   readonly providers?: readonly Provider[];
@@ -89,7 +91,7 @@ declare function defineModule<const TOptions extends ModuleOptions>(options: TOp
 //#endregion
 //#region src/decorators.d.ts
 type ModuleClass = ClassToken<unknown>;
-type ModuleImport = ModuleClass | ModuleDefinition;
+type ModuleImport = ModuleClass | ModuleDefinition | DynamicModule;
 type ModuleProvider = ClassToken<unknown> | Provider;
 interface ModuleMetadata {
   readonly imports?: readonly ModuleImport[];
@@ -97,6 +99,11 @@ interface ModuleMetadata {
   readonly providers?: readonly ModuleProvider[];
   readonly exports?: readonly Token<unknown>[];
 }
+interface DynamicModule extends ModuleMetadata {
+  readonly module: ModuleClass;
+  readonly id: string;
+  readonly instanceId: symbol;
+}
 interface ControllerMetadata {
   readonly path: string;
 }
@@ -166,4 +173,4 @@ declare class ConsoleLogger implements LoggerService {
 }
 declare class Logger extends ConsoleLogger {}
 //#endregion
-export { type AliasProvider, AponiaError, type AponiaErrorCode, type ClassProvider, type ClassToken, ConsoleLogger, type ConsoleLoggerOptions, type Constructor, Controller, type ControllerDefinition, type ControllerMetadata, Delete, type FactoryProvider, Get, Inject, Injectable, type InjectionToken, type LogLevel, Logger, type LoggerService, Module, type ModuleClass, type ModuleDefinition, type ModuleImport, type ModuleMetadata, type ModuleOptions, type ModuleProvider, Patch, Post, type Provider, type ProviderScope, Put, type RequestMethod, type RouteMetadata, type Token, type TokenValue, type TokenValues, type ValueProvider, createToken, defineModule, getConstructorDependencies, getControllerMetadata, getModuleMetadata, getRouteMetadata, provideAlias, provideClass, provideFactory, provideValue, tokenName };
+export { type AliasProvider, AponiaError, type AponiaErrorCode, type ClassProvider, type ClassToken, ConsoleLogger, type ConsoleLoggerOptions, type Constructor, Controller, type ControllerDefinition, type ControllerMetadata, Delete, type DynamicModule, type FactoryProvider, Get, Inject, Injectable, type InjectionToken, type LogLevel, Logger, type LoggerService, Module, type ModuleClass, type ModuleDefinition, type ModuleImport, type ModuleMetadata, type ModuleOptions, type ModuleProvider, Patch, Post, type Provider, type ProviderScope, Put, type RequestMethod, type RouteMetadata, type Token, type TokenValue, type TokenValues, type ValueProvider, createToken, defineModule, getConstructorDependencies, getControllerMetadata, getModuleMetadata, getRouteMetadata, provideAlias, provideClass, provideFactory, provideValue, tokenName };

package/dist/index.mjs

@@ -1,10 +1,10 @@
 import "reflect-metadata";
 import { inspect } from "node:util";
 //#region src/decorators.ts
-const modules = /* @__PURE__ */ new WeakMap();
-const controllers = /* @__PURE__ */ new WeakMap();
-const routes = /* @__PURE__ */ new WeakMap();
-const injectedTokens = /* @__PURE__ */ new WeakMap();
+const moduleMetadataKey = Symbol.for("aponia.module.metadata");
+const controllerMetadataKey = Symbol.for("aponia.controller.metadata");
+const routeMetadataKey = Symbol.for("aponia.route.metadata");
+const injectedTokensMetadataKey = Symbol.for("aponia.injected-tokens.metadata");
 function Module(metadata) {
 	const normalized = Object.freeze({
 		imports: Object.freeze([...metadata.imports ?? []]),
@@ -13,7 +13,7 @@ function Module(metadata) {
 		exports: Object.freeze([...metadata.exports ?? []])
 	});
 	return (target) => {
-		modules.set(target, normalized);
+		Reflect.defineMetadata(moduleMetadataKey, normalized, target);
 	};
 }
 function Injectable() {
@@ -21,15 +21,16 @@ function Injectable() {
 }
 function Controller(path = "") {
 	return (target) => {
-		controllers.set(target, Object.freeze({ path }));
+		Reflect.defineMetadata(controllerMetadataKey, Object.freeze({ path }), target);
 	};
 }
 function Inject(token) {
 	return (target, _propertyKey, parameterIndex) => {
 		const constructor = typeof target === "function" ? target : target.constructor;
-		const parameters = injectedTokens.get(constructor) ?? /* @__PURE__ */ new Map();
-		parameters.set(parameterIndex, token);
-		injectedTokens.set(constructor, parameters);
+		const parameters = Reflect.getOwnMetadata(injectedTokensMetadataKey, constructor) ?? /* @__PURE__ */ new Map();
+		const updatedParameters = new Map(parameters);
+		updatedParameters.set(parameterIndex, token);
+		Reflect.defineMetadata(injectedTokensMetadataKey, updatedParameters, constructor);
 	};
 }
 const Delete = createRouteDecorator("DELETE");
@@ -38,30 +39,30 @@ const Patch = createRouteDecorator("PATCH");
 const Post = createRouteDecorator("POST");
 const Put = createRouteDecorator("PUT");
 function getModuleMetadata(target) {
-	return modules.get(target);
+	return Reflect.getOwnMetadata(moduleMetadataKey, target);
 }
 function getControllerMetadata(target) {
-	return controllers.get(target);
+	return Reflect.getOwnMetadata(controllerMetadataKey, target);
 }
 function getRouteMetadata(target) {
-	return Object.freeze([...routes.get(target.prototype) ?? []]);
+	const routes = Reflect.getOwnMetadata(routeMetadataKey, target.prototype) ?? [];
+	return Object.freeze([...routes]);
 }
 function getConstructorDependencies(target) {
 	const reflected = Reflect.getMetadata("design:paramtypes", target) ?? [];
-	const explicit = injectedTokens.get(target);
+	const explicit = Reflect.getOwnMetadata(injectedTokensMetadataKey, target);
 	const explicitLength = explicit ? Math.max(0, ...[...explicit.keys()].map((index) => index + 1)) : 0;
 	const length = Math.max(reflected.length, explicitLength);
 	return Object.freeze(Array.from({ length }, (_, index) => explicit?.get(index) ?? asToken(reflected[index], target)));
 }
 function createRouteDecorator(method) {
 	return (path = "") => (target, propertyKey) => {
-		const controllerRoutes = routes.get(target) ?? [];
-		controllerRoutes.push(Object.freeze({
+		const controllerRoutes = Reflect.getOwnMetadata(routeMetadataKey, target) ?? [];
+		Reflect.defineMetadata(routeMetadataKey, Object.freeze([...controllerRoutes, Object.freeze({
 			method,
 			path,
 			propertyKey
-		}));
-		routes.set(target, controllerRoutes);
+		})]), target);
 	};
 }
 function asToken(value, target) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aponiajs/common",
-  "version": "0.3.18",
+  "version": "0.3.20",
   "description": "Platform-neutral contracts for Aponia modules and dependency injection.",
   "homepage": "https://github.com/aponiajs/aponiajs#readme",
   "bugs": {