@ontrails/warden 1.0.0-beta.43 → 1.0.0-beta.45

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ontrails/warden
 
+## 1.0.0-beta.45
+
+### Patch Changes
+
+- [`f1bd093`](https://github.com/outfitter-dev/trails/commit/f1bd09395fcf81db0bcb8657030288877c2e26e6): Recognize conditional, aliased, and parenthesized Result provenance while invalidating provenance after reassignment across the implementation-return and redundant-error-wrap rules.
+
+## 1.0.0-beta.44
+
+### Patch Changes
+
+- [`b1fbe57`](https://github.com/outfitter-dev/trails/commit/b1fbe574e6f44d1fecb5e3a000270955c0a77b7b): Publish Bun-validated package tarballs through an npm trusted-publishing adapter
+  binding, add exact repository metadata for each public workspace package, and
+  correct the native Bun release descriptor to its pack-only runtime boundary.
+
 ## 1.0.0-beta.43
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,11 @@
 {
   "name": "@ontrails/warden",
-  "version": "1.0.0-beta.43",
+  "version": "1.0.0-beta.45",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/outfitter-dev/trails.git",
+    "directory": "packages/warden"
+  },
   "bin": {
     "warden": "./bin/warden.ts"
   },
@@ -27,20 +32,20 @@
     "clean": "rm -rf dist *.tsbuildinfo"
   },
   "dependencies": {
-    "@ontrails/adapter-kit": "^1.0.0-beta.43",
-    "@ontrails/cli": "^1.0.0-beta.43",
-    "@ontrails/config": "^1.0.0-beta.43",
-    "@ontrails/permits": "^1.0.0-beta.43",
-    "@ontrails/source": "^1.0.0-beta.43",
-    "@ontrails/store": "^1.0.0-beta.43",
+    "@ontrails/adapter-kit": "^1.0.0-beta.45",
+    "@ontrails/cli": "^1.0.0-beta.45",
+    "@ontrails/config": "^1.0.0-beta.45",
+    "@ontrails/permits": "^1.0.0-beta.45",
+    "@ontrails/source": "^1.0.0-beta.45",
+    "@ontrails/store": "^1.0.0-beta.45",
     "oxc-resolver": "11.19.1",
     "zod": "^4.3.5"
   },
   "devDependencies": {
-    "@ontrails/testing": "^1.0.0-beta.43"
+    "@ontrails/testing": "^1.0.0-beta.45"
   },
   "peerDependencies": {
-    "@ontrails/core": "^1.0.0-beta.43",
-    "@ontrails/topography": "^1.0.0-beta.43"
+    "@ontrails/core": "^1.0.0-beta.45",
+    "@ontrails/topography": "^1.0.0-beta.45"
   }
 }

package/src/rules/implementation-returns-result.ts

@@ -25,8 +25,11 @@ import {
   getNodeImported,
   getNodeInit,
   getNodeLocal,
+  getNodeLeft,
   getNodeName,
+  getNodeOperator,
   getNodeReturnType,
+  getNodeRight,
   getNodeSource,
   getNodeTypeAnnotation,
   getNodeValue,
@@ -97,12 +100,15 @@ export type ScopedHelperMap = ReadonlyMap<
 
 export type MutableScopedHelperMap = Map<ReadonlySet<string>, Set<string>>;
 
-type ScopedResultVariableMap = ReadonlyMap<
+export type ScopedResultVariableMap = ReadonlyMap<
   ReadonlySet<string>,
   ReadonlySet<string>
 >;
 
-type MutableScopedResultVariableMap = Map<ReadonlySet<string>, Set<string>>;
+export type MutableScopedResultVariableMap = Map<
+  ReadonlySet<string>,
+  Set<string>
+>;
 
 export const findNearestBindingScope = (
   name: string,
@@ -224,8 +230,8 @@ const unwrapReturnExpression = (node: AstNode): AstNode => {
   return current;
 };
 
-/** Check if a return argument is an allowed Result value. */
-const isAllowedReturnArgument = (
+/** Check whether an expression has visible Result-producing provenance. */
+export const isResultProducingExpression = (
   argument: AstNode,
   helperNames: ReadonlySet<string>,
   resultVars: ScopedResultVariableMap,
@@ -240,7 +246,7 @@ const isAllowedReturnArgument = (
     return (
       consequent !== undefined &&
       alternate !== undefined &&
-      isAllowedReturnArgument(
+      isResultProducingExpression(
         consequent,
         helperNames,
         resultVars,
@@ -248,7 +254,7 @@ const isAllowedReturnArgument = (
         scopes,
         scopedHelpers
       ) &&
-      isAllowedReturnArgument(
+      isResultProducingExpression(
         alternate,
         helperNames,
         resultVars,
@@ -369,6 +375,14 @@ const addScopedResultVariable = (
   resultVars.set(scope, new Set([name]));
 };
 
+const clearScopedResultVariable = (
+  resultVars: MutableScopedResultVariableMap,
+  scope: ReadonlySet<string>,
+  name: string
+): void => {
+  resultVars.get(scope)?.delete(name);
+};
+
 /** Record `const helper = (): Result<...> => ...` declarations for the current lexical scope. */
 export const trackScopedResultHelperDeclaration = (
   node: AstNode,
@@ -440,8 +454,14 @@ const trackResultVariable = (
     }
     if (
       hasResultVariableAnnotation(id, sourceCode, resultTypeNames) ||
-      isResultExpression(init) ||
-      isHelperCall(init, helperNames, namespaceHelpers, scopes, scopedHelpers)
+      isResultProducingExpression(
+        init,
+        helperNames,
+        resultVars,
+        namespaceHelpers,
+        scopes,
+        scopedHelpers
+      )
     ) {
       const bindingScope = findNearestBindingScope(name, scopes);
       if (bindingScope) {
@@ -451,6 +471,63 @@ const trackResultVariable = (
   }
 };
 
+export const collectDirectResultAssignments = (
+  body: AstNode
+): ReadonlySet<AstNode> => {
+  const assignments = new Set<AstNode>();
+  for (const statement of getNodeBodyStatements(body)) {
+    if (statement.type !== 'ExpressionStatement') {
+      continue;
+    }
+    const expression = getNodeExpression(statement);
+    if (expression?.type === 'AssignmentExpression') {
+      assignments.add(expression);
+    }
+  }
+  return assignments;
+};
+
+const trackResultAssignment = (
+  node: AstNode,
+  resultVars: MutableScopedResultVariableMap,
+  helperNames: ReadonlySet<string>,
+  namespaceHelpers: NamespaceHelperMap,
+  directAssignments: ReadonlySet<AstNode>,
+  scopes: readonly ReadonlySet<string>[],
+  scopedHelpers: ScopedHelperMap
+): void => {
+  const left = getNodeLeft(node);
+  const name = identifierName(left);
+  if (!name) {
+    return;
+  }
+  const bindingScope = findNearestBindingScope(name, scopes);
+  if (!bindingScope) {
+    return;
+  }
+  const right = getNodeRight(node);
+  const resultRhs =
+    getNodeOperator(node) === '=' &&
+    right &&
+    isResultProducingExpression(
+      right,
+      helperNames,
+      resultVars,
+      namespaceHelpers,
+      scopes,
+      scopedHelpers
+    );
+  if (
+    resultRhs &&
+    (isScopedResultVariableBinding(name, scopes, resultVars) ||
+      directAssignments.has(node))
+  ) {
+    addScopedResultVariable(resultVars, bindingScope, name);
+    return;
+  }
+  clearScopedResultVariable(resultVars, bindingScope, name);
+};
+
 // ---------------------------------------------------------------------------
 // Return statement checking
 // ---------------------------------------------------------------------------
@@ -470,6 +547,7 @@ const checkReturnStatements = (
   const resultVars: MutableScopedResultVariableMap = new Map();
   const scopedHelpers: MutableScopedHelperMap = new Map();
   const initialScopes = implScope.size > 0 ? [implScope] : [];
+  const directAssignments = collectDirectResultAssignments(blockBody);
 
   walkWithScopes(
     blockBody,
@@ -494,6 +572,18 @@ const checkReturnStatements = (
         );
       }
 
+      if (node.type === 'AssignmentExpression') {
+        trackResultAssignment(
+          node,
+          resultVars,
+          helperNames,
+          namespaceHelpers,
+          directAssignments,
+          currentScopes,
+          scopedHelpers
+        );
+      }
+
       if (node.type !== 'ReturnStatement') {
         return;
       }
@@ -505,7 +595,7 @@ const checkReturnStatements = (
       }
 
       if (
-        isAllowedReturnArgument(
+        isResultProducingExpression(
           argument,
           helperNames,
           resultVars,

package/src/rules/no-redundant-result-error-wrap.ts

@@ -23,11 +23,11 @@ import {
 import type { AstNode, AstParentContext } from '@ontrails/source';
 import {
   collectAllResultHelperNames,
+  collectDirectResultAssignments,
   collectNamespaceHelperImports,
   collectResultTypeNames,
   findNearestBindingScope,
-  isHelperCall,
-  isResultExpression,
+  isResultProducingExpression,
   trackScopedResultHelperDeclaration,
 } from './implementation-returns-result.js';
 import { isTestFile } from './scan.js';
@@ -82,16 +82,6 @@ const getErrorSourceVariable = (node: AstNode | null): string | null => {
   return identifierName(member?.object);
 };
 
-const isResultProducingExpression = (
-  node: AstNode,
-  helperNames: ReadonlySet<string>,
-  namespaceHelpers: NamespaceHelperMap,
-  scopes: readonly ReadonlySet<string>[],
-  scopedHelpers: ScopedHelperMap
-): boolean =>
-  isResultExpression(node) ||
-  isHelperCall(node, helperNames, namespaceHelpers, scopes, scopedHelpers);
-
 type ResultProvenance = Map<ReadonlySet<string>, Set<string>>;
 
 const markResultVariable = (
@@ -158,6 +148,7 @@ const trackVariableDeclarator = (
     isResultProducingExpression(
       init,
       helperNames,
+      provenance,
       namespaceHelpers,
       scopes,
       scopedHelpers
@@ -175,11 +166,10 @@ const trackAssignmentExpression = (
   helperNames: ReadonlySet<string>,
   namespaceHelpers: NamespaceHelperMap,
   scopedHelpers: ScopedHelperMap,
+  directAssignments: ReadonlySet<AstNode>,
   scopes: readonly ReadonlySet<string>[]
 ): void => {
   const left = getNodeLeft(node);
-  const operator = getNodeOperator(node);
-  const right = getNodeRight(node);
   const name = identifierName(left);
   if (!name) {
     return;
@@ -188,16 +178,22 @@ const trackAssignmentExpression = (
   if (!scope) {
     return;
   }
-  if (
-    operator === '=' &&
+  const right = getNodeRight(node);
+  const resultRhs =
+    getNodeOperator(node) === '=' &&
     right &&
     isResultProducingExpression(
       right,
       helperNames,
+      provenance,
       namespaceHelpers,
       scopes,
       scopedHelpers
-    )
+    );
+  if (
+    resultRhs &&
+    (hasResultProvenance(provenance, scope, name) ||
+      directAssignments.has(node))
   ) {
     markResultVariable(provenance, scope, name);
     return;
@@ -258,6 +254,7 @@ const checkFunctionBody = (
   const scopedHelpers: MutableScopedHelperMap = new Map();
   const implScope = collectScopeFrameBindings(owner);
   const initialScopes = implScope.size > 0 ? [implScope] : [];
+  const directAssignments = collectDirectResultAssignments(body);
 
   walkWithScopes(
     body,
@@ -287,6 +284,7 @@ const checkFunctionBody = (
           helperNames,
           namespaceHelpers,
           scopedHelpers,
+          directAssignments,
           scopes
         );
         return;