catalyst-relay 0.5.6 → 0.5.8

package/dist/index.mjs

@@ -2472,9 +2472,38 @@ async function createTransport(client, config) {
   return ok(transportId);
 }
 
+// src/core/adt/transports/parseTransportTasks.ts
+function parseTransportTasks(doc) {
+  const tasks = [];
+  const taskElements = doc.getElementsByTagName("tm:task");
+  for (let i = 0; i < taskElements.length; i++) {
+    const taskEl = taskElements[i];
+    if (!taskEl) continue;
+    const taskId = taskEl.getAttribute("tm:number");
+    if (!taskId) continue;
+    const objects = [];
+    const objectElements = taskEl.getElementsByTagName("tm:abap_object");
+    for (let j = 0; j < objectElements.length; j++) {
+      const el = objectElements[j];
+      if (!el) continue;
+      const name = el.getAttribute("tm:name");
+      if (!name) continue;
+      objects.push({
+        name,
+        description: el.getAttribute("tm:obj_desc") || el.getAttribute("tm:obj_info") || "",
+        pgmid: el.getAttribute("tm:pgmid") || "",
+        type: el.getAttribute("tm:type") || "",
+        position: el.getAttribute("tm:position") || ""
+      });
+    }
+    tasks.push({ taskId, objects });
+  }
+  return tasks;
+}
+
 // src/core/adt/transports/removeFromTransport.ts
 var ACCEPT_HEADER = "application/vnd.sap.adt.transportorganizer.v1+xml";
-async function removeFromTransport(client, transportId, object) {
+async function removeTransportEntry(client, transportId, object) {
   const body = [
     '<?xml version="1.0" encoding="ASCII"?>',
     `<tm:root xmlns:tm="http://www.sap.com/cts/adt/tm" tm:number="${escapeXml(transportId)}" tm:useraction="removeobject">`,
@@ -2500,36 +2529,32 @@ async function removeFromTransport(client, transportId, object) {
   }
   return ok(void 0);
 }
+async function removeFromTransport(client, transportId, objectName) {
+  const [response, requestErr] = await client.request({
+    method: "GET",
+    path: `/sap/bc/adt/cts/transportrequests/${transportId}`,
+    headers: { "Accept": ACCEPT_HEADER }
+  });
+  if (requestErr) return err(requestErr);
+  if (!response.ok) {
+    const text2 = await response.text();
+    const errorMsg = extractError(text2);
+    return err(new Error(`Failed to read transport ${transportId}: ${errorMsg}`));
+  }
+  const text = await response.text();
+  const [doc, parseErr] = safeParseXml(text);
+  if (parseErr) return err(parseErr);
+  const tasks = parseTransportTasks(doc);
+  for (const task of tasks) {
+    const object = task.objects.find((o) => o.name === objectName);
+    if (!object) continue;
+    return removeTransportEntry(client, task.taskId, object);
+  }
+  return err(new Error(`Object '${objectName}' not found on transport ${transportId}`));
+}
 
 // src/core/adt/transports/deleteTransport.ts
 var ACCEPT_HEADER2 = "application/vnd.sap.adt.transportorganizer.v1+xml";
-function parseTransportTasks(doc) {
-  const tasks = [];
-  const taskElements = doc.getElementsByTagName("tm:task");
-  for (let i = 0; i < taskElements.length; i++) {
-    const taskEl = taskElements[i];
-    if (!taskEl) continue;
-    const taskId = taskEl.getAttribute("tm:number");
-    if (!taskId) continue;
-    const objects = [];
-    const objectElements = taskEl.getElementsByTagName("tm:abap_object");
-    for (let j = 0; j < objectElements.length; j++) {
-      const el = objectElements[j];
-      if (!el) continue;
-      const name = el.getAttribute("tm:name");
-      if (!name) continue;
-      objects.push({
-        name,
-        description: el.getAttribute("tm:obj_desc") || el.getAttribute("tm:obj_info") || "",
-        pgmid: el.getAttribute("tm:pgmid") || "",
-        type: el.getAttribute("tm:type") || "",
-        position: el.getAttribute("tm:position") || ""
-      });
-    }
-    tasks.push({ taskId, objects });
-  }
-  return tasks;
-}
 async function sortAndCompress(client, taskId) {
   const [response, requestErr] = await client.request({
     method: "POST",
@@ -2593,7 +2618,7 @@ async function deleteTransport(client, transportId, removeObjects = false) {
         if (!el) continue;
         const name = el.getAttribute("tm:name");
         if (!name) continue;
-        const [, removeErr] = await removeFromTransport(client, task.taskId, {
+        const [, removeErr] = await removeTransportEntry(client, task.taskId, {
           name,
           description: el.getAttribute("tm:obj_desc") || el.getAttribute("tm:obj_info") || "",
           pgmid: el.getAttribute("tm:pgmid") || "",
@@ -2873,9 +2898,9 @@ async function deleteTransport2(state, requestor, transportId, removeObjects = f
 }
 
 // src/client/methods/transport/removeFromTransport.ts
-async function removeFromTransport2(state, requestor, transportId, object) {
+async function removeFromTransport2(state, requestor, transportId, objectName) {
   if (!state.session) return err(new Error("Not logged in"));
-  return removeFromTransport(requestor, transportId, object);
+  return removeFromTransport(requestor, transportId, objectName);
 }
 
 // src/client/methods/diff/gitDiff.ts
@@ -3257,8 +3282,8 @@ var ADTClientImpl = class {
   async deleteTransport(transportId, removeObjects = false) {
     return deleteTransport2(this.state, this.requestor, transportId, removeObjects);
   }
-  async removeFromTransport(transportId, object) {
-    return removeFromTransport2(this.state, this.requestor, transportId, object);
+  async removeFromTransport(transportId, objectName) {
+    return removeFromTransport2(this.state, this.requestor, transportId, objectName);
   }
   // --- Diff Operations ---
   async gitDiff(objects) {