@armoury/fivem-framework-common 1.0.54 → 1.0.61

package/dist/cjs/common/config.decorator.js

@@ -16,23 +16,21 @@ function Config(key, index = 0) {
     const token = new injection_js_1.InjectionToken(`Config(${key}, ${index})`);
     const inject = (0, injection_js_1.Inject)(token);
     return (target, propertyKey, parameterIndex) => {
-        var _a;
         if (propertyKey !== undefined) {
             throw new Error('Config can only decorate constructor parameters.');
         }
         inject(target, propertyKey, parameterIndex);
-        const bindings = (_a = Reflect.getOwnMetadata(CONFIG_PARAMETERS_METADATA, target)) !== null && _a !== void 0 ? _a : [];
+        const bindings = Reflect.getOwnMetadata(CONFIG_PARAMETERS_METADATA, target) ?? [];
         const binding = { token, key, index };
         Reflect.defineMetadata(CONFIG_PARAMETERS_METADATA, [...bindings, binding], target);
     };
 }
 function createConfigProviders(targets, readValue) {
-    var _a;
     const bindings = new Map();
     for (const target of targets) {
         let constructor = target;
         while (constructor && constructor !== Function.prototype) {
-            const constructorBindings = (_a = Reflect.getOwnMetadata(CONFIG_PARAMETERS_METADATA, constructor)) !== null && _a !== void 0 ? _a : [];
+            const constructorBindings = Reflect.getOwnMetadata(CONFIG_PARAMETERS_METADATA, constructor) ?? [];
             constructorBindings.forEach((binding) => bindings.set(binding.token, binding));
             constructor = Object.getPrototypeOf(constructor);
         }
@@ -63,7 +61,7 @@ function parseConfigValue(value, metadataKey) {
         try {
             return JSON.parse(expression);
         }
-        catch (_a) {
+        catch {
             // Resource manifest tables use Lua syntax rather than JSON.
         }
     }

package/dist/cjs/common/index.js

@@ -93,9 +93,8 @@ function hasProviderForToken(providers, token) {
     return false;
 }
 async function bootstrapWithProviders(entryPoint, parentProviders, options = {}, decorationType = decorator_utils_2.DecorationType.SERVER, readConfigValue, readResourceExports, defaultEagerProviders = []) {
-    var _a, _b;
-    const eagerProviders = (_a = options.eager) !== null && _a !== void 0 ? _a : [];
-    const optionProviders = (_b = options.providers) !== null && _b !== void 0 ? _b : [];
+    const eagerProviders = options.eager ?? [];
+    const optionProviders = options.providers ?? [];
     const platformDefaultProviders = flattenProviders(defaultEagerProviders);
     const activeDefaultEagerProviders = platformDefaultProviders.filter((defaultProvider) => {
         const token = getProviderToken(defaultProvider);

package/dist/cjs/common/resource.decorator.js

@@ -26,22 +26,20 @@ function Resource(resourceName) {
     const token = new injection_js_1.InjectionToken(`Resource(${resourceName})`);
     const inject = (0, injection_js_1.Inject)(token);
     return (target, propertyKey, parameterIndex) => {
-        var _a;
         if (propertyKey !== undefined) {
             throw new Error('Resource can only decorate constructor parameters.');
         }
         inject(target, propertyKey, parameterIndex);
-        const bindings = (_a = Reflect.getOwnMetadata(RESOURCE_PARAMETERS_METADATA, target)) !== null && _a !== void 0 ? _a : [];
+        const bindings = Reflect.getOwnMetadata(RESOURCE_PARAMETERS_METADATA, target) ?? [];
         Reflect.defineMetadata(RESOURCE_PARAMETERS_METADATA, [...bindings, { token, resourceName }], target);
     };
 }
 function createResourceProviders(targets, readExports) {
-    var _a;
     const bindings = new Map();
     for (const target of targets) {
         let constructor = target;
         while (constructor && constructor !== Function.prototype) {
-            const constructorBindings = (_a = Reflect.getOwnMetadata(RESOURCE_PARAMETERS_METADATA, constructor)) !== null && _a !== void 0 ? _a : [];
+            const constructorBindings = Reflect.getOwnMetadata(RESOURCE_PARAMETERS_METADATA, constructor) ?? [];
             constructorBindings.forEach((binding) => bindings.set(binding.token, binding));
             constructor = Object.getPrototypeOf(constructor);
         }

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

@@ -3,34 +3,51 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Command = Command;
 exports.Commands = Commands;
 const decorator_utils_1 = require("./decorator.utils");
-// TODO: adminLevelRequired is not supposed to be here. Move it to @armoury/fivem-gamemode
 function Command(data) {
     return function (target, propertyKey) {
         Reflect.defineMetadata(`arm_command_${propertyKey}`, data, target);
     };
 }
 function Commands(target, _prototype, providers) {
-    decorator_utils_1.DecoratorUtils.map(target, _prototype, providers !== null && providers !== void 0 ? providers : [])
-        .filter((mapping) => mapping.key.startsWith('arm_command_'))
-        .forEach((mapping) => {
-        var _a;
-        const rawCommandName = mapping.key.split('_').slice(2).join('_');
-        const commandName = rawCommandName.toLowerCase() + (((_a = mapping.value) === null || _a === void 0 ? void 0 : _a.suffix) || '');
-        if (!Cfx.Client.IsDuplicityVersion()) {
-            Cfx.Client.RegisterCommand(commandName, (_source, args, _raw) => {
-                mapping.target[rawCommandName].apply(mapping.target, args);
-            }, false);
+    const mappings = decorator_utils_1.DecoratorUtils.map(target, _prototype, providers ?? []);
+    const isServer = Cfx.Client.IsDuplicityVersion();
+    for (const mapping of mappings) {
+        if (!mapping.key.startsWith('arm_command_')) {
+            continue;
         }
-        else {
-            Cfx.Server.RegisterCommand(commandName, (source, args, _raw) => {
-                var _a, _b;
-                // TODO: This conditional is not generic enough. This conditional should actually check a function given through an injection token.
-                if (((_a = mapping.value) === null || _a === void 0 ? void 0 : _a.adminLevelRequired) && Number(Cfx.exports['authentication'].getPlayerInfo(source, 'adminLevel')) < ((_b = mapping.value) === null || _b === void 0 ? void 0 : _b.adminLevelRequired)) {
-                    // TODO: Add error chat message OR some kind of visual notice here
-                    return;
-                }
-                mapping.target[rawCommandName].apply(mapping.target, [source, ...args]);
+        const rawCommandName = mapping.key.substring(12);
+        const commandName = rawCommandName.toLowerCase() + (mapping.value?.suffix || '');
+        const instance = mapping.target;
+        const handler = instance[rawCommandName];
+        if (!isServer) {
+            Cfx.Client.RegisterCommand(commandName, (_source, args) => {
+                handler.apply(instance, args);
             }, false);
+            continue;
         }
-    });
+        const configuredPermissions = mapping.value?.permissions;
+        let permissions = null;
+        if (configuredPermissions != null) {
+            if (Array.isArray(configuredPermissions)) {
+                permissions = configuredPermissions.slice();
+            }
+            else if (typeof configuredPermissions === 'string') {
+                permissions = [configuredPermissions];
+            }
+            else {
+                console.error(`Invalid permissions specified for command ${commandName}.`);
+                continue;
+            }
+        }
+        Cfx.Server.RegisterCommand(commandName, (source, args) => {
+            if (permissions) {
+                for (let i = 0; i < permissions.length; i++) {
+                    if (!Cfx.Server.IsPlayerAceAllowed(source, permissions[i])) {
+                        return;
+                    }
+                }
+            }
+            handler.call(instance, source, ...args);
+        }, false);
+    }
 }

package/dist/cjs/decorators/event-listener.decorator.js

@@ -6,14 +6,14 @@ exports.EventListeners = EventListeners;
 const decorator_utils_1 = require("./decorator.utils");
 function EventListener(data) {
     return function (target, propertyKey) {
-        const eventName = (exports.DEFAULT_EVENTS[propertyKey] || (data === null || data === void 0 ? void 0 : data.eventName));
-        const direction = (data === null || data === void 0 ? void 0 : data.direction) || EVENT_DIRECTIONS.CLIENT_TO_SERVER;
-        const type = (data === null || data === void 0 ? void 0 : data.type) || 'default';
+        const eventName = (exports.DEFAULT_EVENTS[propertyKey] || data?.eventName);
+        const direction = data?.direction || EVENT_DIRECTIONS.CLIENT_TO_SERVER;
+        const type = data?.type || 'default';
         Reflect.defineMetadata(`arm_eventListener_${propertyKey}`, { eventName, direction, type }, target);
     };
 }
 function EventListeners(target, _prototype, providers) {
-    decorator_utils_1.DecoratorUtils.map(target, _prototype, providers !== null && providers !== void 0 ? providers : [])
+    decorator_utils_1.DecoratorUtils.map(target, _prototype, providers ?? [])
         .filter((mapping) => mapping.key.startsWith('arm_eventListener_'))
         .forEach((mapping) => {
         const { eventName, direction, type } = mapping.value;

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

@@ -9,7 +9,7 @@ function Export() {
     };
 }
 function Exports(target, _prototype, providers) {
-    decorator_utils_1.DecoratorUtils.map(target, _prototype, providers !== null && providers !== void 0 ? providers : [])
+    decorator_utils_1.DecoratorUtils.map(target, _prototype, providers ?? [])
         .filter((mapping) => mapping.key.startsWith('arm_export_'))
         .forEach((mapping) => {
         const exportName = mapping.key.split('_').slice(2).join('_');

package/dist/cjs/decorators/key-binding.decorator.js

@@ -17,20 +17,19 @@ function KeyBindings(target, _prototype, providers) {
     if (Cfx.Client.IsDuplicityVersion()) {
         return;
     }
-    const mappings = decorator_utils_1.DecoratorUtils.map(target, _prototype, providers !== null && providers !== void 0 ? providers : []);
+    const mappings = decorator_utils_1.DecoratorUtils.map(target, _prototype, providers ?? []);
     mappings
         .filter((mapping) => mapping.key.startsWith('arm_keybinding_'))
         .forEach((mapping) => {
-        var _a, _b, _c, _d, _e;
         const keybindingName = mapping.key.split('_').slice(2).join('_');
         const commandMapping = mappings.find((entry) => entry.target === mapping.target && entry.key === `arm_command_${keybindingName}`);
-        const command = ((_a = mapping.value) === null || _a === void 0 ? void 0 : _a.command)
+        const command = mapping.value?.command
             ? mapping.value.command.toLowerCase()
-            : keybindingName.toLowerCase() + (((_b = commandMapping === null || commandMapping === void 0 ? void 0 : commandMapping.value) === null || _b === void 0 ? void 0 : _b.suffix) || '');
+            : keybindingName.toLowerCase() + (commandMapping?.value?.suffix || '');
         if (!command) {
             console.error(`Could not find any relevant command for key binding ${keybindingName}`);
             return;
         }
-        Cfx.Client.RegisterKeyMapping(command, (_c = mapping.value) === null || _c === void 0 ? void 0 : _c.description, (_d = mapping.value) === null || _d === void 0 ? void 0 : _d.defaultMapper, (_e = mapping.value) === null || _e === void 0 ? void 0 : _e.key);
+        Cfx.Client.RegisterKeyMapping(command, mapping.value?.description, mapping.value?.defaultMapper, mapping.value?.key);
     });
 }

package/dist/cjs/decorators/ui-listener.decorator.js

@@ -5,12 +5,12 @@ exports.UIListeners = UIListeners;
 const decorator_utils_1 = require("./decorator.utils");
 function UIListener(data) {
     return function (target, propertyKey, _descriptor) {
-        const eventName = (data === null || data === void 0 ? void 0 : data.eventName) || propertyKey;
+        const eventName = data?.eventName || propertyKey;
         Reflect.defineMetadata(`arm_uiListener_${propertyKey}`, { eventName }, target);
     };
 }
 function UIListeners(target, _prototype, providers) {
-    decorator_utils_1.DecoratorUtils.map(target, _prototype, providers !== null && providers !== void 0 ? providers : [])
+    decorator_utils_1.DecoratorUtils.map(target, _prototype, providers ?? [])
         .filter((mapping) => mapping.key.startsWith('arm_uiListener_'))
         .forEach((mapping) => {
         const { eventName } = mapping.value;

package/dist/cjs/shared/models/session.js

@@ -16,8 +16,7 @@ class Session {
      * @returns the value from the state, or null if not found.
      */
     getState(stateItemName) {
-        var _a;
-        return (_a = Cfx.Player(this.id).state[`session:${stateItemName}:value`]) !== null && _a !== void 0 ? _a : null;
+        return Cfx.Player(this.id).state[`session:${stateItemName}:value`] ?? null;
     }
     /**
      * Updates the state of a player.
@@ -36,7 +35,7 @@ class Session {
      * @returns the value which has been set.
      */
     setState(stateItemName, value, replicate) {
-        Cfx.Player(this.id).state.set(`session:${stateItemName}:value`, value, replicate !== null && replicate !== void 0 ? replicate : Cfx.Server.IsDuplicityVersion());
+        Cfx.Player(this.id).state.set(`session:${stateItemName}:value`, value, replicate ?? Cfx.Server.IsDuplicityVersion());
         return value;
     }
     /**
@@ -46,7 +45,6 @@ class Session {
      * @returns the value from the state, or null if not found.
      */
     getServerClaimValue(claimName) {
-        var _a;
         if (!Cfx.Server.IsDuplicityVersion()) {
             console.error('Claims are not currently available in client scripts.');
             return null;
@@ -55,7 +53,7 @@ class Session {
         if (claimValue == null) {
             return null;
         }
-        const kind = (_a = Cfx.Player(this.id).state[`session:${claimName}:kind`]) !== null && _a !== void 0 ? _a : session_claim_1.SessionClaimType.Direct;
+        const kind = Cfx.Player(this.id).state[`session:${claimName}:kind`] ?? session_claim_1.SessionClaimType.Direct;
         if (kind === session_claim_1.SessionClaimType.Proxied) {
             const proxiedValue = this.getProxiedServerClaimValue(claimName);
             Cfx.Player(this.id).state.set(`session:${claimName}:value`, proxiedValue, false);
@@ -71,7 +69,6 @@ class Session {
      * @returns the value from the proxied state, or null if not found or impossible.
      */
     getProxiedServerClaimValue(claimName) {
-        var _a, _b;
         if (!Cfx.Server.IsDuplicityVersion()) {
             console.error('Proxied claims are not currently available in client scripts.');
             return null;
@@ -82,7 +79,8 @@ class Session {
                 + 'returning null.');
             return null;
         }
-        return (_b = (_a = globalThis.exports[resource]) === null || _a === void 0 ? void 0 : _a.getProxiedClaimValue(claimName, this.id)) !== null && _b !== void 0 ? _b : null;
+        return globalThis.exports[resource]
+            ?.getProxiedClaimValue(claimName, this.id) ?? null;
     }
     /**
      * Updates the state of the player, but doesn't replicate the value to the client.

package/dist/cjs/utils/utils.js

@@ -88,12 +88,11 @@ const toThousandsString = (input, args) => {
 };
 exports.toThousandsString = toThousandsString;
 const fromThousandsString = (input) => {
-    var _a;
     const existingSuffix = (input.match(/[a-zA-Z]/) || []).pop() || '';
     if (!existingSuffix) {
         return Number(input);
     }
-    const existingNumber = Number((_a = input.match(/\d+/)) === null || _a === void 0 ? void 0 : _a[0]);
+    const existingNumber = Number(input.match(/\d+/)?.[0]);
     return (existingNumber *
         Math.pow(1000, 1 +
             suffixes

package/dist/esm/common/config.decorator.js

@@ -11,23 +11,21 @@ export function Config(key, index = 0) {
     const token = new InjectionToken(`Config(${key}, ${index})`);
     const inject = Inject(token);
     return (target, propertyKey, parameterIndex) => {
-        var _a;
         if (propertyKey !== undefined) {
             throw new Error('Config can only decorate constructor parameters.');
         }
         inject(target, propertyKey, parameterIndex);
-        const bindings = (_a = Reflect.getOwnMetadata(CONFIG_PARAMETERS_METADATA, target)) !== null && _a !== void 0 ? _a : [];
+        const bindings = Reflect.getOwnMetadata(CONFIG_PARAMETERS_METADATA, target) ?? [];
         const binding = { token, key, index };
         Reflect.defineMetadata(CONFIG_PARAMETERS_METADATA, [...bindings, binding], target);
     };
 }
 export function createConfigProviders(targets, readValue) {
-    var _a;
     const bindings = new Map();
     for (const target of targets) {
         let constructor = target;
         while (constructor && constructor !== Function.prototype) {
-            const constructorBindings = (_a = Reflect.getOwnMetadata(CONFIG_PARAMETERS_METADATA, constructor)) !== null && _a !== void 0 ? _a : [];
+            const constructorBindings = Reflect.getOwnMetadata(CONFIG_PARAMETERS_METADATA, constructor) ?? [];
             constructorBindings.forEach((binding) => bindings.set(binding.token, binding));
             constructor = Object.getPrototypeOf(constructor);
         }
@@ -58,7 +56,7 @@ export function parseConfigValue(value, metadataKey) {
         try {
             return JSON.parse(expression);
         }
-        catch (_a) {
+        catch {
             // Resource manifest tables use Lua syntax rather than JSON.
         }
     }

package/dist/esm/common/index.js

@@ -70,9 +70,8 @@ function hasProviderForToken(providers, token) {
     return false;
 }
 export async function bootstrapWithProviders(entryPoint, parentProviders, options = {}, decorationType = DecorationType.SERVER, readConfigValue, readResourceExports, defaultEagerProviders = []) {
-    var _a, _b;
-    const eagerProviders = (_a = options.eager) !== null && _a !== void 0 ? _a : [];
-    const optionProviders = (_b = options.providers) !== null && _b !== void 0 ? _b : [];
+    const eagerProviders = options.eager ?? [];
+    const optionProviders = options.providers ?? [];
     const platformDefaultProviders = flattenProviders(defaultEagerProviders);
     const activeDefaultEagerProviders = platformDefaultProviders.filter((defaultProvider) => {
         const token = getProviderToken(defaultProvider);

package/dist/esm/common/resource.decorator.js

@@ -20,22 +20,20 @@ export function Resource(resourceName) {
     const token = new InjectionToken(`Resource(${resourceName})`);
     const inject = Inject(token);
     return (target, propertyKey, parameterIndex) => {
-        var _a;
         if (propertyKey !== undefined) {
             throw new Error('Resource can only decorate constructor parameters.');
         }
         inject(target, propertyKey, parameterIndex);
-        const bindings = (_a = Reflect.getOwnMetadata(RESOURCE_PARAMETERS_METADATA, target)) !== null && _a !== void 0 ? _a : [];
+        const bindings = Reflect.getOwnMetadata(RESOURCE_PARAMETERS_METADATA, target) ?? [];
         Reflect.defineMetadata(RESOURCE_PARAMETERS_METADATA, [...bindings, { token, resourceName }], target);
     };
 }
 export function createResourceProviders(targets, readExports) {
-    var _a;
     const bindings = new Map();
     for (const target of targets) {
         let constructor = target;
         while (constructor && constructor !== Function.prototype) {
-            const constructorBindings = (_a = Reflect.getOwnMetadata(RESOURCE_PARAMETERS_METADATA, constructor)) !== null && _a !== void 0 ? _a : [];
+            const constructorBindings = Reflect.getOwnMetadata(RESOURCE_PARAMETERS_METADATA, constructor) ?? [];
             constructorBindings.forEach((binding) => bindings.set(binding.token, binding));
             constructor = Object.getPrototypeOf(constructor);
         }

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

@@ -1,32 +1,49 @@
-import { DecoratorUtils } from "./decorator.utils";
-// TODO: adminLevelRequired is not supposed to be here. Move it to @armoury/fivem-gamemode
+import { DecoratorUtils } from './decorator.utils';
 export function Command(data) {
     return function (target, propertyKey) {
         Reflect.defineMetadata(`arm_command_${propertyKey}`, data, target);
     };
 }
 export function Commands(target, _prototype, providers) {
-    DecoratorUtils.map(target, _prototype, providers !== null && providers !== void 0 ? providers : [])
-        .filter((mapping) => mapping.key.startsWith('arm_command_'))
-        .forEach((mapping) => {
-        var _a;
-        const rawCommandName = mapping.key.split('_').slice(2).join('_');
-        const commandName = rawCommandName.toLowerCase() + (((_a = mapping.value) === null || _a === void 0 ? void 0 : _a.suffix) || '');
-        if (!Cfx.Client.IsDuplicityVersion()) {
-            Cfx.Client.RegisterCommand(commandName, (_source, args, _raw) => {
-                mapping.target[rawCommandName].apply(mapping.target, args);
-            }, false);
+    const mappings = DecoratorUtils.map(target, _prototype, providers ?? []);
+    const isServer = Cfx.Client.IsDuplicityVersion();
+    for (const mapping of mappings) {
+        if (!mapping.key.startsWith('arm_command_')) {
+            continue;
         }
-        else {
-            Cfx.Server.RegisterCommand(commandName, (source, args, _raw) => {
-                var _a, _b;
-                // TODO: This conditional is not generic enough. This conditional should actually check a function given through an injection token.
-                if (((_a = mapping.value) === null || _a === void 0 ? void 0 : _a.adminLevelRequired) && Number(Cfx.exports['authentication'].getPlayerInfo(source, 'adminLevel')) < ((_b = mapping.value) === null || _b === void 0 ? void 0 : _b.adminLevelRequired)) {
-                    // TODO: Add error chat message OR some kind of visual notice here
-                    return;
-                }
-                mapping.target[rawCommandName].apply(mapping.target, [source, ...args]);
+        const rawCommandName = mapping.key.substring(12);
+        const commandName = rawCommandName.toLowerCase() + (mapping.value?.suffix || '');
+        const instance = mapping.target;
+        const handler = instance[rawCommandName];
+        if (!isServer) {
+            Cfx.Client.RegisterCommand(commandName, (_source, args) => {
+                handler.apply(instance, args);
             }, false);
+            continue;
         }
-    });
+        const configuredPermissions = mapping.value?.permissions;
+        let permissions = null;
+        if (configuredPermissions != null) {
+            if (Array.isArray(configuredPermissions)) {
+                permissions = configuredPermissions.slice();
+            }
+            else if (typeof configuredPermissions === 'string') {
+                permissions = [configuredPermissions];
+            }
+            else {
+                console.error(`Invalid permissions specified for command ${commandName}.`);
+                continue;
+            }
+        }
+        Cfx.Server.RegisterCommand(commandName, (source, args) => {
+            if (permissions) {
+                for (let i = 0; i < permissions.length; i++) {
+                    if (!Cfx.Server.IsPlayerAceAllowed(source, permissions[i])) {
+                        return;
+                    }
+                }
+            }
+            handler.call(instance, source, ...args);
+        }, false);
+    }
 }

package/dist/esm/decorators/event-listener.decorator.js

@@ -1,14 +1,14 @@
 import { DecoratorUtils } from "./decorator.utils";
 export function EventListener(data) {
     return function (target, propertyKey) {
-        const eventName = (DEFAULT_EVENTS[propertyKey] || (data === null || data === void 0 ? void 0 : data.eventName));
-        const direction = (data === null || data === void 0 ? void 0 : data.direction) || EVENT_DIRECTIONS.CLIENT_TO_SERVER;
-        const type = (data === null || data === void 0 ? void 0 : data.type) || 'default';
+        const eventName = (DEFAULT_EVENTS[propertyKey] || data?.eventName);
+        const direction = data?.direction || EVENT_DIRECTIONS.CLIENT_TO_SERVER;
+        const type = data?.type || 'default';
         Reflect.defineMetadata(`arm_eventListener_${propertyKey}`, { eventName, direction, type }, target);
     };
 }
 export function EventListeners(target, _prototype, providers) {
-    DecoratorUtils.map(target, _prototype, providers !== null && providers !== void 0 ? providers : [])
+    DecoratorUtils.map(target, _prototype, providers ?? [])
         .filter((mapping) => mapping.key.startsWith('arm_eventListener_'))
         .forEach((mapping) => {
         const { eventName, direction, type } = mapping.value;

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

@@ -5,7 +5,7 @@ export function Export() {
     };
 }
 export function Exports(target, _prototype, providers) {
-    DecoratorUtils.map(target, _prototype, providers !== null && providers !== void 0 ? providers : [])
+    DecoratorUtils.map(target, _prototype, providers ?? [])
         .filter((mapping) => mapping.key.startsWith('arm_export_'))
         .forEach((mapping) => {
         const exportName = mapping.key.split('_').slice(2).join('_');

package/dist/esm/decorators/key-binding.decorator.js

@@ -13,20 +13,19 @@ export function KeyBindings(target, _prototype, providers) {
     if (Cfx.Client.IsDuplicityVersion()) {
         return;
     }
-    const mappings = DecoratorUtils.map(target, _prototype, providers !== null && providers !== void 0 ? providers : []);
+    const mappings = DecoratorUtils.map(target, _prototype, providers ?? []);
     mappings
         .filter((mapping) => mapping.key.startsWith('arm_keybinding_'))
         .forEach((mapping) => {
-        var _a, _b, _c, _d, _e;
         const keybindingName = mapping.key.split('_').slice(2).join('_');
         const commandMapping = mappings.find((entry) => entry.target === mapping.target && entry.key === `arm_command_${keybindingName}`);
-        const command = ((_a = mapping.value) === null || _a === void 0 ? void 0 : _a.command)
+        const command = mapping.value?.command
             ? mapping.value.command.toLowerCase()
-            : keybindingName.toLowerCase() + (((_b = commandMapping === null || commandMapping === void 0 ? void 0 : commandMapping.value) === null || _b === void 0 ? void 0 : _b.suffix) || '');
+            : keybindingName.toLowerCase() + (commandMapping?.value?.suffix || '');
         if (!command) {
             console.error(`Could not find any relevant command for key binding ${keybindingName}`);
             return;
         }
-        Cfx.Client.RegisterKeyMapping(command, (_c = mapping.value) === null || _c === void 0 ? void 0 : _c.description, (_d = mapping.value) === null || _d === void 0 ? void 0 : _d.defaultMapper, (_e = mapping.value) === null || _e === void 0 ? void 0 : _e.key);
+        Cfx.Client.RegisterKeyMapping(command, mapping.value?.description, mapping.value?.defaultMapper, mapping.value?.key);
     });
 }

package/dist/esm/decorators/ui-listener.decorator.js

@@ -1,12 +1,12 @@
 import { DecoratorUtils } from "./decorator.utils";
 export function UIListener(data) {
     return function (target, propertyKey, _descriptor) {
-        const eventName = (data === null || data === void 0 ? void 0 : data.eventName) || propertyKey;
+        const eventName = data?.eventName || propertyKey;
         Reflect.defineMetadata(`arm_uiListener_${propertyKey}`, { eventName }, target);
     };
 }
 export function UIListeners(target, _prototype, providers) {
-    DecoratorUtils.map(target, _prototype, providers !== null && providers !== void 0 ? providers : [])
+    DecoratorUtils.map(target, _prototype, providers ?? [])
         .filter((mapping) => mapping.key.startsWith('arm_uiListener_'))
         .forEach((mapping) => {
         const { eventName } = mapping.value;

package/dist/esm/shared/models/session.js

@@ -13,8 +13,7 @@ export class Session {
      * @returns the value from the state, or null if not found.
      */
     getState(stateItemName) {
-        var _a;
-        return (_a = Cfx.Player(this.id).state[`session:${stateItemName}:value`]) !== null && _a !== void 0 ? _a : null;
+        return Cfx.Player(this.id).state[`session:${stateItemName}:value`] ?? null;
     }
     /**
      * Updates the state of a player.
@@ -33,7 +32,7 @@ export class Session {
      * @returns the value which has been set.
      */
     setState(stateItemName, value, replicate) {
-        Cfx.Player(this.id).state.set(`session:${stateItemName}:value`, value, replicate !== null && replicate !== void 0 ? replicate : Cfx.Server.IsDuplicityVersion());
+        Cfx.Player(this.id).state.set(`session:${stateItemName}:value`, value, replicate ?? Cfx.Server.IsDuplicityVersion());
         return value;
     }
     /**
@@ -43,7 +42,6 @@ export class Session {
      * @returns the value from the state, or null if not found.
      */
     getServerClaimValue(claimName) {
-        var _a;
         if (!Cfx.Server.IsDuplicityVersion()) {
             console.error('Claims are not currently available in client scripts.');
             return null;
@@ -52,7 +50,7 @@ export class Session {
         if (claimValue == null) {
             return null;
         }
-        const kind = (_a = Cfx.Player(this.id).state[`session:${claimName}:kind`]) !== null && _a !== void 0 ? _a : SessionClaimType.Direct;
+        const kind = Cfx.Player(this.id).state[`session:${claimName}:kind`] ?? SessionClaimType.Direct;
         if (kind === SessionClaimType.Proxied) {
             const proxiedValue = this.getProxiedServerClaimValue(claimName);
             Cfx.Player(this.id).state.set(`session:${claimName}:value`, proxiedValue, false);
@@ -68,7 +66,6 @@ export class Session {
      * @returns the value from the proxied state, or null if not found or impossible.
      */
     getProxiedServerClaimValue(claimName) {
-        var _a, _b;
         if (!Cfx.Server.IsDuplicityVersion()) {
             console.error('Proxied claims are not currently available in client scripts.');
             return null;
@@ -79,7 +76,8 @@ export class Session {
                 + 'returning null.');
             return null;
         }
-        return (_b = (_a = globalThis.exports[resource]) === null || _a === void 0 ? void 0 : _a.getProxiedClaimValue(claimName, this.id)) !== null && _b !== void 0 ? _b : null;
+        return globalThis.exports[resource]
+            ?.getProxiedClaimValue(claimName, this.id) ?? null;
     }
     /**
      * Updates the state of the player, but doesn't replicate the value to the client.

package/dist/esm/utils/utils.js

@@ -73,12 +73,11 @@ export const toThousandsString = (input, args) => {
     return ((isNegative ? '-' : '') + (input / Math.pow(1000, exp)).toFixed(args) + suffixes[exp - 1]);
 };
 export const fromThousandsString = (input) => {
-    var _a;
     const existingSuffix = (input.match(/[a-zA-Z]/) || []).pop() || '';
     if (!existingSuffix) {
         return Number(input);
     }
-    const existingNumber = Number((_a = input.match(/\d+/)) === null || _a === void 0 ? void 0 : _a[0]);
+    const existingNumber = Number(input.match(/\d+/)?.[0]);
     return (existingNumber *
         Math.pow(1000, 1 +
             suffixes

package/dist/types/decorators/command.decorator.d.ts

@@ -1,5 +1,5 @@
 export declare function Command(data?: {
-    adminLevelRequired?: number;
+    permissions?: string[] | string;
     suffix?: string;
 }): (target: any, propertyKey: string) => void;
 export declare function Commands(target: any, _prototype: any, providers?: Object[]): void;

package/package.json

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