mcdev 5.0.2 → 5.1.0

package/lib/util/util.js

@@ -85,7 +85,6 @@ const Util = {
      *
      * @param {string} mlName name of marketList
      * @param {TYPE.Mcdevrc} properties General configuration to be used in retrieve
-     * @returns {void} throws errors if problems were found
      */
     verifyMarketList(mlName, properties) {
         if (properties.marketList[mlName]) {
@@ -227,6 +226,65 @@ const Util = {
 
         return typeChoices;
     },
+    /**
+     * wrapper around our standard winston logging to console and logfile
+     *
+     * @param {boolean} [noLogFile=false] optional flag to indicate if we should log to file; CLI logs are always on
+     * @returns {object} initiated logger for console and file
+     */
+    _createNewLoggerTransport: function (noLogFile = false) {
+        // {
+        //   error: 0,
+        //   warn: 1,
+        //   info: 2,
+        //   http: 3,
+        //   verbose: 4,
+        //   debug: 5,
+        //   silly: 6
+        // }
+        const logFileName = new Date().toISOString().split(':').join('.');
+        const transports = {
+            console: new winston.transports.Console({
+                // Write logs to Console
+                level: Util.OPTIONS.loggerLevel || 'info',
+                format: winston.format.combine(
+                    winston.format.colorize(),
+                    winston.format.timestamp({ format: 'HH:mm:ss' }),
+                    winston.format.simple(),
+                    winston.format.printf(
+                        (info) => `${info.timestamp} ${info.level}: ${info.message}`
+                    )
+                ),
+            }),
+        };
+        if (!noLogFile) {
+            transports.file = new winston.transports.File({
+                // Write logs to logfile
+                filename: 'logs/' + logFileName + '.log',
+                level: 'debug', // log everything
+                format: winston.format.combine(
+                    winston.format.timestamp({ format: 'HH:mm:ss.SSS' }),
+                    winston.format.simple(),
+                    winston.format.printf(
+                        (info) => `${info.timestamp} ${info.level}: ${info.message}`
+                    )
+                ),
+            });
+            transports.fileError = new winston.transports.File({
+                // Write logs to additional error-logfile for better visibility of errors
+                filename: 'logs/' + logFileName + '-errors.log',
+                level: 'error', // only log errors
+                format: winston.format.combine(
+                    winston.format.timestamp({ format: 'HH:mm:ss.SSS' }),
+                    winston.format.simple(),
+                    winston.format.printf(
+                        (info) => `${info.timestamp} ${info.level}: ${info.message}`
+                    )
+                ),
+            });
+        }
+        return transports;
+    },
 
     loggerTransports: null,
     /**
@@ -235,7 +293,91 @@ const Util = {
      * @type {TYPE.Logger}
      */
     logger: null,
-    restartLogger: startLogger,
+    /**
+     * initiate winston logger
+     *
+     * @param {boolean} [restart=false] if true, logger will be restarted; otherwise, an existing logger will be used
+     * @param {boolean} [noLogFile=false] if false, logger will log to file; otherwise, only to console
+     * @returns {void}
+     */
+    startLogger: function (restart = false, noLogFile = false) {
+        if (
+            !(
+                Util.loggerTransports === null ||
+                restart ||
+                (!Util.loggerTransports?.file && !noLogFile && !Util.OPTIONS?.noLogFile)
+            )
+        ) {
+            // logger already started
+            return;
+        }
+        Util.loggerTransports = this._createNewLoggerTransport(
+            noLogFile || Util.OPTIONS?.noLogFile
+        );
+        const myWinston = winston.createLogger({
+            level: Util.OPTIONS.loggerLevel,
+            levels: winston.config.npm.levels,
+            transports: Object.values(Util.loggerTransports),
+        });
+        const winstonError = myWinston.error;
+        const winstonExtension = {
+            /**
+             * helper that prints better stack trace for errors
+             *
+             * @param {Error} ex the error
+             * @param {string} [message] optional custom message to be printed as error together with the exception's message
+             * @returns {void}
+             */
+            errorStack: function (ex, message) {
+                if (message) {
+                    // ! this method only sets exitCode=1 if message-param was set
+                    // if not, then this method purely outputs debug information and should not change the exitCode
+                    winstonError(message + ':');
+                    winstonError(`    ${ex.message} (${ex.code})`);
+                    if (ex.endpoint) {
+                        // ex.endpoint is only available if 'ex' is of type RestError
+                        winstonError('    endpoint: ' + ex.endpoint);
+                    }
+                    Util.signalFatalError();
+                }
+                let stack;
+                /* eslint-disable unicorn/prefer-ternary */
+                if (
+                    [
+                        'ETIMEDOUT',
+                        'EHOSTUNREACH',
+                        'ENOTFOUND',
+                        'ECONNRESET',
+                        'ECONNABORTED',
+                    ].includes(ex.code)
+                ) {
+                    // the stack would just return a one-liner that does not help
+                    stack = new Error().stack; // eslint-disable-line unicorn/error-message
+                } else {
+                    stack = ex.stack;
+                }
+                /* eslint-enable unicorn/prefer-ternary */
+                myWinston.debug(stack);
+            },
+            /**
+             * errors should cause surrounding applications to take notice
+             * hence we overwrite the default error function here
+             *
+             * @param {string} msg - the message to log
+             * @returns {void}
+             */
+            error: function (msg) {
+                winstonError(msg);
+                Util.signalFatalError();
+            },
+        };
+        Util.logger = Object.assign(myWinston, winstonExtension);
+
+        const processArgv = process.argv.slice(2);
+        Util.logger.debug(
+            `:: mcdev ${packageJsonMcdev.version} :: ⚡ mcdev ${processArgv.join(' ')}`
+        );
+    },
     /**
      * Logger helper for Metadata functions
      *
@@ -416,7 +558,7 @@ const Util = {
      * @param {string} cmd to be executed command
      * @param {string[]} [args] list of arguments
      * @param {boolean} [hideOutput] if true, output of command will be hidden from CLI
-     * @returns {string} output of command if hideOutput is true
+     * @returns {string|void} output of command if hideOutput is true
      */
     execSync(cmd, args, hideOutput) {
         args ||= [];
@@ -471,34 +613,30 @@ const Util = {
      * @returns {void}
      */
     setLoggingLevel(argv) {
-        Util.loggerTransports.console.file = 'debug';
         if (argv.silent) {
             // only errors printed to CLI
-            Util.logger.level = 'error';
             Util.OPTIONS.loggerLevel = 'error';
-            Util.loggerTransports.console.level = 'error';
             Util.logger.debug('CLI logger set to: silent');
         } else if (argv.verbose) {
             // chatty user cli logs
-            Util.logger.level = 'verbose';
             Util.OPTIONS.loggerLevel = 'verbose';
-            Util.loggerTransports.console.level = 'verbose';
             Util.logger.debug('CLI logger set to: verbose');
         } else {
             // default user cli logs
-            // TODO to be switched to "warn" when cli-process is integrated
-            Util.logger.level = 'info';
             Util.OPTIONS.loggerLevel = 'info';
-            Util.loggerTransports.console.level = 'info';
             Util.logger.debug('CLI logger set to: info / default');
         }
         if (argv.debug) {
             // enables developer output & features. no change to actual logs
-            Util.logger.level = 'debug';
             Util.OPTIONS.loggerLevel = 'debug';
-            Util.loggerTransports.console.level = 'debug';
             Util.logger.debug('CLI logger set to: debug');
         }
+        if (Util.loggerTransports?.console) {
+            Util.loggerTransports.console.level = Util.OPTIONS.loggerLevel;
+        }
+        if (Util.logger) {
+            Util.logger.level = Util.OPTIONS.loggerLevel;
+        }
     },
     /**
      * outputs a warning that the given type is still in beta
@@ -643,122 +781,7 @@ const Util = {
         return null;
     },
 };
-/**
- * wrapper around our standard winston logging to console and logfile
- *
- * @returns {object} initiated logger for console and file
- */
-function createNewLoggerTransport() {
-    // {
-    //   error: 0,
-    //   warn: 1,
-    //   info: 2,
-    //   http: 3,
-    //   verbose: 4,
-    //   debug: 5,
-    //   silly: 6
-    // }
-    const logFileName = new Date().toISOString().split(':').join('.');
-    return {
-        console: new winston.transports.Console({
-            // Write logs to Console
-            level: 'info', // log error, warn, info
-            format: winston.format.combine(
-                winston.format.colorize(),
-                winston.format.timestamp({ format: 'HH:mm:ss' }),
-                winston.format.simple(),
-                winston.format.printf((info) => `${info.timestamp} ${info.level}: ${info.message}`)
-            ),
-        }),
-        file: new winston.transports.File({
-            // Write logs to logfile
-            filename: 'logs/' + logFileName + '.log',
-            level: 'debug', // log everything
-            format: winston.format.combine(
-                winston.format.timestamp({ format: 'HH:mm:ss.SSS' }),
-                winston.format.simple(),
-                winston.format.printf((info) => `${info.timestamp} ${info.level}: ${info.message}`)
-            ),
-        }),
-        fileError: new winston.transports.File({
-            // Write logs to additional error-logfile for better visibility of errors
-            filename: 'logs/' + logFileName + '-errors.log',
-            level: 'error', // only log errors
-            format: winston.format.combine(
-                winston.format.timestamp({ format: 'HH:mm:ss.SSS' }),
-                winston.format.simple(),
-                winston.format.printf((info) => `${info.timestamp} ${info.level}: ${info.message}`)
-            ),
-        }),
-    };
-}
-/**
- * initiate winston logger
- *
- * @returns {void}
- */
-function startLogger() {
-    Util.loggerTransports = createNewLoggerTransport();
-    const myWinston = winston.createLogger({
-        levels: winston.config.npm.levels,
-        transports: [
-            Util.loggerTransports.console,
-            Util.loggerTransports.file,
-            Util.loggerTransports.fileError,
-        ],
-    });
-    const winstonError = myWinston.error;
-    const winstonExtension = {
-        /**
-         * helper that prints better stack trace for errors
-         *
-         * @param {Error} ex the error
-         * @param {string} [message] optional custom message to be printed as error together with the exception's message
-         * @returns {void}
-         */
-        errorStack: function (ex, message) {
-            if (message) {
-                // ! this method only sets exitCode=1 if message-param was set
-                // if not, then this method purely outputs debug information and should not change the exitCode
-                winstonError(message + ':');
-                winstonError(`    ${ex.message} (${ex.code})`);
-                if (ex.endpoint) {
-                    // ex.endpoint is only available if 'ex' is of type RestError
-                    winstonError('    endpoint: ' + ex.endpoint);
-                }
-                Util.signalFatalError();
-            }
-            let stack;
-            /* eslint-disable unicorn/prefer-ternary */
-            if (
-                ['ETIMEDOUT', 'EHOSTUNREACH', 'ENOTFOUND', 'ECONNRESET', 'ECONNABORTED'].includes(
-                    ex.code
-                )
-            ) {
-                // the stack would just return a one-liner that does not help
-                stack = new Error().stack; // eslint-disable-line unicorn/error-message
-            } else {
-                stack = ex.stack;
-            }
-            /* eslint-enable unicorn/prefer-ternary */
-            myWinston.debug(stack);
-        },
-        /**
-         * errors should cause surrounding applications to take notice
-         * hence we overwrite the default error function here
-         *
-         * @param {string} msg - the message to log
-         * @returns {void}
-         */
-        error: function (msg) {
-            winstonError(msg);
-            Util.signalFatalError();
-        },
-    };
-    Util.logger = Object.assign(myWinston, winstonExtension);
 
-    Util.logger.debug(`:: mcdev ${packageJsonMcdev.version} ::`);
-}
-startLogger();
+Util.startLogger(false, true);
 
 module.exports = Util;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "5.0.2",
+    "version": "5.1.0",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "Accenture: joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",
@@ -76,7 +76,7 @@
         "simple-git": "3.18.0",
         "toposort": "2.0.2",
         "update-notifier": "5.1.0",
-        "winston": "3.8.2",
+        "winston": "3.9.0",
         "yargs": "17.7.2"
     },
     "devDependencies": {
@@ -84,14 +84,14 @@
         "axios-mock-adapter": "1.21.3",
         "chai": "4.3.7",
         "chai-files": "1.4.0",
-        "eslint": "8.41.0",
+        "eslint": "8.42.0",
         "eslint-config-prettier": "8.7.0",
         "eslint-config-ssjs": "1.1.11",
-        "eslint-plugin-jsdoc": "45.0.0",
+        "eslint-plugin-jsdoc": "46.2.5",
         "eslint-plugin-mocha": "10.1.0",
         "eslint-plugin-prettier": "4.2.1",
         "eslint-plugin-unicorn": "47.0.0",
-        "fast-xml-parser": "4.2.2",
+        "fast-xml-parser": "4.2.4",
         "husky": "8.0.3",
         "jsdoc-to-markdown": "8.0.0",
         "lint-staged": "13.2.2",

package/test/general.test.js

@@ -14,6 +14,22 @@ describe('GENERAL', () => {
         testUtils.mockReset();
     });
 
+    describe('init ================', () => {
+        it('should init a local project without downloading BUs');
+        it('should init a local project and download all BUs');
+    });
+    describe('join ================', () => {
+        it('should clone a project from git');
+    });
+    describe('upgrade ================', () => {
+        it('should upgrade a project to the latest version');
+    });
+    describe('reloadBUs ================', () => {
+        it('should load all BUs from the server and refresh the config');
+    });
+    describe('selectTypes ================', () => {
+        it('should change which types are selected for default retrieval');
+    });
     describe('explainTypes ================', () => {
         it('without options', () => {
             handler.explainTypes();
@@ -59,4 +75,14 @@ describe('GENERAL', () => {
             return;
         });
     });
+    describe('createDeltaPkg ================', () => {
+        it('should show diff to master branch');
+        // mcdev createDeltaPkg master # resolves to master..HEAD
+        it('should show diff between master and develop branch');
+        // mcdev createDeltaPkg master..develop
+        it(
+            'should show diff between master and develop branch and filter the results to only show MyProject/BU1'
+        );
+        // mcdev createDeltaPkg master..develop --filter 'MyProject/BU1'
+    });
 });

package/test/mockRoot/.mcdevrc.json

@@ -78,5 +78,5 @@
             "triggeredSend"
         ]
     },
-    "version": "5.0.2"
+    "version": "5.1.0"
 }

package/test/mockRoot/deploy/testInstance/testBU/automation/testExisting_automation.automation-meta.json

@@ -0,0 +1,53 @@
+{
+    "description": "updated on deploy",
+    "key": "testExisting_automation",
+    "name": "testExisting_automation",
+    "r__folder_Path": "my automations",
+    "schedule": {
+        "endDate": "2022-07-30T00:00:00",
+        "icalRecur": "FREQ=DAILY;COUNT=1;INTERVAL=1",
+        "startDate": "2022-07-30T00:00:00",
+        "timezoneName": "W. Europe Standard Time",
+        "typeId": 3
+    },
+    "status": "PausedSchedule",
+    "steps": [
+        {
+            "activities": [
+                {
+                    "name": "testExisting_dataExtract",
+                    "r__type": "dataExtract"
+                },
+                {
+                    "name": "testExisting_emailSend",
+                    "r__type": "emailSend"
+                },
+                {
+                    "name": "testExisting_fileTransfer",
+                    "r__type": "fileTransfer"
+                },
+                {
+                    "name": "testExisting_importFile",
+                    "r__type": "importFile"
+                },
+                {
+                    "name": "testExisting_query",
+                    "r__type": "query"
+                },
+                {
+                    "name": "testExisting_script",
+                    "r__type": "script"
+                }
+            ],
+            "name": ""
+        }
+    ],
+    "notifications": [
+        {
+            "email": ["error-updated@test.accenture.com"],
+            "message": "test updated",
+            "type": "Error"
+        }
+    ],
+    "type": "scheduled"
+}

package/test/mockRoot/deploy/testInstance/testBU/automation/testNew_automation.automation-meta.json

@@ -0,0 +1,46 @@
+{
+    "description": "created on deploy",
+    "key": "testNew_automation",
+    "name": "testNew_automation",
+    "r__folder_Path": "my automations",
+    "schedule": {
+        "endDate": "2022-07-30T00:00:00",
+        "icalRecur": "FREQ=DAILY;COUNT=1;INTERVAL=1",
+        "startDate": "2022-07-30T00:00:00",
+        "timezoneName": "W. Europe Standard Time",
+        "typeId": 3
+    },
+    "status": "PausedSchedule",
+    "steps": [
+        {
+            "activities": [
+                {
+                    "name": "testExisting_dataExtract",
+                    "r__type": "dataExtract"
+                },
+                {
+                    "name": "testExisting_emailSend",
+                    "r__type": "emailSend"
+                },
+                {
+                    "name": "testExisting_fileTransfer",
+                    "r__type": "fileTransfer"
+                },
+                {
+                    "name": "testExisting_importFile",
+                    "r__type": "importFile"
+                },
+                {
+                    "name": "testExisting_query",
+                    "r__type": "query"
+                },
+                {
+                    "name": "testExisting_script",
+                    "r__type": "script"
+                }
+            ],
+            "name": ""
+        }
+    ],
+    "type": "scheduled"
+}

package/test/mockRoot/deploy/testInstance/testBU/query/{testExistingQuery.query-meta.json → testExisting_query.query-meta.json}

@@ -1,6 +1,6 @@
 {
-    "name": "testExistingQuery",
-    "key": "testExistingQuery",
+    "name": "testExisting_query",
+    "key": "testExisting_query",
     "description": "updated on deploy",
     "targetKey": "testExisting_dataExtension",
     "createdDate": "2022-04-26T15:21:16.453",

package/test/mockRoot/deploy/testInstance/testBU/query/{testNewQuery.query-meta.json → testNew_query.query-meta.json}

@@ -1,6 +1,6 @@
 {
-    "name": "testNewQuery",
-    "key": "testNewQuery",
+    "name": "testNew_query",
+    "key": "testNew_query",
     "description": "created on deploy",
     "targetKey": "testExisting_dataExtension",
     "createdDate": "2022-04-26T15:21:16.453",