trm-core 1.0.1 → 2.0.0

package/dist/actions/install.js

@@ -62,7 +62,7 @@ function _validateDevclass(input, packagesNamespace) {
     }
 }
 function install(data, inquirer, system, registry, logger) {
-    var _a, _b;
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         const ignoreSapEntries = data.ignoreSapEntries ? true : false;
         const skipDependencies = data.skipDependencies ? true : false;
@@ -212,7 +212,9 @@ function install(data, inquirer, system, registry, logger) {
         }
         const aDevcTransports = aTransports.filter(o => o.type === transport_1.TrmTransportIdentifier.DEVC);
         const aTadirTransports = aTransports.filter(o => o.type === transport_1.TrmTransportIdentifier.TADIR);
+        const aLangTransports = aTransports.filter(o => o.type === transport_1.TrmTransportIdentifier.LANG);
         var wbObjects = [];
+        var trCopy = [];
         if (aDevcTransports.length > 1) {
             throw new Error(`Unexpected declaration of devclass in package ${packageName}.`);
         }
@@ -354,9 +356,11 @@ function install(data, inquirer, system, registry, logger) {
                 const installRoot = installPackageHierarchy.devclass === packageReplacement.installDevclass;
                 const originalParentCl = tdevc.find(o => o.devclass === packageReplacement.originalDevclass).parentcl;
                 if (originalParentCl) {
-                    const installParentCl = packageReplacements.find(o => o.originalDevclass === originalParentCl).installDevclass;
-                    if (!installRoot) {
-                        yield system.setPackageSuperpackage(packageReplacement.installDevclass, installParentCl);
+                    const installParentCl = (_c = packageReplacements.find(o => o.originalDevclass === originalParentCl)) === null || _c === void 0 ? void 0 : _c.installDevclass;
+                    if (installParentCl) {
+                        if (!installRoot) {
+                            yield system.setPackageSuperpackage(packageReplacement.installDevclass, installParentCl);
+                        }
                     }
                 }
             }
@@ -380,6 +384,20 @@ function install(data, inquirer, system, registry, logger) {
             }
             logger.success(`TADIR import finished.`);
         }
+        if (aLangTransports.length > 0) {
+            logger.loading(`Importing transports...`);
+            for (const langTransport of aLangTransports) {
+                trCopy.push(langTransport.trkorr);
+                const oTransport = yield transport_1.Transport.upload({
+                    binary: langTransport.binaries,
+                    systemConnector: system,
+                    trTarget: system.getDest()
+                }, true, logger);
+                yield oTransport.import(false, importTimeout);
+            }
+            logger.success(`Transports imported.`);
+            logger.success(`LANG import finished.`);
+        }
         logger.loading(`Finalizing install...`);
         yield system.rfcClient.setPackageIntegrity({
             package_name: manifest.name,
@@ -406,7 +424,7 @@ function install(data, inquirer, system, registry, logger) {
                 wbObjectsAdd.push(wbObject);
             }
         }
-        if (wbObjectsAdd.length > 0 && !skipWbTransport) {
+        if ((wbObjectsAdd.length > 0 || trCopy.length > 0) && !skipWbTransport) {
             var wbTransport = yield system.getPackageWorkbenchTransport(oTrmPackage);
             if (!wbTransport) {
                 wbTransport = yield transport_1.Transport.createWb({
@@ -430,6 +448,14 @@ function install(data, inquirer, system, registry, logger) {
                 catch (e) {
                 }
             }
+            for (const trFrom of trCopy) {
+                try {
+                    yield wbTransport.addObjectsFromTransport(trFrom);
+                }
+                catch (e) {
+                    debugger;
+                }
+            }
             logger.success(`Use ${wbTransport.trkorr} for transports.`);
         }
         logger.success(`Install of package "${packageName}" finished.`);

package/dist/actions/publish.js

@@ -456,6 +456,24 @@ function publish(data, inquirer, system, registry, logger) {
             target: trTarget,
             text: `@X1@TRM: ${manifest.name} v${manifest.version}`
         }, system, true, logger);
+        var langTr = yield transport_1.Transport.createLang({
+            target: trTarget,
+            text: `@X1@TRM: ${manifest.name} v${manifest.version} (L)`
+        }, system, true, logger);
+        var iLanguageObjects = 0;
+        try {
+            yield langTr.addTranslations(devcOnly.map(o => o.objName));
+            iLanguageObjects = (yield langTr.getE071()).length;
+        }
+        catch (e) {
+            logger.info(`Language transport generation error (${e.toString()})`);
+        }
+        finally {
+            if (iLanguageObjects === 0) {
+                yield langTr.delete();
+                langTr = null;
+            }
+        }
         try {
             yield tadirToc.addComment(`name=${manifest.name}`);
             yield tadirToc.addComment(`version=${manifest.version}`);
@@ -475,18 +493,18 @@ function publish(data, inquirer, system, registry, logger) {
         }
         const timeout = data.releaseTimeout || 180;
         const tmpFolder = data.tmpFolder;
-        var devcTocReleased = false;
         try {
+            var aTransports = [tadirToc, devcToc];
             logger.forceStop();
             yield tadirToc.release(false, false, tmpFolder, timeout);
             logger.loading(`Finalizing release...`);
             yield devcToc.release(false, true, tmpFolder, timeout);
-            devcTocReleased = true;
+            if (langTr) {
+                aTransports.push(langTr);
+                yield langTr.release(false, true, tmpFolder, timeout);
+            }
             logger.loading(`Creating TRM Artifact...`);
-            const trmArtifact = yield TrmArtifact_1.TrmArtifact.create([
-                tadirToc,
-                devcToc
-            ], oTrmPackage.manifest, true);
+            const trmArtifact = yield TrmArtifact_1.TrmArtifact.create(aTransports, oTrmPackage.manifest, true);
             logger.loading(`Publishing...`);
             yield oTrmPackage.publish({
                 artifact: trmArtifact,
@@ -516,10 +534,14 @@ function publish(data, inquirer, system, registry, logger) {
             if (rollBackTransports) {
                 yield system.addToIgnoredTrkorr(tadirToc.trkorr);
                 logger.error(`Transport ${tadirToc.trkorr} rollback.`);
-                if (!devcTocReleased) {
+                if ((yield devcToc.canBeDeleted())) {
                     yield devcToc.delete();
                     logger.error(`Transport ${devcToc.trkorr} rollback.`);
                 }
+                if (langTr && (yield langTr.canBeDeleted())) {
+                    yield langTr.delete();
+                    logger.error(`Transport ${langTr.trkorr} rollback.`);
+                }
             }
         }
     });

package/dist/logger/Logger.js

@@ -45,6 +45,7 @@ class Logger {
     }
     loading(text) {
         if (this.coreEnv === commons_1.CoreEnv.CLI) {
+            this.forceStop();
             this.loader = this.cliObj.render().start(text);
         }
         if (this.coreEnv === commons_1.CoreEnv.JSON) {

package/dist/rfc/client/RFCClient.d.ts

@@ -35,4 +35,6 @@ export declare class RFCClient {
     trmServerPing(): Promise<string>;
     renameTransportRequest(trkorr: components.TRKORR, as4text: components.AS4TEXT): Promise<void>;
     setPackageIntegrity(integrity: struct.ZTRM_INTEGRITY): Promise<void>;
+    addTranslationToTr(trkorr: components.TRKORR, devclassFilter: struct.LXE_TT_PACKG_LINE[]): Promise<void>;
+    trCopy(from: components.TRKORR, to: components.TRKORR, doc?: boolean): Promise<void>;
 }

package/dist/rfc/client/RFCClient.js

@@ -80,11 +80,23 @@ class RFCClient {
             const delimiter = '|';
             var aOptions = [];
             if (options) {
-                aOptions = (options.match(/.{1,72}/g)).map(s => {
-                    return {
-                        text: s
-                    };
-                }) || [];
+                const aSplit = options.split('AND');
+                if (aSplit.length > 1) {
+                    aSplit.forEach((s, i) => {
+                        var sText = s.trim();
+                        if (i !== 0) {
+                            sText = `AND ${sText}`;
+                        }
+                        aOptions.push({ text: sText });
+                    });
+                }
+                else {
+                    aOptions = aSplit.map(s => {
+                        return {
+                            text: s
+                        };
+                    });
+                }
             }
             const result = yield this._call("RFC_READ_TABLE", {
                 query_table: tableName.toUpperCase(),
@@ -325,5 +337,22 @@ class RFCClient {
             });
         });
     }
+    addTranslationToTr(trkorr, devclassFilter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this._call("ZTRM_ADD_LANG_TR", {
+                iv_trkorr: trkorr,
+                it_devclass: devclassFilter
+            });
+        });
+    }
+    trCopy(from, to, doc = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this._call("ZTRM_TR_COPY", {
+                iv_from: from,
+                iv_to: to,
+                iv_doc: doc ? 'X' : ' '
+            });
+        });
+    }
 }
 exports.RFCClient = RFCClient;

package/dist/rfc/components/DDOPTION.d.ts

@@ -0,0 +1 @@
+export type DDOPTION = string;

package/dist/rfc/components/DDOPTION.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/rfc/components/DDSIGN.d.ts

@@ -0,0 +1 @@
+export type DDSIGN = string;

package/dist/rfc/components/DDSIGN.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/rfc/components/TRPARFLAG.d.ts

@@ -0,0 +1 @@
+export type TRPARFLAG = string;

package/dist/rfc/components/TRPARFLAG.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/rfc/components/index.d.ts

@@ -34,3 +34,6 @@ export * from "./ARBGB";
 export * from "./MSGNR";
 export * from "./NATXT";
 export * from "./ZTRM_PACKAGE_INTEGRITY";
+export * from "./DDSIGN";
+export * from "./DDOPTION";
+export * from "./TRPARFLAG";

package/dist/rfc/components/index.js

@@ -50,3 +50,6 @@ __exportStar(require("./ARBGB"), exports);
 __exportStar(require("./MSGNR"), exports);
 __exportStar(require("./NATXT"), exports);
 __exportStar(require("./ZTRM_PACKAGE_INTEGRITY"), exports);
+__exportStar(require("./DDSIGN"), exports);
+__exportStar(require("./DDOPTION"), exports);
+__exportStar(require("./TRPARFLAG"), exports);

package/dist/rfc/struct/LXE_TT_PACKG_LINE.d.ts

@@ -0,0 +1,7 @@
+import { DDOPTION, DDSIGN, DEVCLASS } from "../components";
+export type LXE_TT_PACKG_LINE = {
+    sign: DDSIGN;
+    option: DDOPTION;
+    low: DEVCLASS;
+    high?: DEVCLASS;
+};

package/dist/rfc/struct/LXE_TT_PACKG_LINE.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/rfc/struct/index.d.ts

@@ -16,3 +16,4 @@ export * from "./ZTRM_INSTALLDEVC";
 export * from "./KO100";
 export * from "./T100";
 export * from "./ZTRM_INTEGRITY";
+export * from "./LXE_TT_PACKG_LINE";

package/dist/rfc/struct/index.js

@@ -32,3 +32,4 @@ __exportStar(require("./ZTRM_INSTALLDEVC"), exports);
 __exportStar(require("./KO100"), exports);
 __exportStar(require("./T100"), exports);
 __exportStar(require("./ZTRM_INTEGRITY"), exports);
+__exportStar(require("./LXE_TT_PACKG_LINE"), exports);

package/dist/systemConnector/SystemConnector.d.ts

@@ -24,6 +24,7 @@ export declare class SystemConnector {
     getLogonLanguage(c?: boolean): string;
     getLogonUser(): string;
     connect(skipLog?: boolean): Promise<void>;
+    getTransportStatus(trkorr: TRKORR): Promise<string>;
     getPackageWorkbenchTransport(oPackage: TrmPackage): Promise<Transport>;
     getInstalledPackages(skipLog?: boolean, includeSoruces?: boolean): Promise<TrmPackage[]>;
     getDevclass(devclass: DEVCLASS): Promise<TDEVC>;

package/dist/systemConnector/SystemConnector.js

@@ -63,14 +63,31 @@ class SystemConnector {
             }
         });
     }
+    getTransportStatus(trkorr) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const aTrkorrStatusCheck = (yield this.rfcClient.readTable('E070', [{ fieldName: 'TRKORR' }, { fieldName: 'TRSTATUS' }], `TRKORR EQ '${trkorr}'`));
+            if (aTrkorrStatusCheck.length !== 1) {
+                throw new Error(`Transport not found.`);
+            }
+            else {
+                return aTrkorrStatusCheck[0].trstatus;
+            }
+        });
+    }
     getPackageWorkbenchTransport(oPackage) {
         return __awaiter(this, void 0, void 0, function* () {
             var aTrkorr = (yield this.rfcClient.readTable('E071', [{ fieldName: 'TRKORR' }], `PGMID EQ '*' AND OBJECT EQ '${transport_1.COMMENT_OBJ}'`)).map(o => o.trkorr);
             aTrkorr = Array.from(new Set(aTrkorr));
             var aSkipTrkorr = [];
             for (const sTrkorr of aTrkorr) {
-                const aTrkorrStatusCheck = (yield this.rfcClient.readTable('E070', [{ fieldName: 'TRKORR' }], `TRKORR EQ '${sTrkorr}' AND TRSTATUS EQ 'D'`));
-                if (aTrkorrStatusCheck.length === 0) {
+                var canBeReleased = false;
+                try {
+                    canBeReleased = (yield this.getTransportStatus(sTrkorr)) === 'D';
+                }
+                catch (e) {
+                    canBeReleased = false;
+                }
+                if (!canBeReleased) {
                     aSkipTrkorr.push(sTrkorr);
                 }
             }

package/dist/transport/Transport.d.ts

@@ -42,6 +42,7 @@ export declare class Transport {
     }[]): Documentation[];
     addObjects(objects: E071[], lock: boolean): Promise<void>;
     addComment(comment: TROBJ_NAME): Promise<void>;
+    addTranslations(aDevclass: DEVCLASS[]): Promise<void>;
     getLinkedPackage(): Promise<TrmPackage>;
     delete(): Promise<null>;
     release(lock: boolean, skipLog?: boolean, tmpFolder?: string, secondsTimeout?: number): Promise<Transport>;
@@ -55,6 +56,10 @@ export declare class Transport {
         target: TR_TARGET;
         trmIdentifier?: TrmTransportIdentifier;
     }, systemConnector: SystemConnector, skipLog?: boolean, logger?: Logger): Promise<Transport>;
+    static createLang(data: {
+        text: AS4TEXT;
+        target: TR_TARGET;
+    }, systemConnector: SystemConnector, skipLog?: boolean, logger?: Logger): Promise<Transport>;
     static createWb(data: {
         text: AS4TEXT;
         target?: TR_TARGET;
@@ -74,4 +79,6 @@ export declare class Transport {
     static getLatest(transports: Transport[]): Promise<Transport>;
     import(skipLog?: boolean, timeout?: number): Promise<void>;
     rename(as4text: string): Promise<void>;
+    canBeDeleted(): Promise<boolean>;
+    addObjectsFromTransport(from: TRKORR): Promise<void>;
 }

package/dist/transport/Transport.js

@@ -39,6 +39,7 @@ exports.Transport = exports.COMMENT_OBJ = void 0;
 const logger_1 = require("../logger");
 const commons_1 = require("../commons");
 const node_r3trans_1 = require("node-r3trans");
+const TrmTransportIdentifier_1 = require("./TrmTransportIdentifier");
 const manifest_1 = require("../manifest");
 const promises_1 = require("timers/promises");
 const fs = __importStar(require("fs"));
@@ -232,6 +233,21 @@ class Transport {
                 }], false);
         });
     }
+    addTranslations(aDevclass) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var aDevclassLangFilter = [];
+            aDevclass.forEach(d => {
+                if (!aDevclassLangFilter.find(o => o.low === d)) {
+                    aDevclassLangFilter.push({
+                        sign: 'I',
+                        option: 'EQ',
+                        low: d
+                    });
+                }
+            });
+            yield this._systemConnector.rfcClient.addTranslationToTr(this.trkorr, aDevclassLangFilter);
+        });
+    }
     getLinkedPackage() {
         return __awaiter(this, void 0, void 0, function* () {
             const trmRelevant = yield this.isTrmRelevant();
@@ -516,6 +532,15 @@ class Transport {
             return new Transport(trkorr, systemConnector, data.target, logger).setTrmIdentifier(data.trmIdentifier);
         });
     }
+    static createLang(data, systemConnector, skipLog = false, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            logger = skipLog ? logger_1.Logger.getDummy() : logger;
+            logger.loading(`Creating transport request (LANG)...`);
+            const trkorr = yield systemConnector.rfcClient.createWbTransport(data.text, data.target);
+            logger.success(`Transport request ${trkorr} generated successfully.`);
+            return new Transport(trkorr, systemConnector, data.target, logger).setTrmIdentifier(TrmTransportIdentifier_1.TrmTransportIdentifier.LANG);
+        });
+    }
     static createWb(data, systemConnector, skipLog = false, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             logger = skipLog ? logger_1.Logger.getDummy() : logger;
@@ -605,5 +630,16 @@ class Transport {
             yield this._systemConnector.rfcClient.renameTransportRequest(this.trkorr, as4text);
         });
     }
+    canBeDeleted() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const status = yield this._systemConnector.getTransportStatus(this.trkorr);
+            return status === 'D';
+        });
+    }
+    addObjectsFromTransport(from) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this._systemConnector.rfcClient.trCopy(from, this.trkorr);
+        });
+    }
 }
 exports.Transport = Transport;

package/dist/transport/TrmTransportIdentifier.d.ts

@@ -1,4 +1,5 @@
 export declare enum TrmTransportIdentifier {
     DEVC = "DEVC",
-    TADIR = "TADIR"
+    TADIR = "TADIR",
+    LANG = "LANG"
 }

package/dist/transport/TrmTransportIdentifier.js

@@ -5,4 +5,5 @@ var TrmTransportIdentifier;
 (function (TrmTransportIdentifier) {
     TrmTransportIdentifier["DEVC"] = "DEVC";
     TrmTransportIdentifier["TADIR"] = "TADIR";
+    TrmTransportIdentifier["LANG"] = "LANG";
 })(TrmTransportIdentifier || (exports.TrmTransportIdentifier = TrmTransportIdentifier = {}));

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "trm-core",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "TRM (Transport Request Manager) Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "/dist"
+    "/dist",
+    "!dist/test.*"
   ],
   "scripts": {
     "build": "tsc"