@pnp/cli-microsoft365 6.0.0-beta.4d2402f → 6.0.0-beta.4e32416

package/dist/m365/spo/commands/hubsite/hubsite-rights-grant.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 _SpoHubSiteRightsGrantCommand_instances, _SpoHubSiteRightsGrantCommand_initOptions, _SpoHubSiteRightsGrantCommand_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 SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteRightsGrantCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRightsGrantCommand_instances, "m", _SpoHubSiteRightsGrantCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRightsGrantCommand_instances, "m", _SpoHubSiteRightsGrantCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_RIGHTS_GRANT;
     }
@@ -23,7 +44,7 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
         })
             .then((res) => {
             if (this.verbose) {
-                logger.logToStderr(`Granting permissions to join the hub site ${args.options.url} to principals ${args.options.principals}...`);
+                logger.logToStderr(`Granting permissions to join the hub site ${args.options.hubSiteUrl} to principals ${args.options.principals}...`);
             }
             const principals = args.options.principals
                 .split(',')
@@ -35,7 +56,7 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="37" ObjectPathId="36" /><Method Name="GrantHubSiteRights" Id="38" ObjectPathId="36"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</Parameter><Parameter Type="Enum">${grantedRights}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="36" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="37" ObjectPathId="36" /><Method Name="GrantHubSiteRights" Id="38" ObjectPathId="36"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.hubSiteUrl)}</Parameter><Parameter Type="Array">${principals}</Parameter><Parameter Type="Enum">${grantedRights}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="36" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -49,24 +70,19 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-p, --principals <principals>'
-            },
-            {
-                option: '-r, --rights <rights>',
-                autocomplete: ['Join']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+}
+_SpoHubSiteRightsGrantCommand_instances = new WeakSet(), _SpoHubSiteRightsGrantCommand_initOptions = function _SpoHubSiteRightsGrantCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --hubSiteUrl <hubSiteUrl>'
+    }, {
+        option: '-p, --principals <principals>'
+    }, {
+        option: '-r, --rights <rights>',
+        autocomplete: ['Join']
+    });
+}, _SpoHubSiteRightsGrantCommand_initValidators = function _SpoHubSiteRightsGrantCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.hubSiteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -74,7 +90,7 @@ class SpoHubSiteRightsGrantCommand extends SpoCommand_1.default {
             return `${args.options.rights} is not a valid rights value. Allowed values Join`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoHubSiteRightsGrantCommand();
 //# sourceMappingURL=hubsite-rights-grant.js.map

package/dist/m365/spo/commands/hubsite/hubsite-rights-revoke.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 _SpoHubSiteRightsRevokeCommand_instances, _SpoHubSiteRightsRevokeCommand_initTelemetry, _SpoHubSiteRightsRevokeCommand_initOptions, _SpoHubSiteRightsRevokeCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
@@ -8,22 +23,24 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteRightsRevokeCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRightsRevokeCommand_instances, "m", _SpoHubSiteRightsRevokeCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRightsRevokeCommand_instances, "m", _SpoHubSiteRightsRevokeCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteRightsRevokeCommand_instances, "m", _SpoHubSiteRightsRevokeCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_RIGHTS_REVOKE;
     }
     get description() {
         return 'Revokes rights to join sites to the specified hub site for one or more principals';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const revokeRights = () => {
             let spoAdminUrl = '';
             if (this.verbose) {
-                logger.logToStderr(`Revoking rights for ${args.options.principals} from ${args.options.url}...`);
+                logger.logToStderr(`Revoking rights for ${args.options.principals} from ${args.options.hubSiteUrl}...`);
             }
             utils_1.spo
                 .getSpoAdminUrl(logger, this.debug)
@@ -41,7 +58,7 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><Method Name="RevokeHubSiteRights" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Array">${principals}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><Method Name="RevokeHubSiteRights" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.hubSiteUrl)}</Parameter><Parameter Type="Array">${principals}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -63,7 +80,7 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to revoke rights to join sites to the hub site ${args.options.url} from the specified users?`
+                message: `Are you sure you want to revoke rights to join sites to the hub site ${args.options.hubSiteUrl} from the specified users?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -74,24 +91,23 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-p, --principals <principals>'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
-    }
 }
+_SpoHubSiteRightsRevokeCommand_instances = new WeakSet(), _SpoHubSiteRightsRevokeCommand_initTelemetry = function _SpoHubSiteRightsRevokeCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoHubSiteRightsRevokeCommand_initOptions = function _SpoHubSiteRightsRevokeCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --hubSiteUrl <hubSiteUrl>'
+    }, {
+        option: '-p, --principals <principals>'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoHubSiteRightsRevokeCommand_initValidators = function _SpoHubSiteRightsRevokeCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.hubSiteUrl); }));
+};
 module.exports = new SpoHubSiteRightsRevokeCommand();
 //# sourceMappingURL=hubsite-rights-revoke.js.map

package/dist/m365/spo/commands/hubsite/hubsite-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 _SpoHubSiteSetCommand_instances, _SpoHubSiteSetCommand_initTelemetry, _SpoHubSiteSetCommand_initOptions, _SpoHubSiteSetCommand_initValidators, _SpoHubSiteSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -7,19 +22,20 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initTypes).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_SET;
     }
     get description() {
         return 'Updates properties of the specified hub site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.title = typeof args.options.title === 'string';
-        telemetryProps.description = typeof args.options.description === 'string';
-        telemetryProps.logoUrl = typeof args.options.logoUrl === 'string';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
         utils_1.spo
@@ -61,25 +77,27 @@ class SpoHubSiteSetCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id <id>'
-            },
-            {
-                option: '-t, --title [title]'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '-l, --logoUrl [logoUrl]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoHubSiteSetCommand_instances = new WeakSet(), _SpoHubSiteSetCommand_initTelemetry = function _SpoHubSiteSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title === 'string',
+            description: typeof args.options.description === 'string',
+            logoUrl: typeof args.options.logoUrl === 'string'
+        });
+    });
+}, _SpoHubSiteSetCommand_initOptions = function _SpoHubSiteSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '-l, --logoUrl [logoUrl]'
+    });
+}, _SpoHubSiteSetCommand_initValidators = function _SpoHubSiteSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -89,13 +107,9 @@ class SpoHubSiteSetCommand extends SpoCommand_1.default {
             return 'Specify title, description or logoUrl to update';
         }
         return true;
-    }
-    types() {
-        // required to support passing empty strings as valid values
-        return {
-            string: ['t', 'title', 'd', 'description', 'l', 'logoUrl']
-        };
-    }
-}
+    }));
+}, _SpoHubSiteSetCommand_initTypes = function _SpoHubSiteSetCommand_initTypes() {
+    this.types.string.push('t', 'title', 'd', 'description', 'l', 'logoUrl');
+};
 module.exports = new SpoHubSiteSetCommand();
 //# sourceMappingURL=hubsite-set.js.map

package/dist/m365/spo/commands/hubsite/hubsite-theme-sync.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 _SpoHubSiteThemeSyncCommand_instances, _SpoHubSiteThemeSyncCommand_initOptions, _SpoHubSiteThemeSyncCommand_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 SpoHubSiteThemeSyncCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteThemeSyncCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteThemeSyncCommand_instances, "m", _SpoHubSiteThemeSyncCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteThemeSyncCommand_instances, "m", _SpoHubSiteThemeSyncCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_THEME_SYNC;
     }
@@ -26,18 +47,13 @@ class SpoHubSiteThemeSyncCommand extends SpoCommand_1.default {
             .post(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-    }
 }
+_SpoHubSiteThemeSyncCommand_instances = new WeakSet(), _SpoHubSiteThemeSyncCommand_initOptions = function _SpoHubSiteThemeSyncCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    });
+}, _SpoHubSiteThemeSyncCommand_initValidators = function _SpoHubSiteThemeSyncCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+};
 module.exports = new SpoHubSiteThemeSyncCommand();
 //# sourceMappingURL=hubsite-theme-sync.js.map

package/dist/m365/spo/commands/hubsite/hubsite-unregister.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 _SpoHubSiteUnregisterCommand_instances, _SpoHubSiteUnregisterCommand_initTelemetry, _SpoHubSiteUnregisterCommand_initOptions, _SpoHubSiteUnregisterCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -6,16 +21,18 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteUnregisterCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoHubSiteUnregisterCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoHubSiteUnregisterCommand_instances, "m", _SpoHubSiteUnregisterCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteUnregisterCommand_instances, "m", _SpoHubSiteUnregisterCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoHubSiteUnregisterCommand_instances, "m", _SpoHubSiteUnregisterCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.HUBSITE_UNREGISTER;
     }
     get description() {
-        return 'Unregisters the specifies site collection as a hub site';
-    }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = args.options.confirm || false;
-        return telemetryProps;
+        return 'Unregisters the specified site collection as a hub site';
     }
     commandAction(logger, args, cb) {
         const unregisterHubSite = () => {
@@ -53,21 +70,21 @@ class SpoHubSiteUnregisterCommand 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);
-    }
 }
+_SpoHubSiteUnregisterCommand_instances = new WeakSet(), _SpoHubSiteUnregisterCommand_initTelemetry = function _SpoHubSiteUnregisterCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: args.options.confirm || false
+        });
+    });
+}, _SpoHubSiteUnregisterCommand_initOptions = function _SpoHubSiteUnregisterCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --url <url>'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoHubSiteUnregisterCommand_initValidators = function _SpoHubSiteUnregisterCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+};
 module.exports = new SpoHubSiteUnregisterCommand();
 //# sourceMappingURL=hubsite-unregister.js.map

package/dist/m365/spo/commands/knowledgehub/knowledgehub-remove.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 _SpoKnowledgehubRemoveCommand_instances, _SpoKnowledgehubRemoveCommand_initTelemetry, _SpoKnowledgehubRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
@@ -8,17 +14,18 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoKnowledgehubRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoKnowledgehubRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoKnowledgehubRemoveCommand_instances, "m", _SpoKnowledgehubRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoKnowledgehubRemoveCommand_instances, "m", _SpoKnowledgehubRemoveCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.KNOWLEDGEHUB_REMOVE;
     }
     get description() {
         return 'Removes the Knowledge Hub Site setting for your tenant';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
         const removeKnowledgehub = () => {
@@ -75,15 +82,17 @@ class SpoKnowledgehubRemoveCommand extends SpoCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_SpoKnowledgehubRemoveCommand_instances = new WeakSet(), _SpoKnowledgehubRemoveCommand_initTelemetry = function _SpoKnowledgehubRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoKnowledgehubRemoveCommand_initOptions = function _SpoKnowledgehubRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--confirm'
+    });
+};
 module.exports = new SpoKnowledgehubRemoveCommand();
 //# sourceMappingURL=knowledgehub-remove.js.map

package/dist/m365/spo/commands/knowledgehub/knowledgehub-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 _SpoKnowledgehubSetCommand_instances, _SpoKnowledgehubSetCommand_initOptions, _SpoKnowledgehubSetCommand_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 SpoKnowledgehubSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoKnowledgehubSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoKnowledgehubSetCommand_instances, "m", _SpoKnowledgehubSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoKnowledgehubSetCommand_instances, "m", _SpoKnowledgehubSetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.KNOWLEDGEHUB_SET;
     }
@@ -23,14 +44,14 @@ class SpoKnowledgehubSetCommand extends SpoCommand_1.default {
         })
             .then((res) => {
             if (this.verbose) {
-                logger.logToStderr(`Adding ${args.options.url} as the Knowledge Hub Site`);
+                logger.logToStderr(`Adding ${args.options.siteUrl} as the Knowledge Hub Site`);
             }
             const requestOptions = {
                 url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions> <ObjectPath Id="35" ObjectPathId="34" /> <Method Name="SetKnowledgeHubSite" Id="36" ObjectPathId="34"> <Parameters> <Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter> </Parameters> </Method> </Actions> <ObjectPaths> <Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /> </ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions> <ObjectPath Id="35" ObjectPathId="34" /> <Method Name="SetKnowledgeHubSite" Id="36" ObjectPathId="34"> <Parameters> <Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter> </Parameters> </Method> </Actions> <ObjectPaths> <Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /> </ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -46,18 +67,13 @@ class SpoKnowledgehubSetCommand extends SpoCommand_1.default {
             }
         }, (err) => this.handleRejectedPromise(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);
-    }
 }
+_SpoKnowledgehubSetCommand_instances = new WeakSet(), _SpoKnowledgehubSetCommand_initOptions = function _SpoKnowledgehubSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    });
+}, _SpoKnowledgehubSetCommand_initValidators = function _SpoKnowledgehubSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+};
 module.exports = new SpoKnowledgehubSetCommand();
 //# sourceMappingURL=knowledgehub-set.js.map