@smartive/graphql-magic 23.2.0 → 23.3.0

package/CHANGELOG.md

@@ -1,3 +1,3 @@
-## 23.2.0 (2026-01-29)
+## 23.3.0 (2026-01-30)
 
-* feat: add possibility to mark an entity as a many-to-many relation (#407) ([176296d](https://github.com/smartive/graphql-magic/commit/176296d)), closes [#407](https://github.com/smartive/graphql-magic/issues/407)
+* feat: enhance staticEval to support destructuring and rest parameters in function arguments (#406) ([adf91c6](https://github.com/smartive/graphql-magic/commit/adf91c6)), closes [#406](https://github.com/smartive/graphql-magic/issues/406)

package/dist/bin/gqm.cjs

@@ -2325,6 +2325,7 @@ var KNOWN_IDENTIFIERS = {
 var staticEval = (node, context) => visit(node, context, VISITOR);
 var VISITOR = {
   undefined: () => void 0,
+  [import_ts_morph2.SyntaxKind.BindingElement]: (node, context) => context[node.getName()],
   [import_ts_morph2.SyntaxKind.VariableDeclaration]: (node, context) => staticEval(node.getInitializer(), context),
   [import_ts_morph2.SyntaxKind.ArrayLiteralExpression]: (node, context) => {
     const values = [];
@@ -2420,7 +2421,41 @@ var VISITOR = {
       const parameters = {};
       let i = 0;
       for (const parameter of node.getParameters()) {
-        parameters[parameter.getName()] = args2[i];
+        const argument = args2[i];
+        if (parameter.isRestParameter()) {
+          parameters[parameter.getName()] = args2.slice(i);
+        } else {
+          const nameNode = parameter.getNameNode();
+          if (import_ts_morph2.Node.isObjectBindingPattern(nameNode)) {
+            const value2 = argument ?? {};
+            const usedKeys = /* @__PURE__ */ new Set();
+            for (const element of nameNode.getElements()) {
+              if (element.getDotDotDotToken()) {
+                const restName = element.getName();
+                const restValue = {};
+                for (const key in value2) {
+                  if (!usedKeys.has(key)) {
+                    restValue[key] = value2[key];
+                  }
+                }
+                parameters[restName] = restValue;
+              } else {
+                const propertyNameNode = element.getPropertyNameNode();
+                const elementDetails = element.getNameNode();
+                const key = propertyNameNode ? propertyNameNode.getText() : elementDetails.getText();
+                const variableName = elementDetails.getText();
+                usedKeys.add(key);
+                let propertyValue = value2[key];
+                if (propertyValue === void 0 && element.hasInitializer()) {
+                  propertyValue = staticEval(element.getInitializer(), { ...context, ...parameters });
+                }
+                parameters[variableName] = propertyValue;
+              }
+            }
+          } else {
+            parameters[parameter.getName()] = argument;
+          }
+        }
         i++;
       }
       return staticEval(node.getBody(), { ...context, ...parameters });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartive/graphql-magic",
-  "version": "23.2.0",
+  "version": "23.3.0",
   "description": "",
   "source": "src/index.ts",
   "type": "module",

package/src/bin/gqm/static-eval.ts

@@ -1,5 +1,6 @@
 import { camelCase, Dictionary, kebabCase, lowerFirst, snakeCase, startCase, upperFirst } from 'lodash';
 import {
+  BindingElement,
   CaseClause,
   ElementAccessExpression,
   Identifier,
@@ -47,6 +48,7 @@ export const staticEval = (node: Node | undefined, context: Dictionary<unknown>)
 
 const VISITOR: Visitor<unknown, Dictionary<unknown>> = {
   undefined: () => undefined,
+  [SyntaxKind.BindingElement]: (node: BindingElement, context) => context[node.getName()],
   [SyntaxKind.VariableDeclaration]: (node, context) => staticEval(node.getInitializer(), context),
   [SyntaxKind.ArrayLiteralExpression]: (node, context) => {
     const values: unknown[] = [];
@@ -146,7 +148,52 @@ const VISITOR: Visitor<unknown, Dictionary<unknown>> = {
       const parameters: Dictionary<unknown> = {};
       let i = 0;
       for (const parameter of node.getParameters()) {
-        parameters[parameter.getName()] = args[i];
+        const argument = args[i];
+
+        if (parameter.isRestParameter()) {
+          parameters[parameter.getName()] = args.slice(i);
+        } else {
+          const nameNode = parameter.getNameNode();
+          if (Node.isObjectBindingPattern(nameNode)) {
+            const value = (argument ?? {}) as Dictionary<unknown>;
+            const usedKeys = new Set<string>();
+
+            for (const element of nameNode.getElements()) {
+              if (element.getDotDotDotToken()) {
+                // Handle rest element (...args)
+                const restName = element.getName();
+                const restValue: Dictionary<unknown> = {};
+                for (const key in value) {
+                  if (!usedKeys.has(key)) {
+                    restValue[key] = value[key];
+                  }
+                }
+                parameters[restName] = restValue;
+              } else {
+                // Handle property destructuring (prop: alias = defaultValue)
+                const propertyNameNode = element.getPropertyNameNode();
+                const elementDetails = element.getNameNode();
+
+                // If "prop: alias", key is "prop". If just "alias", key is "alias".
+                const key = propertyNameNode ? propertyNameNode.getText() : elementDetails.getText();
+                const variableName = elementDetails.getText();
+
+                usedKeys.add(key);
+
+                let propertyValue = value[key];
+
+                // Handle default values (= defaultValue)
+                if (propertyValue === undefined && element.hasInitializer()) {
+                  propertyValue = staticEval(element.getInitializer(), { ...context, ...parameters });
+                }
+
+                parameters[variableName] = propertyValue;
+              }
+            }
+          } else {
+            parameters[parameter.getName()] = argument;
+          }
+        }
         i++;
       }
       return staticEval(node.getBody(), { ...context, ...parameters });