@pnp/cli-microsoft365 5.0.0-beta.fe151d6 → 5.1.0-beta.6ab68db

package/dist/m365/planner/commands/task/task-list.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class PlannerTaskListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class PlannerTaskListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.TASK_LIST;
     }
@@ -25,33 +25,52 @@ class PlannerTaskListCommand extends GraphItemsListCommand_1.GraphItemsListComma
         return ['id', 'title', 'startDateTime', 'dueDateTime', 'completedDateTime'];
     }
     commandAction(logger, args, cb) {
-        const bucketId = args.options.bucketId;
         const bucketName = args.options.bucketName;
-        const planId = args.options.planId;
+        let bucketId = args.options.bucketId;
         const planName = args.options.planName;
+        let planId = args.options.planId;
+        let taskItems = [];
         if (bucketId || bucketName) {
             this
                 .getBucketId(args)
-                .then((bucketId) => this.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`, logger, true))
-                .then(() => {
-                logger.log(this.items);
+                .then((retrievedBucketId) => {
+                bucketId = retrievedBucketId;
+                return utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`, logger);
+            })
+                .then((tasks) => {
+                taskItems = tasks;
+                return utils_1.odata.getAllItems(`${this.resource}/beta/planner/buckets/${bucketId}/tasks`, logger);
+            })
+                .then((betaTasks) => {
+                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
                 cb();
             }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
         }
         else if (planId || planName) {
             this
                 .getPlanId(args)
-                .then((planId) => this.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`, logger, true))
-                .then(() => {
-                logger.log(this.items);
+                .then((retrievedPlanId) => {
+                planId = retrievedPlanId;
+                return utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`, logger);
+            })
+                .then((tasks) => {
+                taskItems = tasks;
+                return utils_1.odata.getAllItems(`${this.resource}/beta/planner/plans/${planId}/tasks`, logger);
+            })
+                .then((betaTasks) => {
+                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
                 cb();
             }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
         }
         else {
-            this
-                .getAllItems(`${this.resource}/v1.0/me/planner/tasks`, logger, true)
-                .then(() => {
-                logger.log(this.items);
+            utils_1.odata
+                .getAllItems(`${this.resource}/v1.0/me/planner/tasks`, logger)
+                .then((tasks) => {
+                taskItems = tasks;
+                return utils_1.odata.getAllItems(`${this.resource}/beta/me/planner/tasks`, logger);
+            })
+                .then((betaTasks) => {
+                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
                 cb();
             }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
         }
@@ -125,6 +144,17 @@ class PlannerTaskListCommand extends GraphItemsListCommand_1.GraphItemsListComma
             return Promise.resolve(group.id);
         });
     }
+    mergeTaskPriority(taskItems, betaTaskItems) {
+        const findBetaTask = (id) => betaTaskItems.find(task => task.id === id);
+        taskItems.forEach(task => {
+            const betaTaskItem = findBetaTask(task.id);
+            if (betaTaskItem) {
+                const { priority } = betaTaskItem;
+                Object.assign(task, { priority });
+            }
+        });
+        return taskItems;
+    }
     options() {
         const options = [
             {
@@ -165,7 +195,7 @@ class PlannerTaskListCommand extends GraphItemsListCommand_1.GraphItemsListComma
         if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
         }
-        if (args.options.ownerGroupId && !Utils_1.default.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;

package/dist/m365/planner/commands/task/task-set.js

@@ -0,0 +1,357 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class PlannerTaskSetCommand extends GraphCommand_1.default {
+    constructor() {
+        super(...arguments);
+        this.allowedAppliedCategories = ['category1', 'category2', 'category3', 'category4', 'category5', 'category6'];
+    }
+    get name() {
+        return commands_1.default.TASK_SET;
+    }
+    get description() {
+        return 'Updates a Microsoft Planner Task';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.title = typeof args.options.title !== 'undefined';
+        telemetryProps.planId = typeof args.options.planId !== 'undefined';
+        telemetryProps.planName = typeof args.options.planName !== 'undefined';
+        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
+        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
+        telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
+        telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
+        telemetryProps.startDateTime = typeof args.options.startDateTime !== 'undefined';
+        telemetryProps.dueDateTime = typeof args.options.dueDateTime !== 'undefined';
+        telemetryProps.percentComplete = typeof args.options.percentComplete !== 'undefined';
+        telemetryProps.assignedToUserIds = typeof args.options.assignedToUserIds !== 'undefined';
+        telemetryProps.assignedToUserNames = typeof args.options.assignedToUserNames !== 'undefined';
+        telemetryProps.assigneePriority = typeof args.options.assigneePriority !== 'undefined';
+        telemetryProps.description = typeof args.options.description !== 'undefined';
+        telemetryProps.appliedCategories = typeof args.options.appliedCategories !== 'undefined';
+        telemetryProps.orderHint = typeof args.options.orderHint !== 'undefined';
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getBucketId(args.options)
+            .then(bucketId => {
+            this.bucketId = bucketId;
+            return this.generateUserAssignments(args.options);
+        })
+            .then(resultAssignments => {
+            this.assignments = resultAssignments;
+            return this.getTaskEtag(args.options.id);
+        })
+            .then(etag => {
+            const appliedCategories = this.generateAppliedCategories(args.options);
+            const data = this.mapRequestBody(args.options, appliedCategories);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/tasks/${args.options.id}`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none',
+                    'If-Match': etag,
+                    'Prefer': 'return=representation'
+                },
+                responseType: 'json',
+                data: data
+            };
+            return request_1.default.patch(requestOptions);
+        })
+            .then(newTask => this.updateTaskDetails(args.options, newTask))
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    updateTaskDetails(options, newTask) {
+        if (!options.description) {
+            return Promise.resolve(newTask);
+        }
+        const taskId = newTask.id;
+        return this
+            .getTaskDetailsEtag(taskId)
+            .then(etag => {
+            const requestOptionsTaskDetails = {
+                url: `${this.resource}/v1.0/planner/tasks/${taskId}/details`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none',
+                    'If-Match': etag,
+                    'Prefer': 'return=representation'
+                },
+                responseType: 'json',
+                data: {
+                    description: options.description
+                }
+            };
+            return request_1.default.patch(requestOptionsTaskDetails);
+        })
+            .then(taskDetails => {
+            return Object.assign(Object.assign({}, newTask), taskDetails);
+        });
+    }
+    getTaskDetailsEtag(taskId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details`,
+            headers: {
+                accept: 'application/json'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            const etag = response ? response['@odata.etag'] : undefined;
+            if (!etag) {
+                return Promise.reject(`Error fetching task details`);
+            }
+            return Promise.resolve(etag);
+        });
+    }
+    getTaskEtag(taskId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}`,
+            headers: {
+                accept: 'application/json'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            const etag = response ? response['@odata.etag'] : undefined;
+            if (!etag) {
+                return Promise.reject(`Error fetching task`);
+            }
+            return Promise.resolve(etag);
+        });
+    }
+    generateAppliedCategories(options) {
+        if (!options.appliedCategories) {
+            return {};
+        }
+        const categories = {};
+        options.appliedCategories.toLocaleLowerCase().split(',').forEach(x => categories[x] = true);
+        return categories;
+    }
+    generateUserAssignments(options) {
+        const assignments = {};
+        if (!options.assignedToUserIds && !options.assignedToUserNames) {
+            return Promise.resolve(assignments);
+        }
+        return this
+            .getUserIds(options)
+            .then((userIds) => {
+            userIds.forEach(x => assignments[x] = {
+                '@odata.type': '#microsoft.graph.plannerAssignment',
+                orderHint: ' !'
+            });
+            return Promise.resolve(assignments);
+        });
+    }
+    getUserIds(options) {
+        if (options.assignedToUserIds) {
+            return Promise.resolve(options.assignedToUserIds.split(',').map(o => o.trim()));
+        }
+        // Hitting this section means assignedToUserNames won't be undefined
+        const userNames = options.assignedToUserNames;
+        const userArr = userNames.split(',').map(o => o.trim());
+        let userIds = [];
+        const promises = userArr.map(user => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                headers: {
+                    'accept ': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
+        return Promise
+            .all(promises)
+            .then((usersRes) => {
+            let userUpns = [];
+            userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
+            userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
+            // Find the members where no graph response was found
+            const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
+            if (invalidUsers && invalidUsers.length > 0) {
+                return Promise.reject(`Cannot proceed with planner task update. The following users provided are invalid : ${invalidUsers.join(',')}`);
+            }
+            return Promise.resolve(userIds);
+        });
+    }
+    getBucketId(options) {
+        if (options.bucketId) {
+            return Promise.resolve(options.bucketId);
+        }
+        if (!options.bucketName) {
+            return Promise.resolve(undefined);
+        }
+        return this
+            .getPlanId(options)
+            .then(planId => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/plans/${planId}/buckets?$select=id,name`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then((response) => {
+            const bucket = response.value.find(val => val.name === options.bucketName);
+            if (!bucket) {
+                return Promise.reject(`The specified bucket does not exist`);
+            }
+            return Promise.resolve(bucket.id);
+        });
+    }
+    getPlanId(options) {
+        if (options.planId) {
+            return Promise.resolve(options.planId);
+        }
+        return this
+            .getGroupId(options)
+            .then((groupId) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/plans?$filter=(owner eq '${groupId}')&$select=id,title`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then((response) => {
+            const plan = response.value.find(val => val.title === options.planName);
+            if (!plan) {
+                return Promise.reject(`The specified plan does not exist`);
+            }
+            return Promise.resolve(plan.id);
+        });
+    }
+    getGroupId(options) {
+        if (options.ownerGroupId) {
+            return Promise.resolve(options.ownerGroupId);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(options.ownerGroupName)}'&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const group = response.value[0];
+            if (!group) {
+                return Promise.reject(`The specified owner group does not exist`);
+            }
+            return Promise.resolve(group.id);
+        });
+    }
+    mapRequestBody(options, appliedCategories) {
+        const requestBody = {};
+        if (options.title) {
+            requestBody.title = options.title;
+        }
+        if (this.bucketId) {
+            requestBody.bucketId = this.bucketId;
+        }
+        if (options.startDateTime) {
+            requestBody.startDateTime = options.startDateTime;
+        }
+        if (options.dueDateTime) {
+            requestBody.dueDateTime = options.dueDateTime;
+        }
+        if (options.percentComplete) {
+            requestBody.percentComplete = options.percentComplete;
+        }
+        if (this.assignments && Object.keys(this.assignments).length > 0) {
+            requestBody.assignments = this.assignments;
+        }
+        if (options.assigneePriority) {
+            requestBody.assigneePriority = options.assigneePriority;
+        }
+        if (appliedCategories && Object.keys(appliedCategories).length > 0) {
+            requestBody.appliedCategories = appliedCategories;
+        }
+        if (options.orderHint) {
+            requestBody.orderHint = options.orderHint;
+        }
+        return requestBody;
+    }
+    options() {
+        const options = [
+            { option: '-i, --id <id>' },
+            { option: '-t, --title [title]' },
+            { option: '--planId [planId]' },
+            { option: '--planName [planName]' },
+            { option: '--ownerGroupId [ownerGroupId]' },
+            { option: '--ownerGroupName [ownerGroupName]' },
+            { option: '--bucketId [bucketId]' },
+            { option: '--bucketName [bucketName]' },
+            { option: '--startDateTime [startDateTime]' },
+            { option: '--dueDateTime [dueDateTime]' },
+            { option: '--percentComplete [percentComplete]' },
+            { option: '--assignedToUserIds [assignedToUserIds]' },
+            { option: '--assignedToUserNames [assignedToUserNames]' },
+            { option: '--assigneePriority [assigneePriority]' },
+            { option: '--description [description]' },
+            { option: '--appliedCategories [appliedCategories]' },
+            { option: '--orderHint [orderHint]' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.bucketId && args.options.bucketName) {
+            return 'Specify either bucketId or bucketName but not both';
+        }
+        if (args.options.bucketName && !args.options.planId && !args.options.planName) {
+            return 'Specify either planId or planName when using bucketName';
+        }
+        if (args.options.bucketName && args.options.planId && args.options.planName) {
+            return 'Specify either planId or planName when using bucketName but not both';
+        }
+        if (args.options.planName && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName when using planName';
+        }
+        if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
+        }
+        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+            return `${args.options.ownerGroupId} is not a valid GUID`;
+        }
+        if (args.options.startDateTime && !utils_1.validation.isValidISODateTime(args.options.startDateTime)) {
+            return 'The startDateTime is not a valid ISO date string';
+        }
+        if (args.options.dueDateTime && !utils_1.validation.isValidISODateTime(args.options.dueDateTime)) {
+            return 'The dueDateTime is not a valid ISO date string';
+        }
+        if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
+            return `percentComplete is not a number`;
+        }
+        if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
+            return `percentComplete should be between 0 and 100`;
+        }
+        if (args.options.assignedToUserIds && !utils_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
+            return 'assignedToUserIds contains invalid GUID';
+        }
+        if (args.options.assignedToUserIds && args.options.assignedToUserNames) {
+            return 'Specify either assignedToUserIds or assignedToUserNames but not both';
+        }
+        if (args.options.appliedCategories && args.options.appliedCategories.split(',').filter(category => this.allowedAppliedCategories.indexOf(category.toLocaleLowerCase()) < 0).length !== 0) {
+            return 'The appliedCategories contains invalid value. Specify either category1, category2, category3, category4, category5 and/or category6 as properties';
+        }
+        return true;
+    }
+}
+module.exports = new PlannerTaskSetCommand();
+//# sourceMappingURL=task-set.js.map

package/dist/m365/planner/commands.js

@@ -6,7 +6,12 @@ exports.default = {
     BUCKET_LIST: `${prefix} bucket list`,
     PLAN_ADD: `${prefix} plan add`,
     PLAN_GET: `${prefix} plan get`,
+    PLAN_DETAILS_GET: `${prefix} plan details get`,
     PLAN_LIST: `${prefix} plan list`,
-    TASK_LIST: `${prefix} task list`
+    TASK_ADD: `${prefix} task add`,
+    TASK_DETAILS_GET: `${prefix} task details get`,
+    TASK_GET: `${prefix} task get`,
+    TASK_LIST: `${prefix} task list`,
+    TASK_SET: `${prefix} task set`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/search/commands/externalconnection/externalconnection-add.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class SearchExternalConnectionAddCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.EXTERNALCONNECTION_ADD;
+    }
+    get description() {
+        return 'Adds a new External Connection for Microsoft Search';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.authorizedAppIds = typeof args.options.authorizedAppIds !== undefined;
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        let appIds = [];
+        if (args.options.authorizedAppIds !== undefined &&
+            args.options.authorizedAppIds !== '') {
+            appIds = args.options.authorizedAppIds.split(',');
+        }
+        const commandData = {
+            id: args.options.id,
+            name: args.options.name,
+            description: args.options.description,
+            configuration: {
+                authorizedAppIds: appIds
+            }
+        };
+        const requestOptions = {
+            url: `${this.resource}/v1.0/external/connections`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: commandData
+        };
+        request_1.default
+            .post(requestOptions)
+            .then(_ => cb(), err => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --id <id>'
+            },
+            {
+                option: '-n, --name <name>'
+            },
+            {
+                option: '-d, --description <description>'
+            },
+            {
+                option: '--authorizedAppIds [authorizedAppIds]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        const id = args.options.id;
+        if (id.length < 3 || id.length > 32) {
+            return 'ID must be between 3 and 32 characters in length.';
+        }
+        const alphaNumericRegEx = /[^\w]|_/g;
+        if (alphaNumericRegEx.test(id)) {
+            return 'ID must only contain alphanumeric characters.';
+        }
+        if (id.length > 9 &&
+            id.startsWith('Microsoft')) {
+            return 'ID cannot begin with Microsoft';
+        }
+        const invalidIds = ['None',
+            'Directory',
+            'Exchange',
+            'ExchangeArchive',
+            'LinkedIn',
+            'Mailbox',
+            'OneDriveBusiness',
+            'SharePoint',
+            'Teams',
+            'Yammer',
+            'Connectors',
+            'TaskFabric',
+            'PowerBI',
+            'Assistant',
+            'TopicEngine',
+            'MSFT_All_Connectors'
+        ];
+        if (invalidIds.indexOf(id) > -1) {
+            return `ID cannot be one of the following values: ${invalidIds.join(', ')}.`;
+        }
+        return true;
+    }
+}
+module.exports = new SearchExternalConnectionAddCommand();
+//# sourceMappingURL=externalconnection-add.js.map

package/dist/m365/search/commands.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const prefix = 'search';
+exports.default = {
+    EXTERNALCONNECTION_ADD: `${prefix} externalconnection add`
+};
+//# sourceMappingURL=commands.js.map

package/dist/m365/spfx/commands/package/package-generate.js

@@ -5,7 +5,7 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const uuid_1 = require("uuid");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
@@ -73,8 +73,8 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
                 logger.log('Copying files...');
             }
             const src = path.join(__dirname, 'package-generate', 'assets');
-            Utils_1.default.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
-            const files = Utils_1.default.readdirR(tmpDir);
+            utils_1.fsUtil.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
+            const files = utils_1.fsUtil.readdirR(tmpDir);
             if (this.verbose) {
                 logger.log('Processing files...');
             }
@@ -112,7 +112,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
             if (!this.archive) {
                 this.archive = new AdmZip();
             }
-            const filesToZip = Utils_1.default.readdirR(tmpDir);
+            const filesToZip = utils_1.fsUtil.readdirR(tmpDir);
             filesToZip.forEach(f => {
                 if (this.debug) {
                     logger.log(`Adding ${f} to archive...`);