trm-core 6.0.0 → 6.1.1

package/dist/actions/publish/init.js

@@ -136,7 +136,8 @@ exports.init = {
                 registry,
                 manifest: Object.assign(Object.assign({}, context.rawInput.packageData.manifest), {
                     name: context.rawInput.packageData.name,
-                    version: context.rawInput.packageData.version
+                    version: context.rawInput.packageData.version,
+                    private: context.rawInput.publishData.private
                 })
             },
             systemData: {

package/dist/actions/publish/setManifestValues.js

@@ -39,11 +39,8 @@ exports.setManifestValues = {
                     else if (o.email) {
                         author = o.email;
                     }
-                    else {
-                        throw new Error(`Invalid manifest values: authors.`);
-                    }
                     return author;
-                }).join(', ');
+                }).filter(o => o !== undefined).join(', ');
             }
             else {
                 defaultAuthors = context.runtime.trmPackage.manifest.authors;
@@ -55,6 +52,21 @@ exports.setManifestValues = {
                 defaultKeywords = context.runtime.trmPackage.manifest.keywords;
             }
             var inq = yield inquirer_1.Inquirer.prompt([{
+                    type: "list",
+                    message: "Package visibility",
+                    name: "private",
+                    default: false,
+                    choices: [{
+                            name: `Public`,
+                            value: false
+                        }, {
+                            name: `Private`,
+                            value: true
+                        }],
+                    validate: (input) => {
+                        return (0, inquirer_1.validatePackageVisibility)(context.rawInput.packageData.registry.getRegistryType(), context.rawInput.packageData.name, input);
+                    },
+                }, {
                     type: "input",
                     message: "Short description",
                     name: "description",
@@ -124,28 +136,14 @@ exports.setManifestValues = {
                     name: "license",
                     default: context.runtime.trmPackage.manifest.license
                 }]);
-            inq.authors = inq.authors.split(',').map(s => {
-                const match = s.trim().match(/^(.*?)(?:\s*<([^>]+)>)?$/);
-                if (match && match.length >= 3) {
-                    return {
-                        name: match[1] ? match[1].trim() : undefined,
-                        email: match[2] ? match[2].trim() : undefined
-                    };
-                }
-                else {
-                    throw new Error(`Invalid manifest values: authors.`);
-                }
-            });
-            inq.keywords = inq.keywords.split(',').map(s => {
-                if (s) {
-                    return s.trim();
-                }
-                else {
-                    throw new Error(`Invalid manifest values: keywords.`);
-                }
-            });
             context.runtime.trmPackage.manifest = Object.assign(Object.assign({}, context.runtime.trmPackage.manifest), inq);
         }
+        else {
+            const validateVisibility = (0, inquirer_1.validatePackageVisibility)(context.rawInput.packageData.registry.getRegistryType(), context.rawInput.packageData.name, context.runtime.trmPackage.manifest.private);
+            if (validateVisibility !== true) {
+                throw new Error(validateVisibility);
+            }
+        }
         if (context.runtime.packageData.namespace) {
             context.runtime.trmPackage.manifest.namespace = {
                 replicense: context.runtime.packageData.namespace.trnspacet.replicense,

package/dist/actions/publish/setTransportTarget.js

@@ -48,7 +48,7 @@ exports.setTransportTarget = {
             if (validate && validate !== true) {
                 throw new Error(validate);
             }
-            logger_1.Logger.info(`Publish transport target: "${transportTarget}"`);
+            logger_1.Logger.info(`Publish transport release target: ${transportTarget}`);
         }
         context.rawInput.systemData.transportTarget = transportTarget;
     })

package/dist/inquirer/validators/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./validateDevclass";
 export * from "./validateTransportTarget";
+export * from "./validatePackageVisibility";

package/dist/inquirer/validators/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./validateDevclass"), exports);
 __exportStar(require("./validateTransportTarget"), exports);
+__exportStar(require("./validatePackageVisibility"), exports);

package/dist/inquirer/validators/validateDevclass.d.ts

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

package/dist/inquirer/validators/validatePackageVisibility.d.ts

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

package/dist/inquirer/validators/validatePackageVisibility.js

@@ -0,0 +1,26 @@
+"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) {
+    if (registryType === registry_1.RegistryType.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;
+        }
+    }
+    else {
+        return true;
+    }
+}

package/dist/inquirer/validators/validateTransportTarget.d.ts

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

package/dist/inquirer/validators/validateTransportTarget.js

@@ -21,5 +21,8 @@ function validateTransportTarget(target, systemTmscsys) {
                 return true;
             }
         }
+        else {
+            return `Transport target ${target} not provided.`;
+        }
     });
 }

package/dist/manifest/Manifest.d.ts

@@ -1,6 +1,7 @@
 import { TrmManifest } from "./TrmManifest";
 import { Transport } from "../transport";
 import { TrmPackage } from "../trmPackage";
+import { TrmManifestAuthor } from "./TrmManifestAuthor";
 export declare class Manifest {
     private _manifest;
     constructor(_manifest: TrmManifest);
@@ -17,4 +18,6 @@ export declare class Manifest {
     static _parseAbapXmlSapEntriesArray(input: any): any[];
     static fromJson(sJson: string): Manifest;
     static compare(o1: Manifest, o2: Manifest, checkVersion?: boolean): boolean;
+    static stringAuthorsToArray(sAuthors: string): TrmManifestAuthor[];
+    static stringKeywordsToArray(sKeywords: string): string[];
 }

package/dist/manifest/Manifest.js

@@ -351,7 +351,7 @@ class Manifest {
         if (manifestClone.authors) {
             var aAuthors;
             if (typeof (manifestClone.authors) === 'string') {
-                aAuthors = manifestClone.authors.split(',');
+                aAuthors = this.stringAuthorsToArray(manifestClone.authors);
             }
             else {
                 aAuthors = manifestClone.authors;
@@ -382,7 +382,7 @@ class Manifest {
         if (manifestClone.keywords) {
             var originalKeywords;
             if (typeof (manifestClone.keywords) === 'string') {
-                originalKeywords = manifestClone.keywords.split(',');
+                originalKeywords = this.stringKeywordsToArray(manifestClone.keywords);
             }
             else {
                 originalKeywords = manifestClone.keywords;
@@ -598,5 +598,34 @@ class Manifest {
         const s2 = o2.getKey(checkVersion);
         return s1 === s2;
     }
+    static stringAuthorsToArray(sAuthors) {
+        var authors = [];
+        if (sAuthors) {
+            sAuthors.split(',').forEach(s => {
+                if (s) {
+                    const match = sAuthors.trim().match(/^(.*?)(?:\s*<([^>]+)>)?$/);
+                    if (match && match.length >= 3) {
+                        authors.push({
+                            name: match[1] ? match[1].trim() : undefined,
+                            email: match[2] ? match[2].trim() : undefined
+                        });
+                    }
+                }
+            });
+        }
+        return authors;
+    }
+    static stringKeywordsToArray(sKeywords) {
+        if (sKeywords) {
+            return sKeywords.split(',').map(s => {
+                if (s) {
+                    return s.trim();
+                }
+            }).filter(k => k !== undefined);
+        }
+        else {
+            return [];
+        }
+    }
 }
 exports.Manifest = Manifest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-core",
-  "version": "6.0.0",
+  "version": "6.1.1",
   "description": "TRM (Transport Request Manager) Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/actions/publish/generateCustTr.d.ts

@@ -1,3 +0,0 @@
-import { Step } from "@simonegaffurini/sammarksworkflow";
-import { PublishWorkflowContext } from ".";
-export declare const generateCustTr: Step<PublishWorkflowContext>;

package/dist/actions/publish/generateCustTr.js

@@ -1,72 +0,0 @@
-"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.generateCustTr = void 0;
-const transport_1 = require("../../transport");
-const logger_1 = require("../../logger");
-exports.generateCustTr = {
-    name: 'generate-cust-tr',
-    filter: (context) => __awaiter(void 0, void 0, void 0, function* () {
-        if (!context.parsedInput.skipCust && context.runtime.inputCustTransports.length > 0) {
-            return true;
-        }
-        else {
-            logger_1.Logger.log(`Skipping CUST transport (no input in step)`, true);
-            return false;
-        }
-    }),
-    run: (context) => __awaiter(void 0, void 0, void 0, function* () {
-        const customizingTransports = context.runtime.inputCustTransports;
-        logger_1.Logger.loading(`Generating CUST transport...`);
-        context.runtime.custTransport = yield transport_1.Transport.createToc({
-            target: context.parsedInput.trTarget,
-            text: `@X1@TRM: ${context.runtime.manifest.name} v${context.runtime.manifest.version} (C)`,
-            trmIdentifier: transport_1.TrmTransportIdentifier.CUST
-        });
-        context.runtime.tryCustDeleteRevert = true;
-        for (const transport of customizingTransports) {
-            yield context.runtime.custTransport.addObjectsFromTransport(transport.trkorr);
-        }
-        var e071 = yield context.runtime.custTransport.getE071();
-        e071 = e071.filter(o => !(o.pgmid === 'CORR' && o.object === 'MERG'));
-        if (e071.length === 0) {
-            logger_1.Logger.info(`Customizing transport has no content.`);
-            yield context.runtime.custTransport.delete();
-            delete context.runtime.custTransport;
-            context.runtime.tryCustDeleteRevert = false;
-        }
-        else {
-            const wrongEntries = e071.filter(o => !(o.pgmid === 'R3TR' && o.object === 'TABU'));
-            if (wrongEntries.length > 0) {
-                throw new Error(`Customizing transport contains invalid objects.`);
-            }
-        }
-    }),
-    revert: (context) => __awaiter(void 0, void 0, void 0, function* () {
-        if (context.runtime.tryCustDeleteRevert) {
-            logger_1.Logger.loading(`Rollback CUST transport ${context.runtime.custTransport.trkorr}...`);
-            try {
-                const canBeDeleted = yield context.runtime.custTransport.canBeDeleted();
-                if (canBeDeleted) {
-                    yield context.runtime.custTransport.delete();
-                    logger_1.Logger.info(`Executed rollback on transport ${context.runtime.custTransport.trkorr}`);
-                }
-                else {
-                    throw new Error(`Transport ${context.runtime.custTransport.trkorr} cannot be deleted`);
-                }
-            }
-            catch (e) {
-                logger_1.Logger.info(`Unable to rollback transport ${context.runtime.custTransport.trkorr}`);
-                logger_1.Logger.error(e.toString(), true);
-            }
-        }
-    })
-};