@assembly-js/app-foundation 0.14.5 → 0.14.6

package/CHANGELOG.md

@@ -19,6 +19,9 @@ A patch release never changes what an app's build requires; a minor release may
 not by hand; see `changes/README.md`. CI fails a PR that changes a check script without a
 `bump: minor` change file.
 
+## 0.14.6
+- [behavior] The route scanner now leaves a handler wrapped in `automationActionRoute` or `cronRoute` out of the cross-app contract whichever way it is exported, including `export function POST(req) { return automationActionRoute(...)(req) }` and arrow handlers that return the wrapper call.
+
 ## 0.14.5
 - [guidance] The build agent now knows the public API accepts `select` (one option key string), `checkbox` (JSON boolean) and `date` (`YYYY-MM-DD`) custom fields, and that only `multiSelect` takes an array.
 

package/bin/scan-routes.mjs

@@ -189,6 +189,50 @@ export function readPrivateRoutes(root) {
 
 const hasModifier = (ts, node, kind) => node.modifiers?.some((m) => m.kind === kind) ?? false;
 
+const unwrapExpression = (ts, node) => {
+  while (node && (ts.isParenthesizedExpression(node) || ts.isAwaitExpression(node) || ts.isAsExpression(node) || ts.isSatisfiesExpression?.(node))) {
+    node = node.expression;
+  }
+  return node;
+};
+
+// Return statements of a function body, not those of functions nested in it.
+function ownReturns(ts, body) {
+  const out = [];
+  const visit = (node) => {
+    if (ts.isReturnStatement(node)) out.push(node);
+    if (!ts.isFunctionLike(node)) ts.forEachChild(node, visit);
+  };
+  ts.forEachChild(body, visit);
+  return out;
+}
+
+// A function handler whose only return is `wrapper(...)(req)` is the same
+// wrapped route as `export const GET = wrapper(...)`, so it yields the inner
+// `wrapper(...)` call. A handler with any other return path serves that path
+// unwrapped, so it stays an operation.
+function wrappedCallOf(ts, fn) {
+  const body = fn?.body;
+  if (!body) return null;
+  let expr = body;
+  if (ts.isBlock(body)) {
+    const returns = ownReturns(ts, body);
+    if (returns.length !== 1 || !body.statements.includes(returns[0])) return null;
+    expr = returns[0].expression;
+  }
+  const outer = unwrapExpression(ts, expr);
+  if (!outer || !ts.isCallExpression(outer)) return null;
+  const inner = unwrapExpression(ts, outer.expression);
+  return inner && ts.isCallExpression(inner) && ts.isIdentifier(inner.expression) ? inner : null;
+}
+
+// The expression wrapperName reads for a handler binding.
+function handlerInit(ts, init) {
+  const node = unwrapExpression(ts, init);
+  if (node && (ts.isArrowFunction(node) || ts.isFunctionExpression(node))) return wrappedCallOf(ts, node) ?? init;
+  return init ?? null;
+}
+
 // Returns the exported handler bindings and whether the export surface is
 // opaque (`export *`, CommonJS) so names cannot be read statically.
 export function analyseExports(ts, file, text) {
@@ -206,17 +250,20 @@ export function analyseExports(ts, file, text) {
   for (const stmt of sf.statements) {
     if (ts.isVariableStatement(stmt) && !hasModifier(ts, stmt, ts.SyntaxKind.ExportKeyword)) {
       for (const decl of stmt.declarationList.declarations) {
-        if (ts.isIdentifier(decl.name) && decl.initializer) locals.set(decl.name.text, decl.initializer);
+        if (ts.isIdentifier(decl.name) && decl.initializer) locals.set(decl.name.text, handlerInit(ts, decl.initializer));
       }
+    } else if (ts.isFunctionDeclaration(stmt) && !hasModifier(ts, stmt, ts.SyntaxKind.ExportKeyword) && stmt.name) {
+      const wrapped = wrappedCallOf(ts, stmt);
+      if (wrapped) locals.set(stmt.name.text, wrapped);
     }
   }
 
   for (const stmt of sf.statements) {
     if (ts.isFunctionDeclaration(stmt) && hasModifier(ts, stmt, ts.SyntaxKind.ExportKeyword) && stmt.name) {
-      add(stmt.name.text);
+      add(stmt.name.text, wrappedCallOf(ts, stmt));
     } else if (ts.isVariableStatement(stmt) && hasModifier(ts, stmt, ts.SyntaxKind.ExportKeyword)) {
       for (const decl of stmt.declarationList.declarations) {
-        if (ts.isIdentifier(decl.name)) add(decl.name.text, decl.initializer ?? null);
+        if (ts.isIdentifier(decl.name)) add(decl.name.text, handlerInit(ts, decl.initializer));
         else if (ts.isObjectBindingPattern(decl.name)) {
           for (const el of decl.name.elements) if (ts.isIdentifier(el.name)) add(el.name.text);
         }
@@ -241,10 +288,7 @@ export function analyseExports(ts, file, text) {
 // resolution, so `export const POST = cronRoute(...)` is recognised without
 // following the import.
 export function wrapperName(ts, init) {
-  let node = init;
-  while (node && (ts.isParenthesizedExpression(node) || ts.isAwaitExpression(node) || ts.isAsExpression(node) || ts.isSatisfiesExpression?.(node))) {
-    node = node.expression;
-  }
+  const node = unwrapExpression(ts, init);
   if (node && ts.isCallExpression(node) && ts.isIdentifier(node.expression)) return node.expression.text;
   return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assembly-js/app-foundation",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "description": "Versioned foundation helpers and build context for Assembly generated apps",
   "type": "module",
   "files": [