trm-core 7.5.4 → 8.0.0

package/dist/systemConnector/SystemConnectorBase.js

@@ -36,9 +36,16 @@ class SystemConnectorBase {
             }
         });
     }
-    getPackageWorkbenchTransport(oPackage) {
+    getWbTransports(trmPackage) {
         return __awaiter(this, void 0, void 0, function* () {
-            var aTrkorr = (yield this.readTable('E071', [{ fieldName: 'TRKORR' }], `PGMID EQ '*' AND OBJECT EQ '${transport_1.COMMENT_OBJ}'`)).map(o => o.trkorr);
+            var sqlWhere = `PGMID EQ '*' AND OBJECT EQ '${transport_1.COMMENT_OBJ}'`;
+            if (trmPackage instanceof trmPackage_1.TrmPackage) {
+                sqlWhere += ` AND OBJ_NAME EQ 'name=${trmPackage.packageName}'`;
+            }
+            else if (typeof trmPackage === 'string') {
+                sqlWhere += ` AND OBJ_NAME EQ 'name=${trmPackage}'`;
+            }
+            var aTrkorr = (yield this.readTable('E071', [{ fieldName: 'TRKORR' }], sqlWhere)).map(o => o.trkorr);
             aTrkorr = Array.from(new Set(aTrkorr));
             var aSkipTrkorr = [];
             for (const sTrkorr of aTrkorr) {
@@ -54,20 +61,35 @@ class SystemConnectorBase {
                 }
             }
             aTrkorr = aTrkorr.filter(trkorr => !aSkipTrkorr.includes(trkorr));
-            const transports = aTrkorr.map(trkorr => new transport_1.Transport(trkorr));
             var packageTransports = [];
-            for (const transport of transports) {
-                const transportPackage = yield transport.getLinkedPackage();
-                if (transportPackage) {
-                    if (trmPackage_1.TrmPackage.compare(transportPackage, oPackage)) {
+            var transports = aTrkorr.map(trkorr => new transport_1.Transport(trkorr));
+            for (let i = transports.length - 1; i >= 0; i--) {
+                if (!(yield transports[i].getLinkedPackage())) {
+                    transports.splice(i, 1);
+                }
+            }
+            if (trmPackage instanceof trmPackage_1.TrmPackage) {
+                for (const transport of transports) {
+                    const transportPackage = yield transport.getLinkedPackage();
+                    if (transportPackage) {
+                        if (trmPackage_1.TrmPackage.compare(transportPackage, trmPackage)) {
+                            packageTransports.push(transport);
+                        }
+                    }
+                }
+                return [yield transport_1.Transport.getLatest(packageTransports)];
+            }
+            else if (typeof trmPackage === 'string') {
+                for (const transport of transports) {
+                    if ((yield transport.getTrmPackageName()) === trmPackage) {
                         packageTransports.push(transport);
                     }
                 }
+                return packageTransports;
             }
-            if (packageTransports.length > 0) {
-                return yield transport_1.Transport.getLatest(packageTransports);
+            else {
+                return transports;
             }
-            return null;
         });
     }
     getSourceTrkorr(refresh) {
@@ -231,7 +253,7 @@ class SystemConnectorBase {
             var aSkipTrkorr = yield this.getIgnoredTrkorr();
             trm_commons_1.Logger.log(`Ignored trkorr ${JSON.stringify(aSkipTrkorr)}`, true);
             var aMigrationTrkorr;
-            var aActualTrkorr = (yield this.readTable('E071', [{ fieldName: 'TRKORR' }], `PGMID EQ '*' AND OBJECT EQ '${transport_1.COMMENT_OBJ}' AND TRKORR EQ 'RSTK906391'`)).map(o => o.trkorr);
+            var aActualTrkorr = (yield this.readTable('E071', [{ fieldName: 'TRKORR' }], `PGMID EQ '*' AND OBJECT EQ '${transport_1.COMMENT_OBJ}'`)).map(o => o.trkorr);
             aActualTrkorr = Array.from(new Set(aActualTrkorr));
             try {
                 aMigrationTrkorr = (yield this.readTable('ZTRM_E070', [{ fieldName: 'TRM_TROKRR' }])).map(o => o.trmTrokrr);

package/dist/transport/Transport.d.ts

@@ -16,7 +16,8 @@ export declare class Transport {
     private _e070;
     private _e071;
     private _docs;
-    private _trmRelevant;
+    private _trmPackageName;
+    private _trmPackageVersion;
     private _linkedTrmPackage;
     private _rootDevclass;
     trmIdentifier?: TrmTransportIdentifier;
@@ -29,6 +30,8 @@ export declare class Transport {
     getTasks(): Promise<Transport[]>;
     getDevclass(aTdevc?: TDEVC[]): Promise<DEVCLASS>;
     getDate(): Promise<Date>;
+    getTrmPackageName(): Promise<string>;
+    getTrmPackageVersion(): Promise<string>;
     isTrmRelevant(): Promise<boolean>;
     download(): Promise<{
         binaries: BinaryTransport;

package/dist/transport/Transport.js

@@ -183,16 +183,45 @@ class Transport {
             return (0, commons_1.fromAbapToDate)(e070.as4Date, e070.as4Time);
         });
     }
-    isTrmRelevant() {
+    getTrmPackageName() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._trmRelevant === undefined) {
+            if (this._trmPackageName === undefined) {
                 const e071 = yield this.getE071();
                 const trmComments = e071.filter(o => o.pgmid === '*' && o.object === exports.COMMENT_OBJ);
-                const hasName = trmComments.find(o => /name=/i.test(o.objName));
-                const hasVersion = trmComments.find(o => /version=/i.test(o.objName));
-                this._trmRelevant = (hasName && hasVersion) ? true : false;
+                trmComments.forEach(s => {
+                    if (!this._trmPackageName) {
+                        try {
+                            this._trmPackageName = /name=(\S*)/i.exec(s.objName)[1];
+                        }
+                        catch (e) { }
+                    }
+                });
+            }
+            return this._trmPackageName;
+        });
+    }
+    getTrmPackageVersion() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._trmPackageVersion === undefined) {
+                const e071 = yield this.getE071();
+                const trmComments = e071.filter(o => o.pgmid === '*' && o.object === exports.COMMENT_OBJ);
+                trmComments.forEach(s => {
+                    if (!this._trmPackageVersion) {
+                        try {
+                            this._trmPackageVersion = /version=(\S*)/i.exec(s.objName)[1];
+                        }
+                        catch (e) { }
+                    }
+                });
             }
-            return this._trmRelevant;
+            return this._trmPackageVersion;
+        });
+    }
+    isTrmRelevant() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const packageName = yield this.getTrmPackageName();
+            const packageVersion = yield this.getTrmPackageVersion();
+            return !!(packageName && packageVersion);
         });
     }
     download() {
@@ -367,31 +396,14 @@ class Transport {
     }
     release(lock, skipLog, tmpFolder, secondsTimeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            var rc;
             trm_commons_1.Logger.loading('Releasing transport...', skipLog);
             yield systemConnector_1.SystemConnector.releaseTrkorr(this.trkorr, lock, secondsTimeout);
             yield systemConnector_1.SystemConnector.dequeueTransport(this.trkorr);
             if (tmpFolder) {
-                rc = yield this.readReleaseLog(tmpFolder, secondsTimeout);
+                yield this.readReleaseLog(tmpFolder, secondsTimeout);
             }
             else {
-                rc = yield this._isInTmsQueue(skipLog, false, secondsTimeout);
-            }
-            if (!skipLog && !tmpFolder) {
-                switch (rc) {
-                    case 4:
-                        trm_commons_1.Logger.warning(`${this.trkorr} release ended with warning.`);
-                        break;
-                    case 8:
-                        trm_commons_1.Logger.error(`${this.trkorr} release ended with error.`);
-                        break;
-                    case 12:
-                        trm_commons_1.Logger.error(`${this.trkorr} release was cancelled.`);
-                        break;
-                    case 16:
-                        trm_commons_1.Logger.error(`${this.trkorr} release was cancelled.`);
-                        break;
-                }
+                yield this._isInTmsQueue(skipLog, false, secondsTimeout);
             }
         });
     }
@@ -558,7 +570,6 @@ class Transport {
             var inQueue = false;
             var rc = 12;
             if (this._trTarget) {
-                var sLog = `status unknown`;
                 var inQueueAttempts = 0;
                 while (!inQueue && (new Date()).getTime() < timeoutDate.getTime()) {
                     inQueueAttempts++;
@@ -569,14 +580,17 @@ class Transport {
                     tmsQueue = tmsQueue.filter(o => o.trkorr === this.trkorr);
                     tmsQueue = tmsQueue.sort((a, b) => parseInt(b.bufpos) - parseInt(a.bufpos));
                     if (!checkImpSing) {
-                        sLog = `released`;
                         inQueue = tmsQueue.length > 0;
                     }
                     else {
-                        sLog = `imported`;
                         if (tmsQueue.length > 0) {
                             inQueue = tmsQueue[0].impsing !== 'X';
-                            rc = parseInt(tmsQueue[0].maxrc);
+                            if (!tmsQueue[0].maxrc) {
+                                rc = -1;
+                            }
+                            else {
+                                rc = parseInt(tmsQueue[0].maxrc);
+                            }
                         }
                         else {
                             inQueue = false;
@@ -587,7 +601,10 @@ class Transport {
                     throw new Error(`${this.trkorr} not found in queue, timed out after ${inQueueAttempts + 1} attempts`);
                 }
                 else {
-                    trm_commons_1.Logger.success(`${this.trkorr} ${sLog}.`, skipLog);
+                    if (!checkImpSing) {
+                        trm_commons_1.Logger.success(`${this.trkorr} released.`, skipLog);
+                        rc = -1;
+                    }
                 }
             }
             else {
@@ -753,6 +770,12 @@ class Transport {
             const rc = yield this._isInTmsQueue(false, true, timeout);
             trm_commons_1.Logger.log(`Transport ${this.trkorr} import ended: return code ${rc}`, true);
             switch (rc) {
+                case -1:
+                    trm_commons_1.Logger.error(`${this.trkorr} import has no return code!`);
+                    break;
+                case 0:
+                    trm_commons_1.Logger.success(`${this.trkorr} import ended with success.`);
+                    break;
                 case 4:
                     trm_commons_1.Logger.warning(`${this.trkorr} import ended with warning.`);
                     break;

package/dist/trmPackage/TrmArtifact.js

@@ -84,7 +84,7 @@ class TrmArtifact {
         return this._manifest;
     }
     replaceManifest(oManifest) {
-        const manifestBuffer = Buffer.from(JSON.stringify(oManifest.get(false), null, 2), 'utf8');
+        const manifestBuffer = Buffer.from(oManifest.getJSON(), 'utf8');
         this._zip.updateFile('manifest.json', manifestBuffer);
     }
     getDistFolder() {
@@ -218,10 +218,8 @@ class TrmArtifact {
                     trm_commons_1.Logger.error(`Couldn't add source code to TRM artifact!`);
                 }
             }
-            var oManifest = data.manifest.get(false);
-            var oSapEntries = oManifest.sapEntries;
-            delete oManifest.sapEntries;
-            const manifestBuffer = Buffer.from(JSON.stringify(oManifest, null, 2), 'utf8');
+            const oSapEntries = data.manifest.get().sapEntries;
+            const manifestBuffer = Buffer.from(data.manifest.getJSON(["sapEntries"]), 'utf8');
             trm_commons_1.Logger.log(`Adding manifest.json`, true);
             artifact.addFile(`manifest.json`, manifestBuffer, `manifest`);
             if (oSapEntries && Object.keys(oSapEntries).length > 0) {

package/dist/trmPackage/TrmPackage.d.ts

@@ -2,17 +2,11 @@ import { Manifest } from "../manifest";
 import { AbstractRegistry } from "../registry";
 import { TrmArtifact } from "./TrmArtifact";
 import { DEVCLASS } from "../client";
-import { R3transOptions } from "node-r3trans";
 import { Transport } from "../transport";
-export declare const DEFAULT_VERSION: string;
 export declare class TrmPackage {
     packageName: string;
     registry: AbstractRegistry;
     manifest?: Manifest;
-    private _userAuthorizations;
-    private _canPublishReleasesCause;
-    private _remoteArtifacts;
-    private _remoteContent;
     private _devclass;
     private _wbTransport;
     constructor(packageName: string, registry: AbstractRegistry, manifest?: Manifest);
@@ -20,22 +14,12 @@ export declare class TrmPackage {
     getDevclass(): DEVCLASS;
     setWbTransport(transport: Transport): TrmPackage;
     getWbTransport(): Promise<Transport>;
-    exists(version?: string): Promise<boolean>;
-    canPublishReleases(): Promise<{
-        canPublishReleases: boolean;
-        cause?: string;
-    }>;
-    fetchRemoteArtifact(version?: string): Promise<TrmArtifact>;
-    fetchRemoteManifest(version?: string): Promise<Manifest>;
-    fetchRemoteContent(version?: string, r3transConfig?: R3transOptions): Promise<any>;
     publish(data: {
         artifact: TrmArtifact;
         readme?: string;
     }): Promise<TrmPackage>;
     compareRegistry(registry: AbstractRegistry): boolean;
     compareName(name: string): boolean;
-    private _viewLatest;
     static create(manifest: Manifest, registry: AbstractRegistry): Promise<TrmPackage>;
     static compare(o1: TrmPackage, o2: TrmPackage): boolean;
-    static normalizeVersion(packageName: string, version: string, registry: AbstractRegistry): Promise<string>;
 }

package/dist/trmPackage/TrmPackage.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 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) {
@@ -42,19 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TrmPackage = exports.DEFAULT_VERSION = void 0;
-const semver = __importStar(require("semver"));
+exports.TrmPackage = void 0;
 const trm_commons_1 = require("trm-commons");
 const manifest_1 = require("../manifest");
 const systemConnector_1 = require("../systemConnector");
-exports.DEFAULT_VERSION = "1.0.0";
 class TrmPackage {
     constructor(packageName, registry, manifest) {
         this.packageName = packageName;
         this.registry = registry;
         this.manifest = manifest;
-        this._remoteArtifacts = {};
-        this._remoteContent = {};
     }
     setDevclass(devclass) {
         this._devclass = devclass;
@@ -70,66 +33,18 @@ class TrmPackage {
     getWbTransport() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this._wbTransport === undefined) {
-                this._wbTransport = yield systemConnector_1.SystemConnector.getPackageWorkbenchTransport(this);
-            }
-            return this._wbTransport;
-        });
-    }
-    exists() {
-        return __awaiter(this, arguments, void 0, function* (version = 'latest') {
-            return (yield this.registry.packageExists(this.packageName, version));
-        });
-    }
-    canPublishReleases() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._userAuthorizations === undefined) {
-                var view;
-                try {
-                    view = yield this._viewLatest();
+                const transports = yield systemConnector_1.SystemConnector.getWbTransports(this);
+                if (transports.length === 1) {
+                    this._wbTransport = transports[0];
                 }
-                catch (e) {
-                    this._canPublishReleasesCause = e.message;
-                    if (e.response && typeof (e.response) === "object") {
-                        view = e.response;
-                    }
-                    else {
-                        throw e;
-                    }
+                else {
+                    this._wbTransport = false;
                 }
-                this._userAuthorizations = view.userAuthorizations;
-            }
-            return {
-                canPublishReleases: this._userAuthorizations.canCreateReleases,
-                cause: this._canPublishReleasesCause
-            };
-        });
-    }
-    fetchRemoteArtifact() {
-        return __awaiter(this, arguments, void 0, function* (version = 'latest') {
-            if (!this._remoteArtifacts[version]) {
-                this._remoteArtifacts[version] = yield this.registry.getArtifact(this.packageName, version);
             }
-            return this._remoteArtifacts[version];
-        });
-    }
-    fetchRemoteManifest() {
-        return __awaiter(this, arguments, void 0, function* (version = 'latest') {
-            const artifact = yield this.fetchRemoteArtifact(version);
-            this.manifest = artifact.getManifest();
-            this._remoteArtifacts[this.manifest.get().version] = this._remoteArtifacts[version];
-            return this._remoteArtifacts[version].getManifest();
-        });
-    }
-    fetchRemoteContent() {
-        return __awaiter(this, arguments, void 0, function* (version = 'latest', r3transConfig) {
-            if (!this._remoteContent[version]) {
-                const artifact = yield this.fetchRemoteArtifact(version);
-                const manifest = artifact.getManifest();
-                const actualVersion = manifest.get().version;
-                this._remoteArtifacts[version] = yield artifact.getContent(r3transConfig);
-                this._remoteArtifacts[actualVersion] = this._remoteArtifacts[version];
+            if (this._wbTransport === false) {
+                return undefined;
             }
-            return this._remoteArtifacts[version];
+            return this._wbTransport;
         });
     }
     publish(data) {
@@ -141,9 +56,8 @@ class TrmPackage {
                 throw new Error(`Cannot publish package ${packageName}: expected name is ${this.packageName}`);
             }
             const packageVersion = trmManifest.version;
-            const readme = data.readme || '';
             trm_commons_1.Logger.loading(`Publishing "${packageName}" ${packageVersion} to registry "${this.registry.name}"...`, false);
-            yield this.registry.publishArtifact(packageName, packageVersion, artifact, readme);
+            yield this.registry.publish(packageName, packageVersion, artifact, data.readme);
             this.manifest = new manifest_1.Manifest(trmManifest);
             return this;
         });
@@ -154,11 +68,6 @@ class TrmPackage {
     compareName(name) {
         return this.packageName.trim().toUpperCase() === name.trim().toUpperCase();
     }
-    _viewLatest() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.registry.view(this.packageName, 'latest'));
-        });
-    }
     static create(manifest, registry) {
         return __awaiter(this, void 0, void 0, function* () {
             return new TrmPackage(manifest.get().name, registry, manifest);
@@ -167,37 +76,5 @@ class TrmPackage {
     static compare(o1, o2) {
         return o1.compareName(o2.packageName) && o1.compareRegistry(o2.registry);
     }
-    static normalizeVersion(packageName, version, registry) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const oPackage = new TrmPackage(packageName, registry);
-            const usingLatest = version.trim().toLowerCase() === 'latest';
-            if (!usingLatest) {
-                version = semver.clean(version);
-                if (!version) {
-                    throw new Error('Version not supported.');
-                }
-            }
-            const exists = yield oPackage.exists();
-            if (!exists) {
-                if (usingLatest) {
-                    version = exports.DEFAULT_VERSION;
-                }
-            }
-            else {
-                if (!usingLatest) {
-                    const versionExists = yield oPackage.exists(version);
-                    if (versionExists) {
-                        throw new Error(`Package "${packageName}" versioned ${version} already published.`);
-                    }
-                }
-                else {
-                    const oManifest = yield oPackage.fetchRemoteManifest('latest');
-                    const latestPublishedManifest = oManifest.get();
-                    version = semver.inc(latestPublishedManifest.version, 'patch');
-                }
-            }
-            return version;
-        });
-    }
 }
 exports.TrmPackage = TrmPackage;

package/dist/validators/validatePackageVisibility.d.ts

@@ -1,2 +1,2 @@
 import { RegistryType } from "../registry";
-export declare function validatePackageVisibility(registryType: RegistryType, packageName: string, isPrivate: boolean, latestReleaseVisibility: boolean): string | true;
+export declare function validatePackageVisibility(registryType: RegistryType, isPrivate: boolean, latestReleaseVisibility: boolean): string | true;

package/dist/validators/validatePackageVisibility.js

@@ -1,29 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePackageVisibility = validatePackageVisibility;
-const commons_1 = require("../commons");
 const registry_1 = require("../registry");
-function validatePackageVisibility(registryType, packageName, isPrivate, latestReleaseVisibility) {
+function validatePackageVisibility(registryType, isPrivate, latestReleaseVisibility) {
     if (registryType === registry_1.RegistryType.PUBLIC) {
         if (latestReleaseVisibility !== undefined) {
             if (isPrivate !== latestReleaseVisibility) {
                 return `Cannot change package visibility from ${isPrivate ? 'private' : 'public'} to ${latestReleaseVisibility ? 'private' : 'public'}.`;
             }
         }
-        if (isPrivate) {
-            const packageNameParsed = (0, commons_1.parsePackageName)({
-                fullName: packageName
-            });
-            if (!packageNameParsed.organization) {
-                return `Private packages on public registry need a scope!`;
-            }
-            else {
-                return true;
-            }
-        }
-        else {
-            return true;
-        }
+        return true;
     }
     else {
         return true;