@armoury/fivem-framework-server 1.0.11 → 1.0.12

package/dist/cjs/server/index.js

@@ -16,9 +16,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SERVER_PROVIDERS = void 0;
-exports.Server_Init = Server_Init;
+exports.bootstrap = bootstrap;
 require("reflect-metadata");
-const injection_js_1 = require("injection-js");
 const default_entities_1 = require("./services/session/default-entities");
 const fivem_framework_common_1 = require("@armoury/fivem-framework-common");
 exports.SERVER_PROVIDERS = [
@@ -58,12 +57,8 @@ exports.SERVER_PROVIDERS = [
         multi: true,
     },
 ];
-async function Server_Init(_class, ...providers) {
-    const mainInjector = injection_js_1.ReflectiveInjector.resolveAndCreate(exports.SERVER_PROVIDERS);
-    const injector = injection_js_1.ReflectiveInjector.resolveAndCreate([...providers, _class], mainInjector);
-    const instance = injector.get(_class);
-    (0, fivem_framework_common_1.Decorate)(instance, _class.prototype, [...exports.SERVER_PROVIDERS, ...providers]);
-    return instance;
+async function bootstrap(_class, options = {}) {
+    return (0, fivem_framework_common_1.bootstrapWithProviders)(_class, exports.SERVER_PROVIDERS, options);
 }
 __exportStar(require("./services"), exports);
 __exportStar(require("./models"), exports);

package/dist/esm/server/index.js

@@ -1,8 +1,7 @@
 /// <reference path = "../ambient.declarations.d.ts" />
 import 'reflect-metadata';
-import { ReflectiveInjector } from 'injection-js';
 import { SessionAccountId, SessionCash, SessionHoursPlayed, SessionId, SessionLanguage, SessionLastLocation, SessionName } from './services/session/default-entities';
-import { Decorate } from '@armoury/fivem-framework-common';
+import { bootstrapWithProviders } from '@armoury/fivem-framework-common';
 export const SERVER_PROVIDERS = [
     {
         provide: 'sessionItems',
@@ -40,12 +39,8 @@ export const SERVER_PROVIDERS = [
         multi: true,
     },
 ];
-export async function Server_Init(_class, ...providers) {
-    const mainInjector = ReflectiveInjector.resolveAndCreate(SERVER_PROVIDERS);
-    const injector = ReflectiveInjector.resolveAndCreate([...providers, _class], mainInjector);
-    const instance = injector.get(_class);
-    Decorate(instance, _class.prototype, [...SERVER_PROVIDERS, ...providers]);
-    return instance;
+export async function bootstrap(_class, options = {}) {
+    return bootstrapWithProviders(_class, SERVER_PROVIDERS, options);
 }
 export * from './services';
 export * from './models';

package/dist/types/server/index.d.ts

@@ -2,6 +2,7 @@
 import 'reflect-metadata';
 import { Provider } from 'injection-js';
 import { SessionId, SessionLastLocation, SessionName } from './services/session/default-entities';
+import { BootstrapOptions } from '@armoury/fivem-framework-common';
 export declare const SERVER_PROVIDERS: ({
     provide: string;
     useValue: SessionId;
@@ -15,9 +16,9 @@ export declare const SERVER_PROVIDERS: ({
     useValue: SessionLastLocation;
     multi: boolean;
 })[];
-export declare function Server_Init<T extends {
+export declare function bootstrap<T extends {
     new (...args: any[]): any;
-} & Provider>(_class: T, ...providers: Provider[]): Promise<T>;
+} & Provider>(_class: T, options?: BootstrapOptions): Promise<InstanceType<T>>;
 export * from './services';
 export * from './models';
 export * from '@armoury/fivem-framework-common';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armoury/fivem-framework-server",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Server APIs for the Armoury FiveM framework",
   "main": "dist/cjs/server/index.js",
   "module": "dist/esm/server/index.js",
@@ -27,7 +27,7 @@
     "rxjs": "^7.8.1"
   },
   "peerDependencies": {
-    "@armoury/fivem-framework-common": "1.0.11",
+    "@armoury/fivem-framework-common": "1.0.12",
     "drizzle-orm": "^0.45.4",
     "mysql2": "^3.24.5"
   },