@pnp/cli-microsoft365 6.0.0-beta.d4d33ed → 6.0.0-beta.db5e64c

package/dist/m365/spo/commands/homesite/homesite-set.js

@@ -1,4 +1,19 @@
 "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 _SpoHomeSiteSetCommand_instances, _SpoHomeSiteSetCommand_initOptions, _SpoHomeSiteSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -7,6 +22,12 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHomeSiteSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHomeSiteSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHomeSiteSetCommand_instances, "m", _SpoHomeSiteSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHomeSiteSetCommand_instances, "m", _SpoHomeSiteSetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HOMESITE_SET;
     }
@@ -44,18 +65,13 @@ class SpoHomeSiteSetCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --siteUrl <siteUrl>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_SpoHomeSiteSetCommand_instances = new WeakSet(), _SpoHomeSiteSetCommand_initOptions = function _SpoHomeSiteSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    });
+}, _SpoHomeSiteSetCommand_initValidators = function _SpoHomeSiteSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+};
 module.exports = new SpoHomeSiteSetCommand();
 //# sourceMappingURL=homesite-set.js.map

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

@@ -1,10 +1,31 @@
 "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 _SpoHubSiteConnectCommand_instances, _SpoHubSiteConnectCommand_initOptions, _SpoHubSiteConnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteConnectCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteConnectCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_CONNECT;
     }
@@ -13,10 +34,10 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         utils_1.spo
-            .getRequestDigest(args.options.url)
+            .getRequestDigest(args.options.siteUrl)
             .then((res) => {
             const requestOptions = {
-                url: `${args.options.url}/_api/site/JoinHubSite('${encodeURIComponent(args.options.hubSiteId)}')`,
+                url: `${args.options.siteUrl}/_api/site/JoinHubSite('${encodeURIComponent(args.options.id)}')`,
                 headers: {
                     'X-RequestDigest': res.FormDigestValue,
                     accept: 'application/json;odata=nometadata'
@@ -27,28 +48,24 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
         })
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-i, --hubSiteId <hubSiteId>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+}
+_SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_initOptions = function _SpoHubSiteConnectCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-i, --id <id>'
+    });
+}, _SpoHubSiteConnectCommand_initValidators = function _SpoHubSiteConnectCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!utils_1.validation.isValidGuid(args.options.hubSiteId)) {
-            return `${args.options.hubSiteId} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoHubSiteConnectCommand();
 //# sourceMappingURL=hubsite-connect.js.map

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

@@ -1,21 +1,38 @@
 "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 _SpoHubSiteDataGetCommand_instances, _SpoHubSiteDataGetCommand_initTelemetry, _SpoHubSiteDataGetCommand_initOptions, _SpoHubSiteDataGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteDataGetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteDataGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteDataGetCommand_instances, "m", _SpoHubSiteDataGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteDataGetCommand_instances, "m", _SpoHubSiteDataGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteDataGetCommand_instances, "m", _SpoHubSiteDataGetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_DATA_GET;
     }
     get description() {
         return 'Get hub site data for the specified site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.forceRefresh = args.options.forceRefresh === true;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         if (this.verbose) {
             logger.logToStderr('Retrieving hub site data...');
@@ -42,21 +59,21 @@ class SpoHubSiteDataGetCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-f, --forceRefresh'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-    }
 }
+_SpoHubSiteDataGetCommand_instances = new WeakSet(), _SpoHubSiteDataGetCommand_initTelemetry = function _SpoHubSiteDataGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            forceRefresh: args.options.forceRefresh === true
+        });
+    });
+}, _SpoHubSiteDataGetCommand_initOptions = function _SpoHubSiteDataGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-f, --forceRefresh'
+    });
+}, _SpoHubSiteDataGetCommand_initValidators = function _SpoHubSiteDataGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+};
 module.exports = new SpoHubSiteDataGetCommand();
 //# sourceMappingURL=hubsite-data-get.js.map

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

@@ -1,4 +1,19 @@
 "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 request_1 = require("../../../../request");
@@ -6,27 +21,29 @@ const utils_1 = require("../../../../utils");
 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)
+                .getRequestDigest(args.options.siteUrl)
                 .then((res) => {
                 if (this.verbose) {
-                    logger.logToStderr(`Disconnecting site collection ${args.options.url} from its hubsite...`);
+                    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')`,
+                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue,
                         accept: 'application/json;odata=nometadata'
@@ -45,7 +62,7 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to disconnect the site collection ${args.options.url} from its hub site?`
+                message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -56,21 +73,21 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
-    }
 }
+_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 utils_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,4 +1,19 @@
 "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 request_1 = require("../../../../request");
@@ -7,33 +22,20 @@ 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;
-    }
-    getAssociatedSites(spoAdminUrl, hubSiteId, logger, args) {
-        const options = {
-            output: 'json',
-            debug: args.options.debug,
-            verbose: args.options.verbose,
-            listTitle: 'DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS',
-            webUrl: spoAdminUrl,
-            filter: `HubSiteId eq '${hubSiteId}'`,
-            fields: 'Title,SiteUrl,SiteId'
-        };
-        return cli_1.Cli
-            .executeCommandWithOutput(SpoListItemListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
-    }
     commandAction(logger, args, cb) {
         let hubSite;
         utils_1.spo
@@ -69,6 +71,19 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    getAssociatedSites(spoAdminUrl, hubSiteId, logger, args) {
+        const options = {
+            output: 'json',
+            debug: args.options.debug,
+            verbose: args.options.verbose,
+            listTitle: 'DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS',
+            webUrl: spoAdminUrl,
+            filter: `HubSiteId eq '${hubSiteId}'`,
+            fields: 'Title,SiteUrl,SiteId'
+        };
+        return cli_1.Cli
+            .executeCommandWithOutput(SpoListItemListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+    }
     getHubSiteById(spoUrl, options) {
         const requestOptions = {
             url: `${spoUrl}/_api/hubsites/getbyid('${options.id}')`,
@@ -106,22 +121,20 @@ 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) {
+}
+_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 && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -129,7 +142,9 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
             return utils_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,4 +1,10 @@
 "use strict";
+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");
@@ -7,8 +13,11 @@ 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,11 +25,6 @@ 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'];
     }
@@ -126,15 +130,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,10 +1,31 @@
 "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 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;
     }
@@ -13,10 +34,10 @@ class SpoHubSiteRegisterCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         utils_1.spo
-            .getRequestDigest(args.options.url)
+            .getRequestDigest(args.options.siteUrl)
             .then((res) => {
             const requestOptions = {
-                url: `${args.options.url}/_api/site/RegisterHubSite`,
+                url: `${args.options.siteUrl}/_api/site/RegisterHubSite`,
                 headers: {
                     'X-RequestDigest': res.FormDigestValue,
                     accept: 'application/json;odata=nometadata'
@@ -30,18 +51,13 @@ class SpoHubSiteRegisterCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
-    }
 }
+_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 utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+};
 module.exports = new SpoHubSiteRegisterCommand();
 //# sourceMappingURL=hubsite-register.js.map