@rcrsr/rill-cli 0.16.0 → 0.17.0

package/dist/cli-run.js

@@ -26,7 +26,7 @@ Options:
   --format <mode>           Output format: human, json, compact (default: human)
   --verbose                 Show full error details (default: false)
   --max-stack-depth <n>     Error stack frame limit (default: 10)
-  --create-bindings         Write bindings source to config-defined file and exit
+  --create-bindings [dir]   Write bindings source to dir and exit (default: ./bindings)
   --explain <code>          Print error code documentation
   --help                    Print this help message and exit
   --version                 Print version and exit`.trimEnd();
@@ -38,17 +38,42 @@ const BASE_OPTIONS = {
     format: { type: 'string' },
     verbose: { type: 'boolean' },
     'max-stack-depth': { type: 'string' },
-    'create-bindings': { type: 'boolean' },
     help: { type: 'boolean' },
     version: { type: 'boolean' },
     explain: { type: 'string' },
 };
 // ============================================================
+// CREATE-BINDINGS EXTRACTION
+// ============================================================
+/**
+ * Extract --create-bindings [dir] from argv before parseArgs.
+ * Handles the optional dir argument that parseArgs cannot natively support.
+ * Returns the filtered argv (with --create-bindings removed) and the resolved dir.
+ */
+function extractCreateBindings(argv) {
+    const idx = argv.indexOf('--create-bindings');
+    if (idx === -1) {
+        return { filteredArgv: argv, createBindings: undefined };
+    }
+    const next = argv[idx + 1];
+    if (next !== undefined && !next.startsWith('-')) {
+        return {
+            filteredArgv: [...argv.slice(0, idx), ...argv.slice(idx + 2)],
+            createBindings: next,
+        };
+    }
+    return {
+        filteredArgv: [...argv.slice(0, idx), ...argv.slice(idx + 1)],
+        createBindings: './bindings',
+    };
+}
+// ============================================================
 // PARSE ARGS
 // ============================================================
 export function parseCliArgs(argv = process.argv.slice(2)) {
+    const { filteredArgv, createBindings } = extractCreateBindings(argv);
     const { values, positionals } = parseArgs({
-        args: argv,
+        args: filteredArgv,
         options: BASE_OPTIONS,
         allowPositionals: true,
         strict: false,
@@ -77,7 +102,7 @@ export function parseCliArgs(argv = process.argv.slice(2)) {
         verbose: values['verbose'] === true,
         maxStackDepth,
         explain: values['explain'],
-        createBindings: values['create-bindings'] === true,
+        createBindings,
     };
 }
 // ============================================================
@@ -96,8 +121,9 @@ function extractHandlerArgs(argv, params) {
             type: param.type === 'bool' ? 'boolean' : 'string',
         };
     }
+    const { filteredArgv } = extractCreateBindings(argv);
     const { values } = parseArgs({
-        args: argv,
+        args: filteredArgv,
         options: handlerOptions,
         allowPositionals: true,
         strict: false,
@@ -165,14 +191,20 @@ export async function main() {
         throw err;
     }
     // Create bindings and exit early if --create-bindings was set
-    if (opts.createBindings === true) {
-        const extBindingsPath = resolve(process.cwd(), project.config.extensions?.bindings ?? 'bindings/ext.rill');
-        mkdirSync(dirname(extBindingsPath), { recursive: true });
-        writeFileSync(extBindingsPath, project.extensionBindings + '\n');
+    if (opts.createBindings !== undefined) {
+        const bindingsDir = resolve(dirname(configPath), opts.createBindings);
+        mkdirSync(bindingsDir, { recursive: true });
+        writeFileSync(resolve(bindingsDir, 'ext.rill'), project.extensionBindings + '\n');
         if (project.config.context !== undefined) {
-            const ctxBindingsPath = resolve(process.cwd(), project.config.context.bindings ?? 'bindings/context.rill');
-            mkdirSync(dirname(ctxBindingsPath), { recursive: true });
-            writeFileSync(ctxBindingsPath, project.contextBindings + '\n');
+            writeFileSync(resolve(bindingsDir, 'context.rill'), project.contextBindings + '\n');
+        }
+        for (const dispose of project.disposes) {
+            try {
+                await dispose();
+            }
+            catch {
+                // Ignore dispose errors during cleanup
+            }
         }
         process.exit(0);
     }
@@ -272,7 +304,9 @@ export async function main() {
         ...opts,
         scriptPath,
     };
-    const runResult = await runScript(runOpts, project.config, project.extTree, project.extensionBindings, [...project.disposes]);
+    const runResult = await runScript(runOpts, project.config, project.extTree, [
+        ...project.disposes,
+    ]);
     if (runResult.output !== undefined) {
         process.stdout.write(runResult.output + '\n');
     }

package/dist/run/runner.d.ts

@@ -2,8 +2,8 @@
  * Script runner for rill-run.
  * Builds runtime options, executes rill scripts, and maps results to exit codes.
  */
-import { type SchemeResolver } from '@rcrsr/rill';
-import type { NestedExtConfig, RillConfigFile } from '@rcrsr/rill-config';
+import { type RillValue, type SchemeResolver } from '@rcrsr/rill';
+import type { RillConfigFile } from '@rcrsr/rill-config';
 import type { RunCliOptions } from './types.js';
 export interface RunResult {
     readonly exitCode: number;
@@ -11,13 +11,13 @@ export interface RunResult {
     readonly errorOutput?: string | undefined;
 }
 /**
- * Build a custom module scheme resolver.
- * - ID 'ext' → returns generated bindings source
- * - ID 'ext.*' → drills into extTree subtree and returns bindings for that node
- * - All other IDs → delegates to moduleResolver with the modules config
+ * Build a custom module scheme resolver using folder aliasing.
+ * Each config key maps to a directory. Dot-paths resolve to files within:
+ * - `module:alias.sub.path` → `{dir}/sub/path.rill`
+ * - `module:alias` → `{dir}/index.rill`
  */
-export declare function buildModuleResolver(bindingsSource: string, modulesConfig: Record<string, string>, extTree: NestedExtConfig, configDir: string): SchemeResolver;
+export declare function buildModuleResolver(modulesConfig: Record<string, string>, configDir: string): SchemeResolver;
 /**
  * Run a rill script file with the given extension tree and config.
  */
-export declare function runScript(opts: RunCliOptions, config: RillConfigFile, extTree: NestedExtConfig, bindingsSrc: string, disposes: Array<() => void | Promise<void>>): Promise<RunResult>;
+export declare function runScript(opts: RunCliOptions, config: RillConfigFile, extTree: Record<string, RillValue>, disposes: Array<() => void | Promise<void>>): Promise<RunResult>;

package/dist/run/runner.js

@@ -6,78 +6,33 @@ import { readFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { parse, execute, createRuntimeContext, extResolver, moduleResolver, toNative, isTuple, } from '@rcrsr/rill';
 import { ParseError, RillError, formatRillError, formatRillErrorJson, } from '@rcrsr/rill';
-import { buildExtensionBindings, isLeafFunction } from '@rcrsr/rill-config';
-// ============================================================
-// TREE CONVERSION
-// ============================================================
-function convertTreeToRillValues(tree) {
-    const result = {};
-    for (const [key, value] of Object.entries(tree)) {
-        if (typeof value === 'object' &&
-            value !== null &&
-            'fn' in value &&
-            typeof value.fn === 'function' &&
-            'params' in value) {
-            const rillFn = value;
-            result[key] = {
-                __type: 'callable',
-                kind: 'application',
-                isProperty: false,
-                fn: rillFn.fn,
-                params: rillFn.params,
-                returnType: rillFn.returnType,
-                annotations: rillFn.annotations ?? {},
-            };
-        }
-        else {
-            result[key] = convertTreeToRillValues(value);
-        }
-    }
-    return result;
-}
 // ============================================================
 // MODULE RESOLVER
 // ============================================================
 /**
- * Build a custom module scheme resolver.
- * - ID 'ext' → returns generated bindings source
- * - ID 'ext.*' → drills into extTree subtree and returns bindings for that node
- * - All other IDs → delegates to moduleResolver with the modules config
+ * Build a custom module scheme resolver using folder aliasing.
+ * Each config key maps to a directory. Dot-paths resolve to files within:
+ * - `module:alias.sub.path` → `{dir}/sub/path.rill`
+ * - `module:alias` → `{dir}/index.rill`
  */
-export function buildModuleResolver(bindingsSource, modulesConfig, extTree, configDir) {
-    const moduleConfig = {};
+export function buildModuleResolver(modulesConfig, configDir) {
+    const moduleDirs = {};
     for (const [id, value] of Object.entries(modulesConfig)) {
-        if (id !== 'ext') {
-            moduleConfig[id] = resolve(configDir, value);
-        }
+        moduleDirs[id] = resolve(configDir, value);
     }
     const resolver = (resource) => {
-        if (resource === 'ext') {
-            return { kind: 'source', text: bindingsSource };
+        const dotIndex = resource.indexOf('.');
+        const alias = dotIndex === -1 ? resource : resource.slice(0, dotIndex);
+        const dirPath = moduleDirs[alias];
+        if (dirPath === undefined) {
+            return moduleResolver(resource, {});
         }
-        if (resource.startsWith('ext.')) {
-            const suffix = resource.slice('ext.'.length);
-            const segments = suffix.split('.');
-            let node = extTree;
-            let fullyResolved = true;
-            for (const segment of segments) {
-                const child = node[segment];
-                if (child === undefined) {
-                    fullyResolved = false;
-                    break;
-                }
-                if (isLeafFunction(child)) {
-                    fullyResolved = false;
-                    break;
-                }
-                node = child;
-            }
-            if (fullyResolved && node !== extTree) {
-                const subtreeSource = buildExtensionBindings(node, suffix);
-                return { kind: 'source', text: subtreeSource };
-            }
-        }
-        return moduleResolver(resource, moduleConfig);
+        const subPath = dotIndex === -1 ? '' : resource.slice(dotIndex + 1);
+        const relPath = subPath.length > 0
+            ? subPath.replaceAll('.', '/') + '.rill'
+            : 'index.rill';
+        const filePath = resolve(dirPath, relPath);
+        return moduleResolver(resource, { [resource]: filePath });
     };
     return resolver;
 }
@@ -120,7 +75,7 @@ function formatOutput(value, format) {
 /**
  * Run a rill script file with the given extension tree and config.
  */
-export async function runScript(opts, config, extTree, bindingsSrc, disposes) {
+export async function runScript(opts, config, extTree, disposes) {
     if (!opts.scriptPath) {
         return { exitCode: 1, errorOutput: 'no script path provided' };
     }
@@ -132,10 +87,9 @@ export async function runScript(opts, config, extTree, bindingsSrc, disposes) {
         const message = err instanceof Error ? err.message : String(err);
         return { exitCode: 1, errorOutput: message };
     }
-    const extConfig = convertTreeToRillValues(extTree);
     const modulesConfig = config.modules ?? {};
     const configDir = dirname(resolve(opts.config));
-    const customModuleResolver = buildModuleResolver(bindingsSrc, modulesConfig, extTree, configDir);
+    const customModuleResolver = buildModuleResolver(modulesConfig, configDir);
     const runtimeOptions = {
         resolvers: {
             ext: extResolver,
@@ -143,7 +97,7 @@ export async function runScript(opts, config, extTree, bindingsSrc, disposes) {
         },
         configurations: {
             resolvers: {
-                ext: extConfig,
+                ext: extTree,
             },
         },
         parseSource: parse,
@@ -196,7 +150,7 @@ export async function runScript(opts, config, extTree, bindingsSrc, disposes) {
                     verbose: opts.verbose,
                     maxStackDepth: opts.maxStackDepth,
                     filePath: opts.scriptPath,
-                    sources: { script: source, bindings: bindingsSrc },
+                    sources: { script: source },
                 });
             return { exitCode: 1, errorOutput: formatted };
         }

package/dist/run/types.d.ts

@@ -12,5 +12,5 @@ export interface RunCliOptions {
     readonly verbose: boolean;
     readonly maxStackDepth: number;
     readonly explain?: string | undefined;
-    readonly createBindings?: boolean | undefined;
+    readonly createBindings?: string | undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcrsr/rill-cli",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "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.16.0",
-    "@rcrsr/rill": "^0.16.0"
+    "@rcrsr/rill": "^0.17.0",
+    "@rcrsr/rill-config": "^0.17.0"
   },
   "files": [
     "dist"