trm-core 8.1.2 → 8.1.4

package/changelog.txt

@@ -8,6 +8,14 @@ Legend
 + : added
 - : removed
 
+2025-11-16 v8.1.4
+-------------------
++ execute trm-server post activities if necessary
+
+2025-11-15 v8.1.3
+-------------------
+* multiple dependencies detected for same object
+
 2025-11-07 v8.1.2
 -------------------
 - encode uri in registry endpoint

package/dist/actions/commons/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./IActionContext";
 export * from "./setSystemPackages";
 export * from "./checkServerAuth";
+export * from "./trmServerPa";

package/dist/actions/commons/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./IActionContext"), exports);
 __exportStar(require("./setSystemPackages"), exports);
 __exportStar(require("./checkServerAuth"), exports);
+__exportStar(require("./trmServerPa"), exports);

package/dist/actions/commons/trmServerPa.d.ts

@@ -0,0 +1,3 @@
+import { Step } from "@simonegaffurini/sammarksworkflow";
+import { IActionContext } from "..";
+export declare const trmServerPa: Step<IActionContext>;

package/dist/actions/commons/trmServerPa.js

@@ -0,0 +1,40 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trmServerPa = void 0;
+const trm_commons_1 = require("trm-commons");
+const systemConnector_1 = require("../../systemConnector");
+const registry_1 = require("../../registry");
+const manifest_1 = require("../../manifest");
+exports.trmServerPa = {
+    name: 'trm-server-pa',
+    run: (context) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        trm_commons_1.Logger.log('Run trm-server pa step', true);
+        const trmServerPackage = (_b = (_a = context.rawInput.contextData) === null || _a === void 0 ? void 0 : _a.systemPackages) === null || _b === void 0 ? void 0 : _b.find(o => o.packageName === systemConnector_1.TRM_SERVER_PACKAGE_NAME && o.compareRegistry(registry_1.RegistryProvider.getRegistry()));
+        if (trmServerPackage) {
+            const pa = (_c = trmServerPackage.manifest) === null || _c === void 0 ? void 0 : _c.get().postActivities;
+            if (pa) {
+                trm_commons_1.Logger.setPrefix(`Initialize trm-server v${(_d = trmServerPackage.manifest) === null || _d === void 0 ? void 0 : _d.get().version} -> `);
+                for (const data of pa) {
+                    try {
+                        const postActivity = new manifest_1.PostActivity(data);
+                        yield postActivity.execute();
+                    }
+                    catch (e) {
+                        trm_commons_1.Logger.error(e.toString(), true);
+                    }
+                }
+                trm_commons_1.Logger.removePrefix();
+            }
+        }
+    })
+};

package/dist/actions/findDependencies/parseSenvi.js

@@ -58,10 +58,15 @@ const _addEntry = (tableName, sapEntries, dependencyIn, dependency) => {
         });
         index--;
     }
-    sapEntries[index].dependencies.push({
-        foundIn: dependencyIn,
-        object: dependency
-    });
+    if (sapEntries[index].dependencies.find(o => _.isEqual(o.object, dependency))) {
+        trm_commons_1.Logger.log(`Skipping, dependency with ${JSON.stringify(dependency)} already declared`, true);
+    }
+    else {
+        sapEntries[index].dependencies.push({
+            foundIn: dependencyIn,
+            object: dependency
+        });
+    }
     return sapEntries;
 };
 exports.parseSenvi = {

package/dist/actions/install/index.js

@@ -50,6 +50,7 @@ function install(inputData) {
             __1.checkServerAuth,
             init_1.init,
             setSystemPackages_1.setSystemPackages,
+            __1.trmServerPa,
             setTrmServerUpgradeService_1.setTrmServerUpgradeService,
             checkAlreadyInstalled_1.checkAlreadyInstalled,
             checkSapEntries_1.checkSapEntries,

package/dist/actions/install/init.js

@@ -55,7 +55,7 @@ exports.init = {
             }
             manifest = artifact.getManifest().get();
         }
-        trm_commons_1.Logger.info(`Ready to install ${manifest.name} v${manifest.version}${!(0, semver_1.valid)(context.rawInput.packageData.version) ? ' (' + context.rawInput.packageData.version + ')' : ''}.`);
+        trm_commons_1.Logger.info(`Ready to install ${manifest.name} v${manifest.version}${!(0, semver_1.valid)(context.rawInput.packageData.version) ? ' (' + context.rawInput.packageData.version || 'latest' + ')' : ''}.`);
         context.runtime = {
             registry: actualRegistry || registry,
             update: undefined,

package/dist/actions/installDependency/findInstallRelease.js

@@ -18,7 +18,7 @@ exports.findInstallRelease = {
     name: 'find-install-release',
     run: (context) => __awaiter(void 0, void 0, void 0, function* () {
         trm_commons_1.Logger.log('Find install release step', true);
-        const lock = context.rawInput.installData.checks.lockfile ? context.rawInput.installData.checks.lockfile.getLock(context.runtime.trmPackage) : null;
+        const lock = context.rawInput.installData.checks.lockfile ? context.rawInput.installData.checks.lockfile.getLock(context.runtime.trmPackage, context.rawInput.dependencyDataPackage.versionRange) : null;
         if (lock) {
             const testLock = yield lockfile_1.Lockfile.testReleaseByLock(lock);
             if (!testLock) {

package/dist/actions/publish/index.js

@@ -40,6 +40,7 @@ function publish(inputData) {
             __1.checkServerAuth,
             init_1.init,
             __1.setSystemPackages,
+            __1.trmServerPa,
             setTransportTarget_1.setTransportTarget,
             setDevclass_1.setDevclass,
             findDependencies_1.findDependencies,

package/dist/lockfile/Lockfile.d.ts

@@ -18,6 +18,6 @@ export declare class Lockfile {
     static generate(root: TrmPackage, packages?: TrmPackage[]): Promise<Lockfile>;
     static fromJson(json: any): Lockfile;
     toJson(): string;
-    getLock(trmPackage: TrmPackage): Lock;
+    getLock(trmPackage: TrmPackage, versionRange: string): Lock;
     static testReleaseByLock(lock: Lock): Promise<boolean>;
 }

package/dist/lockfile/Lockfile.js

@@ -15,6 +15,7 @@ const registry_1 = require("../registry");
 const systemConnector_1 = require("../systemConnector");
 const commons_1 = require("../commons");
 const crypto_1 = require("crypto");
+const semver_1 = require("semver");
 class Lockfile {
     constructor(lockfile) {
         this.lockfile = lockfile;
@@ -79,10 +80,10 @@ class Lockfile {
         ];
         return (0, commons_1.jsonStringifyWithKeyOrder)(this.lockfile, KEYS_ORDER, 2);
     }
-    getLock(trmPackage) {
+    getLock(trmPackage, versionRange) {
         var _a;
         const lock = (_a = this.lockfile.packages) === null || _a === void 0 ? void 0 : _a.find(o => trmPackage.compareName(o.name) && trmPackage.compareRegistry(registry_1.RegistryProvider.getRegistry(o.registry)));
-        if (!lock) {
+        if (!lock || !(0, semver_1.satisfies)(lock.version, versionRange)) {
             throw new Error(`Lock for package "${trmPackage.packageName}", registry "${trmPackage.registry.endpoint}" not found`);
         }
         return lock;

package/dist/systemConnector/SystemConnectorBase.js

@@ -342,6 +342,17 @@ class SystemConnectorBase {
                         generatedTrmServerPackage.manifest = trmServerPackage.manifest;
                     }
                 }
+                else {
+                    trm_commons_1.Logger.log(`trm-server from abapgit is the one currenlty in use, setting manifest value from registry`, true);
+                    try {
+                        const registryPackage = yield registry_1.RegistryProvider.getRegistry().getPackage(exports.TRM_SERVER_PACKAGE_NAME, generatedTrmServerPackage.manifest.get().version);
+                        generatedTrmServerPackage.manifest = new manifest_1.Manifest(registryPackage.manifest);
+                    }
+                    catch (e) {
+                        trm_commons_1.Logger.error(`Error fetching trm-server manifest in registry`, true);
+                        trm_commons_1.Logger.error(e.toString(), true);
+                    }
+                }
                 trmPackages = trmPackages.filter(o => !(o.packageName === exports.TRM_SERVER_PACKAGE_NAME && o.compareRegistry(registry_1.RegistryProvider.getRegistry())));
                 trmPackages.push(generatedTrmServerPackage);
             }
@@ -359,6 +370,17 @@ class SystemConnectorBase {
                         generatedTrmRestPackage.manifest = trmRestPackage.manifest;
                     }
                 }
+                else {
+                    trm_commons_1.Logger.log(`trm-rest from abapgit is the one currenlty in use, setting manifest value from registry`, true);
+                    try {
+                        const registryPackage = yield registry_1.RegistryProvider.getRegistry().getPackage(exports.TRM_REST_PACKAGE_NAME, generatedTrmRestPackage.manifest.get().version);
+                        generatedTrmRestPackage.manifest = new manifest_1.Manifest(registryPackage.manifest);
+                    }
+                    catch (e) {
+                        trm_commons_1.Logger.error(`Error fetching trm-rest manifest in registry`, true);
+                        trm_commons_1.Logger.error(e.toString(), true);
+                    }
+                }
                 trmPackages = trmPackages.filter(o => !(o.packageName === exports.TRM_REST_PACKAGE_NAME && o.compareRegistry(registry_1.RegistryProvider.getRegistry())));
                 trmPackages.push(generatedTrmRestPackage);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-core",
-  "version": "8.1.2",
+  "version": "8.1.4",
   "description": "TRM (Transport Request Manager) Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",