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

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

@@ -1,88 +1,102 @@
 "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 _SpoSiteScriptSetCommand_instances, _SpoSiteScriptSetCommand_initTelemetry, _SpoSiteScriptSetCommand_initOptions, _SpoSiteScriptSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteScriptSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSiteScriptSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteScriptSetCommand_instances, "m", _SpoSiteScriptSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteScriptSetCommand_instances, "m", _SpoSiteScriptSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteScriptSetCommand_instances, "m", _SpoSiteScriptSetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SITESCRIPT_SET;
     }
     get description() {
         return 'Updates existing site script';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.title = (!(!args.options.title)).toString();
-        telemetryProps.description = (!(!args.options.description)).toString();
-        telemetryProps.version = (!(!args.options.version)).toString();
-        telemetryProps.content = (!(!args.options.content)).toString();
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        let spoUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((_spoUrl) => {
-            spoUrl = _spoUrl;
-            return utils_1.spo.getRequestDigest(spoUrl);
-        })
-            .then((res) => {
-            const updateInfo = {
-                Id: args.options.id
-            };
-            if (args.options.title) {
-                updateInfo.Title = args.options.title;
-            }
-            if (args.options.description) {
-                updateInfo.Description = args.options.description;
-            }
-            if (args.options.version) {
-                updateInfo.Version = parseInt(args.options.version);
-            }
-            if (args.options.content) {
-                updateInfo.Content = args.options.content;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const formDigest = yield spo_1.spo.getRequestDigest(spoUrl);
+                const updateInfo = {
+                    Id: args.options.id
+                };
+                if (args.options.title) {
+                    updateInfo.Title = args.options.title;
+                }
+                if (args.options.description) {
+                    updateInfo.Description = args.options.description;
+                }
+                if (args.options.version) {
+                    updateInfo.Version = parseInt(args.options.version);
+                }
+                if (args.options.content) {
+                    updateInfo.Content = args.options.content;
+                }
+                const requestOptions = {
+                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.UpdateSiteScript`,
+                    headers: {
+                        'X-RequestDigest': formDigest.FormDigestValue,
+                        'content-type': 'application/json;charset=utf-8',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: { updateInfo: updateInfo },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
             }
-            const requestOptions = {
-                url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.UpdateSiteScript`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue,
-                    'content-type': 'application/json;charset=utf-8',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: { updateInfo: updateInfo },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --id <id>'
-            },
-            {
-                option: '-t, --title [title]'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '-v, --version [version]'
-            },
-            {
-                option: '-c, --content [content]'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+}
+_SpoSiteScriptSetCommand_instances = new WeakSet(), _SpoSiteScriptSetCommand_initTelemetry = function _SpoSiteScriptSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            title: (!(!args.options.title)).toString(),
+            description: (!(!args.options.description)).toString(),
+            version: (!(!args.options.version)).toString(),
+            content: (!(!args.options.content)).toString()
+        });
+    });
+}, _SpoSiteScriptSetCommand_initOptions = function _SpoSiteScriptSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '-v, --version [version]'
+    }, {
+        option: '-c, --content [content]'
+    });
+}, _SpoSiteScriptSetCommand_initValidators = function _SpoSiteScriptSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.version) {
@@ -100,7 +114,7 @@ class SpoSiteScriptSetCommand extends SpoCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoSiteScriptSetCommand();
 //# sourceMappingURL=sitescript-set.js.map

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

@@ -1,4 +1,13 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../Auth");
 const SpoCommand_1 = require("../../base/SpoCommand");
@@ -10,12 +19,13 @@ class SpoGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets the context URL for the root SharePoint site collection and SharePoint tenant admin site';
     }
-    commandAction(logger, args, cb) {
-        const spoContext = {
-            SpoUrl: Auth_1.default.service.spoUrl ? Auth_1.default.service.spoUrl : ''
-        };
-        logger.log(spoContext);
-        cb();
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const spoContext = {
+                SpoUrl: Auth_1.default.service.spoUrl ? Auth_1.default.service.spoUrl : ''
+            };
+            logger.log(spoContext);
+        });
     }
 }
 module.exports = new SpoGetCommand();

package/dist/m365/spo/commands/spo-search.js

@@ -1,66 +1,61 @@
 "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 _SpoSearchCommand_instances, _SpoSearchCommand_initTelemetry, _SpoSearchCommand_initOptions, _SpoSearchCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 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 SpoSearchCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSearchCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSearchCommand_instances, "m", _SpoSearchCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSearchCommand_instances, "m", _SpoSearchCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSearchCommand_instances, "m", _SpoSearchCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SEARCH;
     }
     get description() {
         return 'Executes a search query';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.selectproperties = typeof args.options.selectProperties !== 'undefined';
-        telemetryProps.allResults = args.options.allResults;
-        telemetryProps.rowLimit = args.options.rowLimit;
-        telemetryProps.sourceId = typeof args.options.sourceId !== 'undefined';
-        telemetryProps.trimDuplicates = args.options.trimDuplicates;
-        telemetryProps.enableStemming = args.options.enableStemming;
-        telemetryProps.culture = args.options.culture;
-        telemetryProps.refinementFilters = typeof args.options.refinementFilters !== 'undefined';
-        telemetryProps.queryTemplate = typeof args.options.queryTemplate !== 'undefined';
-        telemetryProps.sortList = typeof args.options.sortList !== 'undefined';
-        telemetryProps.rankingModelId = typeof args.options.rankingModelId !== 'undefined';
-        telemetryProps.startRow = typeof args.options.startRow !== 'undefined';
-        telemetryProps.properties = typeof args.options.properties !== 'undefined';
-        telemetryProps.sourceName = typeof args.options.sourceName !== 'undefined';
-        telemetryProps.refiners = typeof args.options.refiners !== 'undefined';
-        telemetryProps.webUrl = typeof args.options.webUrl !== 'undefined';
-        telemetryProps.hiddenConstraints = typeof args.options.hiddenConstraints !== 'undefined';
-        telemetryProps.clientType = typeof args.options.clientType !== 'undefined';
-        telemetryProps.enablePhonetic = args.options.enablePhonetic;
-        telemetryProps.processBestBets = args.options.processBestBets;
-        telemetryProps.enableQueryRules = args.options.enableQueryRules;
-        telemetryProps.processPersonalFavorites = args.options.processPersonalFavorites;
-        telemetryProps.rawOutput = args.options.rawOutput;
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        let webUrl = '';
-        (() => {
-            if (args.options.webUrl) {
-                return Promise.resolve(args.options.webUrl);
-            }
-            else {
-                return utils_1.spo.getSpoUrl(logger, this.debug);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let webUrl = '';
+            try {
+                if (args.options.webUrl) {
+                    webUrl = args.options.webUrl;
+                }
+                else {
+                    webUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Executing search query '${args.options.queryText}' on site at ${webUrl}...`);
+                }
+                const startRow = args.options.startRow ? args.options.startRow : 0;
+                const results = yield this.executeSearchQuery(logger, args, webUrl, [], startRow);
+                this.printResults(logger, args, results);
             }
-        })()
-            .then((_webUrl) => {
-            webUrl = _webUrl;
-            if (this.verbose) {
-                logger.logToStderr(`Executing search query '${args.options.queryText}' on site at ${webUrl}...`);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const startRow = args.options.startRow ? args.options.startRow : 0;
-            return this.executeSearchQuery(logger, args, webUrl, [], startRow);
-        })
-            .then((results) => {
-            this.printResults(logger, args, results);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     executeSearchQuery(logger, args, webUrl, resultSet, startRow) {
         return (() => {
@@ -134,105 +129,6 @@ class SpoSearchCommand extends SpoCommand_1.default {
             ? args.options.selectProperties.split(",")
             : ["Title", "OriginalPath"];
     }
-    options() {
-        const options = [
-            {
-                option: '-q, --queryText <queryText>'
-            },
-            {
-                option: '-p, --selectProperties [selectProperties]'
-            },
-            {
-                option: '-u, --webUrl [webUrl]'
-            },
-            {
-                option: '--allResults'
-            },
-            {
-                option: '--rowLimit [rowLimit]'
-            },
-            {
-                option: '--sourceId [sourceId]'
-            },
-            {
-                option: '--trimDuplicates'
-            },
-            {
-                option: '--enableStemming'
-            },
-            {
-                option: '--culture [culture]'
-            },
-            {
-                option: '--refinementFilters [refinementFilters]'
-            },
-            {
-                option: '--queryTemplate [queryTemplate]'
-            },
-            {
-                option: '--sortList [sortList]'
-            },
-            {
-                option: '--rankingModelId [rankingModelId]'
-            },
-            {
-                option: '--startRow [startRow]'
-            },
-            {
-                option: '--properties [properties]'
-            },
-            {
-                option: '--sourceName [sourceName]'
-            },
-            {
-                option: '--refiners [refiners]'
-            },
-            {
-                option: '--hiddenConstraints [hiddenConstraints]'
-            },
-            {
-                option: '--clientType [clientType]'
-            },
-            {
-                option: '--enablePhonetic'
-            },
-            {
-                option: '--processBestBets'
-            },
-            {
-                option: '--enableQueryRules'
-            },
-            {
-                option: '--processPersonalFavorites'
-            },
-            {
-                option: '--rawOutput'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (args.options.sourceId && !utils_1.validation.isValidGuid(args.options.sourceId)) {
-            return `${args.options.sourceId} is not a valid GUID`;
-        }
-        if (args.options.rankingModelId && !utils_1.validation.isValidGuid(args.options.rankingModelId)) {
-            return `${args.options.rankingModelId} is not a valid GUID`;
-        }
-        if (args.options.sortList && !/^([a-z0-9_]+:(ascending|descending))(,([a-z0-9_]+:(ascending|descending)))*$/gi.test(args.options.sortList)) {
-            return `sortlist parameter value '${args.options.sortList}' does not match the required pattern (=comma-separated list of '<property>:(ascending|descending)'-pattern)`;
-        }
-        if (args.options.rowLimit && !(0, util_1.isNumber)(args.options.rowLimit)) {
-            return `${args.options.rowLimit} is not a valid number`;
-        }
-        if (args.options.startRow && !(0, util_1.isNumber)(args.options.startRow)) {
-            return `${args.options.startRow} is not a valid number`;
-        }
-        if (args.options.culture && !(0, util_1.isNumber)(args.options.culture)) {
-            return `${args.options.culture} is not a valid number`;
-        }
-        return true;
-    }
     printResults(logger, args, results) {
         if (args.options.rawOutput) {
             logger.log(results);
@@ -275,5 +171,106 @@ class SpoSearchCommand extends SpoCommand_1.default {
         return outputData;
     }
 }
+_SpoSearchCommand_instances = new WeakSet(), _SpoSearchCommand_initTelemetry = function _SpoSearchCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            selectproperties: typeof args.options.selectProperties !== 'undefined',
+            allResults: args.options.allResults,
+            rowLimit: args.options.rowLimit,
+            sourceId: typeof args.options.sourceId !== 'undefined',
+            trimDuplicates: args.options.trimDuplicates,
+            enableStemming: args.options.enableStemming,
+            culture: args.options.culture,
+            refinementFilters: typeof args.options.refinementFilters !== 'undefined',
+            queryTemplate: typeof args.options.queryTemplate !== 'undefined',
+            sortList: typeof args.options.sortList !== 'undefined',
+            rankingModelId: typeof args.options.rankingModelId !== 'undefined',
+            startRow: typeof args.options.startRow !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined',
+            sourceName: typeof args.options.sourceName !== 'undefined',
+            refiners: typeof args.options.refiners !== 'undefined',
+            webUrl: typeof args.options.webUrl !== 'undefined',
+            hiddenConstraints: typeof args.options.hiddenConstraints !== 'undefined',
+            clientType: typeof args.options.clientType !== 'undefined',
+            enablePhonetic: args.options.enablePhonetic,
+            processBestBets: args.options.processBestBets,
+            enableQueryRules: args.options.enableQueryRules,
+            processPersonalFavorites: args.options.processPersonalFavorites,
+            rawOutput: args.options.rawOutput
+        });
+    });
+}, _SpoSearchCommand_initOptions = function _SpoSearchCommand_initOptions() {
+    this.options.unshift({
+        option: '-q, --queryText <queryText>'
+    }, {
+        option: '-p, --selectProperties [selectProperties]'
+    }, {
+        option: '-u, --webUrl [webUrl]'
+    }, {
+        option: '--allResults'
+    }, {
+        option: '--rowLimit [rowLimit]'
+    }, {
+        option: '--sourceId [sourceId]'
+    }, {
+        option: '--trimDuplicates'
+    }, {
+        option: '--enableStemming'
+    }, {
+        option: '--culture [culture]'
+    }, {
+        option: '--refinementFilters [refinementFilters]'
+    }, {
+        option: '--queryTemplate [queryTemplate]'
+    }, {
+        option: '--sortList [sortList]'
+    }, {
+        option: '--rankingModelId [rankingModelId]'
+    }, {
+        option: '--startRow [startRow]'
+    }, {
+        option: '--properties [properties]'
+    }, {
+        option: '--sourceName [sourceName]'
+    }, {
+        option: '--refiners [refiners]'
+    }, {
+        option: '--hiddenConstraints [hiddenConstraints]'
+    }, {
+        option: '--clientType [clientType]'
+    }, {
+        option: '--enablePhonetic'
+    }, {
+        option: '--processBestBets'
+    }, {
+        option: '--enableQueryRules'
+    }, {
+        option: '--processPersonalFavorites'
+    }, {
+        option: '--rawOutput'
+    });
+}, _SpoSearchCommand_initValidators = function _SpoSearchCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.sourceId && !validation_1.validation.isValidGuid(args.options.sourceId)) {
+            return `${args.options.sourceId} is not a valid GUID`;
+        }
+        if (args.options.rankingModelId && !validation_1.validation.isValidGuid(args.options.rankingModelId)) {
+            return `${args.options.rankingModelId} is not a valid GUID`;
+        }
+        if (args.options.sortList && !/^([a-z0-9_]+:(ascending|descending))(,([a-z0-9_]+:(ascending|descending)))*$/gi.test(args.options.sortList)) {
+            return `sortlist parameter value '${args.options.sortList}' does not match the required pattern (=comma-separated list of '<property>:(ascending|descending)'-pattern)`;
+        }
+        if (args.options.rowLimit && !(0, util_1.isNumber)(args.options.rowLimit)) {
+            return `${args.options.rowLimit} is not a valid number`;
+        }
+        if (args.options.startRow && !(0, util_1.isNumber)(args.options.startRow)) {
+            return `${args.options.startRow} is not a valid number`;
+        }
+        if (args.options.culture && !(0, util_1.isNumber)(args.options.culture)) {
+            return `${args.options.culture} is not a valid number`;
+        }
+        return true;
+    }));
+};
 module.exports = new SpoSearchCommand();
 //# sourceMappingURL=spo-search.js.map

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

@@ -1,37 +1,55 @@
 "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 _SpoSetCommand_instances, _SpoSetCommand_initOptions, _SpoSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../Auth");
-const Command_1 = require("../../../Command");
-const utils_1 = require("../../../utils");
+const validation_1 = require("../../../utils/validation");
 const SpoCommand_1 = require("../../base/SpoCommand");
 const commands_1 = require("../commands");
 class SpoSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSetCommand_instances, "m", _SpoSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSetCommand_instances, "m", _SpoSetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SET;
     }
     get description() {
         return 'Sets the URL of the root SharePoint site collection for use in SPO commands';
     }
-    commandAction(logger, args, cb) {
-        Auth_1.default.service.spoUrl = args.options.url;
-        Auth_1.default.storeConnectionInfo().then(() => {
-            cb();
-        }, err => {
-            cb(new Command_1.CommandError(err));
-        });
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            Auth_1.default.service.spoUrl = args.options.url;
+            try {
+                yield Auth_1.default.storeConnectionInfo();
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
+_SpoSetCommand_instances = new WeakSet(), _SpoSetCommand_initOptions = function _SpoSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --url <url>'
+    });
+}, _SpoSetCommand_initValidators = function _SpoSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
+};
 module.exports = new SpoSetCommand();
 //# sourceMappingURL=spo-set.js.map