@pnp/cli-microsoft365 6.0.0-beta.27b9708 → 6.0.0-beta.291f17c

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

@@ -13,56 +13,135 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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;
+var _SpoHubSiteConnectCommand_instances, _SpoHubSiteConnectCommand_initTelemetry, _SpoHubSiteConnectCommand_initOptions, _SpoHubSiteConnectCommand_initOptionSets, _SpoHubSiteConnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 class SpoHubSiteConnectCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoHubSiteConnectCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.HUBSITE_CONNECT;
     }
     get description() {
-        return 'Connects the specified site collection to the given hub site';
+        return 'Connect a hub site to a parent hub site';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getRequestDigest(args.options.siteUrl)
-            .then((res) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Connecting hub site '${args.options.id || args.options.title || args.options.url}' to hub site '${args.options.parentId || args.options.parentTitle || args.options.parentUrl}'...`);
+            }
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const hubSites = yield this.getHubSites(spoAdminUrl);
+                const hubSite = this.getSpecificHubSite(hubSites, args.options.id, args.options.title, args.options.url);
+                const parentHubSite = this.getSpecificHubSite(hubSites, args.options.parentId, args.options.parentTitle, args.options.parentUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_api/HubSites/GetById('${hubSite.ID}')`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        'if-match': hubSite['odata.etag']
+                    },
+                    responseType: 'json',
+                    data: {
+                        ParentHubSiteId: parentHubSite.ID
+                    }
+                };
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getHubSites(spoAdminUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${args.options.siteUrl}/_api/site/JoinHubSite('${encodeURIComponent(args.options.id)}')`,
+                url: `${spoAdminUrl}/_api/HubSites?$select=ID,Title,SiteUrl&$top=5000`,
                 headers: {
-                    'X-RequestDigest': res.FormDigestValue,
-                    accept: 'application/json;odata=nometadata'
+                    accept: 'application/json;odata=minimalmetadata'
                 },
                 responseType: 'json'
             };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            const hubSites = yield request_1.default.get(requestOptions);
+            return hubSites.value;
+        });
+    }
+    getSpecificHubSite(hubSites, id, title, url) {
+        let filteredHubSites = [];
+        if (id) {
+            filteredHubSites = hubSites.filter(site => site.ID.toLowerCase() === id.toLowerCase());
+        }
+        else if (title) {
+            filteredHubSites = hubSites.filter(site => site.Title.toLowerCase() === title.toLowerCase());
+        }
+        else if (url) {
+            filteredHubSites = hubSites.filter(site => site.SiteUrl.toLowerCase() === url.toLowerCase());
+        }
+        if (filteredHubSites.length === 0) {
+            throw `The specified hub site '${id || title || url}' does not exist.`;
+        }
+        if (filteredHubSites.length > 1) {
+            throw `Multiple hub sites with name '${title}' found: ${filteredHubSites.map(s => s.ID).join(',')}.`;
+        }
+        return filteredHubSites[0];
     }
 }
-_SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_initOptions = function _SpoHubSiteConnectCommand_initOptions() {
+_SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_initTelemetry = function _SpoHubSiteConnectCommand_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',
+            parentId: typeof args.options.parentId !== 'undefined',
+            parentTitle: typeof args.options.parentTitle !== 'undefined',
+            parentUrl: typeof args.options.parentUrl !== 'undefined'
+        });
+    });
+}, _SpoHubSiteConnectCommand_initOptions = function _SpoHubSiteConnectCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-u, --url [url]'
     }, {
-        option: '-i, --id <id>'
+        option: '--parentId [parentId]'
+    }, {
+        option: '--parentTitle [parentTitle]'
+    }, {
+        option: '--parentUrl [parentUrl]'
     });
+}, _SpoHubSiteConnectCommand_initOptionSets = function _SpoHubSiteConnectCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title', 'url'] }, { options: ['parentId', 'parentTitle', 'parentUrl'] });
 }, _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 (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `'${args.options.id}' is not a valid GUID`;
+        }
+        if (args.options.parentId && !validation_1.validation.isValidGuid(args.options.parentId)) {
+            return `'${args.options.parentId}' is not a valid GUID`;
+        }
+        if (args.options.url) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (args.options.parentUrl) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.parentUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
         }
         return true;
     }));

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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 validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteDataGetCommand extends SpoCommand_1.default {
@@ -33,31 +33,34 @@ class SpoHubSiteDataGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Get hub site data for the specified site';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr('Retrieving hub site data...');
-        }
-        const forceRefresh = args.options.forceRefresh === true;
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/HubSiteData(${forceRefresh})`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res['odata.null'] !== true) {
-                logger.log(JSON.parse(res.value));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Retrieving hub site data...');
             }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr(`${args.options.webUrl} is not connected to a hub site and is not a hub site itself`);
+            const forceRefresh = args.options.forceRefresh === true;
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/HubSiteData(${forceRefresh})`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                if (res['odata.null'] !== true) {
+                    logger.log(JSON.parse(res.value));
                 }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr(`${args.options.webUrl} is not connected to a hub site and is not a hub site itself`);
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoHubSiteDataGetCommand_instances = new WeakSet(), _SpoHubSiteDataGetCommand_initTelemetry = function _SpoHubSiteDataGetCommand_initTelemetry() {
@@ -73,7 +76,7 @@ _SpoHubSiteDataGetCommand_instances = new WeakSet(), _SpoHubSiteDataGetCommand_i
         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); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_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

@@ -13,11 +13,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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;
+var _SpoHubSiteDisconnectCommand_instances, _SpoHubSiteDisconnectCommand_initTelemetry, _SpoHubSiteDisconnectCommand_initOptions, _SpoHubSiteDisconnectCommand_initOptionSets, _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 {
@@ -27,67 +28,122 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
         __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);
+        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.HUBSITE_DISCONNECT;
     }
     get description() {
-        return 'Disconnects the specifies site collection from its hub site';
+        return 'Disconnect a hub site from its parent hub site';
     }
-    commandAction(logger, args, cb) {
-        const disconnectHubSite = () => {
-            utils_1.spo
-                .getRequestDigest(args.options.siteUrl)
-                .then((res) => {
-                if (this.verbose) {
-                    logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const disconnectHubSite = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Disconnecting hub site '${args.options.id || args.options.title || args.options.url}' from its parent hub site...`);
+                    }
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const hubSite = yield this.getHubSite(spoAdminUrl, args.options);
+                    const requestOptions = {
+                        url: `${spoAdminUrl}/_api/HubSites/GetById('${hubSite.ID}')`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata',
+                            'if-match': hubSite['odata.etag']
+                        },
+                        responseType: 'json',
+                        data: {
+                            ParentHubSiteId: '00000000-0000-0000-0000-000000000000'
+                        }
+                    };
+                    yield request_1.default.patch(requestOptions);
                 }
-                const requestOptions = {
-                    url: `${args.options.siteUrl}/_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.siteUrl} from its hub site?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    disconnectHubSite();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield disconnectHubSite();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want disconnect hub site '${args.options.id || args.options.title || args.options.url}' from its parent hub site?`
+                });
+                if (result.continue) {
+                    yield disconnectHubSite();
+                }
+            }
+        });
+    }
+    getHubSite(spoAdminUrl, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                headers: {
+                    accept: 'application/json;odata=minimalmetadata'
+                },
+                responseType: 'json'
+            };
+            if (options.id) {
+                requestOptions.url = `${spoAdminUrl}/_api/HubSites/GetById('${options.id}')?$select=ID`;
+                const result = yield request_1.default.get(requestOptions);
+                return result;
+            }
+            requestOptions.url = `${spoAdminUrl}/_api/HubSites?$select=ID,Title,SiteUrl&$top=5000`;
+            const hubSitesResponse = yield request_1.default.get(requestOptions);
+            const hubSites = hubSitesResponse.value;
+            let filteredHubSites = [];
+            if (options.title) {
+                filteredHubSites = hubSites.filter(site => site.Title.toLowerCase() === options.title.toLowerCase());
+            }
+            else if (options.url) {
+                filteredHubSites = hubSites.filter(site => site.SiteUrl.toLowerCase() === options.url.toLowerCase());
+            }
+            if (filteredHubSites.length === 0) {
+                throw `The specified hub site '${options.title || options.url}' does not exist.`;
+            }
+            if (filteredHubSites.length > 1) {
+                throw `Multiple hub sites with name '${options.title}' found: ${filteredHubSites.map(s => s.ID).join(',')}.`;
+            }
+            return filteredHubSites[0];
+        });
     }
 }
 _SpoHubSiteDisconnectCommand_instances = new WeakSet(), _SpoHubSiteDisconnectCommand_initTelemetry = function _SpoHubSiteDisconnectCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            url: typeof args.options.url !== 'undefined'
         });
     });
 }, _SpoHubSiteDisconnectCommand_initOptions = function _SpoHubSiteDisconnectCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-u, --url [url]'
     }, {
         option: '--confirm'
     });
+}, _SpoHubSiteDisconnectCommand_initOptionSets = function _SpoHubSiteDisconnectCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title', 'url'] });
 }, _SpoHubSiteDisconnectCommand_initValidators = function _SpoHubSiteDisconnectCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    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) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
+        return true;
+    }));
 };
 module.exports = new SpoHubSiteDisconnectCommand();
 //# sourceMappingURL=hubsite-disconnect.js.map

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 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");
@@ -36,40 +37,26 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets information about the specified hub site';
     }
-    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);
+    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);
             }
-            else {
-                return this.getHubSite(spoUrl, args.options);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        })
-            .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));
+        });
     }
     getAssociatedSites(spoAdminUrl, hubSiteId, logger, args) {
         const options = {
@@ -81,7 +68,7 @@ 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), { _: [] }) });
     }
     getHubSiteById(spoUrl, options) {
@@ -135,16 +122,16 @@ _SpoHubSiteGetCommand_instances = new WeakSet(), _SpoHubSiteGetCommand_initTelem
     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)) {
+        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']);
+    this.optionSets.push({ options: ['id', 'title', 'url'] });
 };
 module.exports = new SpoHubSiteGetCommand();
 //# sourceMappingURL=hubsite-get.js.map