@greenpandastudios/aug-cli 0.19.0 → 0.20.1

package/src/checker.js

@@ -10,14 +10,16 @@ import { builtinType as builtin, builtinTypes, builtinProperties, collectionOper
 import { orderGraph } from "./di.js";
 import { javadocBefore } from "./javadoc.js";
 import { callableDocumentation } from "./documentation.js";
+import { nativeHttpContracts } from "./http-contracts.js";
 import { jsonDataType } from "./schemas.js";
 import { htmlTags, htmlVoidTags, htmlAttribute, htmlUrlAttributes } from "./html.js";
 import { generateOpenApi } from "./openapi.js";
-import { httpPolicyNames, checkHttpPolicy } from "./http-policies.js";
+import { httpPolicyNames, httpPolicyOptions, checkHttpPolicy } from "./http-policies.js";
 export { tyName } from "./types.js";
 const builtinNames = new Set(Object.keys(builtinTypes));
 const errorTy = { id: 'error', name: '<error>', kind: 'error', args: [], nullable: false };
 const nullTy = { id: 'null', name: 'null', kind: 'null', args: [], nullable: true };
+const unresolved = (type) => type.kind === 'error' || type.args.some(unresolved);
 export function checkProject(project) {
     const checker = new Checker(project);
     const checked = checker.check();
@@ -34,6 +36,11 @@ class Checker {
     bindings = [];
     interceptorPlans = new Map();
     effectContracts = new Map();
+    callableContracts = new Map();
+    constructorContracts = new Map();
+    initializers = new Map();
+    inferredChanges = new Map();
+    contextualResults = new Set();
     expressionOrigins = new WeakMap();
     scopes = new Map();
     markupCalls = new WeakMap();
@@ -48,11 +55,33 @@ class Checker {
     changingInference = new Set();
     constructor(project) { this.project = project; this.diagnostics = [...project.diagnostics]; }
     check() {
+        // Make inherited default bodies visible to forward calls during inference.
+        this.inferring = true;
+        for (const def of this.project.definitions.values())
+            if (def.node.kind === 'class') {
+                const methods = new Map();
+                const types = this.paramsFor(def.node.typeParams, def.node, def.file);
+                for (const ref of def.node.implements)
+                    for (const [name, entries] of this.interfaceMethods(this.resolveType(ref, def.file, types), new Set()))
+                        if (!def.node.methods.some(method => method.name === name)) {
+                            const entry = entries.find(entry => entry.method.body);
+                            if (entry)
+                                methods.set(name, entry);
+                        }
+                this.defaults.set(def.id, methods);
+            }
+        this.inferring = false;
+        this.inferImplementationEffects();
         for (const def of this.project.definitions.values())
             if (def.node.kind === 'interceptor')
                 this.checkInterceptorShape(def);
         this.planInterceptors();
-        this.inferImplementationEffects();
+        this.constructorFreshness.clear();
+        // Layers can add contracts to callers. Recompute after their mappings exist.
+        this.inferImplementationEffects(false);
+        for (const layers of this.interceptorPlans.values())
+            for (const layer of layers)
+                layer.errors = this.bodyErrors(layer.around, layer.definition.file, layer.types);
         for (const def of this.project.definitions.values()) {
             if (def.node.kind === 'class')
                 this.checkClassShape(def);
@@ -67,12 +96,9 @@ class Checker {
             if (def.node.kind === 'function' && def.node.body)
                 this.checkFunctionBody(def.node, def.file);
             if (def.node.kind === 'class') {
-                if (initializationOf(def.node).length)
-                    this.checkFunctionBody({
-                        kind: 'function', name: def.name, typeParams: [], params: [],
-                        returns: syntheticType('void', def.node.span), returnOwnership: 'managed',
-                        throws: def.node.validationErrors ?? [], body: initializationOf(def.node), externC: false, span: def.node.span,
-                    }, def.file, def, true);
+                const initializer = this.initializers.get(def.node);
+                if (initializer)
+                    this.checkFunctionBody(initializer, def.file, def, true);
                 for (const method of def.node.methods)
                     if (method.body)
                         this.checkFunctionBody(method, def.file, def);
@@ -96,15 +122,32 @@ class Checker {
                     returns: layer.outputType, returnOwnership: layer.around.returnOwnership,
                     indices: layer.argumentIndices });
             }
-        for (const [node] of this.interceptorPlans)
-            if (node.annotations?.length) {
-                const source = this.project.files.get(node.span.file)?.source ?? '';
-                const doc = javadocBefore(source, node.annotations[0].span.start);
-                const errors = this.effectiveErrors(node, node.span.file, this.paramsFor(node.typeParams, node, node.span.file));
-                for (const tag of doc?.tags ?? [])
+        for (const def of this.project.definitions.values()) {
+            if (this.project.files.get(def.file)?.builtin)
+                continue;
+            const methods = def.node.kind === 'function' ? [def.node] : 'methods' in def.node ? def.node.methods : [];
+            for (const method of methods) {
+                const source = this.project.files.get(def.file)?.source ?? '';
+                const doc = javadocBefore(source, method.annotations?.[0]?.span.start ?? method.span.start);
+                const types = new Map([...this.paramsFor(def.node.typeParams, def.node, def.file), ...this.paramsFor(method.typeParams, method, def.file)]);
+                const errors = this.effectiveErrors(method, def.file, types);
+                for (const tag of doc?.tags ?? []) {
+                    if (['return', 'returns'].includes(tag.name) && this.returnType(method, def.file, types).name === 'void')
+                        this.report(method.span, `@${tag.name} requires a value-returning callable`, 'DOC');
                     if (['throws', 'exception'].includes(tag.name) && !errors.some(error => tyName(error) === tag.value.split(/\s/)[0]))
-                        this.report(node.span, `@${tag.name} ${tag.value.split(/\s/)[0]} is absent from ${node.name}'s effective unless contract`, 'DOC');
+                        this.report(method.span, `@${tag.name} ${tag.value.split(/\s/)[0]} is absent from ${method.name}'s effective unless contract`, 'DOC');
+                }
+            }
+            if (def.node.kind === 'class' && def.node.record && def.node.validationDeclared === false) {
+                const source = this.project.files.get(def.file)?.source ?? '';
+                const doc = javadocBefore(source, def.node.span.start);
+                const errors = this.effectiveErrors(def.node, def.file, this.paramsFor(def.node.typeParams, def.node, def.file));
+                for (const tag of doc?.tags ?? [])
+                    if (['throws', 'exception'].includes(tag.name) &&
+                        !errors.some(error => tyName(error) === tag.value.split(/\s/)[0]))
+                        this.report(def.node.span, `@${tag.name} ${tag.value.split(/\s/)[0]} is absent from ${def.node.name}'s inferred validation errors`, 'DOC');
             }
+        }
         if (this.project.main) {
             const context = { file: this.project.main.path, locals: new Map(),
                 returns: builtin('void'), returnOwnership: 'managed', allowedErrors: this.project.testMode ? [builtin('Error')] : [],
@@ -133,7 +176,7 @@ class Checker {
                     this.report(def.node.span, '/__aug/actions.js is reserved for HTTP action transport', 'HTTP');
         return { project: this.project, diagnostics: this.diagnostics, bindings: this.bindings,
             expressionTypes: this.expressionTypes, defaults: this.defaults, callPlans: this.callPlans,
-            interceptorPlans: this.interceptorPlans, effectContracts: this.effectContracts,
+            interceptorPlans: this.interceptorPlans, effectContracts: this.effectContracts, callableContracts: this.callableContracts, constructorContracts: this.constructorContracts,
             expressionOrigins: this.expressionOrigins, scopes: this.scopes, markupCalls: this.markupCalls, actions: this.actions, httpPolicies: this.httpPolicies };
     }
     isStatement(item) {
@@ -144,48 +187,84 @@ class Checker {
             return;
         this.diagnostics.push({ file: span.file, line: span.line, column: span.column, message, code });
     }
-    /** Infer implementation details before comparing them with public contracts. */
-    inferImplementationEffects() {
+    /** Infer body-derived contracts without changing the cached source AST. */
+    inferImplementationEffects(initialize = true) {
         const bodies = [];
         for (const definition of this.project.definitions.values()) {
             const node = definition.node;
+            if (node.kind === 'class' && initializationOf(node).length) {
+                if (initialize) {
+                    const initializer = { kind: 'function', name: node.name, typeParams: [], params: [],
+                        returns: syntheticType('void', node.span), returnOwnership: 'managed', throws: node.validationErrors ?? [],
+                        body: initializationOf(node), externC: false, span: node.span };
+                    const errors = (node.validationErrors ?? []).map(ref => this.resolveType(ref, definition.file, this.paramsFor(node.typeParams, node, definition.file)));
+                    const contract = { result: builtin('void'), errors, inferredResult: false,
+                        inferredErrors: !!node.record && node.validationDeclared === false };
+                    this.initializers.set(node, initializer);
+                    this.callableContracts.set(initializer, contract);
+                    this.constructorContracts.set(node, contract);
+                }
+                bodies.push({ method: this.initializers.get(node), definition, owner: definition, initializing: true });
+            }
             const methods = node.kind === 'function' ? [node] : 'methods' in node ? node.methods : [];
+            const types = this.paramsFor(node.typeParams, node, definition.file);
             for (const method of methods) {
-                if (!method.body || method.externC || method.uses?.length || method.name === 'drop')
-                    continue;
-                if (node.kind !== 'class' && !isPrivateName(method.name))
-                    continue;
-                if (node.kind === 'interface')
-                    continue;
-                this.inferredUses.set(method, new Map());
-                bodies.push({ method, definition, owner: node.kind === 'function' ? undefined : definition });
+                const eligible = !!method.body && !method.externC && method.name !== 'drop';
+                if (initialize) {
+                    const params = new Map([...types, ...this.paramsFor(method.typeParams, method, definition.file)]);
+                    this.callableContracts.set(method, {
+                        result: eligible && method.declared?.returns === false ? errorTy : this.resolveType(method.returns, definition.file, params),
+                        errors: method.throws.map(ref => this.resolveType(ref, definition.file, params)),
+                        inferredResult: eligible && method.declared?.returns === false,
+                        inferredErrors: eligible && method.declared?.errors === false,
+                    });
+                    if (eligible && !method.uses?.length)
+                        this.inferredUses.set(method, new Map());
+                    if (eligible && !method.changes?.length)
+                        this.inferredChanges.set(method, new Set());
+                }
+                if (eligible)
+                    bodies.push({ method, definition, owner: node.kind === 'function' ? undefined : definition });
             }
         }
         this.inferring = true;
         try {
-            for (const { method, owner } of bodies)
-                if (owner?.node.kind === 'class') {
+            for (const { method, owner, initializing } of bodies)
+                if (!initializing && owner?.node.kind === 'class') {
                     const types = this.paramsFor(owner.node.typeParams, owner.node, owner.file);
                     for (const ref of owner.node.implements) {
                         const implemented = this.resolveType(ref, owner.file, types);
                         for (const entry of this.interfaceMethods(implemented, new Set()).get(method.name) ?? []) {
                             const contractOwner = this.project.definitions.get(entry.from);
+                            if (initialize && this.callableContracts.get(method)?.inferredResult && !entry.method.body) {
+                                const interfaceTypes = new Map(entry.params);
+                                entry.method.typeParams.forEach((name, index) => {
+                                    const own = this.paramsFor(method.typeParams, method, owner.file).get(method.typeParams[index]);
+                                    if (own)
+                                        interfaceTypes.set(name, own);
+                                });
+                                this.callableContracts.get(method).result = this.returnType(entry.method, entry.file, interfaceTypes);
+                                this.contextualResults.add(method);
+                            }
                             if (contractOwner?.node.kind !== 'interface' || !contractOwner.node.capability)
                                 continue;
-                            // Invoking a capability is itself an effect, including synchronized stores and test adapters.
+                            // Invoking a capability is an effect even for a pure test adapter.
                             const contract = this.contractFor(entry.method, entry.file, contractOwner, entry.params);
                             for (const [key, effect] of contract.uses)
-                                this.inferredUses.get(method).set(key, effect);
+                                this.inferredUses.get(method)?.set(key, effect);
                         }
                     }
                 }
-            // A fixed point makes forward references and recursive helper calls order independent.
-            // Type-changing generic recursion must provide an explicit finite contract.
-            for (let pass = 0; pass <= bodies.length; pass++) {
+            // Forward references and recursive calls reach the same deterministic fixed point.
+            for (let pass = 0; pass <= bodies.length + 1; pass++) {
+                this.constructorFreshness.clear();
                 this.inferenceChanged = false;
                 this.changingInference.clear();
-                for (const { method, definition, owner } of bodies)
-                    this.checkFunctionBody(method, definition.file, owner);
+                for (const { method, definition, owner, initializing } of bodies) {
+                    const types = this.paramsFor(owner && 'typeParams' in owner.node ? owner.node.typeParams : [], owner?.node, definition.file);
+                    const next = owner?.node.kind === 'interceptor' && method.name === 'around' ? this.nextFor(method, definition.file, types) : undefined;
+                    this.checkFunctionBody(method, definition.file, owner, initializing, undefined, next);
+                }
                 if (!this.inferenceChanged)
                     return;
             }
@@ -194,7 +273,39 @@ class Checker {
             this.inferring = false;
         }
         for (const method of this.changingInference)
-            this.report(method.span, `Effect inference for ${method.name} did not reach a finite contract; declare uses on recursive generic helpers`, 'EFFECT');
+            this.report(method.span, `Contract inference for ${method.name} did not reach a finite contract; declare returns, uses, or unless on recursive generic helpers`, 'INFERENCE');
+    }
+    returnType(fn, file, types = new Map()) {
+        const contract = this.callableContracts.get(fn);
+        return contract ? this.substitute(contract.result, types) : this.resolveType(fn.returns, file, types);
+    }
+    bodyErrors(fn, file, types = new Map()) {
+        const contract = this.callableContracts.get(fn);
+        return contract ? contract.errors.map(type => this.substitute(type, types)) : fn.throws.map(ref => this.resolveType(ref, file, types));
+    }
+    markInference(fn) {
+        this.inferenceChanged = true;
+        this.changingInference.add(fn);
+    }
+    inferredReturn(types) {
+        const known = types.filter(type => type.kind !== 'error');
+        if (!known.length)
+            return types.length ? errorTy : builtin('void');
+        let result = known[0];
+        for (const type of known.slice(1)) {
+            if (unresolved(result) && !unresolved(type))
+                result = type;
+            else if (type.kind === 'null' && result.kind !== 'null')
+                result = { ...result, nullable: true, optional: true };
+            else if (result.kind === 'null' && type.kind !== 'null')
+                result = { ...type, nullable: true, optional: true };
+            else if (this.assignable(type, result))
+                continue;
+            else if (this.assignable(result, type))
+                result = type;
+            // Keep the first type; the final checking pass diagnoses incompatible returns.
+        }
+        return result;
     }
     checkMemberVisibility(ownerId, ownerName, name, span, context) {
         if (isPrivateName(name) && context.self?.id !== ownerId)
@@ -289,8 +400,10 @@ class Checker {
         iface.extends.forEach(ref => visit(ref, 1));
         iface.methods.forEach(method => {
             method.params.forEach(param => visit(param.type, -1));
-            visit(method.returns, 1);
-            method.throws.forEach(ref => visit(ref, 1));
+            const result = this.callableContracts.get(method)?.result;
+            const reference = (type) => ({ name: type.name, args: type.args.map(reference), nullable: type.nullable, optional: type.optional, span: method.span });
+            visit(result ? reference(result) : method.returns, 1);
+            (this.callableContracts.get(method)?.errors.map(reference) ?? method.throws).forEach(ref => visit(ref, 1));
         });
     }
     checkFunctionSignature(fn, file, inheritedParams) {
@@ -313,7 +426,7 @@ class Checker {
                 this.report(param.span, 'A resolve parameter cannot also be own or borrow', 'DI');
             this.resolveType(param.type, file, params);
         }
-        this.resolveType(fn.returns, file, params);
+        this.returnType(fn, file, params);
         if (fn.endpoint) {
             const endpoint = fn.endpoint;
             if (!/^[A-Z]+$/.test(endpoint.method))
@@ -342,7 +455,7 @@ class Checker {
                 if (param.source?.kind === 'request' && type.name !== 'HttpRequest')
                     this.report(param.span, 'from request provides HttpRequest', 'HTTP');
             }
-            const result = this.resolveType(fn.returns, file, params);
+            const result = this.returnType(fn, file, params);
             if (endpoint.streams) {
                 if (!['ServerEvent', 'Bytes', 'Html'].includes(result.name) || result.optional || result.nullable)
                     this.report(fn.span, 'An endpoint streams ServerEvent<T>, Bytes, or Html', 'HTTP');
@@ -414,7 +527,7 @@ class Checker {
                     this.report(method.span, 'Declare generic parameters on the interceptor, rather than around', 'INTERCEPTOR');
                 if (method.annotations?.length)
                     this.report(method.span, 'Apply interceptor layers to the target declaration; around cannot be annotated', 'INTERCEPTOR');
-                if (method.returns.name !== 'void' && canFallThrough(method.body ?? []))
+                if (this.returnType(method, def.file, types).name !== 'void' && canFallThrough(method.body ?? []))
                     this.report(method.span, 'around must return its result or throw on every execution path', 'INTERCEPTOR');
                 if (canRepeatNext(method.body ?? []))
                     this.report(method.span, 'next may be called at most once on each execution path; a loop or catch path can call it again', 'NEXT');
@@ -424,8 +537,11 @@ class Checker {
             this.report(node.span, `${node.name} must define around(...)`, 'INTERCEPTOR');
     }
     nextFor(method, file, types) {
+        const result = this.returnType(method, file, types);
         return { params: method.params, types: method.params.map(param => this.resolveType(param.type, file, types)),
-            returns: this.resolveType(method.returns, file, types), returnOwnership: method.returnOwnership };
+            returns: result.kind === 'error' && method.declared?.returns === false ?
+                { id: 'continuation:' + file + ':' + method.span.start, name: '<target result>', kind: 'param', args: [], nullable: false } : result,
+            returnOwnership: method.returnOwnership };
     }
     inferInterceptorType(ref, actual, names, types, file) {
         inferType(ref, actual, names, types, message => this.report(ref.span, message, 'GENERIC'), (name, value) => {
@@ -450,6 +566,24 @@ class Checker {
         }
         return undefined;
     }
+    /** The native policy ABI accepts the published capability shape across source-package identities. */
+    nativeWebCapability(type, name) {
+        const canonical = nativeHttpContracts.get(name);
+        const shape = (value) => {
+            if (Array.isArray(value))
+                return value.map(shape);
+            if (!value || typeof value !== 'object')
+                return value;
+            return Object.fromEntries(Object.entries(value).filter(([key]) => !['span', 'nameSpan', 'headerEnd'].includes(key)).map(([key, child]) => [key, shape(child)]));
+        };
+        if (!canonical || !type.def || JSON.stringify(shape(type.def.node)) !== JSON.stringify(shape(canonical)))
+            return false;
+        if (name === 'RequestLogger')
+            return true;
+        const principal = this.project.scopes.get(type.def.file)?.get('Principal');
+        const expected = nativeHttpContracts.get('Principal');
+        return !!principal && !!expected && JSON.stringify(shape(principal.node)) === JSON.stringify(shape(expected));
+    }
     planInterceptors() {
         const plan = (node, file, ownerTypes, inputs, output, ownership) => {
             const layers = [];
@@ -465,7 +599,7 @@ class Checker {
                         const policies = this.httpPolicies.get(node) ?? [];
                         if (['Cors', 'Compress'].includes(annotation.name) && policies.some(policy => policy.name === annotation.name))
                             this.report(annotation.span, `${annotation.name} may appear only once on an endpoint`, 'HTTP');
-                        policies.push(checkHttpPolicy(annotation, node, this.diagnostics, (param, name) => this.resolveType(param.type, file, ownerTypes).id === `august/web/contracts.aug:${name}`));
+                        policies.push(checkHttpPolicy(annotation, node, this.diagnostics, (param, name) => this.nativeWebCapability(this.resolveType(param.type, file, ownerTypes), name)));
                         this.httpPolicies.set(node, policies);
                     }
                     continue;
@@ -511,7 +645,16 @@ class Checker {
                         types.set(name, this.resolveType(annotation.typeArgs[index], file, ownerTypes));
                 });
                 const inferredNames = interceptor.typeParams.filter((_, index) => !annotation.typeArgs[index]);
-                this.inferInterceptorType(around.returns, output, inferredNames, types, definition.file);
+                const inferredOutput = this.callableContracts.get(around);
+                if (inferredOutput?.inferredResult) {
+                    types.set('<target result>', output);
+                    if (inferredOutput.result.name !== '<target result>') {
+                        const reference = (type) => ({ name: type.name, args: type.args.map(reference), nullable: type.nullable, optional: type.optional, span: around.span });
+                        this.inferInterceptorType(reference(inferredOutput.result), output, inferredNames, types, definition.file);
+                    }
+                }
+                else
+                    this.inferInterceptorType(around.returns, output, inferredNames, types, definition.file);
                 const argumentIndices = around.params.map(param => param.injected ? undefined :
                     inputs.findIndex(input => input.name === (mapping.get(param.name) ?? param.name)));
                 const inputTypes = argumentIndices.map((index, i) => index !== undefined && index >= 0 ?
@@ -548,7 +691,7 @@ class Checker {
                     }
                     return undefined;
                 });
-                const result = this.resolveType(around.returns, definition.file, types);
+                const result = this.returnType(around, definition.file, types);
                 if (!this.assignable(result, output))
                     this.report(annotation.span, `${interceptor.name}.around returns ${tyName(result)}; ${node.name} requires ${tyName(output)}`, 'INTERCEPTOR');
                 if (around.returnOwnership !== ownership)
@@ -566,7 +709,7 @@ class Checker {
                 const argumentInjectionIndices = around.params.map(param => param.injected ? injectedIndex(param.type) : undefined);
                 layers.push({ annotation, definition, around, argumentIndices, argumentBindings, constructorKeys,
                     types, inputTypes, outputType: output, constructorInputIndices, argumentInjectionIndices,
-                    errors: around.throws.map(ref => this.resolveType(ref, definition.file, types)) });
+                    errors: this.bodyErrors(around, definition.file, types) });
             }
         };
         for (const def of this.project.definitions.values()) {
@@ -575,13 +718,13 @@ class Checker {
             if (node.kind === 'class')
                 plan(node, def.file, types, node.fields, { id: def.id, name: def.name, kind: 'class', def, args: [...types.values()], nullable: false }, 'managed');
             if (node.kind === 'function')
-                plan(node, def.file, types, node.params, this.resolveType(node.returns, def.file, types), node.returnOwnership);
+                plan(node, def.file, types, node.params, this.returnType(node, def.file, types), node.returnOwnership);
             if ('methods' in node)
                 for (const method of node.methods) {
                     if (node.kind === 'interceptor' && method.name === 'around')
                         continue;
                     const methodTypes = new Map([...types, ...this.paramsFor(method.typeParams, method, def.file)]);
-                    plan(method, def.file, methodTypes, method.params, this.resolveType(method.returns, def.file, methodTypes), method.returnOwnership);
+                    plan(method, def.file, methodTypes, method.params, this.returnType(method, def.file, methodTypes), method.returnOwnership);
                 }
         }
     }
@@ -594,8 +737,8 @@ class Checker {
     }
     effectiveErrors(node, file, types) {
         return [
-            ...(node.kind === 'function' ? node.throws : node.validationErrors ?? []).map(ref => this.resolveType(ref, file, types)),
-            ...(this.interceptorPlans.get(node) ?? []).flatMap(layer => layer.errors.map(type => this.substitute(type, types))),
+            ...(node.kind === 'function' ? this.bodyErrors(node, file, types) : (this.constructorContracts.get(node)?.errors.map(type => this.substitute(type, types)) ?? (node.validationErrors ?? []).map(ref => this.resolveType(ref, file, types)))),
+            ...(this.interceptorPlans.get(node) ?? []).flatMap(layer => this.bodyErrors(layer.around, layer.definition.file, new Map([...layer.types].map(([name, type]) => [name, this.substitute(type, types)])))),
         ];
     }
     checkInterceptorDependencies() {
@@ -745,7 +888,7 @@ class Checker {
             param.injected === method.params[i].injected &&
             param.ownership === method.params[i].ownership &&
             equalRef(param.type, method.params[i].type)) &&
-            equalRef(left.returns, method.returns) &&
+            this.sameType(this.returnType(left, leftFile, leftParams), this.returnType(method, right.file, rightParams)) &&
             left.returnOwnership === method.returnOwnership &&
             this.effectiveErrors(left, leftFile, leftParams).every(thrown => this.effectiveErrors(method, right.file, rightParams).some(allowed => this.assignable(thrown, allowed)));
     }
@@ -863,7 +1006,7 @@ class Checker {
             else if (item.keyTypeArgs.length)
                 this.report(item.span, `Named binding ${item.key} cannot take type arguments`, 'DI');
             const stateful = fieldsOf(target.node).some(field => field.mutable || field.ownership === 'own' || field.type.name === 'Shared') ||
-                target.node.methods.some(method => method.changes?.some(path => path === 'self' || path.startsWith('self.')));
+                target.node.methods.some(method => this.effectiveContract(method, target.file, target, new Map(target.node.typeParams.map((name, index) => [name, targetType.args[index] ?? errorTy]))).changes.some(path => path === 'self' || path.startsWith('self.')));
             const info = { key, target, exposedType, stateful, lifetime: item.lifetime ?? (stateful ? 'fresh' : 'shared'),
                 dependencies: [], constructorKeys: [], declaration: item, requiresScope: item.lifetime === 'scoped' };
             this.bindings.push(info);
@@ -921,9 +1064,10 @@ class Checker {
         for (const [name, ty] of this.paramsFor(fn.typeParams, fn, file))
             params.set(name, ty);
         this.addBounds(params, fn, file);
-        const context = { file, locals: new Map(), returns: this.resolveType(fn.returns, file, params),
+        const context = { file, locals: new Map(), returns: this.returnType(fn, file, params),
             returnOwnership: fn.returnOwnership,
-            allowedErrors: fn.throws.map(type => this.resolveType(type, file, params)),
+            allowedErrors: this.bodyErrors(fn, file, params),
+            inferredReturns: this.inferring && this.callableContracts.get(fn)?.inferredResult && !this.contextualResults.has(fn) ? [] : undefined,
             unsafe: false, borrowed: new Set(), initializing, types: params, next, callable: fn, owner,
             flow: new OwnershipFlow() };
         if (fn.endpoint?.streams) {
@@ -934,7 +1078,7 @@ class Checker {
             context.self = { id: owner.id, name: owner.name,
                 kind: owner.node.kind === 'class' ? 'class' : owner.node.kind === 'interceptor' ? 'interceptor' : 'interface', def: owner,
                 args: [...params.values()].slice(0, owner.node.typeParams.length), nullable: false };
-            context.locals.set('self', { type: context.self, ownership: (fn.changes ?? []).some(path => path === 'self' || path.startsWith('self.')) || initializing ? 'borrow' : 'managed', moved: false });
+            context.locals.set('self', { type: context.self, ownership: this.contractFor(fn, file, owner, params).changes.some(path => path === 'self' || path.startsWith('self.')) || initializing ? 'borrow' : 'managed', moved: false });
             if (owner.node.kind === 'class' || owner.node.kind === 'interceptor') {
                 for (const field of fieldsOf(owner.node))
                     context.locals.set(field.name, { type: { ...this.resolveType(field.type, file, params), readonly: !field.mutable }, ownership: field.ownership,
@@ -966,7 +1110,28 @@ class Checker {
         context.effects = this.contractFor(fn, file, owner, params);
         if ((fn.changes ?? []).some(path => path.startsWith('self')) && !owner)
             this.report(fn.span, 'A free function has no self to change', 'EFFECT');
+        for (const policy of this.httpPolicies.get(fn) ?? []) {
+            const operations = Object.values(httpPolicyOptions[policy.name]).filter(spec => spec.startsWith('dependency:'));
+            policy.dependencies.forEach((index, order) => {
+                const param = fn.params[index];
+                if (!param || !operations[order])
+                    return;
+                const type = this.resolveType(param.type, file, params);
+                const operation = operations[order].split('.')[1];
+                this.requireUse(capabilityKey(type, operation), `${tyName(type)}.${operation}`, policy.annotation.span, context, { source: tyName(type), operation, span: policy.annotation.span, capability: type });
+            });
+        }
         this.checkStatements(fn.body ?? [], context, fn.span);
+        if (context.inferredReturns) {
+            const contract = this.callableContracts.get(fn);
+            const result = this.inferredReturn(context.inferredReturns);
+            if (!sameType(result, contract.result)) {
+                contract.result = result;
+                this.markInference(fn);
+            }
+        }
+        if (!this.inferring && unresolved(this.returnType(fn, file, params)))
+            this.report(fn.span, `Cannot infer ${fn.name}'s return type; add returns T to anchor recursive or ambiguous results`, 'INFERENCE');
         if (fn.body && context.returns.id !== 'builtin:void' &&
             !(owner?.node.kind === 'interceptor' && fn.name === 'around') && canFallThrough(fn.body))
             this.report(fn.span, `${fn.name} must return a value or throw on every path`, 'TYPE');
@@ -1046,16 +1211,19 @@ class Checker {
             report: (span, message) => this.report(span, message, 'EFFECT'),
         });
         const inferred = this.inferredUses.get(fn);
+        const inferredChanges = this.inferredChanges.get(fn);
+        const changes = inferredChanges ? [...inferredChanges].sort() : result.changes;
         if (!inferred) {
-            this.effectContracts.set(fn, result);
-            return result;
+            const contract = { ...result, changes, inferredChanges: !!inferredChanges };
+            this.effectContracts.set(fn, contract);
+            return contract;
         }
         const uses = new Map(result.uses);
         for (const [key, effect] of inferred) {
             const capability = effect.capability && this.substitute(effect.capability, types);
             uses.set(capability ? capabilityKey(capability, effect.operation) : key, { ...effect, capability, source: capability ? tyName(capability) : effect.source });
         }
-        const contract = { ...result, uses, inferred: true };
+        const contract = { ...result, changes, uses, inferred: true, inferredChanges: !!inferredChanges };
         this.effectContracts.set(fn, contract);
         return contract;
     }
@@ -1096,7 +1264,7 @@ class Checker {
                     changes.push([fn.params[target].name, ...path].join('.'));
             }
         }
-        const result = { changes: [...new Set(changes)], uses, inferred: base.inferred };
+        const result = { changes: [...new Set(changes)], uses, inferred: base.inferred, inferredChanges: base.inferredChanges };
         this.effectContracts.set(fn, result);
         return result;
     }
@@ -1126,8 +1294,16 @@ class Checker {
             return;
         const input = context.callable.params.find(param => param.name === origin);
         if (path.startsWith('self') || input && input.ownership !== 'own') {
-            if (!coversChange(context.effects?.changes ?? [], path))
-                this.report(span, `${context.callable.name} must declare changes ${path.startsWith('self') ? 'self' : origin}`, 'EFFECT');
+            const inferred = this.inferring && this.inferredChanges.get(context.callable);
+            const change = path.startsWith('self') ? 'self' : origin;
+            if (inferred) {
+                if (!inferred.has(change)) {
+                    inferred.add(change);
+                    this.markInference(context.callable);
+                }
+            }
+            else if (!coversChange(context.effects?.changes ?? [], path))
+                this.report(span, `${context.callable.name} must declare changes ${change}`, 'EFFECT');
         }
     }
     immutableData(type, seen = new Set()) {
@@ -1214,8 +1390,9 @@ class Checker {
             const type = this.checkExpression(stmt.value, context);
             if (type.id !== 'builtin:Shared')
                 this.report(stmt.value.span, 'lock requires Shared<T>', 'CONCURRENCY');
-            if (context.callable && !context.effects?.uses.size && !context.effects?.changes.length)
-                this.report(stmt.span, 'A callable that locks shared state declares its capability operation or changes contract', 'EFFECT');
+            const external = type.readonly || !!context.flow.external(this.rootName(stmt.value) ?? '');
+            if (context.callable && external && !context.effects?.uses.size && !context.effects?.changes.length)
+                this.report(stmt.span, 'A callable that locks external shared state declares its capability operation or changes contract', 'EFFECT');
             const inside = this.cloneContext(context);
             inside.locked = true;
             const origins = allocationOrigin(stmt.span);
@@ -1494,8 +1671,9 @@ class Checker {
             return;
         }
         if (stmt.kind === 'return') {
-            const type = stmt.value ? this.checkExpression(stmt.value, context, context.returns) : builtin('void');
-            const declaredErrors = context.callable?.throws.map(type => this.resolveType(type, context.file, context.types)) ?? [];
+            const type = stmt.value ? this.checkExpression(stmt.value, context, context.returns.kind === 'error' ? undefined : context.returns) : builtin('void');
+            context.inferredReturns?.push(type);
+            const declaredErrors = context.callable ? this.bodyErrors(context.callable, context.file, context.types) : [];
             for (const error of context.flow.pendingTaskErrors())
                 this.checkAllowedError(error, stmt.span, { ...context, allowedErrors: declaredErrors, exceptionalFlows: undefined });
             if (!this.assignable(type, context.returns))
@@ -1829,8 +2007,17 @@ class Checker {
             return;
         }
         context.exceptionalFlows?.push({ type, flow: context.flow.clone() });
-        if (!context.allowedErrors.some(allowed => this.assignable(type, allowed)))
-            this.report(span, `Unhandled ${tyName(type)}; catch it or declare unless ${tyName(type)}`, 'THROWS');
+        if (!context.allowedErrors.some(allowed => this.assignable(type, allowed))) {
+            const contract = context.callable && this.inferring && this.callableContracts.get(context.callable);
+            if (contract && contract.inferredErrors && type.kind !== 'error') {
+                if (!contract.errors.some(error => sameType(error, type))) {
+                    contract.errors.push(type);
+                    this.markInference(context.callable);
+                }
+            }
+            else
+                this.report(span, `Unhandled ${tyName(type)}; catch it or declare unless ${tyName(type)}`, 'THROWS');
+        }
     }
     checkCollection(expr, context, expected) {
         const name = expr.collection === 'empty' ? expected?.name === 'Set' ? 'Set' : 'Map' : expr.collection;
@@ -2142,14 +2329,14 @@ class Checker {
                 this.defaults.get(def.id)?.get(name)?.method;
             if (method) {
                 this.checkMemberVisibility(def.id, def.name, name, span, context);
-                return this.resolveType(method.returns, def.file, new Map(def.node.typeParams.map((param, i) => [param, receiver.args[i] ?? errorTy])));
+                return this.returnType(method, def.file, new Map(def.node.typeParams.map((param, i) => [param, receiver.args[i] ?? errorTy])));
             }
         }
         if (def?.node.kind === 'interface') {
             const entry = this.interfaceMethods(receiver, new Set()).get(name)?.[0];
             if (entry) {
                 this.checkMemberVisibility(entry.from, def.name, name, span, context);
-                return this.resolveType(entry.method.returns, def.file);
+                return this.returnType(entry.method, entry.file, entry.params);
             }
         }
         this.report(span, `${tyName(receiver)} has no member ${name}`);
@@ -2604,8 +2791,8 @@ class Checker {
                 else if (!jsonDataType(this.project, result))
                     this.report(expr.span, `${tyName(result)} is not JSON data; use a record or data collection`, 'JSON');
                 if (result.def?.node.kind === 'class')
-                    for (const error of result.def.node.validationErrors ?? [])
-                        this.checkAllowedError(this.resolveType(error, result.def.file), expr.span, context);
+                    for (const error of this.effectiveErrors(result.def.node, result.def.file, new Map(result.def.node.typeParams.map((name, index) => [name, result.args[index] ?? errorTy]))))
+                        this.checkAllowedError(error, expr.span, context);
             }
             return this.isReference(result) ? { ...result, readonly: true, frozen: decoding || receiver.name === 'Json' } : result;
         }
@@ -2797,7 +2984,7 @@ class Checker {
         ], (span, message) => this.report(span, message, 'BORROW'));
         for (const thrown of this.effectiveErrors(fn, fnFile, params))
             this.checkAllowedError(thrown, expr.span, context);
-        const result = this.resolveType(fn.returns, fnFile, params);
+        const result = this.returnType(fn, fnFile, params);
         return this.isReference(result) && fn.returnOwnership !== 'own' && !this.functionIsFresh(fn, fnFile, owner && 'fields' in owner.node ? new Set(fieldsOf(owner.node).map(field => field.name)) : new Set()) ?
             { ...result, readonly: true } : result;
     }