@armoury/fivem-framework-server 1.0.9 → 1.0.11

package/dist/cjs/server/index.js

@@ -18,11 +18,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SERVER_PROVIDERS = void 0;
 exports.Server_Init = Server_Init;
 require("reflect-metadata");
-const core_1 = require("@mikro-orm/core");
 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");
-const path = require('node:path');
 exports.SERVER_PROVIDERS = [
     {
         provide: 'sessionItems',
@@ -61,17 +59,6 @@ exports.SERVER_PROVIDERS = [
     },
 ];
 async function Server_Init(_class, ...providers) {
-    var _a;
-    const database = (_a = Cfx.Server.GetConvar('mysql_connection_string', '').split(';')
-        .find((item) => item.startsWith('database='))) === null || _a === void 0 ? void 0 : _a.split('=').slice(-1)[0];
-    const test = await core_1.MikroORM.init({
-        baseDir: path.resolve(Cfx.Server.GetResourcePath(Cfx.Server.GetCurrentResourceName()), '../..'),
-        entities: [default_entities_1.Character],
-        // entitiesTs: ['./src/**/*.entity.ts'],
-        dbName: database,
-        discovery: { disableDynamicFileAccess: true }
-    });
-    console.log('mikro-orm is', test);
     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);

package/dist/cjs/server/services/session/default-entities/character.entity.js

@@ -1,31 +1,8 @@
 "use strict";
-var __decorate = (this && this.__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") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
+// import { Entity, PrimaryKey, Property } from '@mikro-orm/core';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Character = void 0;
-const core_1 = require("@mikro-orm/core");
-let Character = class Character {
-};
+// @Entity()
+class Character {
+}
 exports.Character = Character;
-__decorate([
-    (0, core_1.PrimaryKey)(),
-    __metadata("design:type", typeof BigInt === "function" ? BigInt : Object)
-], Character.prototype, "id", void 0);
-__decorate([
-    (0, core_1.Property)(),
-    __metadata("design:type", typeof BigInt === "function" ? BigInt : Object)
-], Character.prototype, "accountId", void 0);
-__decorate([
-    (0, core_1.Property)(),
-    __metadata("design:type", String)
-], Character.prototype, "name", void 0);
-exports.Character = Character = __decorate([
-    (0, core_1.Entity)()
-], Character);

package/dist/esm/server/index.js

@@ -1,10 +1,8 @@
 /// <reference path = "../ambient.declarations.d.ts" />
 import 'reflect-metadata';
-import { MikroORM } from '@mikro-orm/core';
 import { ReflectiveInjector } from 'injection-js';
-import { Character, SessionAccountId, SessionCash, SessionHoursPlayed, SessionId, SessionLanguage, SessionLastLocation, SessionName } from './services/session/default-entities';
+import { SessionAccountId, SessionCash, SessionHoursPlayed, SessionId, SessionLanguage, SessionLastLocation, SessionName } from './services/session/default-entities';
 import { Decorate } from '@armoury/fivem-framework-common';
-const path = require('node:path');
 export const SERVER_PROVIDERS = [
     {
         provide: 'sessionItems',
@@ -43,17 +41,6 @@ export const SERVER_PROVIDERS = [
     },
 ];
 export async function Server_Init(_class, ...providers) {
-    var _a;
-    const database = (_a = Cfx.Server.GetConvar('mysql_connection_string', '').split(';')
-        .find((item) => item.startsWith('database='))) === null || _a === void 0 ? void 0 : _a.split('=').slice(-1)[0];
-    const test = await MikroORM.init({
-        baseDir: path.resolve(Cfx.Server.GetResourcePath(Cfx.Server.GetCurrentResourceName()), '../..'),
-        entities: [Character],
-        // entitiesTs: ['./src/**/*.entity.ts'],
-        dbName: database,
-        discovery: { disableDynamicFileAccess: true }
-    });
-    console.log('mikro-orm is', test);
     const mainInjector = ReflectiveInjector.resolveAndCreate(SERVER_PROVIDERS);
     const injector = ReflectiveInjector.resolveAndCreate([...providers, _class], mainInjector);
     const instance = injector.get(_class);

package/dist/esm/server/services/session/default-entities/character.entity.js

@@ -1,28 +1,4 @@
-var __decorate = (this && this.__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") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Entity, PrimaryKey, Property } from '@mikro-orm/core';
-let Character = class Character {
-};
-__decorate([
-    PrimaryKey(),
-    __metadata("design:type", typeof BigInt === "function" ? BigInt : Object)
-], Character.prototype, "id", void 0);
-__decorate([
-    Property(),
-    __metadata("design:type", typeof BigInt === "function" ? BigInt : Object)
-], Character.prototype, "accountId", void 0);
-__decorate([
-    Property(),
-    __metadata("design:type", String)
-], Character.prototype, "name", void 0);
-Character = __decorate([
-    Entity()
-], Character);
-export { Character };
+// import { Entity, PrimaryKey, Property } from '@mikro-orm/core';
+// @Entity()
+export class Character {
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armoury/fivem-framework-server",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Server APIs for the Armoury FiveM framework",
   "main": "dist/cjs/server/index.js",
   "module": "dist/esm/server/index.js",
@@ -12,7 +12,9 @@
       "require": "./dist/cjs/server/index.js"
     }
   },
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "npm run build:cjs && npm run build:esm && npm run build:types",
     "build:cjs": "tsc -p tsconfig.cjs.json",
@@ -20,17 +22,16 @@
     "build:types": "tsc -p tsconfig.types.json && node ../../tools/move_ambientdeclaration.js server"
   },
   "dependencies": {
-    "@armoury/fivem-framework-common": "1.0.9",
     "injection-js": "^2.4.0",
     "reflect-metadata": "^0.2.1",
     "rxjs": "^7.8.1"
   },
   "peerDependencies": {
-    "@armoury/fivem-framework-common": "1.0.7",
-    "@mikro-orm/core": "^6.2.9",
-    "@mikro-orm/mysql": "^6.2.9"
+    "@armoury/fivem-framework-common": "1.0.11",
+    "drizzle-orm": "^0.45.4",
+    "mysql2": "^3.24.5"
   },
   "publishConfig": {
     "access": "public"
   }
-}
+}