@rcrsr/rill 0.13.2 → 0.15.0

package/dist/runtime/core/eval/mixins/types.js

@@ -132,7 +132,7 @@ function createTypesMixin(Base) {
                             throw new RuntimeError('RILL-R004', 'tuple() requires positional arguments');
                         }
                     }
-                    const elements = args.map(resolveArg);
+                    const elements = args.map((arg) => [resolveArg(arg)]);
                     const structure = { type: 'tuple', elements };
                     return Object.freeze({
                         __rill_type: true,
@@ -147,10 +147,7 @@ function createTypesMixin(Base) {
                         throw new RuntimeError('RILL-R004', 'dict() requires named arguments (field: type)');
                     }
                 }
-                const orderedFields = args.map((arg) => [
-                    arg.name,
-                    resolveArg(arg),
-                ]);
+                const orderedFields = args.map((arg) => [arg.name, resolveArg(arg)]);
                 const structure = {
                     type: 'ordered',
                     fields: orderedFields,
@@ -338,7 +335,21 @@ function createTypesMixin(Base) {
                     if (arg.kind === 'named') {
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         const argVal = await this.evaluateExpression(arg.value);
-                        fields[arg.name] = await resolveArgAsType(argVal);
+                        const resolvedType = await resolveArgAsType(argVal);
+                        if (arg.defaultValue !== undefined) {
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                            const defaultVal = await this.evaluatePrimary(arg.defaultValue);
+                            if (!structuralTypeMatches(defaultVal, resolvedType)) {
+                                throw new RuntimeError('RILL-R004', `Default value for field '${arg.name}' must be ${formatStructuralType(resolvedType)}, got ${inferType(defaultVal)}`, location);
+                            }
+                            fields[arg.name] = {
+                                type: resolvedType,
+                                defaultValue: defaultVal,
+                            };
+                        }
+                        else {
+                            fields[arg.name] = resolvedType;
+                        }
                     }
                 }
                 const structure = { type: 'dict', fields };
@@ -360,7 +371,27 @@ function createTypesMixin(Base) {
                     if (arg.kind === 'positional') {
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         const argVal = await this.evaluateExpression(arg.value);
-                        elements.push(await resolveArgAsType(argVal));
+                        const resolvedType = await resolveArgAsType(argVal);
+                        if (arg.defaultValue !== undefined) {
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                            const defaultVal = await this.evaluatePrimary(arg.defaultValue);
+                            elements.push([resolvedType, defaultVal]);
+                        }
+                        else {
+                            elements.push([resolvedType]);
+                        }
+                    }
+                }
+                // EC-3: defaults must be trailing-only — no element without a default
+                // may follow an element that has one.
+                let sawDefault = false;
+                for (let i = 0; i < elements.length; i++) {
+                    const hasDefault = elements[i].length === 2;
+                    if (hasDefault) {
+                        sawDefault = true;
+                    }
+                    else if (sawDefault) {
+                        throw new RuntimeError('RILL-P003', `tuple() default values must be trailing: element at position ${i} has no default but a preceding element does`, location);
                     }
                 }
                 const structure = { type: 'tuple', elements };
@@ -382,7 +413,18 @@ function createTypesMixin(Base) {
                 if (arg.kind === 'named') {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     const argVal = await this.evaluateExpression(arg.value);
-                    orderedFields.push([arg.name, await resolveArgAsType(argVal)]);
+                    const resolvedType = await resolveArgAsType(argVal);
+                    if (arg.defaultValue !== undefined) {
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        const defaultVal = await this.evaluatePrimary(arg.defaultValue);
+                        if (!structuralTypeMatches(defaultVal, resolvedType)) {
+                            throw new RuntimeError('RILL-R004', `Default value for field '${arg.name}' must be ${formatStructuralType(resolvedType)}, got ${inferType(defaultVal)}`, location);
+                        }
+                        orderedFields.push([arg.name, resolvedType, defaultVal]);
+                    }
+                    else {
+                        orderedFields.push([arg.name, resolvedType]);
+                    }
                 }
             }
             const structure = {

package/dist/runtime/core/eval/mixins/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/types.ts"],"names":[],"mappings":"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"}

package/dist/runtime/core/eval/mixins/use.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/use.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AA4LH,eAAO,MAAM,QAAQ,EAAqB,GAAG,CAAC"}
+{"version":3,"file":"use.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/use.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAsNH,eAAO,MAAM,QAAQ,EAAqB,GAAG,CAAC"}

package/dist/runtime/core/eval/mixins/use.js

@@ -21,7 +21,7 @@
  *
  * @internal
  */
-import { RuntimeError } from '../../../../types.js';
+import { RillError, RuntimeError } from '../../../../types.js';
 import { createChildContext } from '../../context.js';
 import { execute } from '../../execute.js';
 /**
@@ -125,13 +125,33 @@ function createUseMixin(Base) {
                 }
                 catch (err) {
                     const message = err instanceof Error ? err.message : String(err);
-                    const wrapped = RuntimeError.fromNode('RILL-R056', `Resolver error for '${key}': ${message}`, node, { sourceId: key });
+                    // Use the parse error's location within the resolved source, not the use<> call site
+                    const parseLocation = err instanceof RillError ? err.location : undefined;
+                    const wrapped = parseLocation !== undefined
+                        ? new RuntimeError('RILL-R056', `Resolver error for '${key}': ${message.replace(/ at \d+:\d+$/, '')}`, parseLocation, { sourceId: key })
+                        : RuntimeError.fromNode('RILL-R056', `Resolver error for '${key}': ${message}`, node, { sourceId: key });
                     wrapped.sourceId = key;
                     wrapped.cause = err;
                     throw wrapped;
                 }
-                const childCtx = createChildContext(this.ctx);
-                const execResult = await execute(scriptNode, childCtx);
+                const childCtx = createChildContext(this.ctx, {
+                    sourceId: result.sourceId ?? key,
+                    sourceText: result.text,
+                });
+                let execResult;
+                try {
+                    execResult = await execute(scriptNode, childCtx);
+                }
+                catch (err) {
+                    // Enrich runtime errors from module execution with sourceId and sourceText
+                    if (err instanceof RillError && !err.sourceId) {
+                        err.sourceId = result.sourceId ?? key;
+                        const ctx = (err.context ?? {});
+                        ctx['sourceText'] = result.text;
+                        err.context = ctx;
+                    }
+                    throw err;
+                }
                 return execResult.result;
             }
             finally {

package/dist/runtime/core/eval/mixins/use.js.map

@@ -1 +1 @@
-{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/use.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAI3C;;;;;;;;;;;;;;;GAeG;AACH,SAAS,cAAc,CAAC,IAAyC;IAC/D,OAAO,MAAM,YAAa,SAAQ,IAAI;QACpC;;;;;WAKG;QACH,KAAK,CAAC,eAAe,CAAC,IAAiB;YACrC,IAAI,MAAc,CAAC;YACnB,IAAI,QAAgB,CAAC;YAErB,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;YAE5B,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACjC,uDAAuD;gBACvD,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;gBAC3B,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3C,CAAC;iBAAM,IAAI,UAAU,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC1C,sDAAsD;gBACtD,MAAM,OAAO,GAAG;oBACd,IAAI,EAAE,UAAmB;oBACzB,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,SAAS,EAAE,KAAK;oBAChB,WAAW,EAAE,EAAE;oBACf,YAAY,EAAE,IAAI;oBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;iBAChB,CAAC;gBACF,8DAA8D;gBAC9D,MAAM,QAAQ,GAAG,MAAO,IAAY,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;gBACpE,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACjC,MAAM,YAAY,CAAC,QAAQ,CACzB,WAAW,EACX,gDAAgD,OAAO,QAAQ,EAAE,EACjE,IAAI,CACL,CAAC;gBACJ,CAAC;gBACD,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBACjD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;gBACvB,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,wDAAwD;gBACxD,8DAA8D;gBAC9D,MAAM,SAAS,GAAG,MAAO,IAAY,CAAC,kBAAkB,CACtD,UAAU,CAAC,UAAU,CACtB,CAAC;gBACF,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;oBAClC,MAAM,YAAY,CAAC,QAAQ,CACzB,WAAW,EACX,gDAAgD,OAAO,SAAS,EAAE,EAClE,IAAI,CACL,CAAC;gBACJ,CAAC;gBACD,MAAM,MAAM,GAAG,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;gBACvB,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC7B,CAAC;YAED,mBAAmB;YACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAChD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,YAAY,CAAC,QAAQ,CACzB,WAAW,EACX,sCAAsC,MAAM,GAAG,EAC/C,IAAI,CACL,CAAC;YACJ,CAAC;YAED,iDAAiD;YACjD,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC;YACpC,IAAI,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvC,MAAM,YAAY,CAAC,QAAQ,CACzB,WAAW,EACX,iCAAiC,GAAG,4BAA4B,EAChE,IAAI,CACL,CAAC;YACJ,CAAC;YAED,sEAAsE;YACtE,sEAAsE;YACtE,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAEnC,IAAI,MAAM,CAAC;YACX,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACpD,IAAI,CAAC;oBACH,MAAM,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAC5C,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACjE,MAAM,YAAY,CAAC,QAAQ,CACzB,WAAW,EACX,uBAAuB,GAAG,MAAM,OAAO,EAAE,EACzC,IAAI,CACL,CAAC;gBACJ,CAAC;gBAED,uEAAuE;gBACvE,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBAC5B,OAAO,MAAM,CAAC,KAAK,CAAC;gBACtB,CAAC;gBAED,2CAA2C;gBAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;gBACzC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,MAAM,YAAY,CAAC,QAAQ,CACzB,WAAW,EACX,uBAAuB,GAAG,oHAAoH,EAC9I,IAAI,CACL,CAAC;gBACJ,CAAC;gBAED,IAAI,UAAU,CAAC;gBACf,IAAI,CAAC;oBACH,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACxC,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACjE,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CACnC,WAAW,EACX,uBAAuB,GAAG,MAAM,OAAO,EAAE,EACzC,IAAI,EACJ,EAAE,QAAQ,EAAE,GAAG,EAAE,CAClB,CAAC;oBACD,OAAgC,CAAC,QAAQ,GAAG,GAAG,CAAC;oBACjD,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC;oBACpB,MAAM,OAAO,CAAC;gBAChB,CAAC;gBACD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC9C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBACvD,OAAO,UAAU,CAAC,MAAM,CAAC;YAC3B,CAAC;oBAAS,CAAC;gBACT,0EAA0E;gBAC1E,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,iBAAiB,CACxB,KAAa,EACb,IAAiB;IAEjB,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;QACtB,MAAM,YAAY,CAAC,QAAQ,CACzB,WAAW,EACX,oDAAoD,EACpD,IAAI,CACL,CAAC;IACJ,CAAC;IACD,OAAO;QACL,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC;QAClC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC;KACtC,CAAC;AACJ,CAAC;AAED,8DAA8D;AAC9D,gGAAgG;AAChG,8DAA8D;AAC9D,MAAM,CAAC,MAAM,QAAQ,GAAG,cAAqB,CAAC"}
+{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/use.ts"],"names":[],"mappings":"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"}

package/dist/runtime/core/eval/mixins/variables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/variables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AA2zBH,eAAO,MAAM,cAAc,EAA2B,GAAG,CAAC"}
+{"version":3,"file":"variables.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/variables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AA6zBH,eAAO,MAAM,cAAc,EAA2B,GAAG,CAAC"}

package/dist/runtime/core/eval/mixins/variables.js

@@ -34,7 +34,6 @@ import { RuntimeError } from '../../../../types.js';
 import { formatStructuralType, inferType, isTypeValue, structuralTypeMatches, } from '../../values.js';
 import { getVariable, hasVariable } from '../../context.js';
 import { isDict, isCallable } from '../../callable.js';
-import { BUILTIN_METHODS } from '../../../ext/builtins.js';
 /**
  * VariablesMixin implementation.
  *
@@ -242,7 +241,8 @@ function createVariablesMixin(Base) {
                             }
                         }
                     }
-                    else if (field in BUILTIN_METHODS) {
+                    else if (this.ctx.typeMethodDicts.get(inferType(value))?.[field] !==
+                        undefined) {
                         // Field is a built-in method - invoke it
                         // Create a synthetic MethodCallNode with no args and call evaluateMethod
                         const methodNode = {

package/dist/runtime/core/eval/mixins/variables.js.map

@@ -1 +1 @@
-{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/variables.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../../../src/runtime/core/eval/mixins/variables.ts"],"names":[],"mappings":"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"}

package/dist/runtime/core/field-descriptor.d.ts

@@ -8,7 +8,7 @@
  * @internal
  */
 import type { SourceLocation } from '../../types.js';
-import type { RillType } from './values.js';
+import type { RillFieldType, RillType } from './values.js';
 /**
  * Field descriptor — carries field name and structural type when accessing a
  * dict-kind RillType field.
@@ -16,7 +16,7 @@ import type { RillType } from './values.js';
 export interface RillFieldDescriptor {
     readonly __rill_field_descriptor: true;
     readonly fieldName: string;
-    readonly fieldType: RillType;
+    readonly fieldType: RillFieldType;
 }
 /**
  * Build a frozen RillFieldDescriptor for the given field in a structural dict type.

package/dist/runtime/core/field-descriptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"field-descriptor.d.ts","sourceRoot":"","sources":["../../../src/runtime/core/field-descriptor.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,uBAAuB,EAAE,IAAI,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC;CAC9B;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAC3C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,cAAc,GACvB,mBAAmB,CAcrB"}
+{"version":3,"file":"field-descriptor.d.ts","sourceRoot":"","sources":["../../../src/runtime/core/field-descriptor.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE3D;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,uBAAuB,EAAE,IAAI,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;CACnC;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAC3C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,cAAc,GACvB,mBAAmB,CAcrB"}

package/dist/runtime/core/introspection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"introspection.d.ts","sourceRoot":"","sources":["../../../src/runtime/core/introspection.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAW7C;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,2EAA2E;IAC3E,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,2DAA2D;IAC3D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,8CAA8C;IAC9C,QAAQ,CAAC,MAAM,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,mDAAmD;IACnD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,qBAAqB;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,yDAAyD;IACzD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,4DAA4D;IAC5D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,qEAAqE;IACrE,QAAQ,CAAC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;CAC9C;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,cAAc,GAAG,gBAAgB,EAAE,CAqGpE;AA+DD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM,CAoC5D;AAED;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C,2BAA2B;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,4CAA4C;IAC5C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,sDAAsD;IACtD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,cAAc,GAClB,2BAA2B,CAkC7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C"}
+{"version":3,"file":"introspection.d.ts","sourceRoot":"","sources":["../../../src/runtime/core/introspection.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAW7C;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,2EAA2E;IAC3E,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,2DAA2D;IAC3D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,8CAA8C;IAC9C,QAAQ,CAAC,MAAM,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,mDAAmD;IACnD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,qBAAqB;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,yDAAyD;IACzD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,4DAA4D;IAC5D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,qEAAqE;IACrE,QAAQ,CAAC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;CAC9C;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,cAAc,GAAG,gBAAgB,EAAE,CAoGpE;AA+DD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM,CA+B5D;AAED;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C,2BAA2B;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,4CAA4C;IAC5C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,sDAAsD;IACtD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,cAAc,GAClB,2BAA2B,CAkC7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C"}

package/dist/runtime/core/introspection.js

@@ -48,18 +48,16 @@ export function getFunctions(ctx) {
                     }));
                     hostFunctions.push({
                         name,
-                        description: callable.description ?? '',
+                        description: callable.annotations?.['description'] ?? '',
                         params,
-                        returnType: callable.returnType !== undefined
-                            ? formatStructuralType(callable.returnType)
-                            : 'any',
+                        returnType: formatStructuralType(callable.returnType.structure),
                     });
                 }
                 else {
                     // ApplicationCallable without params (untyped)
                     builtinFunctions.push({
                         name,
-                        description: callable.description ?? '',
+                        description: callable.annotations?.['description'] ?? '',
                         params: [],
                         returnType: 'any',
                     });
@@ -191,11 +189,7 @@ export function generateManifest(ctx) {
         if (!isApplicationCallable(callable) || callable.params === undefined) {
             continue;
         }
-        const signature = callable.originalSignature !== undefined
-            ? callable.originalSignature
-            : serializeClosureSignature(callable.params, callable.returnType !== undefined
-                ? formatStructuralType(callable.returnType)
-                : 'any', callable.description);
+        const signature = serializeClosureSignature(callable.params, formatStructuralType(callable.returnType.structure), callable.annotations?.['description'] ?? undefined);
         entries.push(`  "${name}": ${signature}`);
     }
     if (entries.length === 0) {

package/dist/runtime/core/introspection.js.map

@@ -1 +1 @@
-{"version":3,"file":"introspection.js","sourceRoot":"","sources":["../../../src/runtime/core/introspection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"introspection.js","sourceRoot":"","sources":["../../../src/runtime/core/introspection.ts"],"names":[],"mappings":"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"}

package/dist/runtime/core/resolvers.d.ts

@@ -8,10 +8,9 @@ import type { SchemeResolver } from './types.js';
 /**
  * Resolves a module ID to Rill source text by reading a file.
  *
- * Config shape: `{ basePath?: string; [moduleId: string]: string }`
- * - `basePath` is optional; file paths resolve relative to it when provided,
- *   otherwise relative to `process.cwd()`.
- * - Each other key is a module ID mapping to a file path string.
+ * Config shape: `{ [moduleId: string]: string }`
+ * - Each key is a module ID mapping to an absolute file path string.
+ *   The caller is responsible for resolving paths before passing them in.
  *
  * Error codes:
  * - RILL-R059 when config is not a plain object

package/dist/runtime/core/resolvers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../src/runtime/core/resolvers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,YAAY,CAAC;AAOjE;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,cAAc,EAAE,cA8C5B,CAAC;AAMF;;;;;;;;;;;;;;;GAeG;AAKH;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,EAAE,cA2C7B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,cAwCzB,CAAC"}
+{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../src/runtime/core/resolvers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,YAAY,CAAC;AAOjE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,cAAc,EAAE,cAuC5B,CAAC;AAMF;;;;;;;;;;;;;;;GAeG;AAKH;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,EAAE,cA2C7B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,cAwCzB,CAAC"}

package/dist/runtime/core/resolvers.js

@@ -11,10 +11,9 @@ import { RuntimeError } from '../../error-classes.js';
 /**
  * Resolves a module ID to Rill source text by reading a file.
  *
- * Config shape: `{ basePath?: string; [moduleId: string]: string }`
- * - `basePath` is optional; file paths resolve relative to it when provided,
- *   otherwise relative to `process.cwd()`.
- * - Each other key is a module ID mapping to a file path string.
+ * Config shape: `{ [moduleId: string]: string }`
+ * - Each key is a module ID mapping to an absolute file path string.
+ *   The caller is responsible for resolving paths before passing them in.
  *
  * Error codes:
  * - RILL-R059 when config is not a plain object
@@ -26,25 +25,20 @@ export const moduleResolver = async (resource, config) => {
         throw new RuntimeError('RILL-R059', 'moduleResolver config must be a plain object');
     }
     const cfg = config;
-    const basePath = typeof cfg['basePath'] === 'string' ? cfg['basePath'] : undefined;
     const filePath = cfg[resource];
     if (typeof filePath !== 'string') {
         throw new RuntimeError('RILL-R050', `Module '${resource}' not found in resolver config`, undefined, { resource });
     }
     const { readFile } = await import('node:fs/promises');
-    const { resolve } = await import('node:path');
-    const absolutePath = basePath
-        ? resolve(basePath, filePath)
-        : resolve(process.cwd(), filePath);
     let text;
     try {
-        text = await readFile(absolutePath, { encoding: 'utf8' });
+        text = await readFile(filePath, { encoding: 'utf8' });
     }
     catch (err) {
         const reason = err instanceof Error ? err.message : String(err);
         throw new RuntimeError('RILL-R051', `Failed to read module '${resource}': ${reason}`, undefined, { resource, reason });
     }
-    return { kind: 'source', text };
+    return { kind: 'source', text, sourceId: filePath };
 };
 // ============================================================
 // EXTENSION RESOLVER

package/dist/runtime/core/resolvers.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../../src/runtime/core/resolvers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../../src/runtime/core/resolvers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,+DAA+D;AAC/D,kBAAkB;AAClB,+DAA+D;AAE/D;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,cAAc,GAAmB,KAAK,EACjD,QAAgB,EAChB,MAAgB,EACS,EAAE;IAC3B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,YAAY,CACpB,WAAW,EACX,8CAA8C,CAC/C,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,MAAgC,CAAC;IAE7C,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,IAAI,YAAY,CACpB,WAAW,EACX,WAAW,QAAQ,gCAAgC,EACnD,SAAS,EACT,EAAE,QAAQ,EAAE,CACb,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAEtD,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACxD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChE,MAAM,IAAI,YAAY,CACpB,WAAW,EACX,0BAA0B,QAAQ,MAAM,MAAM,EAAE,EAChD,SAAS,EACT,EAAE,QAAQ,EAAE,MAAM,EAAE,CACrB,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AACtD,CAAC,CAAC;AAEF,+DAA+D;AAC/D,qBAAqB;AACrB,+DAA+D;AAE/D;;;;;;;;;;;;;;;GAeG;AACH,+DAA+D;AAC/D,mBAAmB;AACnB,+DAA+D;AAE/D;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,eAAe,GAAmB,CAC7C,QAAgB,EAChB,MAAgB,EACA,EAAE;IAClB,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,EAAE,CAA4B,CAAC;IAEtD,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;IAEpC,IAAI,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC;QAClB,MAAM,IAAI,YAAY,CACpB,WAAW,EACX,gBAAgB,QAAQ,aAAa,EACrC,SAAS,EACT,EAAE,GAAG,EAAE,QAAQ,EAAE,CAClB,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,GAAY,GAAG,CAAC,GAAG,CAAC,CAAC;IAE9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAW,CAAC;QACtC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,IAAI,YAAY,CACpB,WAAW,EACX,iBAAiB,QAAQ,OAAO,IAAI,iBAAiB,EACrD,SAAS,EACT,EAAE,IAAI,EAAE,OAAO,EAAE,CAClB,CAAC;QACJ,CAAC;QACD,KAAK,GAAI,KAAiC,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,YAAY,CACpB,WAAW,EACX,gBAAgB,QAAQ,aAAa,EACrC,SAAS,EACT,EAAE,GAAG,EAAE,QAAQ,EAAE,CAClB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAkB,EAAE,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAmB,CACzC,QAAgB,EAChB,MAAgB,EACA,EAAE;IAClB,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,EAAE,CAA8B,CAAC;IAExD,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;IAErC,IAAI,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,YAAY,CACpB,WAAW,EACX,cAAc,IAAI,gCAAgC,EAClD,SAAS,EACT,EAAE,IAAI,EAAE,CACT,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,GAAc,GAAG,CAAC,IAAI,CAAc,CAAC;IAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAW,CAAC;QACtC,IACE,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YACpB,CAAC,CAAC,OAAO,IAAK,KAAmC,CAAC,EAClD,CAAC;YACD,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChD,MAAM,IAAI,YAAY,CACpB,WAAW,EACX,WAAW,IAAI,6BAA6B,IAAI,GAAG,EACnD,SAAS,EACT,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;QACJ,CAAC;QACD,KAAK,GAAI,KAAmC,CAAC,OAAO,CAAc,CAAC;IACrE,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAClC,CAAC,CAAC"}

package/dist/runtime/core/types.d.ts

@@ -5,15 +5,9 @@
  * These types are the primary interface for host applications.
  */
 import type { RillTypeName } from '../../types.js';
-import type { CallableFn, RillFunction, RillFunctionSignature } from './callable.js';
+import type { CallableFn, RillFunction } from './callable.js';
 import type { RillType, RillValue } from './values.js';
 export type { NativeArray, NativePlainObject, NativeValue } from './values.js';
-/**
- * Method signature for built-in methods.
- * Methods are called on a receiver value: $val.method(args)
- * @internal
- */
-export type RillMethod = (receiver: RillValue, args: RillValue[], ctx: RuntimeContext, location?: import('../../types.js').SourceLocation) => RillValue | Promise<RillValue>;
 /** I/O callbacks for runtime operations */
 export interface RuntimeCallbacks {
     /** Called when .log is invoked */
@@ -108,6 +102,7 @@ export type ResolverResult = {
 } | {
     kind: 'source';
     text: string;
+    sourceId?: string;
 };
 /**
  * Resolves a scheme-qualified resource to a value or source text.
@@ -127,12 +122,6 @@ export interface RuntimeContext {
     readonly variableTypes: Map<string, RillTypeName | RillType>;
     /** Built-in and user-defined functions (CallableFn for untyped, ApplicationCallable for typed) */
     readonly functions: Map<string, CallableFn | import('./callable.js').ApplicationCallable>;
-    /** Built-in and user-defined methods */
-    readonly methods: Map<string, RillMethod>;
-    /** Receiver type constraints for methods (empty array = unconstrained) */
-    readonly methodReceiverTypes: Map<string, readonly string[]>;
-    /** Parsed parameter declarations for built-in methods (AC-15 arg validation) */
-    readonly methodParams: Map<string, readonly import('./callable.js').RillParam[]>;
     /** I/O callbacks */
     readonly callbacks: RuntimeCallbacks;
     /** Observability callbacks */
@@ -166,6 +155,12 @@ export interface RuntimeContext {
     readonly callStack: import('../../types.js').CallFrame[];
     /** Arbitrary string metadata passed from the host (e.g. request IDs, user IDs) */
     readonly metadata?: Record<string, string> | undefined;
+    /**
+     * Per-type method dictionaries: maps type name to a frozen dict of ApplicationCallable values.
+     * Keys: "string", "list", "dict", "number", "bool", "vector".
+     * Populated at context creation from BUILTIN_METHODS; propagated to child contexts.
+     */
+    readonly typeMethodDicts: ReadonlyMap<string, Readonly<Record<string, RillValue>>>;
     /** Scheme-to-resolver map, populated from RuntimeOptions.resolvers (empty Map when absent) */
     readonly resolvers: ReadonlyMap<string, SchemeResolver>;
     /** Per-scheme config data, populated from RuntimeOptions.configurations.resolvers (empty Map when absent) */
@@ -178,13 +173,17 @@ export interface RuntimeContext {
      * Omit if only `kind: 'value'` resolvers are used.
      */
     readonly parseSource?: ((text: string) => import('../../types.js').ScriptNode) | undefined;
+    /** Identifies the current source file for cross-module error reporting */
+    readonly sourceId?: string | undefined;
+    /** Source text of the current file for cross-module error snippets */
+    readonly sourceText?: string | undefined;
 }
 /** Options for creating a runtime context */
 export interface RuntimeOptions {
     /** Initial variables */
     variables?: Record<string, RillValue>;
-    /** Host functions: structured definitions or signature strings */
-    functions?: Record<string, RillFunction | RillFunctionSignature>;
+    /** Host functions: structured definitions */
+    functions?: Record<string, RillFunction>;
     /** I/O callbacks */
     callbacks?: Partial<RuntimeCallbacks>;
     /** Observability callbacks for monitoring execution */