trm-core 6.4.1 → 6.5.0

package/dist/trmPackage/TrmArtifact.js

@@ -43,7 +43,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrmArtifact = void 0;
-const logger_1 = require("../logger");
+const trm_commons_1 = require("trm-commons");
 const manifest_1 = require("../manifest");
 const AdmZip = __importStar(require("adm-zip"));
 const node_r3trans_1 = require("node-r3trans");
@@ -163,16 +163,16 @@ class TrmArtifact {
     }
     static create(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.Logger.log(`Generating artifact with transports ${JSON.stringify(data.transports.map(o => o.trkorr))}`, true);
+            trm_commons_1.Logger.log(`Generating artifact with transports ${JSON.stringify(data.transports.map(o => o.trkorr))}`, true);
             const artifact = new AdmZip.default();
             data.distFolder = data.distFolder || DIST_FOLDER;
             data.srcFolder = data.srcFolder || SRC_FOLDER;
-            logger_1.Logger.log(`Adding ZIP comment`, true);
+            trm_commons_1.Logger.log(`Adding ZIP comment`, true);
             artifact.addZipComment(`TRM Package`);
             var binaries = [];
             var packedTransports = [];
             for (const transport of data.transports) {
-                logger_1.Logger.log(`Downloading transport ${transport.trmIdentifier}`, true);
+                trm_commons_1.Logger.log(`Downloading transport ${transport.trmIdentifier}`, true);
                 const trBinary = yield transport.download();
                 binaries.push({
                     trkorr: transport.trkorr,
@@ -183,7 +183,7 @@ class TrmArtifact {
             }
             for (const bin of binaries) {
                 const packedTransport = new AdmZip.default();
-                logger_1.Logger.log(`Packing header and data in single file`, true);
+                trm_commons_1.Logger.log(`Packing header and data in single file`, true);
                 packedTransport.addZipComment(`Transport request: ${bin.trkorr}\nContent type: ${bin.type || 'Unknown'}`);
                 packedTransport.addFile(bin.filenames.header, bin.binaries.header, "header");
                 packedTransport.addFile(bin.filenames.data, bin.binaries.data, "data");
@@ -194,12 +194,12 @@ class TrmArtifact {
                 });
             }
             for (const file of packedTransports) {
-                logger_1.Logger.log(`Adding packed transport ${file.comment} to artifact`, true);
+                trm_commons_1.Logger.log(`Adding packed transport ${file.comment} to artifact`, true);
                 artifact.addFile(`${data.distFolder}/${file.filename}`, file.binary, file.comment);
             }
             data.manifest.setDistFolder(data.distFolder);
             if (data.sourceCode) {
-                logger_1.Logger.log(`Adding source code`, true);
+                trm_commons_1.Logger.log(`Adding source code`, true);
                 try {
                     if (data.srcFolder === data.distFolder) {
                         throw new Error(`Source code folder and build folder are identical.`);
@@ -211,19 +211,19 @@ class TrmArtifact {
                     data.manifest.setSrcFolder(data.srcFolder);
                 }
                 catch (e) {
-                    logger_1.Logger.error(e.toString(), true);
-                    logger_1.Logger.error(`Couldn't add source code to TRM artifact!`);
+                    trm_commons_1.Logger.error(e.toString(), true);
+                    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');
-            logger_1.Logger.log(`Adding manifest.json`, true);
+            trm_commons_1.Logger.log(`Adding manifest.json`, true);
             artifact.addFile(`manifest.json`, manifestBuffer, `manifest`);
             if (oSapEntries && Object.keys(oSapEntries).length > 0) {
                 const sapEntriesBuffer = Buffer.from(JSON.stringify(oSapEntries, null, 2), 'utf8');
-                logger_1.Logger.log(`Adding sap_entries.json`, true);
+                trm_commons_1.Logger.log(`Adding sap_entries.json`, true);
                 artifact.addFile(`sap_entries.json`, sapEntriesBuffer, `sap_entries`);
             }
             return new TrmArtifact(artifact.toBuffer(), data.distFolder, data.srcFolder, data.manifest);

package/dist/trmPackage/TrmPackage.js

@@ -44,7 +44,7 @@ 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"));
-const logger_1 = require("../logger");
+const trm_commons_1 = require("trm-commons");
 const manifest_1 = require("../manifest");
 exports.DEFAULT_VERSION = "1.0.0";
 class TrmPackage {
@@ -129,7 +129,7 @@ class TrmPackage {
             }
             const packageVersion = trmManifest.version;
             const readme = data.readme || '';
-            logger_1.Logger.loading(`Publishing "${packageName}" ${packageVersion} to registry "${this.registry.name}"...`, false);
+            trm_commons_1.Logger.loading(`Publishing "${packageName}" ${packageVersion} to registry "${this.registry.name}"...`, false);
             yield this.registry.publishArtifact(packageName, packageVersion, artifact, readme);
             this.manifest = new manifest_1.Manifest(trmManifest);
             return this;

package/dist/{inquirer/validators → validators}/validateDevclass.d.ts

@@ -1,2 +1,2 @@
-import { DEVCLASS } from "../../client";
+import { DEVCLASS } from "../client";
 export declare function validateDevclass(devclass: DEVCLASS, allowTemporaryPackages?: boolean): Promise<string | true>;

package/dist/{inquirer/validators → validators}/validateDevclass.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateDevclass = validateDevclass;
-const systemConnector_1 = require("../../systemConnector");
+const systemConnector_1 = require("../systemConnector");
 function validateDevclass(devclass, allowTemporaryPackages) {
     return __awaiter(this, void 0, void 0, function* () {
         if (devclass) {

package/dist/{inquirer/validators → validators}/validatePackageVisibility.d.ts

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

package/dist/{inquirer/validators → validators}/validatePackageVisibility.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePackageVisibility = validatePackageVisibility;
-const commons_1 = require("../../commons");
-const registry_1 = require("../../registry");
+const commons_1 = require("../commons");
+const registry_1 = require("../registry");
 function validatePackageVisibility(registryType, packageName, isPrivate, latestReleaseVisibility) {
     if (registryType === registry_1.RegistryType.PUBLIC) {
         if (latestReleaseVisibility !== undefined) {

package/dist/{inquirer/validators → validators}/validateTransportTarget.d.ts

@@ -1,2 +1,2 @@
-import { TR_TARGET, TMSCSYS } from "../../client";
+import { TMSCSYS, TR_TARGET } from "../client";
 export declare function validateTransportTarget(target: TR_TARGET, systemTmscsys: TMSCSYS[]): Promise<string | true>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-core",
-  "version": "6.4.1",
+  "version": "6.5.0",
   "description": "TRM (Transport Request Manager) Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,23 +45,21 @@
     "axios": "^1.7.9",
     "chalk": "^4.1.2",
     "cli-progress": "^3.12.0",
-    "cli-table3": "^0.6.3",
     "dotenv": "^16.3.1",
     "email-validator": "^2.0.4",
     "express": "^4.18.2",
     "get-root-path": "^3.0.1",
     "get-stack-trace": "^3.1.1",
-    "loading-cli": "^1.1.0",
     "lodash": "^4.17.21",
     "node-r3trans": "^1.5.0",
     "object-keys-normalizer": "^1.0.1",
     "opener": "^1.5.2",
     "parse-multipart-data": "^1.5.0",
-    "print-tree": "^0.1.5",
     "protocol-registry": "^1.4.0",
     "semver": "^7.5.4",
     "semver-sort": "^1.0.0",
     "spdx-license-ids": "^3.0.13",
+    "trm-commons": "^1.0.0",
     "trm-registry-types": "^1.1.1",
     "uuid": "^9.0.1",
     "xml-beautify": "^1.2.3",

package/dist/inquirer/CliInquirer.d.ts

@@ -1,10 +0,0 @@
-import { Question } from "./Question";
-import { IInquirer } from "./IInquirer";
-export declare class CliInquirer implements IInquirer {
-    private _prefix;
-    constructor();
-    prompt(arg1: Question | Question[]): Promise<any>;
-    setPrefix(text: string): void;
-    removePrefix(): void;
-    getPrefix(): string;
-}

package/dist/inquirer/CliInquirer.js

@@ -1,103 +0,0 @@
-"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) {
-        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.CliInquirer = void 0;
-const logger_1 = require("../logger");
-const cliInquirer = __importStar(require("@inquirer/prompts"));
-class CliInquirer {
-    constructor() {
-        this._prefix = '';
-    }
-    prompt(arg1) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (logger_1.Logger.logger instanceof logger_1.CliLogger || logger_1.Logger.logger instanceof logger_1.CliLogFileLogger) {
-                logger_1.Logger.logger.forceStop();
-            }
-            var aQuestions;
-            var hash = {};
-            if (!Array.isArray(arg1)) {
-                aQuestions = [arg1];
-            }
-            else {
-                aQuestions = arg1;
-            }
-            for (var question of aQuestions) {
-                if (question.type === 'list') {
-                    question.type = 'select';
-                }
-                if (cliInquirer[question.type]) {
-                    var prompt;
-                    if (question.when === undefined) {
-                        prompt = true;
-                    }
-                    else if (typeof (question.when) === 'boolean') {
-                        prompt = question.when;
-                    }
-                    else {
-                        prompt = yield question.when(hash);
-                    }
-                    if (prompt) {
-                        question.message = this._prefix + question.message;
-                        const oResponse = yield cliInquirer[question.type](question);
-                        hash[question.name] = oResponse;
-                    }
-                }
-                else {
-                    throw new Error(`Unknown CLI inquirer type "${question.type}".`);
-                }
-            }
-            return hash;
-        });
-    }
-    setPrefix(text) {
-        this._prefix = text;
-    }
-    removePrefix() {
-        this._prefix = '';
-    }
-    getPrefix() {
-        return this._prefix;
-    }
-}
-exports.CliInquirer = CliInquirer;

package/dist/inquirer/IInquirer.d.ts

@@ -1,7 +0,0 @@
-import { Question } from "./Question";
-export interface IInquirer {
-    prompt: (arg1: Question | Question[]) => Promise<any>;
-    setPrefix: (text: string) => void;
-    removePrefix: () => void;
-    getPrefix: () => string;
-}

package/dist/inquirer/IInquirer.js

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

package/dist/inquirer/Inquirer.d.ts

@@ -1,9 +0,0 @@
-import { IInquirer } from "./IInquirer";
-import { Question } from "./Question";
-export declare namespace Inquirer {
-    var inquirer: IInquirer;
-    function prompt(arg1: Question | Question[]): Promise<any>;
-    function setPrefix(text: string): void;
-    function removePrefix(): void;
-    function getPrefix(): string;
-}

package/dist/inquirer/Inquirer.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Inquirer = void 0;
-var Inquirer;
-(function (Inquirer) {
-    function checkInquirer() {
-        if (!Inquirer.inquirer) {
-            throw new Error('Inquirer not initialized.');
-        }
-    }
-    function prompt(arg1) {
-        checkInquirer();
-        return Inquirer.inquirer.prompt(arg1);
-    }
-    Inquirer.prompt = prompt;
-    function setPrefix(text) {
-        checkInquirer();
-        return Inquirer.inquirer.setPrefix(text);
-    }
-    Inquirer.setPrefix = setPrefix;
-    function removePrefix() {
-        checkInquirer();
-        return Inquirer.inquirer.removePrefix();
-    }
-    Inquirer.removePrefix = removePrefix;
-    function getPrefix() {
-        checkInquirer();
-        return Inquirer.inquirer.getPrefix();
-    }
-    Inquirer.getPrefix = getPrefix;
-})(Inquirer || (exports.Inquirer = Inquirer = {}));

package/dist/inquirer/Question.d.ts

@@ -1,12 +0,0 @@
-export type Question = {
-    type: any;
-    message: any;
-    name: any;
-    default?: any;
-    validate?: any;
-    choices?: any[];
-    when?: any;
-    pageSize?: number;
-    expanded?: boolean;
-    postfix?: string;
-};

package/dist/inquirer/Question.js

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

package/dist/inquirer/index.d.ts

@@ -1,5 +0,0 @@
-export * from "./CliInquirer";
-export * from "./Question";
-export * from "./validators";
-export * from "./Inquirer";
-export * from "./IInquirer";

package/dist/inquirer/index.js

@@ -1,21 +0,0 @@
-"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./CliInquirer"), exports);
-__exportStar(require("./Question"), exports);
-__exportStar(require("./validators"), exports);
-__exportStar(require("./Inquirer"), exports);
-__exportStar(require("./IInquirer"), exports);

package/dist/logger/CliLogFileLogger.d.ts

@@ -1,25 +0,0 @@
-import { ResponseMessage } from "trm-registry-types";
-import { CliLogger } from "./CliLogger";
-import { TreeLog } from "./TreeLog";
-export declare class CliLogFileLogger extends CliLogger {
-    private _dir;
-    private _filePath;
-    private _sessionId;
-    constructor(_dir: string, debug?: boolean);
-    getSessionId(): string;
-    private _getStackTrace;
-    private _getDebugString;
-    private _append;
-    endLog(): void;
-    getFilePath(): string;
-    loading(text: string, debug?: boolean): void;
-    success(text: string, debug?: boolean): void;
-    error(text: string, debug?: boolean): void;
-    warning(text: string, debug?: boolean): void;
-    info(text: string, debug?: boolean): void;
-    log(text: string, debug?: boolean): void;
-    table(header: string[], data: string[][], debug?: boolean): void;
-    registryResponse(response: ResponseMessage, debug?: boolean): void;
-    tree(data: TreeLog, debug?: boolean): void;
-    forceStop(): void;
-}

package/dist/logger/CliLogFileLogger.js

@@ -1,92 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CliLogFileLogger = void 0;
-const CliLogger_1 = require("./CliLogger");
-const fs_1 = require("fs");
-const uuid_1 = require("uuid");
-const path_1 = require("path");
-const get_stack_trace_1 = require("get-stack-trace");
-class CliLogFileLogger extends CliLogger_1.CliLogger {
-    constructor(_dir, debug) {
-        super(debug);
-        this._dir = _dir;
-        if (!(0, fs_1.existsSync)(this._dir)) {
-            (0, fs_1.mkdirSync)(this._dir, {
-                recursive: true
-            });
-        }
-        this._sessionId = (0, uuid_1.v4)();
-        this._filePath = (0, path_1.join)(this._dir, `${this._sessionId}.txt`);
-        (0, fs_1.writeFileSync)(this.getFilePath(), `*** STARTING LOG SESSION ID ${this._sessionId}, ${new Date().toISOString()} ***`);
-    }
-    getSessionId() {
-        return this._sessionId;
-    }
-    _getStackTrace() {
-        var sStackTrace;
-        try {
-            const aStackTrace = (0, get_stack_trace_1.getStackTrace)();
-            const oStackTrace = aStackTrace[5];
-            const moduleName = /(trm-[^\\\/]*)(?:\\{1,2}|\/{1,2})dist/gmi.exec(oStackTrace.fileName)[1];
-            sStackTrace = `[${moduleName}] ${oStackTrace.functionName} ${oStackTrace.lineNumber},${oStackTrace.columnNumber}`;
-        }
-        catch (e) {
-            sStackTrace = ``;
-        }
-        return sStackTrace;
-    }
-    _getDebugString(text, type) {
-        const sStackTrace = this._getStackTrace();
-        return `${type} ${new Date().toISOString()} ${sStackTrace}   ${text}`;
-    }
-    _append(text, type) {
-        (0, fs_1.appendFileSync)(this.getFilePath(), `\n${this._getDebugString(text, type)}`);
-    }
-    endLog() {
-        (0, fs_1.appendFileSync)(this.getFilePath(), `\n*** ENDING LOG SESSION ID ${this._sessionId}, ${new Date().toISOString()} ***`);
-    }
-    getFilePath() {
-        return this._filePath;
-    }
-    loading(text, debug) {
-        this._append(text, 'WAIT');
-        super.loading(text, debug);
-    }
-    success(text, debug) {
-        this._append(text, 'OK  ');
-        super.success(text, debug);
-    }
-    error(text, debug) {
-        this._append(text, 'ERR ');
-        super.error(text, debug);
-    }
-    warning(text, debug) {
-        this._append(text, 'WARN');
-        super.warning(text, debug);
-    }
-    info(text, debug) {
-        this._append(text, 'INFO');
-        super.info(text, debug);
-    }
-    log(text, debug) {
-        this._append(text, 'LOG ');
-        super.log(text, debug);
-    }
-    table(header, data, debug) {
-        this._append(`${JSON.stringify(header)}${JSON.stringify(data)}`, 'TABL');
-        super.table(header, data, debug);
-    }
-    registryResponse(response, debug) {
-        this._append(`${JSON.stringify(response)}`, 'REG ');
-        super.registryResponse(response, debug);
-    }
-    tree(data, debug) {
-        this._append(`${JSON.stringify(data)}`, 'TREE');
-        super.tree(data, debug);
-    }
-    forceStop() {
-        this.log(`Forcing loader stop.`, true);
-        super.forceStop();
-    }
-}
-exports.CliLogFileLogger = CliLogFileLogger;

package/dist/logger/CliLogger.d.ts

@@ -1,25 +0,0 @@
-import { ResponseMessage } from "trm-registry-types";
-import { ILogger } from "./ILogger";
-import { TreeLog } from "./TreeLog";
-export declare class CliLogger implements ILogger {
-    debug: boolean;
-    private _cliObj;
-    private _loader;
-    private _prefix;
-    constructor(debug: boolean);
-    loading(text: string, debug?: boolean): void;
-    success(text: string, debug?: boolean): void;
-    error(text: string, debug?: boolean): void;
-    warning(text: string, debug?: boolean): void;
-    info(text: string, debug?: boolean): void;
-    log(text: string, debug?: boolean): void;
-    table(header: string[], data: string[][], debug?: boolean): void;
-    registryResponse(response: ResponseMessage, debug?: boolean): void;
-    tree(data: TreeLog, debug?: boolean): void;
-    forceStop(): void;
-    private _clearLoader;
-    setPrefix(text: string): void;
-    removePrefix(): void;
-    getPrefix(): string;
-    msgty(msgty: string, text: string, debug?: boolean): void;
-}