@rcrsr/rill-cli 0.13.3 → 0.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/run/runner.d.ts +1 -1
- package/dist/run/runner.d.ts.map +1 -1
- package/dist/run/runner.js +31 -71
- package/dist/run/runner.js.map +1 -1
- package/package.json +3 -3
package/dist/run/runner.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export interface RunResult {
|
|
|
16
16
|
* - ID 'ext.*' → drills into extTree subtree and returns bindings for that node
|
|
17
17
|
* - All other IDs → delegates to moduleResolver with the modules config
|
|
18
18
|
*/
|
|
19
|
-
export declare function buildModuleResolver(bindingsSource: string, modulesConfig: Record<string, string>, extTree: NestedExtConfig): SchemeResolver;
|
|
19
|
+
export declare function buildModuleResolver(bindingsSource: string, modulesConfig: Record<string, string>, extTree: NestedExtConfig, configDir: string): SchemeResolver;
|
|
20
20
|
/**
|
|
21
21
|
* Run a rill script file with the given extension tree and config.
|
|
22
22
|
*/
|
package/dist/run/runner.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/run/runner.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/run/runner.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAWL,KAAK,cAAc,EACpB,MAAM,aAAa,CAAC;AAQrB,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAMhD,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C;AAgDD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,MAAM,GAChB,cAAc,CAwChB;AAkDD;;GAEG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,KAAK,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAC1C,OAAO,CAAC,SAAS,CAAC,CAwGpB"}
|
package/dist/run/runner.js
CHANGED
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
* Builds runtime options, executes rill scripts, and maps results to exit codes.
|
|
4
4
|
*/
|
|
5
5
|
import { readFileSync } from 'node:fs';
|
|
6
|
+
import { dirname, resolve } from 'node:path';
|
|
6
7
|
import { parse, execute, createRuntimeContext, extResolver, moduleResolver, toNative, isTuple, } from '@rcrsr/rill';
|
|
7
|
-
import { ParseError, RillError,
|
|
8
|
+
import { ParseError, RillError, formatRillError, formatRillErrorJson, } from '@rcrsr/rill';
|
|
8
9
|
import { buildExtensionBindings, isLeafFunction } from '@rcrsr/rill-config';
|
|
9
10
|
// ============================================================
|
|
10
11
|
// TREE CONVERSION
|
|
@@ -24,6 +25,8 @@ function convertTreeToRillValues(tree) {
|
|
|
24
25
|
isProperty: false,
|
|
25
26
|
fn: rillFn.fn,
|
|
26
27
|
params: rillFn.params,
|
|
28
|
+
returnType: rillFn.returnType,
|
|
29
|
+
annotations: rillFn.annotations ?? {},
|
|
27
30
|
};
|
|
28
31
|
}
|
|
29
32
|
else {
|
|
@@ -41,11 +44,11 @@ function convertTreeToRillValues(tree) {
|
|
|
41
44
|
* - ID 'ext.*' → drills into extTree subtree and returns bindings for that node
|
|
42
45
|
* - All other IDs → delegates to moduleResolver with the modules config
|
|
43
46
|
*/
|
|
44
|
-
export function buildModuleResolver(bindingsSource, modulesConfig, extTree) {
|
|
47
|
+
export function buildModuleResolver(bindingsSource, modulesConfig, extTree, configDir) {
|
|
45
48
|
const moduleConfig = {};
|
|
46
|
-
for (const [id,
|
|
49
|
+
for (const [id, value] of Object.entries(modulesConfig)) {
|
|
47
50
|
if (id !== 'ext') {
|
|
48
|
-
moduleConfig[id] =
|
|
51
|
+
moduleConfig[id] = resolve(configDir, value);
|
|
49
52
|
}
|
|
50
53
|
}
|
|
51
54
|
const resolver = (resource) => {
|
|
@@ -112,70 +115,6 @@ function formatOutput(value, format) {
|
|
|
112
115
|
return JSON.stringify(native.value, null, 2);
|
|
113
116
|
}
|
|
114
117
|
// ============================================================
|
|
115
|
-
// ERROR FORMATTING
|
|
116
|
-
// ============================================================
|
|
117
|
-
function resolveSourceSnippet(location, sources, filePath) {
|
|
118
|
-
if (sources.script !== undefined) {
|
|
119
|
-
const lines = sources.script.split('\n');
|
|
120
|
-
const idx = location.line - 1;
|
|
121
|
-
if (idx >= 0 &&
|
|
122
|
-
idx < lines.length &&
|
|
123
|
-
location.column <= lines[idx].length + 1) {
|
|
124
|
-
return {
|
|
125
|
-
label: filePath ?? '<script>',
|
|
126
|
-
...(lines[idx] !== undefined ? { sourceLine: lines[idx] } : {}),
|
|
127
|
-
};
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
if (sources.bindings !== undefined) {
|
|
131
|
-
const lines = sources.bindings.split('\n');
|
|
132
|
-
const idx = location.line - 1;
|
|
133
|
-
if (idx >= 0 && idx < lines.length) {
|
|
134
|
-
return {
|
|
135
|
-
label: '<generated bindings>',
|
|
136
|
-
...(lines[idx] !== undefined ? { sourceLine: lines[idx] } : {}),
|
|
137
|
-
};
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
return { label: filePath ?? '<unknown>' };
|
|
141
|
-
}
|
|
142
|
-
function formatRillError(error, verbose, maxStackDepth, filePath, sources) {
|
|
143
|
-
const data = error.toData();
|
|
144
|
-
const parts = [];
|
|
145
|
-
parts.push(`${data.errorId}: ${data.message}`);
|
|
146
|
-
if (data.location !== undefined && sources !== undefined) {
|
|
147
|
-
const match = resolveSourceSnippet(data.location, sources, filePath);
|
|
148
|
-
parts.push(` at ${match.label}:${data.location.line}:${data.location.column}`);
|
|
149
|
-
if (match.sourceLine !== undefined) {
|
|
150
|
-
parts.push('');
|
|
151
|
-
const lineNum = String(data.location.line);
|
|
152
|
-
parts.push(` ${lineNum} | ${match.sourceLine}`);
|
|
153
|
-
const caretCol = Math.max(0, data.location.column - 1);
|
|
154
|
-
parts.push(` ${' '.repeat(lineNum.length)} | ${' '.repeat(caretCol)}^`);
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
else if (data.location !== undefined) {
|
|
158
|
-
parts.push(` at line ${data.location.line}, column ${data.location.column}`);
|
|
159
|
-
}
|
|
160
|
-
if (verbose &&
|
|
161
|
-
data.context !== undefined &&
|
|
162
|
-
Object.keys(data.context).length > 0) {
|
|
163
|
-
parts.push(` context: ${JSON.stringify(data.context, null, 2)}`);
|
|
164
|
-
}
|
|
165
|
-
if (verbose && data.helpUrl !== undefined) {
|
|
166
|
-
parts.push(` help: ${data.helpUrl}`);
|
|
167
|
-
}
|
|
168
|
-
const frames = getCallStack(error);
|
|
169
|
-
const visibleFrames = frames.slice(0, maxStackDepth);
|
|
170
|
-
for (const frame of visibleFrames) {
|
|
171
|
-
const loc = `${frame.location.start.line}:${frame.location.start.column}`;
|
|
172
|
-
const name = frame.functionName !== undefined ? ` in ${frame.functionName}` : '';
|
|
173
|
-
const ctx = frame.context !== undefined ? ` (${frame.context})` : '';
|
|
174
|
-
parts.push(` at ${loc}${name}${ctx}`);
|
|
175
|
-
}
|
|
176
|
-
return parts.join('\n');
|
|
177
|
-
}
|
|
178
|
-
// ============================================================
|
|
179
118
|
// RUNNER
|
|
180
119
|
// ============================================================
|
|
181
120
|
/**
|
|
@@ -195,7 +134,8 @@ export async function runScript(opts, config, extTree, bindingsSrc, disposes) {
|
|
|
195
134
|
}
|
|
196
135
|
const extConfig = convertTreeToRillValues(extTree);
|
|
197
136
|
const modulesConfig = config.modules ?? {};
|
|
198
|
-
const
|
|
137
|
+
const configDir = dirname(resolve(opts.config));
|
|
138
|
+
const customModuleResolver = buildModuleResolver(bindingsSrc, modulesConfig, extTree, configDir);
|
|
199
139
|
const runtimeOptions = {
|
|
200
140
|
resolvers: {
|
|
201
141
|
ext: extResolver,
|
|
@@ -224,7 +164,17 @@ export async function runScript(opts, config, extTree, bindingsSrc, disposes) {
|
|
|
224
164
|
}
|
|
225
165
|
catch (err) {
|
|
226
166
|
if (err instanceof ParseError) {
|
|
227
|
-
const formatted =
|
|
167
|
+
const formatted = opts.format === 'json'
|
|
168
|
+
? formatRillErrorJson(err, {
|
|
169
|
+
maxStackDepth: opts.maxStackDepth,
|
|
170
|
+
filePath: opts.scriptPath,
|
|
171
|
+
})
|
|
172
|
+
: formatRillError(err, {
|
|
173
|
+
verbose: opts.verbose,
|
|
174
|
+
maxStackDepth: opts.maxStackDepth,
|
|
175
|
+
filePath: opts.scriptPath,
|
|
176
|
+
sources: { script: source },
|
|
177
|
+
});
|
|
228
178
|
return { exitCode: 1, errorOutput: formatted };
|
|
229
179
|
}
|
|
230
180
|
const message = err instanceof Error ? err.message : String(err);
|
|
@@ -237,7 +187,17 @@ export async function runScript(opts, config, extTree, bindingsSrc, disposes) {
|
|
|
237
187
|
}
|
|
238
188
|
catch (err) {
|
|
239
189
|
if (err instanceof RillError) {
|
|
240
|
-
const formatted =
|
|
190
|
+
const formatted = opts.format === 'json'
|
|
191
|
+
? formatRillErrorJson(err, {
|
|
192
|
+
maxStackDepth: opts.maxStackDepth,
|
|
193
|
+
filePath: opts.scriptPath,
|
|
194
|
+
})
|
|
195
|
+
: formatRillError(err, {
|
|
196
|
+
verbose: opts.verbose,
|
|
197
|
+
maxStackDepth: opts.maxStackDepth,
|
|
198
|
+
filePath: opts.scriptPath,
|
|
199
|
+
sources: { script: source, bindings: bindingsSrc },
|
|
200
|
+
});
|
|
241
201
|
return { exitCode: 1, errorOutput: formatted };
|
|
242
202
|
}
|
|
243
203
|
const message = err instanceof Error ? err.message : String(err);
|
package/dist/run/runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/run/runner.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EACL,KAAK,EACL,OAAO,EACP,oBAAoB,EACpB,WAAW,EACX,cAAc,EACd,QAAQ,EACR,OAAO,GAKR,MAAM,aAAa,CAAC;AACrB,OAAO,
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/run/runner.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rcrsr/rill-cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.14.0",
|
|
4
4
|
"description": "CLI tools for the rill scripting language",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Andre Bremer",
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"dotenv": "^16.0.0",
|
|
23
23
|
"yaml": "^2.8.2",
|
|
24
|
-
"@rcrsr/rill": "^0.
|
|
25
|
-
"@rcrsr/rill
|
|
24
|
+
"@rcrsr/rill-config": "^0.14.0",
|
|
25
|
+
"@rcrsr/rill": "^0.14.0"
|
|
26
26
|
},
|
|
27
27
|
"files": [
|
|
28
28
|
"dist"
|