trm-core 2.2.3 → 3.0.0

package/dist/logger/Logger.js

@@ -1,199 +1,58 @@
 "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 (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = void 0;
-const commons_1 = require("../commons");
-const loading_cli_1 = __importDefault(require("loading-cli"));
-const cliTable = __importStar(require("cli-table3"));
-const TraceLevel_1 = require("./TraceLevel");
-const trm_registry_types_1 = require("trm-registry-types");
-class Logger {
-    constructor(coreEnv, traceLevel) {
-        this.coreEnv = coreEnv;
-        this.traceLevel = traceLevel;
-        if (this.coreEnv === commons_1.CoreEnv.CLI) {
-            this.cliObj = (0, loading_cli_1.default)({
-                frames: ["⊶", "⊷"],
-                interval: 1000
-            });
-        }
-    }
-    loading(text) {
-        if (this.coreEnv === commons_1.CoreEnv.CLI) {
-            this.loader = this.cliObj.render().start(text);
-        }
-        if (this.coreEnv === commons_1.CoreEnv.JSON) {
-            const log = {
-                type: "loading",
-                text
-            };
-            console.log(JSON.stringify(log));
-        }
-    }
-    success(text) {
-        const aText = text.split('\n');
-        aText.forEach(s => {
-            if (this.coreEnv === commons_1.CoreEnv.CLI) {
-                if (this.loader) {
-                    this.loader.succeed(s);
-                    this.loader = null;
-                }
-                else {
-                    this.cliObj.succeed(s);
-                }
-            }
-            if (this.coreEnv === commons_1.CoreEnv.JSON) {
-                const log = {
-                    type: "success",
-                    text: s
-                };
-                console.log(JSON.stringify(log));
-            }
-        });
-    }
-    error(text) {
-        const aText = text.split('\n');
-        aText.forEach(s => {
-            if (this.coreEnv === commons_1.CoreEnv.CLI) {
-                if (this.loader) {
-                    this.loader.fail(s);
-                    this.loader = null;
-                }
-                else {
-                    this.cliObj.fail(s);
-                }
-            }
-            if (this.coreEnv === commons_1.CoreEnv.JSON) {
-                const log = {
-                    type: "error",
-                    text: s
-                };
-                console.log(JSON.stringify(log));
-            }
-        });
-    }
-    warning(text) {
-        const aText = text.split('\n');
-        aText.forEach(s => {
-            if (this.coreEnv === commons_1.CoreEnv.CLI) {
-                if (this.loader) {
-                    this.loader.warn(s);
-                    this.loader = null;
-                }
-                else {
-                    this.cliObj.warn(s);
-                }
-            }
-            if (this.coreEnv === commons_1.CoreEnv.JSON) {
-                const log = {
-                    type: "warning",
-                    text: s
-                };
-                console.log(JSON.stringify(log));
-            }
-        });
-    }
-    info(text) {
-        const aText = text.split('\n');
-        aText.forEach(s => {
-            if (this.coreEnv === commons_1.CoreEnv.CLI) {
-                if (this.loader) {
-                    this.loader.info(s);
-                    this.loader = null;
-                }
-                else {
-                    this.cliObj.info(s);
-                }
-            }
-            if (this.coreEnv === commons_1.CoreEnv.JSON) {
-                const log = {
-                    type: "info",
-                    text: s
-                };
-                console.log(JSON.stringify(log));
-            }
-        });
-    }
-    log(text) {
-        const aText = text.split('\n');
-        aText.forEach(s => {
-            if (this.coreEnv === commons_1.CoreEnv.CLI) {
-                if (this.loader) {
-                    this.cliObj.stop();
-                }
-                console.log(s);
-            }
-            if (this.coreEnv === commons_1.CoreEnv.JSON) {
-                const log = {
-                    type: "log",
-                    text: s
-                };
-                console.log(JSON.stringify(log));
-            }
-        });
-    }
-    table(header, data) {
-        if (this.coreEnv === commons_1.CoreEnv.CLI) {
-            var table = new cliTable.default({
-                head: header,
-            });
-            data.forEach(arr => {
-                table.push(arr);
-            });
-            console.log(table.toString());
-        }
-        if (this.coreEnv === commons_1.CoreEnv.JSON) {
-            const log = {
-                type: "error",
-                text: JSON.stringify({ header, data })
-            };
-            console.log(JSON.stringify(log));
-        }
-    }
-    registryResponse(response) {
-        if (response.type === trm_registry_types_1.MessageType.ERROR) {
-            this.error(response.text);
-        }
-        if (response.type === trm_registry_types_1.MessageType.INFO) {
-            this.info(response.text);
-        }
-        if (response.type === trm_registry_types_1.MessageType.WARNING) {
-            this.warning(response.text);
-        }
-    }
-    forceStop() {
-        try {
-            this.cliObj.stop();
-        }
-        catch (e) { }
-    }
-    static getDummy() {
-        return new Logger(commons_1.CoreEnv.DUMMY, TraceLevel_1.TraceLevel.TRACE_ALL);
-    }
-}
-exports.Logger = Logger;
+const DummyLogger_1 = require("./DummyLogger");
+var Logger;
+(function (Logger) {
+    Logger.logger = new DummyLogger_1.DummyLogger();
+    function checkLogger() {
+        if (!Logger.logger) {
+            throw new Error('Logger not initialized.');
+        }
+    }
+    function loading(text, debug) {
+        checkLogger();
+        return Logger.logger.loading(text, debug);
+    }
+    Logger.loading = loading;
+    function success(text, debug) {
+        checkLogger();
+        return Logger.logger.success(text, debug);
+    }
+    Logger.success = success;
+    function error(text, debug) {
+        checkLogger();
+        return Logger.logger.error(text, debug);
+    }
+    Logger.error = error;
+    function warning(text, debug) {
+        checkLogger();
+        return Logger.logger.warning(text, debug);
+    }
+    Logger.warning = warning;
+    function info(text, debug) {
+        checkLogger();
+        return Logger.logger.info(text, debug);
+    }
+    Logger.info = info;
+    function log(text, debug) {
+        checkLogger();
+        return Logger.logger.log(text, debug);
+    }
+    Logger.log = log;
+    function table(header, data, debug) {
+        checkLogger();
+        return Logger.logger.table(header, data, debug);
+    }
+    Logger.table = table;
+    function registryResponse(response, debug) {
+        checkLogger();
+        return Logger.logger.registryResponse(response, debug);
+    }
+    Logger.registryResponse = registryResponse;
+    function tree(data, debug) {
+        checkLogger();
+        return Logger.logger.tree(data, debug);
+    }
+    Logger.tree = tree;
+})(Logger || (exports.Logger = Logger = {}));

package/dist/logger/TreeLog.d.ts

@@ -0,0 +1,4 @@
+export type TreeLog = {
+    text: string;
+    children?: TreeLog[];
+};

package/dist/logger/TreeLog.js

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

package/dist/logger/index.d.ts

@@ -1,3 +1,8 @@
-export * from "./Logger";
+export * from "./CliLogger";
+export * from "./ILogger";
 export * from "./JSONLog";
-export * from "./TraceLevel";
+export * from "./TreeLog";
+export * from "./Logger";
+export * from "./CliLogFileLogger";
+export * from "./DummyLogger";
+export * from "./ConsoleLogger";

package/dist/logger/index.js

@@ -14,6 +14,11 @@ 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("./Logger"), exports);
+__exportStar(require("./CliLogger"), exports);
+__exportStar(require("./ILogger"), exports);
 __exportStar(require("./JSONLog"), exports);
-__exportStar(require("./TraceLevel"), exports);
+__exportStar(require("./TreeLog"), exports);
+__exportStar(require("./Logger"), exports);
+__exportStar(require("./CliLogFileLogger"), exports);
+__exportStar(require("./DummyLogger"), exports);
+__exportStar(require("./ConsoleLogger"), exports);

package/dist/manifest/Manifest.d.ts

@@ -14,6 +14,7 @@ export declare class Manifest {
     getPackage(): TrmPackage;
     static normalize(manifest: TrmManifest, keepRuntimeValues: boolean): TrmManifest;
     static fromAbapXml(sXml: string): Manifest;
+    static _parseAbapXmlSapEntriesArray(input: any): any[];
     static fromJson(sJson: string): Manifest;
     static compare(o1: Manifest, o2: Manifest, checkVersion?: boolean): boolean;
 }

package/dist/manifest/Manifest.js

@@ -36,8 +36,9 @@ const normalize_url_1 = __importDefault(require("@esm2cjs/normalize-url"));
 const email_validator_1 = require("email-validator");
 const SpdxLicenseIds = __importStar(require("spdx-license-ids/index.json"));
 const xmldom_1 = require("xmldom");
-const _ = __importStar(require("lodash"));
+const lodash_1 = __importDefault(require("lodash"));
 const xml_beautify_1 = __importDefault(require("xml-beautify"));
+const logger_1 = require("../logger");
 function getManifestAuthor(sAuthor) {
     var author = {};
     const emailRegex = new RegExp("<([^>]*)>");
@@ -239,7 +240,7 @@ class Manifest {
         return new trmPackage_1.TrmPackage(manifest.name, registry, this);
     }
     static normalize(manifest, keepRuntimeValues) {
-        var manifestClone = _.cloneDeep(manifest);
+        var manifestClone = lodash_1.default.cloneDeep(manifest);
         if (!keepRuntimeValues) {
             delete manifestClone.linkedTransport;
             delete manifestClone.registry;
@@ -409,12 +410,13 @@ class Manifest {
         return manifestClone;
     }
     static fromAbapXml(sXml) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         var manifest;
         const oAbapXml = xml.xml2js(sXml, { compact: true });
         var oAbapManifest;
+        var sapEntries;
         try {
-            oAbapManifest = (0, commons_1.normalize)(oAbapXml['asx:abap']['asx:values']['TRM_MANIFEST']);
+            oAbapManifest = (0, commons_1.normalize)(lodash_1.default.cloneDeep(oAbapXml)['asx:abap']['asx:values']['TRM_MANIFEST']);
             manifest = {
                 name: oAbapManifest.name.text,
                 version: oAbapManifest.version.text,
@@ -426,6 +428,13 @@ class Manifest {
         catch (e) {
             throw new Error('XML Manifest is corrupted.');
         }
+        try {
+            sapEntries = oAbapXml['asx:abap']['asx:values']['TRM_MANIFEST']['SAP_ENTRIES'];
+        }
+        catch (e) {
+            logger_1.Logger.error(e.toString(), true);
+            logger_1.Logger.error(`Couldn't parse sapEntries in abap xml manifest`, true);
+        }
         if (oAbapManifest.description && oAbapManifest.description.text) {
             manifest.description = oAbapManifest.description.text;
         }
@@ -472,8 +481,72 @@ class Manifest {
                     }];
             }
         }
+        if (oAbapManifest.dependencies && oAbapManifest.dependencies.item) {
+            if (Array.isArray(oAbapManifest.dependencies.item)) {
+                manifest.dependencies = oAbapManifest.dependencies.item.map(o => {
+                    var _a, _b, _c, _d;
+                    return {
+                        name: (_a = o.name) === null || _a === void 0 ? void 0 : _a.text,
+                        integrity: (_b = o.integrity) === null || _b === void 0 ? void 0 : _b.text,
+                        version: (_c = o.version) === null || _c === void 0 ? void 0 : _c.text,
+                        registry: (_d = o.registry) === null || _d === void 0 ? void 0 : _d.text
+                    };
+                });
+            }
+            else {
+                manifest.dependencies = [{
+                        name: (_c = oAbapManifest.dependencies.item.name) === null || _c === void 0 ? void 0 : _c.text,
+                        integrity: (_d = oAbapManifest.dependencies.item.integrity) === null || _d === void 0 ? void 0 : _d.text,
+                        version: (_e = oAbapManifest.dependencies.item.version) === null || _e === void 0 ? void 0 : _e.text,
+                        registry: (_f = oAbapManifest.dependencies.item.registry) === null || _f === void 0 ? void 0 : _f.text
+                    }];
+            }
+        }
+        if (sapEntries && sapEntries.item) {
+            manifest.sapEntries = {};
+            try {
+                const aParsedXml = this._parseAbapXmlSapEntriesArray(sapEntries.item);
+                aParsedXml.forEach(o => {
+                    manifest.sapEntries[o.TABLE] = [];
+                    o.ENTRIES.forEach(e => {
+                        var parsedEntry = {};
+                        Object.keys(e).forEach(field => {
+                            var parsedField = field.toUpperCase();
+                            parsedEntry[parsedField] = e[field];
+                        });
+                        if (Object.keys(parsedEntry).length > 0) {
+                            manifest.sapEntries[o.TABLE].push(parsedEntry);
+                        }
+                    });
+                });
+            }
+            catch (e) { }
+        }
         return new Manifest(Manifest.normalize(manifest, false));
     }
+    static _parseAbapXmlSapEntriesArray(input) {
+        var array = [];
+        if (Array.isArray(input)) {
+            input.forEach(o => {
+                array = array.concat(this._parseAbapXmlSapEntriesArray(o));
+            });
+        }
+        else {
+            var obj = {};
+            Object.keys(input).forEach(k => {
+                if (input[k]._text) {
+                    obj[k] = input[k]._text;
+                }
+                else {
+                    if (input[k].item) {
+                        obj[k] = this._parseAbapXmlSapEntriesArray(input[k].item);
+                    }
+                }
+            });
+            array.push(obj);
+        }
+        return array;
+    }
     static fromJson(sJson) {
         return new Manifest(Manifest.normalize(JSON.parse(sJson), false));
     }

package/dist/registry/Registry.d.ts

@@ -1,8 +1,6 @@
 import { RegistryType } from "./RegistryType";
 import { Ping, Release, View, WhoAmI } from "trm-registry-types";
 import { TrmArtifact } from "../trmPackage/TrmArtifact";
-import { Inquirer } from "../inquirer";
-import { Logger } from "../logger";
 export declare class Registry {
     endpoint: string;
     name: string;
@@ -12,8 +10,9 @@ export declare class Registry {
     private _ping;
     private _whoami;
     constructor(endpoint: string, name?: string);
+    private _getAxiosInstance;
     getRegistryType(): RegistryType;
-    authenticate(inquirer: Inquirer, logger: Logger, defaultData?: any): Promise<Registry>;
+    authenticate(defaultData?: any): Promise<Registry>;
     private _basicAuth;
     private _tokenAuth;
     private _oauth2;