@rcrsr/rill-cli 0.18.1 → 0.18.2

package/dist/check/rules/closures.js

@@ -59,14 +59,31 @@ export const CLOSURE_BARE_DOLLAR = {
  */
 function containsBareReference(node) {
     let found = false;
+    let scopeDepth = 0;
+    const scopeTypes = new Set([
+        'Closure',
+        'FilterExpr',
+        'MapExpr',
+        'EachExpr',
+    ]);
     const ctx = {};
     visitNode(node, ctx, {
         enter(n) {
+            if (scopeTypes.has(n.type)) {
+                scopeDepth++;
+                return;
+            }
+            if (scopeDepth > 0)
+                return;
             if (n.type === 'Variable' && n.isPipeVar) {
                 found = true;
             }
         },
-        exit() { },
+        exit(n) {
+            if (scopeTypes.has(n.type)) {
+                scopeDepth--;
+            }
+        },
     });
     return found;
 }

package/dist/cli-run.js

@@ -269,9 +269,16 @@ export async function main() {
             throw err;
         }
         ctx.pipeValue = handlerArgs;
+        // Map handler args to positional args in param order so marshalArgs
+        // can bind them to the closure's declared parameters.
+        // Omitted optional params stay undefined so closure defaults hydrate.
+        // pipeValue is kept for zero-param closures that access $ directly.
+        const positionalArgs = introspection.params.map((p) => (Object.prototype.hasOwnProperty.call(handlerArgs, p.name)
+            ? handlerArgs[p.name]
+            : undefined));
         let handlerResult;
         try {
-            handlerResult = await invokeCallable(handlerValue, [], ctx);
+            handlerResult = await invokeCallable(handlerValue, positionalArgs, ctx);
         }
         catch (err) {
             const message = err instanceof Error ? err.message : String(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcrsr/rill-cli",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "CLI tools for the rill scripting language",
   "license": "MIT",
   "author": "Andre Bremer",
@@ -21,8 +21,8 @@
   "dependencies": {
     "dotenv": "^16.0.0",
     "yaml": "^2.8.2",
-    "@rcrsr/rill-config": "^0.18.1",
-    "@rcrsr/rill": "^0.18.0"
+    "@rcrsr/rill": "^0.18.2",
+    "@rcrsr/rill-config": "^0.18.1"
   },
   "files": [
     "dist"