trm-client 9.4.1 → 10.0.1

package/dist/command/metadata/helpers.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.argument = argument;
+exports.option = option;
+function argument(position, args) {
+    var _a, _b;
+    return {
+        kind: "argument",
+        position,
+        name: args.name,
+        cliName: args.cliName,
+        label: args.label,
+        description: args.description,
+        required: (_a = args.required) !== null && _a !== void 0 ? _a : true,
+        control: (_b = args.control) !== null && _b !== void 0 ? _b : "text-input",
+        pickerType: args.pickerType,
+        defaultValue: args.defaultValue,
+        choices: args.choices,
+        placeholder: args.placeholder,
+        multiple: args.multiple,
+        sensitive: args.sensitive,
+        guiRelevant: args.guiRelevant
+    };
+}
+function option(flags, args) {
+    var _a, _b;
+    return {
+        kind: "option",
+        flags,
+        negated: args.negated,
+        name: args.name,
+        cliName: args.cliName,
+        label: args.label,
+        description: args.description,
+        required: (_a = args.required) !== null && _a !== void 0 ? _a : false,
+        control: (_b = args.control) !== null && _b !== void 0 ? _b : "text-input",
+        pickerType: args.pickerType,
+        defaultValue: args.defaultValue,
+        choices: args.choices,
+        placeholder: args.placeholder,
+        multiple: args.multiple,
+        sensitive: args.sensitive,
+        guiRelevant: args.guiRelevant
+    };
+}

package/dist/command/metadata/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./CommandMetadata";
+export * from "./applyCommandMetadata";
+export * from "./helpers";

package/dist/command/metadata/index.js

@@ -0,0 +1,19 @@
+"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("./CommandMetadata"), exports);
+__exportStar(require("./applyCommandMetadata"), exports);
+__exportStar(require("./helpers"), exports);

package/dist/command/runCommandHandler.d.ts

@@ -0,0 +1,2 @@
+export type CommandHandlerValues = Record<string, unknown>;
+export declare function runCommandHandler(id: string, values?: CommandHandlerValues): Promise<void>;

package/dist/command/runCommandHandler.js

@@ -0,0 +1,24 @@
+"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.runCommandHandler = runCommandHandler;
+const implementations_1 = require("./implementations");
+function runCommandHandler(id_1) {
+    return __awaiter(this, arguments, void 0, function* (id, values = {}) {
+        const commandClass = (0, implementations_1.getCommand)(id);
+        const metadata = (0, implementations_1.getCommandMetadata)(id);
+        if (!commandClass || !metadata) {
+            throw new Error(`Unknown command metadata id "${id}".`);
+        }
+        const command = new commandClass(metadata.command, metadata.aliases, metadata.subcommand);
+        yield command.run(values);
+    });
+}

package/dist/utils/GlobalContext.d.ts

@@ -7,7 +7,6 @@ export declare class GlobalContext {
     private _cache;
     private _connections;
     private _plugins;
-    private _dockerized;
     constructor();
     getSettings(): SettingsData;
     getGlobalNodeModules(): string;
@@ -26,6 +25,9 @@ export declare class GlobalContext {
     private getSettingsInternal;
     clearCache(): void;
     private getCacheInternal;
+    private isCacheData;
+    private isCacheEntryValid;
+    private isStringCacheEntryValid;
     private generateSettingsFile;
     private generateCacheFile;
     static getInstance(): GlobalContext;

package/dist/utils/GlobalContext.js

@@ -52,6 +52,7 @@ const fs = __importStar(require("fs"));
 const ini = __importStar(require("ini"));
 const trm_commons_1 = require("trm-commons");
 const trm_core_1 = require("trm-core");
+const registryAlias_1 = require("../registryAlias");
 const CACHE_FILE_NAME = ".cache";
 const SETTINGS_FILE_NAME = "settings.ini";
 class RESTConnectExtended extends trm_commons_1.RESTConnect {
@@ -71,7 +72,6 @@ class GlobalContext {
         this._pluginsLoaded = false;
         this._connections = [];
         this._plugins = [];
-        this._dockerized = process.env.TRM_DOCKERIZED === 'true';
         this._settings = this.getSettingsInternal();
         this._cache = this.getCacheInternal();
         if (typeof (this._settings.r3transDocker) !== 'boolean') {
@@ -85,19 +85,22 @@ class GlobalContext {
         return this._settings;
     }
     getGlobalNodeModules() {
-        if (!this._cache.globalNpmPath) {
+        if (!this.isStringCacheEntryValid(this._cache.globalNpmPath, this.getSettings().npmGlobalPathCheckCache)) {
             this.setGlobalNpmPathInternal();
         }
         return this._cache.globalNpmPath.data;
     }
     getLatestVersion() {
+        if (!this.isStringCacheEntryValid(this._cache.latestVersion)) {
+            throw new Error(`Client latest version cache is not loaded.`);
+        }
         return this._cache.latestVersion.data;
     }
     load() {
         return __awaiter(this, void 0, void 0, function* () {
             this.setGlobalNpmPathInternal();
             const latestVersionCache = this._cache.latestVersion;
-            if (!latestVersionCache || (latestVersionCache.ts && Date.now() - latestVersionCache.ts > this.getSettings().cliUpdateCheckCache * 1000)) {
+            if (!this.isStringCacheEntryValid(latestVersionCache, this.getSettings().cliUpdateCheckCache)) {
                 trm_commons_1.Logger.loading(`Cache expired, setting client latest version...`, true);
                 const version = (yield (0, _1.getNpmPackageLatestVersion)('trm-client')).latest;
                 trm_commons_1.Logger.log(`Client latest version set to ${version}`, true);
@@ -164,29 +167,22 @@ class GlobalContext {
         if (!sapLandscape || !fs.existsSync(sapLandscape)) {
             sapLandscape = undefined;
         }
+        const registryAliases = registryAlias_1.RegistryAlias.getAll();
         return {
             loggerType: 'CLI',
             logOutputFolder: 'default',
             cliUpdateCheckCache: 60,
             npmGlobalPathCheckCache: 180,
+            guiRegistryAutoconnect: registryAliases.length === 1,
+            guiRegistryAutoconnectAlias: registryAliases.length === 1 ? registryAliases[0].alias : undefined,
+            guiSystemAutoconnect: false,
             sapLandscape
         };
     }
     setGlobalNpmPathInternal() {
         var path;
-        if (this._dockerized) {
-            trm_commons_1.Logger.log(`TRM running in docker environment, ignoring cache and recalculating NPM global path`, true);
-            path = (0, trm_commons_1.getGlobalNodeModules)();
-            this._cache['globalNpmPath'] = {
-                ts: -1,
-                data: path
-            };
-            trm_commons_1.Logger.log(`Npm global modules path set to ${path}`, true);
-            return;
-        }
         const globalNpmPathCache = this._cache.globalNpmPath;
-        const isValid = !!globalNpmPathCache && !!globalNpmPathCache.ts && (Date.now() - globalNpmPathCache.ts) < this.getSettings().npmGlobalPathCheckCache * 1000;
-        if (isValid) {
+        if (this.isStringCacheEntryValid(globalNpmPathCache, this.getSettings().npmGlobalPathCheckCache)) {
             return globalNpmPathCache.data;
         }
         trm_commons_1.Logger.loading(`Cache expired, setting npm global modules path...`, true);
@@ -224,23 +220,35 @@ class GlobalContext {
     }
     clearCache() {
         const filePath = this.getCacheFilePath();
-        this.generateCacheFile({}, filePath);
+        this._cache = {};
+        this.generateCacheFile(this._cache, filePath);
     }
     getCacheInternal() {
         const filePath = this.getCacheFilePath();
         if (fs.existsSync(filePath)) {
             try {
-                var data = JSON.parse(fs.readFileSync(filePath).toString());
-                if (this._dockerized) {
-                    delete data.globalNpmPath;
+                const data = JSON.parse(fs.readFileSync(filePath).toString());
+                if (this.isCacheData(data)) {
+                    return data;
                 }
-                return data;
             }
             catch (e) { }
         }
         this.generateCacheFile({}, filePath);
         return {};
     }
+    isCacheData(data) {
+        return !!data && typeof data === 'object' && !Array.isArray(data);
+    }
+    isCacheEntryValid(cache, ttlSeconds) {
+        if (!cache || typeof cache !== 'object' || typeof cache.ts !== 'number' || Number.isNaN(cache.ts) || cache.data === undefined || cache.data === null) {
+            return false;
+        }
+        return ttlSeconds === undefined || Date.now() - cache.ts < ttlSeconds * 1000;
+    }
+    isStringCacheEntryValid(cache, ttlSeconds) {
+        return this.isCacheEntryValid(cache, ttlSeconds) && typeof cache.data === 'string' && cache.data.length > 0;
+    }
     generateSettingsFile(data, filePath) {
         fs.writeFileSync(filePath, ini.encode(data), { encoding: 'utf8', flag: 'w' });
     }

package/dist/utils/SettingsData.d.ts

@@ -3,6 +3,10 @@ export type SettingsData = {
     logOutputFolder: string;
     cliUpdateCheckCache: number;
     npmGlobalPathCheckCache: number;
+    guiRegistryAutoconnect: boolean;
+    guiRegistryAutoconnectAlias?: string;
+    guiSystemAutoconnect: boolean;
+    guiSystemAutoconnectAlias?: string;
     sapLandscape?: string;
     r3transDocker?: boolean;
     r3transDockerName?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-client",
-  "version": "9.4.1",
+  "version": "10.0.1",
   "description": "TRM (Transport Request Manager) Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -41,19 +41,18 @@
     "chalk": "^4.1.2",
     "commander": "^11.0.0",
     "dotenv": "^17.2.2",
-    "execa": "^9.6.0",
     "i": "^0.3.7",
     "ini": "^4.1.1",
     "lodash": "^4.17.21",
     "sanitize-filename": "^1.6.3",
     "semver": "^7.7.4",
-    "trm-commons": "^5.0.0",
-    "trm-core": "^9.8.0",
+    "trm-commons": "^5.0.1",
+    "trm-core": "^9.8.1",
     "trm-registry-types": "^2.1.0",
     "xml2js": "^0.6.2"
   },
   "peerDependencies": {
-    "trm-commons": "^5.0.0"
+    "trm-commons": "^5.0.1"
   },
   "devDependencies": {
     "@types/ini": "^1.3.31",