@saptools/service-flow 0.1.36 → 0.1.37

package/dist/{chunk-2UOIY2NI.js → chunk-WE3A6TOJ.js}

@@ -998,47 +998,51 @@ function isSupportedEventReceiver(receiver, rootReceiver, serviceVariables) {
 }
 function collectWrapperSpecs(source) {
   const specs = /* @__PURE__ */ new Map();
+  const serviceVariables = collectServiceVariables(source);
+  const calledNames = /* @__PURE__ */ new Set();
+  const collectCalls = (node) => {
+    if (ts4.isCallExpression(node)) {
+      if (ts4.isIdentifier(node.expression)) calledNames.add(node.expression.text);
+      if (ts4.isCallExpression(node.expression) && ts4.isIdentifier(node.expression.expression)) calledNames.add(node.expression.expression.text);
+    }
+    ts4.forEachChild(node, collectCalls);
+  };
+  collectCalls(source);
   const scanFunction = (name, fn) => {
+    if (!calledNames.has(name)) return;
     const params = fn.parameters.map((param) => ts4.isIdentifier(param.name) ? param.name.text : void 0);
-    const closure = returnedClosure(fn);
-    if (!closure) return;
     const sends = [];
     const visit = (node) => {
       if (ts4.isCallExpression(node) && ts4.isPropertyAccessExpression(node.expression) && node.expression.name.text === "send" && ts4.isIdentifier(node.expression.expression)) {
         const objectArg = node.arguments[0];
         if (objectArg && ts4.isObjectLiteralExpression(objectArg)) {
-          const pathProp = objectArg.properties.find((property) => ts4.isShorthandPropertyAssignment(property) && property.name.text === "path");
-          if (pathProp) sends.push({ client: node.expression.expression.text, path: pathProp.name.text, method: objectPropertyText(objectArg, "method") });
+          const pathProp = propertyInitializer(objectArg, "path");
+          const methodProp = propertyInitializer(objectArg, "method");
+          const pathName = pathProp && ts4.isIdentifier(pathProp) ? pathProp.text : void 0;
+          const methodName = methodProp && ts4.isIdentifier(methodProp) ? methodProp.text : void 0;
+          const methodLiteral = staticExpressionText(methodProp, variableInitializers(source));
+          if (pathName) sends.push({ client: node.expression.expression.text, path: pathName, method: methodName, methodLiteral, start: node.getStart(source), end: node.getEnd() });
         }
       }
       ts4.forEachChild(node, visit);
     };
-    visit(closure);
+    visit(fn);
     if (sends.length !== 1) return;
     const found = sends[0];
     const clientIndex = params.indexOf(found.client);
     const pathIndex = params.indexOf(found.path);
-    const methodIndex = found.method && params.includes(found.method) ? params.indexOf(found.method) : void 0;
-    if (clientIndex >= 0 && pathIndex >= 0) specs.set(name, { clientIndex, pathIndex, methodIndex, definitionLine: lineOf3(source.text, fn.getStart(source)), internalStart: closure.getStart(source), internalEnd: closure.getEnd() });
+    const methodIndex = found.method ? params.indexOf(found.method) : -1;
+    const capturesKnownClient = serviceVariables.has(found.client) || /^(srv|service|serviceClient|client|.*Client)$/.test(found.client);
+    if (pathIndex >= 0 && (clientIndex >= 0 || capturesKnownClient)) specs.set(name, { clientIndex: clientIndex >= 0 ? clientIndex : void 0, clientName: clientIndex >= 0 ? void 0 : found.client, pathIndex, methodIndex: methodIndex >= 0 ? methodIndex : void 0, methodName: found.method, methodLiteral: found.methodLiteral, definitionLine: lineOf3(source.text, fn.getStart(source)), internalStart: found.start, internalEnd: found.end });
   };
-  for (const stmt of source.statements) {
-    if (ts4.isFunctionDeclaration(stmt) && stmt.name) scanFunction(stmt.name.text, stmt);
-    if (ts4.isVariableStatement(stmt)) {
-      for (const decl of stmt.declarationList.declarations) if (ts4.isIdentifier(decl.name) && decl.initializer && (ts4.isArrowFunction(decl.initializer) || ts4.isFunctionExpression(decl.initializer))) scanFunction(decl.name.text, decl.initializer);
-    }
-  }
+  const visitTop = (node) => {
+    if (ts4.isFunctionDeclaration(node) && node.name) scanFunction(node.name.text, node);
+    if (ts4.isVariableDeclaration(node) && ts4.isIdentifier(node.name) && node.initializer && (ts4.isArrowFunction(node.initializer) || ts4.isFunctionExpression(node.initializer))) scanFunction(node.name.text, node.initializer);
+    ts4.forEachChild(node, visitTop);
+  };
+  visitTop(source);
   return specs;
 }
-function returnedClosure(fn) {
-  const body = fn.body;
-  if (!body) return void 0;
-  if (ts4.isArrowFunction(fn) && !ts4.isBlock(body)) return ts4.isArrowFunction(body) || ts4.isFunctionExpression(body) ? body : void 0;
-  if (!ts4.isBlock(body)) return void 0;
-  const returns = body.statements.filter(ts4.isReturnStatement);
-  if (returns.length !== 1) return void 0;
-  const expr = returns[0]?.expression;
-  return expr && (ts4.isArrowFunction(expr) || ts4.isFunctionExpression(expr)) ? expr : void 0;
-}
 function classifyOutboundCallsInSource(source, filePath) {
   const calls = [];
   const sourceFile = normalizePath(filePath);
@@ -1067,26 +1071,31 @@ function classifyOutboundCallsInSource(source, filePath) {
           const receiver = receiverName(expr.expression);
           const query = objectPropertyText(objectArg, "query");
           const method = stripQuotes(objectPropertyText(objectArg, "method") ?? "POST");
-          const op = objectPropertyText(objectArg, "path") ?? objectPropertyText(objectArg, "event");
+          const pathExpr = propertyInitializer(objectArg, "path") ?? propertyInitializer(objectArg, "event");
+          const op = pathExpr ? staticExpressionText(pathExpr, initializers) ?? pathExpr.getText(source) : void 0;
           const shorthandPath = objectPropertyIsShorthand(objectArg, "path");
-          const operationPathExpr = op && !shorthandPath ? `/${stripQuotes(op).replace(/^\//, "")}` : void 0;
+          const staticPath = staticExpressionText(pathExpr, initializers);
+          const literalPath = isStringLike(pathExpr) ? pathExpr.text : pathExpr && ts4.isTemplateExpression(pathExpr) ? pathExpr.getText(source) : void 0;
+          const operationPathExpr = staticPath ? `/${stripQuotes(staticPath).replace(/^\//, "")}` : literalPath ? `/${stripQuotes(literalPath).replace(/^\//, "")}` : void 0;
           const intent = classifyODataPathIntent(operationPathExpr, method);
           const entityCallTypes = { entity_mutation: "remote_entity_mutation", entity_delete: "remote_entity_delete", entity_media: "remote_entity_media", entity_candidate: "remote_entity_candidate" };
           const entityCallType = entityCallTypes[intent.kind];
           const isODataQueryRead = method.toUpperCase() === "GET" && ["entity_query", "entity_key_read", "entity_navigation_query"].includes(intent.kind);
-          add(node, { callType: query ? "remote_query" : entityCallType ?? (isODataQueryRead ? "remote_query" : "remote_action"), serviceVariableName: receiver, method, operationPathExpr, queryEntity: query ? extractQueryEntity(query) : isODataQueryRead ? intent.entitySegment : void 0, payloadSummary: summarizeExpression(objectArg.getText(source)), confidence: op || query ? 0.8 : 0.4, unresolvedReason: !query && shorthandPath ? "dynamic_operation_path_identifier" : void 0 }, { receiver, classifier: "service_client_send_object", operationPathExpression: shorthandPath ? op : void 0, odataPathIntent: operationPathExpr ? intent : void 0, parserWarning: shorthandPath ? "dynamic_operation_path_identifier" : void 0 });
+          add(node, { callType: query ? "remote_query" : entityCallType ?? (isODataQueryRead ? "remote_query" : "remote_action"), serviceVariableName: receiver, method, operationPathExpr, queryEntity: query ? extractQueryEntity(query) : isODataQueryRead ? intent.entitySegment : void 0, payloadSummary: summarizeExpression(objectArg.getText(source)), confidence: op || query ? 0.8 : 0.4, unresolvedReason: !query && pathExpr && !operationPathExpr ? "dynamic_operation_path_identifier" : void 0 }, { receiver, classifier: "service_client_send_object", operationPathExpression: shorthandPath ? op : void 0, literalPathSource: shorthandPath && staticPath ? "same_scope_const_initializer" : void 0, odataPathIntent: operationPathExpr ? intent : void 0, parserWarning: !query && pathExpr && !operationPathExpr ? "dynamic_operation_path_identifier" : void 0 });
         }
       } else if (ts4.isCallExpression(expr) && ts4.isIdentifier(expr.expression) && wrapperSpecs.has(expr.expression.text) || ts4.isIdentifier(expr) && wrapperSpecs.has(expr.text)) {
         const wrapperName = ts4.isIdentifier(expr) ? expr.text : ts4.isCallExpression(expr) && ts4.isIdentifier(expr.expression) ? expr.expression.text : "";
         const wrapperArgs = ts4.isIdentifier(expr) ? node.arguments : ts4.isCallExpression(expr) ? expr.arguments : node.arguments;
         const spec = wrapperSpecs.get(wrapperName);
-        const clientArg = spec ? wrapperArgs[spec.clientIndex] : void 0;
+        const clientArg = spec?.clientIndex === void 0 ? void 0 : wrapperArgs[spec.clientIndex];
         const pathArg = spec ? wrapperArgs[spec.pathIndex] : void 0;
         const methodArg = spec?.methodIndex === void 0 ? void 0 : wrapperArgs[spec.methodIndex];
-        if (spec && clientArg && ts4.isIdentifier(clientArg) && isStringLike(pathArg)) {
-          add(node, { callType: "remote_action", serviceVariableName: clientArg.text, method: stripQuotes(methodArg?.getText(source) ?? "POST"), operationPathExpr: `/${pathArg.text.replace(/^\//, "")}`, payloadSummary: summarizeExpression(node.getText(source)), confidence: 0.75 }, { receiver: clientArg.text, classifier: "higher_order_wrapper_literal_path", wrapperFunction: wrapperName, wrapperDefinitionLine: spec.definitionLine, literalCallerArgumentDetected: true });
-        } else if (spec && clientArg && ts4.isIdentifier(clientArg)) {
-          add(node, { callType: "remote_action", serviceVariableName: clientArg.text, method: stripQuotes(methodArg?.getText(source) ?? "POST"), payloadSummary: summarizeExpression(node.getText(source)), confidence: 0.45, unresolvedReason: "dynamic_operation_path_identifier" }, { receiver: clientArg.text, classifier: "higher_order_wrapper_dynamic_path", wrapperFunction: wrapperName, wrapperDefinitionLine: spec.definitionLine, parserWarning: "dynamic_operation_path_identifier" });
+        const receiver = clientArg && ts4.isIdentifier(clientArg) ? clientArg.text : spec?.clientName;
+        const method = stripQuotes(staticExpressionText(methodArg, initializers) ?? spec?.methodLiteral ?? "POST");
+        if (spec && receiver && isStringLike(pathArg)) {
+          add(node, { callType: "remote_action", serviceVariableName: receiver, method, operationPathExpr: `/${pathArg.text.replace(/^\//, "")}`, payloadSummary: summarizeExpression(node.getText(source)), confidence: 0.75 }, { receiver, classifier: "higher_order_wrapper_literal_path", wrapperFunction: wrapperName, wrapperDefinitionLine: spec.definitionLine, callerLine: lineOf3(source.text, node.getStart(source)), literalPathSource: "wrapper_call_argument", literalCallerArgumentDetected: true });
+        } else if (spec && receiver) {
+          add(node, { callType: "remote_action", serviceVariableName: receiver, method, payloadSummary: summarizeExpression(node.getText(source)), confidence: 0.45, unresolvedReason: "dynamic_operation_path_identifier" }, { receiver, classifier: "higher_order_wrapper_dynamic_path", wrapperFunction: wrapperName, wrapperDefinitionLine: spec.definitionLine, callerLine: lineOf3(source.text, node.getStart(source)), parserWarning: "dynamic_operation_path_identifier" });
         }
       } else if (ts4.isPropertyAccessExpression(expr) && ["emit", "publish", "on"].includes(expr.name.text)) {
         const receiver = receiverName(expr.expression);
@@ -1257,6 +1266,17 @@ function unwrapIdentityExpression(expr) {
   if (ts5.isTypeAssertionExpression(expr)) return unwrapIdentityExpression(expr.expression);
   return expr;
 }
+function transactionReceiverName(expr) {
+  const call = unwrapCall(expr);
+  if (call && ts5.isPropertyAccessExpression(call.expression) && ["tx", "transaction"].includes(call.expression.name.text) && ts5.isIdentifier(call.expression.expression)) return call.expression.expression.text;
+  const unwrapped = unwrapIdentityExpression(expr);
+  if (ts5.isConditionalExpression(unwrapped)) {
+    const left = transactionReceiverName(unwrapped.whenTrue);
+    const right = transactionReceiverName(unwrapped.whenFalse);
+    return left && left === right ? left : void 0;
+  }
+  return void 0;
+}
 function findConnectInExpression(expr) {
   const direct = unwrapCall(expr);
   if (direct) {
@@ -1343,9 +1363,8 @@ function collectLocalBindingFacts(fn) {
     if (ts5.isVariableDeclaration(node) && ts5.isIdentifier(node.name) && node.initializer) {
       const fact = findConnectInExpression(node.initializer);
       if (fact) bindings.set(node.name.text, fact);
-      const call = unwrapCall(node.initializer);
-      if (call && ts5.isPropertyAccessExpression(call.expression) && call.expression.name.text === "tx" && ts5.isIdentifier(call.expression.expression)) {
-        const sourceName = call.expression.expression.text;
+      const sourceName = transactionReceiverName(node.initializer);
+      if (sourceName) {
         const source = bindings.get(sourceName);
         if (source) bindings.set(node.name.text, { ...source, helperChain: [...source.helperChain ?? [], { aliasOf: sourceName, callerVariable: node.name.text, aliasKind: "transaction", transactionAliasSource: sourceName }] });
       }
@@ -1548,7 +1567,8 @@ async function parseServiceBindings(repoPath, filePath) {
           callerVariable: targetName,
           aliasOf: sourceName,
           aliasKind,
-          scopeRule: "same-file-source-order"
+          scopeRule: "same-file-source-order",
+          ...aliasKind === "transaction" ? { transactionAliasSource: sourceName } : {}
         }
       ]
     });
@@ -1780,8 +1800,9 @@ async function parseServiceBindings(repoPath, filePath) {
       recordDestructuredClassHelper(decl);
       await recordVariable(decl);
       recordIdentityAlias(decl);
-      if (ts5.isIdentifier(decl.name) && decl.initializer && ts5.isCallExpression(decl.initializer) && ts5.isPropertyAccessExpression(decl.initializer.expression) && decl.initializer.expression.name.text === "tx" && ts5.isIdentifier(decl.initializer.expression.expression)) {
-        cloneAliasBinding(decl.name.text, decl.initializer.expression.expression.text, "transaction", decl);
+      if (ts5.isIdentifier(decl.name) && decl.initializer) {
+        const sourceName = transactionReceiverName(decl.initializer);
+        if (sourceName) cloneAliasBinding(decl.name.text, sourceName, "transaction", decl);
       }
       continue;
     }
@@ -3058,4 +3079,4 @@ export {
   linkWorkspace,
   trace
 };
-//# sourceMappingURL=chunk-2UOIY2NI.js.map
+//# sourceMappingURL=chunk-WE3A6TOJ.js.map