@armoury/fivem-framework-common 1.0.21 → 1.0.22

package/dist/cjs/common/index.js

@@ -111,7 +111,18 @@ async function bootstrapWithProviders(entryPoint, parentProviders, options = {},
     const injector = injection_js_1.ReflectiveInjector.resolveAndCreate([...configProviders, ...resourceProviders, ...providers, entryPoint], parentInjector);
     const instance = injector.get(entryPoint);
     (0, decorator_utils_2.Decorate)(instance, entryPoint.prototype, [...parentProviders, ...providers], decorationType);
-    eagerTokens.forEach((token) => injector.get(token));
+    const decoratedInstances = new Set([instance]);
+    for (const token of eagerTokens) {
+        const eagerInstance = injector.get(token);
+        if (typeof eagerInstance !== 'object' || eagerInstance === null || decoratedInstances.has(eagerInstance)) {
+            continue;
+        }
+        const prototype = Object.getPrototypeOf(eagerInstance);
+        if (prototype && prototype !== Object.prototype) {
+            (0, decorator_utils_2.Decorate)(eagerInstance, prototype, [...parentProviders, ...providers], decorationType);
+            decoratedInstances.add(eagerInstance);
+        }
+    }
     const initializers = injector.get(exports.APP_INITIALIZER, []);
     await Promise.all(initializers.map((initializer) => initializer()));
     return instance;

package/dist/cjs/decorators/decorator.utils.js

@@ -7,6 +7,7 @@ const event_listener_decorator_1 = require("./event-listener.decorator");
 const export_decorator_1 = require("./export.decorator");
 const key_binding_decorator_1 = require("./key-binding.decorator");
 const ui_listener_decorator_1 = require("./ui-listener.decorator");
+const decoratedTargets = new WeakSet();
 class DecoratorUtils {
     static map(target, _prototype, providers) {
         return [
@@ -25,9 +26,16 @@ class DecoratorUtils {
 }
 exports.DecoratorUtils = DecoratorUtils;
 function Decorate(instance, _prototype, providers, decorationType = DecorationType.SERVER) {
+    if (decoratedTargets.has(instance)) {
+        return;
+    }
     const relevantProvidersForClass = Object.values(instance)
         .filter((provider) => typeof provider === 'object'
+        && provider !== null
+        && !decoratedTargets.has(provider)
         && Reflect.getMetadataKeys(provider).some((key) => key.startsWith('arm_')));
+    decoratedTargets.add(instance);
+    relevantProvidersForClass.forEach((provider) => decoratedTargets.add(provider));
     (0, command_decorator_1.Commands)(instance, _prototype, relevantProvidersForClass);
     (0, event_listener_decorator_1.EventListeners)(instance, _prototype, relevantProvidersForClass);
     (0, export_decorator_1.Exports)(instance, _prototype, relevantProvidersForClass);

package/dist/esm/common/index.js

@@ -88,7 +88,18 @@ export async function bootstrapWithProviders(entryPoint, parentProviders, option
     const injector = ReflectiveInjector.resolveAndCreate([...configProviders, ...resourceProviders, ...providers, entryPoint], parentInjector);
     const instance = injector.get(entryPoint);
     Decorate(instance, entryPoint.prototype, [...parentProviders, ...providers], decorationType);
-    eagerTokens.forEach((token) => injector.get(token));
+    const decoratedInstances = new Set([instance]);
+    for (const token of eagerTokens) {
+        const eagerInstance = injector.get(token);
+        if (typeof eagerInstance !== 'object' || eagerInstance === null || decoratedInstances.has(eagerInstance)) {
+            continue;
+        }
+        const prototype = Object.getPrototypeOf(eagerInstance);
+        if (prototype && prototype !== Object.prototype) {
+            Decorate(eagerInstance, prototype, [...parentProviders, ...providers], decorationType);
+            decoratedInstances.add(eagerInstance);
+        }
+    }
     const initializers = injector.get(APP_INITIALIZER, []);
     await Promise.all(initializers.map((initializer) => initializer()));
     return instance;

package/dist/esm/decorators/decorator.utils.js

@@ -3,6 +3,7 @@ import { EventListeners } from "./event-listener.decorator";
 import { Exports } from "./export.decorator";
 import { KeyBindings } from "./key-binding.decorator";
 import { UIListeners } from "./ui-listener.decorator";
+const decoratedTargets = new WeakSet();
 export class DecoratorUtils {
     static map(target, _prototype, providers) {
         return [
@@ -20,9 +21,16 @@ export class DecoratorUtils {
     }
 }
 export function Decorate(instance, _prototype, providers, decorationType = DecorationType.SERVER) {
+    if (decoratedTargets.has(instance)) {
+        return;
+    }
     const relevantProvidersForClass = Object.values(instance)
         .filter((provider) => typeof provider === 'object'
+        && provider !== null
+        && !decoratedTargets.has(provider)
         && Reflect.getMetadataKeys(provider).some((key) => key.startsWith('arm_')));
+    decoratedTargets.add(instance);
+    relevantProvidersForClass.forEach((provider) => decoratedTargets.add(provider));
     Commands(instance, _prototype, relevantProvidersForClass);
     EventListeners(instance, _prototype, relevantProvidersForClass);
     Exports(instance, _prototype, relevantProvidersForClass);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armoury/fivem-framework-common",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "Shared APIs for the Armoury FiveM framework",
   "main": "dist/cjs/common/index.js",
   "module": "dist/esm/common/index.js",