@open-core/framework 0.3.1 → 0.3.2

package/dist/runtime/server/decorators/command.d.ts

@@ -34,6 +34,8 @@ export interface CommandMetadata extends CommandConfig {
     isPublic?: boolean;
     /** Security metadata for remote validation */
     security?: SecurityMetadata;
+    /** True if the last parameter uses the spread operator (...args) */
+    hasSpreadParam?: boolean;
 }
 type ServerCommandHandler = (() => any) | ((player: Player, ...args: any[]) => any);
 /**

package/dist/runtime/server/decorators/command.js

@@ -24,9 +24,12 @@ function Command(configOrName, schema) {
             throw new Error(`@Command '${config.command}': first parameter must be Player if parameters are present`);
         }
         const paramNames = (0, function_helper_1.getParameterNames)(descriptor.value);
+        const spreadIndices = (0, function_helper_1.getSpreadParameterIndices)(descriptor.value);
+        const hasSpreadParam = spreadIndices.length > 0 && spreadIndices[spreadIndices.length - 1];
         const metadata = Object.assign(Object.assign({}, config), { methodName: propertyKey, target: target.constructor, paramTypes,
             paramNames,
-            expectsPlayer });
+            expectsPlayer,
+            hasSpreadParam });
         Reflect.defineMetadata(metadata_server_keys_1.METADATA_KEYS.COMMAND, metadata, target, propertyKey);
     };
 }

package/dist/runtime/server/helpers/command-validation.helper.js

@@ -61,7 +61,18 @@ async function validateAndExecuteCommand(meta, player, args, handler) {
                 usage: meta.usage,
             });
         });
-        return await handler(player, ...validated);
+        const finalArgs = validated;
+        // If the handler uses spread operator (...args), flatten the last array argument
+        // so the handler receives individual arguments instead of a single array.
+        if (meta.hasSpreadParam &&
+            finalArgs.length > 0 &&
+            Array.isArray(finalArgs[finalArgs.length - 1])) {
+            const positional = finalArgs.slice(0, finalArgs.length - 1);
+            const rest = finalArgs[finalArgs.length - 1];
+            return await handler(player, ...positional, ...rest);
+        }
+        // For regular array parameters (args: string[]), pass as-is
+        return await handler(player, ...finalArgs);
     }
     // fallback
     return await handler(player);

package/dist/runtime/server/helpers/function-helper.d.ts

@@ -1 +1,6 @@
 export declare function getParameterNames(func: (...args: any[]) => any): string[];
+/**
+ * Detects which parameter indices use the spread operator (...args).
+ * Returns an array of booleans where true means the parameter at that index is a spread parameter.
+ */
+export declare function getSpreadParameterIndices(func: (...args: any[]) => any): boolean[];

package/dist/runtime/server/helpers/function-helper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getParameterNames = getParameterNames;
+exports.getSpreadParameterIndices = getSpreadParameterIndices;
 function getParameterNames(func) {
     const stripped = func
         .toString()
@@ -13,3 +14,19 @@ function getParameterNames(func) {
         .filter(Boolean);
     return args;
 }
+/**
+ * Detects which parameter indices use the spread operator (...args).
+ * Returns an array of booleans where true means the parameter at that index is a spread parameter.
+ */
+function getSpreadParameterIndices(func) {
+    const stripped = func
+        .toString()
+        .replace(/\/\/.*$/gm, '')
+        .replace(/\/\*[\s\S]*?\*\//gm, '');
+    const argsString = stripped.slice(stripped.indexOf('(') + 1, stripped.indexOf(')'));
+    const args = argsString
+        .split(',')
+        .map((arg) => arg.trim())
+        .filter(Boolean);
+    return args.map((arg) => arg.startsWith('...'));
+}

package/dist/runtime/server/helpers/process-tuple-schema.js

@@ -28,24 +28,35 @@ function processTupleSchema(schema, args) {
     if (items.length === 0) {
         return args;
     }
-    // Only process if we have MORE args than schema expects
-    // This means we need to group extra args into the last position
-    if (args.length <= items.length) {
-        return args;
-    }
     const lastItem = items[items.length - 1];
     const positionalCount = items.length - 1;
-    // If last parameter is an array type, collect extra args into it
-    if (lastItem instanceof zod_1.default.ZodArray) {
-        const positional = args.slice(0, positionalCount);
-        const restArray = args.slice(positionalCount);
-        return [...positional, restArray];
+    // Case: More args than items (Greedy grouping)
+    if (args.length > items.length) {
+        // If last parameter is a string, join extra args with space
+        if (lastItem instanceof zod_1.default.ZodString) {
+            const positional = args.slice(0, positionalCount);
+            const restString = args.slice(positionalCount).join(' ');
+            return [...positional, restString];
+        }
+        // If last parameter is an array, we keep them as individual elements
+        // for the handler's spread operator (...args) or just as the array itself
+        // if ZodTuple is being used to parse.
+        // However, to avoid nesting [arg1, [arg2, arg3]], we return them flat
+        // if the handler expects a spread, OR we return the array if it's a single param.
+        if (lastItem instanceof zod_1.default.ZodArray) {
+            // For ZodTuple.parse() to work with a ZodArray at the end,
+            // it actually expects the array as a single element in that position.
+            const positional = args.slice(0, positionalCount);
+            const restArray = args.slice(positionalCount);
+            return [...positional, restArray];
+        }
     }
-    // If last parameter is a string, join extra args with space
-    if (lastItem instanceof zod_1.default.ZodString) {
-        const positional = args.slice(0, positionalCount);
-        const restString = args.slice(positionalCount).join(' ');
-        return [...positional, restString];
+    // Case: Exact match but last is array
+    if (args.length === items.length) {
+        if (lastItem instanceof zod_1.default.ZodArray && !Array.isArray(args[positionalCount])) {
+            const positional = args.slice(0, positionalCount);
+            return [...positional, [args[positionalCount]]];
+        }
     }
     return args;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-core/framework",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Secure, Event-Driven, OOP Engine for FiveM. Stop scripting, start engineering.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",