@rcrsr/rill 0.15.0 → 0.16.0

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

@@ -42,9 +42,9 @@
  * @internal
  */
 import { RillError, RuntimeError } from '../../../../types.js';
-import { isCallable, isScriptCallable, isApplicationCallable, isDict, validateCallableArgs, paramsToStructuralType, } from '../../callable.js';
+import { isCallable, isScriptCallable, isApplicationCallable, isDict, marshalArgs, } from '../../callable.js';
 import { getVariable, pushCallFrame, popCallFrame, UNVALIDATED_METHOD_PARAMS, UNVALIDATED_METHOD_RECEIVERS, } from '../../context.js';
-import { inferType, isTypeValue, isTuple, isOrdered, createOrdered, inferStructuralType, structuralTypeMatches, formatStructuralType, anyTypeValue, } from '../../values.js';
+import { inferType, isTypeValue, isTuple, isOrdered, paramToFieldDef, inferStructuralType, structuralTypeMatches, formatStructuralType, anyTypeValue, rillTypeToTypeValue, } from '../../values.js';
 /**
  * ClosuresMixin implementation.
  *
@@ -153,14 +153,22 @@ function createClosuresMixin(Base) {
         async invokeFnCallable(callable, args, callLocation, functionName = 'callable') {
             // Apply boundDict BEFORE validation (property-style callables need dict as first arg)
             const effectiveArgs = callable.boundDict && args.length === 0 ? [callable.boundDict] : args;
-            // Validate arguments for typed ApplicationCallable (task 1.5)
+            // Marshal arguments for typed ApplicationCallable (IC-1).
             // Skip when params is undefined (untyped callable() factory).
-            // Explicitly registered zero-param callables have params: [] and still validate.
+            // Untyped callables still receive RillValue[] cast as Record to preserve
+            // existing runtime behavior without changing the fn contract.
+            let fnArgs;
             if (isApplicationCallable(callable) && callable.params !== undefined) {
-                validateCallableArgs(effectiveArgs, callable.params, functionName, callLocation);
+                fnArgs = marshalArgs(effectiveArgs, callable.params, {
+                    functionName,
+                    location: callLocation,
+                });
+            }
+            else {
+                fnArgs = effectiveArgs;
             }
             try {
-                const result = callable.fn(effectiveArgs, this.ctx, callLocation);
+                const result = callable.fn(fnArgs, this.ctx, callLocation);
                 return result instanceof Promise ? await result : result;
             }
             catch (error) {
@@ -219,28 +227,20 @@ function createClosuresMixin(Base) {
          */
         async invokeScriptCallable(callable, args, callLocation) {
             const callableCtx = this.createCallableContext(callable);
-            // Validate excess arguments (EC-8)
-            if (args.length > callable.params.length) {
-                throw new RuntimeError('RILL-R001', `Function expects ${callable.params.length} arguments, got ${args.length}`, callLocation);
+            // Marshal positional args to named record (IC-1).
+            // Script callables always have params defined.
+            const record = marshalArgs(args, callable.params, {
+                functionName: '<anonymous>',
+                location: callLocation,
+            });
+            // Bind each named value into the callable context.
+            for (const [name, value] of Object.entries(record)) {
+                callableCtx.variables.set(name, value);
             }
-            for (let i = 0; i < callable.params.length; i++) {
-                const param = callable.params[i];
-                let value;
-                if (i < args.length) {
-                    value = args[i];
-                }
-                else if (param.defaultValue !== undefined) {
-                    value = param.defaultValue;
-                }
-                else {
-                    throw new RuntimeError('RILL-R001', `Missing argument for parameter '${param.name}' at position ${i}`, callLocation, { paramName: param.name, position: i });
-                }
-                this.validateParamType(param, value, callLocation);
-                callableCtx.variables.set(param.name, value);
-                // Block-closures have param named '$': sync with pipeValue for bare $ references
-                if (param.name === '$') {
-                    callableCtx.pipeValue = value;
-                }
+            // IR-4: Block closure pipe sync — first param named '$' means block closure.
+            // Sync pipeValue so bare '$' references resolve correctly inside the body.
+            if (callable.params[0]?.name === '$') {
+                callableCtx.pipeValue = record['$'];
             }
             // EC-1: Reject empty block bodies before execution (AC-17)
             if (callable.body.type === 'Block' &&
@@ -557,23 +557,39 @@ function createClosuresMixin(Base) {
             const typeDict = this.ctx.typeMethodDicts.get(typeName);
             const typeMethod = typeDict?.[node.name];
             if (typeMethod !== undefined && isApplicationCallable(typeMethod)) {
-                // AC-24 (EC-7): validate method args via typeMethod.params when set.
-                // Methods in UNVALIDATED_METHOD_PARAMS handle their own arg validation
-                // with specific error messages; skip generic validation for them.
-                if (!UNVALIDATED_METHOD_PARAMS.has(node.name) &&
-                    typeMethod.params !== undefined &&
-                    typeMethod.params.length > 0) {
-                    validateCallableArgs(args, typeMethod.params, node.name, this.getNodeLocation(node));
-                }
-                // buildMethodEntry wraps fn(args) where args[0] = receiver and args[1..] = method args
-                // Invoke fn directly to preserve the receiver-as-first-arg contract without
-                // triggering invokeCallable's arity validation (params counts method args only)
+                // IC-1: marshalArgs handles type method dispatch.
+                // effectiveArgs prepends receiver as first element; after task 2.3 typeMethod.params
+                // will include the receiver param so the counts align.
+                // UNVALIDATED_METHOD_PARAMS methods handle their own validation internally;
+                // skip marshalArgs for them and pass the positional array via cast.
+                const callLocation = this.getNodeLocation(node);
+                const effectiveArgs = [receiver, ...args];
+                let methodArgs;
+                if (typeMethod.params === undefined) {
+                    // Untyped method: pass positional array via cast.
+                    methodArgs = effectiveArgs;
+                }
+                else if (UNVALIDATED_METHOD_PARAMS.has(node.name)) {
+                    // UNVALIDATED_METHOD_PARAMS: method handles its own arity and type
+                    // validation with custom error messages. Pass the actual user args
+                    // via __positionalArgs so buildMethodEntry reconstructs positionalArgs
+                    // with the correct length, letting method body arity checks fire.
+                    methodArgs = {
+                        receiver,
+                        __positionalArgs: args,
+                    };
+                }
+                else {
+                    methodArgs = marshalArgs(effectiveArgs, typeMethod.params, {
+                        functionName: node.name,
+                        location: callLocation,
+                    });
+                }
                 try {
-                    const result = typeMethod.fn([receiver, ...args], this.ctx, this.getNodeLocation(node));
+                    const result = typeMethod.fn(methodArgs, this.ctx, callLocation);
                     return result instanceof Promise ? await result : result;
                 }
                 catch (error) {
-                    const callLocation = this.getNodeLocation(node);
                     if (error instanceof RuntimeError &&
                         !error.location &&
                         callLocation) {
@@ -623,7 +639,18 @@ function createClosuresMixin(Base) {
                     if (fallbackMethod !== undefined &&
                         isApplicationCallable(fallbackMethod)) {
                         try {
-                            const result = fallbackMethod.fn([receiver, ...args], this.ctx, this.getNodeLocation(node));
+                            // UNVALIDATED_METHOD_RECEIVERS handle their own receiver validation.
+                            // Build named record with receiver so buildMethodEntry extracts it correctly;
+                            // the method body performs its own receiver type check with a custom error.
+                            const fbMethodArgs = { receiver };
+                            if (fallbackMethod.params) {
+                                for (let i = 1; i < fallbackMethod.params.length; i++) {
+                                    const p = fallbackMethod.params[i];
+                                    if (p)
+                                        fbMethodArgs[p.name] = args[i - 1] ?? null;
+                                }
+                            }
+                            const result = fallbackMethod.fn(fbMethodArgs, this.ctx, this.getNodeLocation(node));
                             return result instanceof Promise ? await result : result;
                         }
                         catch (error) {
@@ -695,16 +722,16 @@ function createClosuresMixin(Base) {
             if (key === 'description') {
                 return value.annotations['description'] ?? {};
             }
-            // IR-3: ^input computes from callable.params via paramsToStructuralType() for all kinds
-            // Params are converted from internal tuples to RillOrdered so the
-            // value survives rill's homogeneous-list constraint.
+            // IR-3: ^input computes from callable.params for all kinds.
+            // Each param's RillType is converted to a RillTypeValue so it is recognized
+            // as a type token (not a plain dict) in rill's type system.
             if (key === 'input') {
                 // Untyped host callables have params set to undefined at runtime (see callable() factory)
                 if (value.params === undefined) {
-                    return createOrdered([]);
+                    return rillTypeToTypeValue({ type: 'ordered', fields: [] });
                 }
-                const shape = paramsToStructuralType(value.params);
-                return createOrdered(shape.params);
+                const fields = value.params.map((param) => paramToFieldDef(param.name, param.type ?? { type: 'any' }, param.defaultValue));
+                return rillTypeToTypeValue({ type: 'ordered', fields });
             }
             // IR-3: ^output reads callable.returnType directly for all kinds
             if (key === 'output') {
@@ -723,7 +750,14 @@ function createClosuresMixin(Base) {
          *
          * Evaluates positional args LTR, evaluates the spread expression, dispatches
          * by value type (Tuple, Ordered, or Dict), validates bindings, and returns
-         * a Map of param name → value.
+         * a BoundArgs map of param name → value.
+         *
+         * Output is compatible with marshalArgs stages 2-3 (IR-1):
+         * - All params present in returned map (defaults applied, missing required throws)
+         * - Stage 1 (excess args) is NOT checked here; bindArgsToParams validates arity
+         *   differently per spread source type (tuple length, dict key match, etc.)
+         * - Phase 2 callers convert BoundArgs.params to positional RillValue[] then
+         *   feed into marshalArgs stages 2-3 for type-checking
          *
          * EC-3: bare ... with null pipe value → RuntimeError
          * EC-4: spread value is not tuple/dict/ordered → RuntimeError
@@ -835,17 +869,6 @@ function createClosuresMixin(Base) {
             finally {
                 this.ctx.pipeValue = savedPipeValue;
             }
-            // EC-8: check for missing required parameters
-            for (const param of params) {
-                if (!bound.has(param.name)) {
-                    if (param.defaultValue !== null && param.defaultValue !== undefined) {
-                        bound.set(param.name, param.defaultValue);
-                    }
-                    else {
-                        throw new RuntimeError('RILL-R001', `Missing required parameter '${param.name}'`, callLocation);
-                    }
-                }
-            }
             return { params: bound };
         }
         /**
@@ -887,4 +910,3 @@ function createClosuresMixin(Base) {
 // TypeScript can't generate declarations for functions returning classes with protected members
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const ClosuresMixin = createClosuresMixin;
-//# sourceMappingURL=closures.js.map

package/dist/runtime/core/eval/mixins/collections.d.ts

@@ -21,4 +21,3 @@
  * @internal
  */
 export declare const CollectionsMixin: any;
-//# sourceMappingURL=collections.d.ts.map

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

@@ -24,7 +24,7 @@ import { RuntimeError } from '../../../../types.js';
 import { inferType, isRillIterator, isVector } from '../../values.js';
 import { createChildContext, getVariable } from '../../context.js';
 import { BreakSignal } from '../../signals.js';
-import { isCallable, isDict } from '../../callable.js';
+import { isCallable, isDict, marshalArgs } from '../../callable.js';
 import { getEvaluator } from '../evaluator.js';
 /**
  * Default maximum iteration count for iterators.
@@ -223,9 +223,15 @@ function createCollectionsMixin(Base) {
                     if (accumulator !== null) {
                         args.push(accumulator);
                     }
-                    // Handle both CallableFn and ApplicationCallable (task 1.5 will refactor validation)
                     const fnToCall = typeof fn === 'function' ? fn : fn.fn;
-                    return fnToCall(args, this.ctx, body.span.start);
+                    // Marshal args to named record if fn has params; cast otherwise (IC-1).
+                    const callArgs = typeof fn !== 'function' && fn.params !== undefined
+                        ? marshalArgs(args, fn.params, {
+                            functionName: body.name,
+                            location: body.span.start,
+                        })
+                        : args;
+                    return fnToCall(callArgs, this.ctx, body.span.start);
                 }
                 default: {
                     // TypeScript exhaustiveness check - should never reach here
@@ -509,4 +515,3 @@ function createCollectionsMixin(Base) {
 // TypeScript can't generate declarations for functions returning classes with protected members
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const CollectionsMixin = createCollectionsMixin;
-//# sourceMappingURL=collections.js.map

package/dist/runtime/core/eval/mixins/control-flow.d.ts

@@ -24,4 +24,3 @@
  * @internal
  */
 export declare const ControlFlowMixin: any;
-//# sourceMappingURL=control-flow.d.ts.map

package/dist/runtime/core/eval/mixins/control-flow.js

@@ -453,4 +453,3 @@ function createControlFlowMixin(Base) {
 // TypeScript can't generate declarations for functions returning classes with protected members
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const ControlFlowMixin = createControlFlowMixin;
-//# sourceMappingURL=control-flow.js.map

package/dist/runtime/core/eval/mixins/conversion.d.ts

@@ -27,4 +27,3 @@
  * @internal
  */
 export declare const ConversionMixin: any;
-//# sourceMappingURL=conversion.d.ts.map

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

@@ -27,7 +27,7 @@
  * @internal
  */
 import { RuntimeError } from '../../../../types.js';
-import { inferType, isTuple, isOrdered, isTypeValue, createOrdered, createTuple, formatValue, isFieldTypeWithDefault, } from '../../values.js';
+import { inferType, isTuple, isOrdered, isTypeValue, createOrdered, createTuple, formatValue, deepCopyRillValue, hasCollectionFields, emptyForType, } from '../../values.js';
 import { isDict } from '../../callable.js';
 import { getVariable } from '../../context.js';
 /**
@@ -54,16 +54,31 @@ function createConversionMixin(Base) {
             const typeRef = node.typeRef;
             // Structural type constructor: :>ordered(name: type, ...) or :>list(T), :>dict(...), :>tuple(...)
             if (isTypeConstructorNode(typeRef)) {
-                if (typeRef.constructorName === 'ordered') {
-                    return this.convertToOrderedWithSig(input, typeRef, node);
-                }
-                if (typeRef.constructorName === 'dict') {
-                    return this.convertToDictWithSig(input, typeRef, node);
-                }
-                if (typeRef.constructorName === 'tuple') {
+                // For dict/ordered/tuple, evaluate the type constructor to determine
+                // uniform (valueType) vs structural (fields/elements) dispatch.
+                if (typeRef.constructorName === 'ordered' ||
+                    typeRef.constructorName === 'dict' ||
+                    typeRef.constructorName === 'tuple') {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    const typeValue = await this.evaluateTypeConstructor(typeRef);
+                    const structure = typeValue.structure;
+                    // Uniform types (valueType present): use general convert-then-assert path
+                    if ('valueType' in structure && structure.valueType) {
+                        const result = this.applyConversion(input, typeRef.constructorName, node);
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        this.assertType(result, structure, node.span.start);
+                        return result;
+                    }
+                    // Structural types (fields/elements present): use structural-specific handlers
+                    if (typeRef.constructorName === 'ordered') {
+                        return this.convertToOrderedWithSig(input, typeRef, node);
+                    }
+                    if (typeRef.constructorName === 'dict') {
+                        return this.convertToDictWithSig(input, typeRef, node);
+                    }
                     return this.convertToTupleWithSig(input, typeRef, node);
                 }
-                // Non-dict/ordered constructors: convert first, then assert structural type
+                // Non-dict/ordered/tuple constructors: convert first, then assert structural type
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 const typeValue = await this.evaluateTypeConstructor(typeRef);
                 const result = this.applyConversion(input, typeRef.constructorName, node);
@@ -209,28 +224,45 @@ function createConversionMixin(Base) {
          * - Extra keys not in signature: omitted from result
          */
         async convertToOrderedWithSig(input, sigNode, node) {
-            if (!isDict(input)) {
+            let dictInput;
+            if (isOrdered(input)) {
+                dictInput = Object.fromEntries(input.entries);
+            }
+            else if (isDict(input)) {
+                dictInput = input;
+            }
+            else {
                 throw new RuntimeError('RILL-R036', `cannot convert ${inferType(input)} to ordered`, this.getNodeLocation(node), { source: inferType(input), target: 'ordered' });
             }
+            const sourceType = isOrdered(input) ? 'ordered' : 'dict';
             // Evaluate the full type constructor to get resolved fields with defaults.
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const typeValue = await this.evaluateTypeConstructor(sigNode);
             const resolvedFields = typeValue.structure.type === 'ordered' && typeValue.structure.fields
                 ? typeValue.structure.fields
                 : [];
-            const dictInput = input;
             const entries = [];
             for (const field of resolvedFields) {
-                const fieldName = field[0];
-                const hasDefault = field.length === 3;
+                const fieldName = field.name;
                 if (fieldName in dictInput) {
-                    entries.push([fieldName, dictInput[fieldName]]);
+                    let fieldValue = dictInput[fieldName];
+                    fieldValue = this.hydrateNested(fieldValue, field.type, node);
+                    entries.push([fieldName, fieldValue]);
+                }
+                else if (field.defaultValue !== undefined) {
+                    entries.push([
+                        fieldName,
+                        this.hydrateNested(deepCopyRillValue(field.defaultValue), field.type, node),
+                    ]);
                 }
-                else if (hasDefault) {
-                    entries.push([fieldName, deepCopyRillValue(field[2])]);
+                else if (hasCollectionFields(field.type)) {
+                    entries.push([
+                        fieldName,
+                        this.hydrateNested(emptyForType(field.type), field.type, node),
+                    ]);
                 }
                 else {
-                    throw new RuntimeError('RILL-R044', `cannot convert dict to ordered: missing required field '${fieldName}'`, this.getNodeLocation(node), { source: 'dict', target: 'ordered' });
+                    throw new RuntimeError('RILL-R044', `cannot convert ${sourceType} to ordered: missing required field '${fieldName}'`, this.getNodeLocation(node), { source: sourceType, target: 'ordered' });
                 }
             }
             return createOrdered(entries);
@@ -246,19 +278,26 @@ function createConversionMixin(Base) {
          * - Recurses into nested dict-typed fields for nested hydration
          */
         async convertToDictWithSig(input, sigNode, node) {
-            if (!isDict(input)) {
+            let dictInput;
+            if (isOrdered(input)) {
+                dictInput = Object.fromEntries(input.entries);
+            }
+            else if (isDict(input)) {
+                dictInput = input;
+            }
+            else {
                 throw new RuntimeError('RILL-R036', `cannot convert ${inferType(input)} to dict`, this.getNodeLocation(node), { source: inferType(input), target: 'dict' });
             }
+            const sourceType = isOrdered(input) ? 'ordered' : 'dict';
             // Evaluate the full type constructor to get resolved fields with defaults.
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const typeValue = await this.evaluateTypeConstructor(sigNode);
             const resolvedFields = typeValue.structure.type === 'dict' && typeValue.structure.fields
                 ? typeValue.structure.fields
                 : {};
-            const dictInput = input;
             const result = {};
             for (const arg of sigNode.args) {
-                if (arg.kind !== 'named') {
+                if (arg.name === undefined) {
                     continue;
                 }
                 const fieldName = arg.name;
@@ -267,21 +306,22 @@ function createConversionMixin(Base) {
                     // Field present in input: use it, recursing if the field type is a nested dict
                     let fieldValue = dictInput[fieldName];
                     if (resolvedField !== undefined) {
-                        const innerType = isFieldTypeWithDefault(resolvedField)
-                            ? resolvedField.type
-                            : resolvedField;
-                        fieldValue = this.hydrateNestedDict(fieldValue, innerType, node);
+                        fieldValue = this.hydrateNested(fieldValue, resolvedField.type, node);
                     }
                     result[fieldName] = fieldValue;
                 }
                 else {
                     // Field missing from input: use default if available, else error
                     if (resolvedField !== undefined &&
-                        isFieldTypeWithDefault(resolvedField)) {
-                        result[fieldName] = deepCopyRillValue(resolvedField.defaultValue);
+                        resolvedField.defaultValue !== undefined) {
+                        result[fieldName] = this.hydrateNested(deepCopyRillValue(resolvedField.defaultValue), resolvedField.type, node);
+                    }
+                    else if (resolvedField !== undefined &&
+                        hasCollectionFields(resolvedField.type)) {
+                        result[fieldName] = this.hydrateNested(emptyForType(resolvedField.type), resolvedField.type, node);
                     }
                     else {
-                        throw new RuntimeError('RILL-R044', `cannot convert dict to dict: missing required field '${fieldName}'`, this.getNodeLocation(node), { source: 'dict', target: 'dict' });
+                        throw new RuntimeError('RILL-R044', `cannot convert ${sourceType} to dict: missing required field '${fieldName}'`, this.getNodeLocation(node), { source: sourceType, target: 'dict' });
                     }
                 }
             }
@@ -314,14 +354,17 @@ function createConversionMixin(Base) {
             const result = [];
             for (let i = 0; i < resolvedElements.length; i++) {
                 const element = resolvedElements[i];
-                const hasDefault = element.length === 2;
                 if (i < inputEntries.length) {
-                    // Element present in input: use it directly
-                    result.push(inputEntries[i]);
+                    // Element present in input: recurse into nested types
+                    result.push(this.hydrateNested(inputEntries[i], element.type, node));
+                }
+                else if (element.defaultValue !== undefined) {
+                    // Missing trailing element with default: deep copy and hydrate
+                    result.push(this.hydrateNested(deepCopyRillValue(element.defaultValue), element.type, node));
                 }
-                else if (hasDefault) {
-                    // Missing trailing element with default: deep copy default
-                    result.push(deepCopyRillValue(element[1]));
+                else if (hasCollectionFields(element.type)) {
+                    // Missing element with collection type: seed empty and hydrate
+                    result.push(this.hydrateNested(emptyForType(element.type), element.type, node));
                 }
                 else {
                     // Missing element without default
@@ -331,40 +374,94 @@ function createConversionMixin(Base) {
             return createTuple(result);
         }
         /**
-         * Recursively hydrate a dict value against a nested dict RillType.
-         * Only applies when the field type is a dict with explicit fields.
-         * Returns the value unchanged if it is not a dict or the type has no fields.
+         * Recursively hydrate a value against a nested dict, ordered, or tuple RillType.
+         * Only applies when the field type has explicit fields/elements.
+         * Returns the value unchanged if the type has no fields or the value type does not match.
          */
-        hydrateNestedDict(value, fieldType, node) {
-            if (fieldType.type !== 'dict' || !fieldType.fields) {
-                return value;
-            }
-            if (!isDict(value)) {
-                return value;
+        hydrateNested(value, fieldType, node) {
+            if (fieldType.type === 'dict' && fieldType.fields && isDict(value)) {
+                const dictValue = value;
+                const result = {};
+                for (const [fieldName, resolvedField] of Object.entries(fieldType.fields)) {
+                    if (fieldName in dictValue) {
+                        const fieldValue = this.hydrateNested(dictValue[fieldName], resolvedField.type, node);
+                        result[fieldName] = fieldValue;
+                    }
+                    else {
+                        if (resolvedField.defaultValue !== undefined) {
+                            result[fieldName] = this.hydrateNested(deepCopyRillValue(resolvedField.defaultValue), resolvedField.type, node);
+                        }
+                        else if (hasCollectionFields(resolvedField.type)) {
+                            result[fieldName] = this.hydrateNested(emptyForType(resolvedField.type), resolvedField.type, node);
+                        }
+                        else {
+                            throw new RuntimeError('RILL-R044', `cannot convert dict to dict: missing required field '${fieldName}'`, this.getNodeLocation(node), { source: 'dict', target: 'dict' });
+                        }
+                    }
+                }
+                return result;
             }
-            const dictValue = value;
-            const result = {};
-            for (const [fieldName, resolvedField] of Object.entries(fieldType.fields)) {
-                if (fieldName in dictValue) {
-                    let fieldValue = dictValue[fieldName];
-                    if (isFieldTypeWithDefault(resolvedField)) {
-                        fieldValue = this.hydrateNestedDict(fieldValue, resolvedField.type, node);
+            else if (fieldType.type === 'ordered' && fieldType.fields) {
+                // Only hydrate if the runtime value is an ordered or dict; return unchanged otherwise.
+                if (!isOrdered(value) && !isDict(value)) {
+                    return value;
+                }
+                const source = isOrdered(value) ? 'ordered' : 'dict';
+                // Build a key->value lookup from either an ordered value or a dict value.
+                const lookup = new Map(isOrdered(value)
+                    ? value.entries.map(([k, v]) => [k, v])
+                    : Object.entries(value));
+                const resultEntries = [];
+                for (const field of fieldType.fields) {
+                    const name = field.name;
+                    if (lookup.has(name)) {
+                        const fieldValue = this.hydrateNested(lookup.get(name), field.type, node);
+                        resultEntries.push([name, fieldValue]);
+                    }
+                    else if (field.defaultValue !== undefined) {
+                        resultEntries.push([
+                            name,
+                            this.hydrateNested(deepCopyRillValue(field.defaultValue), field.type, node),
+                        ]);
+                    }
+                    else if (hasCollectionFields(field.type)) {
+                        resultEntries.push([
+                            name,
+                            this.hydrateNested(emptyForType(field.type), field.type, node),
+                        ]);
                     }
                     else {
-                        fieldValue = this.hydrateNestedDict(fieldValue, resolvedField, node);
+                        throw new RuntimeError('RILL-R044', `cannot convert ${source} to ordered: missing required field '${name}'`, this.getNodeLocation(node), { source, target: 'ordered' });
                     }
-                    result[fieldName] = fieldValue;
                 }
-                else {
-                    if (isFieldTypeWithDefault(resolvedField)) {
-                        result[fieldName] = deepCopyRillValue(resolvedField.defaultValue);
+                return createOrdered(resultEntries);
+            }
+            else if (fieldType.type === 'tuple' && fieldType.elements) {
+                // Only hydrate if the runtime value is a tuple; return unchanged otherwise.
+                if (!isTuple(value)) {
+                    return value;
+                }
+                const inputEntries = value.entries;
+                const resultEntries = [];
+                for (let i = 0; i < fieldType.elements.length; i++) {
+                    const element = fieldType.elements[i];
+                    if (i < inputEntries.length) {
+                        const elementValue = this.hydrateNested(inputEntries[i], element.type, node);
+                        resultEntries.push(elementValue);
+                    }
+                    else if (element.defaultValue !== undefined) {
+                        resultEntries.push(this.hydrateNested(deepCopyRillValue(element.defaultValue), element.type, node));
+                    }
+                    else if (hasCollectionFields(element.type)) {
+                        resultEntries.push(this.hydrateNested(emptyForType(element.type), element.type, node));
                     }
                     else {
-                        throw new RuntimeError('RILL-R044', `cannot convert dict to dict: missing required field '${fieldName}'`, this.getNodeLocation(node), { source: 'dict', target: 'dict' });
+                        throw new RuntimeError('RILL-R044', `cannot convert tuple to tuple: missing required element at position ${i}`, this.getNodeLocation(node), { source: 'tuple', target: 'tuple' });
                     }
                 }
+                return createTuple(resultEntries);
             }
-            return result;
+            return value;
         }
         /** Throw EC-10 incompatible conversion error. */
         throwIncompatible(source, target, node) {
@@ -372,35 +469,6 @@ function createConversionMixin(Base) {
         }
     };
 }
-/**
- * Deep copy a RillValue, producing a new independent value.
- * Handles primitives, arrays, plain dicts, and null.
- * Special markers (closures, tuples, ordered, vectors, type values) are returned
- * as-is since they are immutable by contract.
- */
-function deepCopyRillValue(value) {
-    if (value === null || typeof value !== 'object') {
-        return value;
-    }
-    if (Array.isArray(value)) {
-        return value.map(deepCopyRillValue);
-    }
-    // Plain dict: copy recursively. Special markers (RillTuple, RillOrdered, etc.)
-    // carry __rill_* own properties and are treated as immutable; return as-is.
-    if (!('__rill_tuple' in value) &&
-        !('__rill_ordered' in value) &&
-        !('__rill_vector' in value) &&
-        !('__rill_type' in value) &&
-        !('__type' in value) &&
-        !('__rill_field_descriptor' in value)) {
-        const copy = {};
-        for (const [k, v] of Object.entries(value)) {
-            copy[k] = deepCopyRillValue(v);
-        }
-        return copy;
-    }
-    return value;
-}
 /**
  * Type guard: check if a TypeRef | TypeConstructorNode is a TypeConstructorNode.
  */
@@ -410,4 +478,3 @@ function isTypeConstructorNode(ref) {
 // Export with type assertion to work around TS4094 limitation
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const ConversionMixin = createConversionMixin;
-//# sourceMappingURL=conversion.js.map

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

@@ -21,4 +21,3 @@
  * @internal
  */
 export declare const CoreMixin: any;
-//# sourceMappingURL=core.d.ts.map

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

@@ -753,4 +753,3 @@ function createCoreMixin(Base) {
 // TypeScript can't generate declarations for functions returning classes with protected members
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const CoreMixin = createCoreMixin;
-//# sourceMappingURL=core.js.map

package/dist/runtime/core/eval/mixins/expressions.d.ts

@@ -18,4 +18,3 @@
  * @internal
  */
 export declare const ExpressionsMixin: any;
-//# sourceMappingURL=expressions.d.ts.map