@mcp-abap-adt/adt-backup 0.1.2 → 1.1.0

package/dist/lib/verify/verifyObjectInSystem.js

@@ -4,25 +4,8 @@ exports.verifyObjectInSystem = verifyObjectInSystem;
 const readMetadataXmlForType_1 = require("../backup/readMetadataXmlForType");
 const readSourceText_1 = require("../backup/readSourceText");
 const decodeBase64_1 = require("../crypto/decodeBase64");
-const verbosity_1 = require("../state/verbosity");
 const extractMetadata_1 = require("../xml/extractMetadata");
-const findOtherType_1 = require("./findOtherType");
-function getHttpStatus(error) {
-    const err = error;
-    if (err.response?.status) {
-        return err.response.status;
-    }
-    if (err.status) {
-        return err.status;
-    }
-    // Check if it's a "Request failed with status code 404" style message
-    const match = String(err.message || '').match(/status code (\d+)/);
-    if (match) {
-        return Number.parseInt(match[1], 10);
-    }
-    return undefined;
-}
-async function verifyObjectInSystem(client, spec, expectedPackage, expectedSource, expectedSourceBase64, expectedFormat) {
+async function verifyObjectInSystem(client, spec, expectedPackage, expectedSource, expectedSourceBase64, expectedFormat, version = 'active') {
     const base = {
         type: spec.type,
         name: spec.name,
@@ -30,91 +13,42 @@ async function verifyObjectInSystem(client, spec, expectedPackage, expectedSourc
         status: 'ok',
         expectedPackage,
     };
-    let metadataXml;
     try {
-        metadataXml = await (0, readMetadataXmlForType_1.readMetadataXmlForType)(client, spec.type, spec.name, spec.functionGroupName);
-    }
-    catch (error) {
-        const status = getHttpStatus(error);
-        const message = error instanceof Error ? error.message : String(error);
-        // Check if error message explicitly says "not found"
-        // Examples: "Domain 'XYZ' not found", "Function group 'ABC' not found"
-        const isNotFoundMessage = /not found/i.test(message) || /does not exist/i.test(message);
-        if (status === 404 || status === 410 || isNotFoundMessage) {
-            if (verbosity_1.verbosityState.level >= 3) {
-                const otherType = await (0, findOtherType_1.findOtherType)(client, spec.type, spec.name);
-                if (otherType) {
-                    return {
-                        ...base,
-                        status: 'type-mismatch',
-                        message: `Found object of type ${otherType}`,
-                    };
-                }
-            }
-            return {
-                ...base,
-                status: 'missing',
-                message: isNotFoundMessage
-                    ? message
-                    : 'Object does not exist in the system',
-            };
+        // 1. Try to get metadata first (works for almost everything)
+        const metadataXml = await (0, readMetadataXmlForType_1.readMetadataXmlForType)(client, spec.type, spec.name, spec.functionGroupName);
+        if (metadataXml === null) {
+            return { ...base, status: 'missing' };
         }
-        // If it's a package, and we failed to read metadata, let's try a simpler check
-        if (spec.type === 'package') {
-            try {
-                await client.getUtils().getPackageContents(spec.name);
-                // If this succeeds, the package exists but metadata read failed for some reason
+        if (metadataXml !== undefined) {
+            const metadata = (0, extractMetadata_1.extractMetadata)(metadataXml);
+            if (metadata.packageName) {
+                base.actualPackage = metadata.packageName;
             }
-            catch (innerError) {
-                const innerStatus = getHttpStatus(innerError);
-                if (innerStatus === 404) {
-                    return { ...base, status: 'missing', message: 'Package not found' };
-                }
+            if (expectedPackage &&
+                metadata.packageName &&
+                metadata.packageName.toUpperCase() !== expectedPackage.toUpperCase()) {
+                return {
+                    ...base,
+                    status: 'package-mismatch',
+                    message: `Expected package ${expectedPackage}, found ${metadata.packageName}`,
+                };
+            }
+            // If we don't need source check, we're done
+            if (!expectedSource && !expectedSourceBase64) {
+                return base;
             }
         }
-        return {
-            ...base,
-            status: 'error',
-            message: error instanceof Error ? error.message : String(error),
-        };
-    }
-    if (!metadataXml) {
-        return {
-            ...base,
-            status: 'unsupported',
-            message: 'Metadata read is not supported for this object type',
-        };
-    }
-    const metadata = (0, extractMetadata_1.extractMetadata)(metadataXml);
-    if (metadata.packageName) {
-        base.actualPackage = metadata.packageName;
-    }
-    if (expectedPackage &&
-        metadata.packageName &&
-        metadata.packageName.toUpperCase() !== expectedPackage.toUpperCase()) {
-        return {
-            ...base,
-            status: 'package-mismatch',
-            message: `Expected package ${expectedPackage}, found ${metadata.packageName}`,
-        };
-    }
-    const expectedText = expectedSourceBase64 !== undefined
-        ? (0, decodeBase64_1.decodeBase64)(expectedSourceBase64)
-        : expectedSource;
-    if (expectedText !== undefined) {
-        if (expectedFormat === 'xml') {
-            return base;
+        // 2. Secondary check via Source (if required or metadata is unsupported)
+        const actualSource = await (0, readSourceText_1.readSourceText)(client, spec, version);
+        if (actualSource === null && metadataXml === undefined) {
+            // If metadata was unsupported AND source is missing - it's missing
+            return { ...base, status: 'missing' };
         }
-        else {
-            try {
-                const actualSource = await (0, readSourceText_1.readSourceText)(client, spec);
-                if (actualSource === undefined) {
-                    return {
-                        ...base,
-                        status: 'error',
-                        message: 'Source not available for comparison',
-                    };
-                }
+        if (actualSource !== undefined) {
+            const expectedText = expectedSourceBase64 !== undefined
+                ? (0, decodeBase64_1.decodeBase64)(expectedSourceBase64)
+                : expectedSource;
+            if (expectedText !== undefined && expectedFormat !== 'xml') {
                 if (expectedText !== actualSource) {
                     return {
                         ...base,
@@ -123,14 +57,14 @@ async function verifyObjectInSystem(client, spec, expectedPackage, expectedSourc
                     };
                 }
             }
-            catch (error) {
-                return {
-                    ...base,
-                    status: 'error',
-                    message: error instanceof Error ? error.message : String(error),
-                };
-            }
         }
+        return base;
+    }
+    catch (error) {
+        return {
+            ...base,
+            status: 'error',
+            message: error.message || String(error),
+        };
     }
-    return base;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcp-abap-adt/adt-backup",
-  "version": "0.1.2",
+  "version": "1.1.0",
   "description": "ADT backup CLI for SAP ABAP objects (recursive package backups and restores)",
   "main": "dist/bin/adt-backup.js",
   "types": "dist/bin/adt-backup.d.ts",
@@ -38,8 +38,8 @@
     "lint": "npx biome check --write src",
     "lint:check": "npx biome check src",
     "format": "npx biome format --write src",
-    "build": "npm run --silent clean && npx biome check src --diagnostic-level=error && npx tsc -p tsconfig.json",
-    "build:fast": "npx tsc -p tsconfig.json",
+    "build": "npm run --silent clean && npx biome check src --diagnostic-level=error && npx tsc -p tsconfig.json && chmod +x dist/bin/adt-backup.js",
+    "build:fast": "npx tsc -p tsconfig.json && chmod +x dist/bin/adt-backup.js",
     "test:integration": "node scripts/integration-test.mjs",
     "delete:package": "npx ts-node scripts/delete-package.ts",
     "debug:deps": "npx ts-node scripts/debug-where-used-list.ts"
@@ -48,17 +48,17 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@mcp-abap-adt/adt-clients": "0.3.22",
+    "@mcp-abap-adt/adt-clients": "^2.2.0",
     "@mcp-abap-adt/auth-broker": "^1.0.5",
     "@mcp-abap-adt/auth-providers": "^1.0.5",
     "@mcp-abap-adt/auth-stores": "^1.0.2",
     "@mcp-abap-adt/connection": "^1.1.0",
-    "fast-xml-parser": "^5.3.7",
+    "fast-xml-parser": "^5.4.1",
     "yaml": "^2.8.2"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.4",
-    "@types/node": "^25.3.0",
+    "@types/node": "^25.3.1",
     "typescript": "^5.9.2"
   }
 }