@pnp/cli-microsoft365 6.0.0-beta.9d619b2 → 6.0.0-beta.a008afc

package/dist/m365/spo/commands/hubsite/hubsite-disconnect.js

@@ -1,76 +1,93 @@
 "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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoHubSiteDisconnectCommand_instances, _SpoHubSiteDisconnectCommand_initTelemetry, _SpoHubSiteDisconnectCommand_initOptions, _SpoHubSiteDisconnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteDisconnectCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_DISCONNECT;
     }
     get description() {
         return 'Disconnects the specifies site collection from its hub site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = args.options.confirm || false;
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        const disconnectHubSite = () => {
-            utils_1.spo
-                .getRequestDigest(args.options.url)
-                .then((res) => {
-                if (this.verbose) {
-                    logger.logToStderr(`Disconnecting site collection ${args.options.url} from its hubsite...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const disconnectHubSite = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
+                    if (this.verbose) {
+                        logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
+                    }
+                    const requestOptions = {
+                        url: `${args.options.url}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
+                        headers: {
+                            'X-RequestDigest': res.FormDigestValue,
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                const requestOptions = {
-                    url: `${args.options.url}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue,
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            disconnectHubSite();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to disconnect the site collection ${args.options.url} from its hub site?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    disconnectHubSite();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield disconnectHubSite();
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
+                });
+                if (result.continue) {
+                    yield disconnectHubSite();
+                }
+            }
+        });
     }
 }
+_SpoHubSiteDisconnectCommand_instances = new WeakSet(), _SpoHubSiteDisconnectCommand_initTelemetry = function _SpoHubSiteDisconnectCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: args.options.confirm || false
+        });
+    });
+}, _SpoHubSiteDisconnectCommand_initOptions = function _SpoHubSiteDisconnectCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoHubSiteDisconnectCommand_initValidators = function _SpoHubSiteDisconnectCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+};
 module.exports = new SpoHubSiteDisconnectCommand();
 //# sourceMappingURL=hubsite-disconnect.js.map

package/dist/m365/spo/commands/hubsite/hubsite-get.js

@@ -1,25 +1,62 @@
 "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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoHubSiteGetCommand_instances, _SpoHubSiteGetCommand_initTelemetry, _SpoHubSiteGetCommand_initOptions, _SpoHubSiteGetCommand_initValidators, _SpoHubSiteGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoListItemListCommand = require("../listitem/listitem-list");
 class SpoHubSiteGetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteGetCommand_instances, "m", _SpoHubSiteGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteGetCommand_instances, "m", _SpoHubSiteGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteGetCommand_instances, "m", _SpoHubSiteGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteGetCommand_instances, "m", _SpoHubSiteGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_GET;
     }
     get description() {
         return 'Gets information about the specified hub site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.title = typeof args.options.title !== 'undefined';
-        telemetryProps.url = typeof args.options.url !== 'undefined';
-        telemetryProps.includeAssociatedSites = args.options.includeAssociatedSites === true;
-        return telemetryProps;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const hubSite = args.options.id ? yield this.getHubSiteById(spoUrl, args.options) : yield this.getHubSite(spoUrl, args.options);
+                if (args.options.includeAssociatedSites && (args.options.output && args.options.output !== 'json')) {
+                    throw 'includeAssociatedSites option is only allowed with json output mode';
+                }
+                if (args.options.includeAssociatedSites === true && args.options.output && args.options.output === 'json') {
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const associatedSitesCommandOutput = yield this.getAssociatedSites(spoAdminUrl, hubSite.SiteId, logger, args);
+                    const associatedSites = JSON.parse(associatedSitesCommandOutput.stdout);
+                    hubSite.AssociatedSites = associatedSites.filter(s => s.SiteId !== hubSite.SiteId);
+                }
+                logger.log(hubSite);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getAssociatedSites(spoAdminUrl, hubSiteId, logger, args) {
         const options = {
@@ -31,44 +68,9 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
             filter: `HubSiteId eq '${hubSiteId}'`,
             fields: 'Title,SiteUrl,SiteId'
         };
-        return cli_1.Cli
+        return Cli_1.Cli
             .executeCommandWithOutput(SpoListItemListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
     }
-    commandAction(logger, args, cb) {
-        let hubSite;
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            if (args.options.id) {
-                return this.getHubSiteById(spoUrl, args.options);
-            }
-            else {
-                return this.getHubSite(spoUrl, args.options);
-            }
-        })
-            .then((res) => {
-            hubSite = res;
-            if (args.options.includeAssociatedSites && (args.options.output && args.options.output !== 'json')) {
-                throw Error('includeAssociatedSites option is only allowed with json output mode');
-            }
-            if (args.options.includeAssociatedSites !== true || args.options.output && args.options.output !== 'json') {
-                return Promise.resolve();
-            }
-            return utils_1.spo
-                .getSpoAdminUrl(logger, this.debug)
-                .then((spoAdminUrl) => {
-                return this.getAssociatedSites(spoAdminUrl, hubSite.SiteId, logger, args);
-            });
-        })
-            .then((associatedSitesCommandOutput) => {
-            if (args.options.includeAssociatedSites) {
-                const associatedSites = JSON.parse(associatedSitesCommandOutput.stdout);
-                hubSite.AssociatedSites = associatedSites.filter(s => s.SiteId !== hubSite.SiteId);
-            }
-            logger.log(hubSite);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
     getHubSiteById(spoUrl, options) {
         const requestOptions = {
             url: `${spoUrl}/_api/hubsites/getbyid('${options.id}')`,
@@ -106,30 +108,30 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
             return hubSites[0];
         });
     }
-    options() {
-        const options = [
-            { option: '-i, --id [id]' },
-            { option: '-t, --title [title]' },
-            { option: '-u, --url [url]' },
-            { option: '--includeAssociatedSites' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    optionSets() {
-        return [
-            ['id', 'title', 'url']
-        ];
-    }
-    validate(args) {
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+}
+_SpoHubSiteGetCommand_instances = new WeakSet(), _SpoHubSiteGetCommand_initTelemetry = function _SpoHubSiteGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            includeAssociatedSites: args.options.includeAssociatedSites === true
+        });
+    });
+}, _SpoHubSiteGetCommand_initOptions = function _SpoHubSiteGetCommand_initOptions() {
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--includeAssociatedSites' });
+}, _SpoHubSiteGetCommand_initValidators = function _SpoHubSiteGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.url) {
-            return utils_1.validation.isValidSharePointUrl(args.options.url);
+            return validation_1.validation.isValidSharePointUrl(args.options.url);
         }
         return true;
-    }
-}
+    }));
+}, _SpoHubSiteGetCommand_initOptionSets = function _SpoHubSiteGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title', 'url']);
+};
 module.exports = new SpoHubSiteGetCommand();
 //# sourceMappingURL=hubsite-get.js.map

package/dist/m365/spo/commands/hubsite/hubsite-list.js

@@ -1,14 +1,32 @@
 "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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoHubSiteListCommand_instances, _SpoHubSiteListCommand_initTelemetry, _SpoHubSiteListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteListCommand extends SpoCommand_1.default {
     constructor() {
         super();
+        _SpoHubSiteListCommand_instances.add(this);
         this.batchSize = 30;
         this.batchSize = 30;
+        __classPrivateFieldGet(this, _SpoHubSiteListCommand_instances, "m", _SpoHubSiteListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteListCommand_instances, "m", _SpoHubSiteListCommand_initOptions).call(this);
     }
     get name() {
         return commands_1.default.HUBSITE_LIST;
@@ -16,80 +34,68 @@ class SpoHubSiteListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists hub sites in the current tenant';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.includeAssociatedSites = args.options.includeAssociatedSites === true;
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['ID', 'SiteUrl', 'Title'];
     }
-    commandAction(logger, args, cb) {
-        let hubSites;
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/hubsites`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            hubSites = res.value;
-            if (args.options.includeAssociatedSites !== true || args.options.output && args.options.output !== 'json') {
-                return Promise.resolve();
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr('Retrieving associated sites...');
-                    logger.logToStderr('');
-                }
-            }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/web/lists/GetByTitle('DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS')/RenderListDataAsStream`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    parameters: {
-                        ViewXml: "<View><Query><Where><And><And><IsNull><FieldRef Name=\"TimeDeleted\"/></IsNull><Neq><FieldRef Name=\"State\"/><Value Type='Integer'>0</Value></Neq></And><Neq><FieldRef Name=\"HubSiteId\"/><Value Type='Text'>{00000000-0000-0000-0000-000000000000}</Value></Neq></And></Where><OrderBy><FieldRef Name='Title' Ascending='true' /></OrderBy></Query><ViewFields><FieldRef Name=\"Title\"/><FieldRef Name=\"SiteUrl\"/><FieldRef Name=\"SiteId\"/><FieldRef Name=\"HubSiteId\"/></ViewFields><RowLimit Paged=\"TRUE\">" + this.batchSize + "</RowLimit></View>",
-                        DatesInUtc: true
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                let requestOptions = {
+                    url: `${spoAdminUrl}/_api/hubsites`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const hubSitesResult = yield request_1.default.get(requestOptions);
+                const hubSites = hubSitesResult.value;
+                if (!(args.options.includeAssociatedSites !== true || args.options.output && args.options.output !== 'json')) {
+                    if (this.debug) {
+                        logger.logToStderr('Retrieving associated sites...');
+                        logger.logToStderr('');
+                    }
+                    requestOptions = {
+                        url: `${spoAdminUrl}/_api/web/lists/GetByTitle('DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS')/RenderListDataAsStream`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json',
+                        data: {
+                            parameters: {
+                                ViewXml: "<View><Query><Where><And><And><IsNull><FieldRef Name=\"TimeDeleted\"/></IsNull><Neq><FieldRef Name=\"State\"/><Value Type='Integer'>0</Value></Neq></And><Neq><FieldRef Name=\"HubSiteId\"/><Value Type='Text'>{00000000-0000-0000-0000-000000000000}</Value></Neq></And></Where><OrderBy><FieldRef Name='Title' Ascending='true' /></OrderBy></Query><ViewFields><FieldRef Name=\"Title\"/><FieldRef Name=\"SiteUrl\"/><FieldRef Name=\"SiteId\"/><FieldRef Name=\"HubSiteId\"/></ViewFields><RowLimit Paged=\"TRUE\">" + this.batchSize + "</RowLimit></View>",
+                                DatesInUtc: true
+                            }
+                        }
+                    };
+                    if (this.debug) {
+                        logger.logToStderr(`Will retrieve associated sites (including the hub sites) in batches of ${this.batchSize}`);
+                    }
+                    const res = yield this.getSites(requestOptions, requestOptions.url, logger);
+                    if (res) {
+                        hubSites.forEach(h => {
+                            const filteredSites = res.filter(f => {
+                                // Only include sites of which the Site Id is not the same as the
+                                // Hub Site ID (as this site is the actual hub site) and of which the
+                                // Hub Site ID matches the ID of the Hub
+                                return f.SiteId !== f.HubSiteId
+                                    && f.HubSiteId.toUpperCase() === `{${h.ID.toUpperCase()}}`;
+                            });
+                            h.AssociatedSites = filteredSites.map(a => {
+                                return {
+                                    Title: a.Title,
+                                    SiteUrl: a.SiteUrl
+                                };
+                            });
+                        });
                     }
                 }
-            };
-            if (this.debug) {
-                logger.logToStderr(`Will retrieve associated sites (including the hub sites) in batches of ${this.batchSize}`);
+                logger.log(hubSites);
             }
-            return this.getSites(requestOptions, requestOptions.url, logger);
-        })
-            .then((res) => {
-            if (res) {
-                hubSites.forEach(h => {
-                    const filteredSites = res.filter(f => {
-                        // Only include sites of which the Site Id is not the same as the
-                        // Hub Site ID (as this site is the actual hub site) and of which the
-                        // Hub Site ID matches the ID of the Hub
-                        return f.SiteId !== f.HubSiteId
-                            && f.HubSiteId.toUpperCase() === `{${h.ID.toUpperCase()}}`;
-                    });
-                    h.AssociatedSites = filteredSites.map(a => {
-                        return {
-                            Title: a.Title,
-                            SiteUrl: a.SiteUrl
-                        };
-                    });
-                });
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(hubSites);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getSites(reqOptions, nonPagedUrl, logger, sites = [], batchNumber = 0) {
         return new Promise((resolve, reject) => {
@@ -126,15 +132,17 @@ class SpoHubSiteListCommand extends SpoCommand_1.default {
             });
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --includeAssociatedSites'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_SpoHubSiteListCommand_instances = new WeakSet(), _SpoHubSiteListCommand_initTelemetry = function _SpoHubSiteListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            includeAssociatedSites: args.options.includeAssociatedSites === true
+        });
+    });
+}, _SpoHubSiteListCommand_initOptions = function _SpoHubSiteListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --includeAssociatedSites'
+    });
+};
 module.exports = new SpoHubSiteListCommand();
 //# sourceMappingURL=hubsite-list.js.map

package/dist/m365/spo/commands/hubsite/hubsite-register.js

@@ -1,47 +1,65 @@
 "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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoHubSiteRegisterCommand_instances, _SpoHubSiteRegisterCommand_initOptions, _SpoHubSiteRegisterCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteRegisterCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteRegisterCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRegisterCommand_instances, "m", _SpoHubSiteRegisterCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRegisterCommand_instances, "m", _SpoHubSiteRegisterCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_REGISTER;
     }
     get description() {
         return 'Registers the specified site collection as a hub site';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getRequestDigest(args.options.url)
-            .then((res) => {
-            const requestOptions = {
-                url: `${args.options.url}/_api/site/RegisterHubSite`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue,
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
+                const requestOptions = {
+                    url: `${args.options.siteUrl}/_api/site/RegisterHubSite`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.FormDigestValue,
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
+_SpoHubSiteRegisterCommand_instances = new WeakSet(), _SpoHubSiteRegisterCommand_initOptions = function _SpoHubSiteRegisterCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    });
+}, _SpoHubSiteRegisterCommand_initValidators = function _SpoHubSiteRegisterCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+};
 module.exports = new SpoHubSiteRegisterCommand();
 //# sourceMappingURL=hubsite-register.js.map