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

package/dist/m365/spo/commands/term/term-add.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 _SpoTermAddCommand_instances, _SpoTermAddCommand_initTelemetry, _SpoTermAddCommand_initOptions, _SpoTermAddCommand_initValidators, _SpoTermAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const Command_1 = require("../../../../Command");
@@ -8,25 +23,20 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTermAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoTermAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.TERM_ADD;
     }
     get description() {
         return 'Adds taxonomy term';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.customProperties = typeof args.options.customProperties !== 'undefined';
-        telemetryProps.description = typeof args.options.description !== 'undefined';
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.localCustomProperties = typeof args.options.localCustomProperties !== 'undefined';
-        telemetryProps.parentTermId = typeof args.options.parentTermId !== 'undefined';
-        telemetryProps.termGroupId = typeof args.options.termGroupId !== 'undefined';
-        telemetryProps.termGroupName = typeof args.options.termGroupName !== 'undefined';
-        telemetryProps.termSetId = typeof args.options.termSetId !== 'undefined';
-        telemetryProps.termSetName = typeof args.options.termSetName !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let term;
         let formDigest;
@@ -130,43 +140,45 @@ class SpoTermAddCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '--termSetId [termSetId]'
-            },
-            {
-                option: '--termSetName [termSetName]'
-            },
-            {
-                option: '--termGroupId [termGroupId]'
-            },
-            {
-                option: '--termGroupName [termGroupName]'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '--parentTermId [parentTermId]'
-            },
-            {
-                option: '--customProperties [customProperties]'
-            },
-            {
-                option: '--localCustomProperties [localCustomProperties]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry = function _SpoTermAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            customProperties: typeof args.options.customProperties !== 'undefined',
+            description: typeof args.options.description !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            localCustomProperties: typeof args.options.localCustomProperties !== 'undefined',
+            parentTermId: typeof args.options.parentTermId !== 'undefined',
+            termGroupId: typeof args.options.termGroupId !== 'undefined',
+            termGroupName: typeof args.options.termGroupName !== 'undefined',
+            termSetId: typeof args.options.termSetId !== 'undefined',
+            termSetName: typeof args.options.termSetName !== 'undefined'
+        });
+    });
+}, _SpoTermAddCommand_initOptions = function _SpoTermAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '--termSetId [termSetId]'
+    }, {
+        option: '--termSetName [termSetName]'
+    }, {
+        option: '--termGroupId [termGroupId]'
+    }, {
+        option: '--termGroupName [termGroupName]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--parentTermId [parentTermId]'
+    }, {
+        option: '--customProperties [customProperties]'
+    }, {
+        option: '--localCustomProperties [localCustomProperties]'
+    });
+}, _SpoTermAddCommand_initValidators = function _SpoTermAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
             if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
@@ -180,12 +192,6 @@ class SpoTermAddCommand extends SpoCommand_1.default {
                 return 'Specify either parentTermId, termSetId or termSetName but not both';
             }
         }
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
@@ -219,7 +225,9 @@ class SpoTermAddCommand extends SpoCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+}, _SpoTermAddCommand_initOptionSets = function _SpoTermAddCommand_initOptionSets() {
+    this.optionSets.push(['termGroupId', 'termGroupName']);
+};
 module.exports = new SpoTermAddCommand();
 //# sourceMappingURL=term-add.js.map

package/dist/m365/spo/commands/term/term-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 _SpoTermGetCommand_instances, _SpoTermGetCommand_initTelemetry, _SpoTermGetCommand_initOptions, _SpoTermGetCommand_initValidators, _SpoTermGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -7,22 +22,20 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTermGetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoTermGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermGetCommand_instances, "m", _SpoTermGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.TERM_GET;
     }
     get description() {
         return 'Gets information about the specified taxonomy term';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.termGroupId = typeof args.options.termGroupId !== 'undefined';
-        telemetryProps.termGroupName = typeof args.options.termGroupName !== 'undefined';
-        telemetryProps.termSetId = typeof args.options.termSetId !== 'undefined';
-        telemetryProps.termSetName = typeof args.options.termSetName !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
         utils_1.spo
@@ -74,37 +87,34 @@ class SpoTermGetCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '--termGroupId [termGroupId]'
-            },
-            {
-                option: '--termGroupName [termGroupName]'
-            },
-            {
-                option: '--termSetId [termSetId]'
-            },
-            {
-                option: '--termSetName [termSetName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name but not both';
-        }
+}
+_SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry = function _SpoTermGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            termGroupId: typeof args.options.termGroupId !== 'undefined',
+            termGroupName: typeof args.options.termGroupName !== 'undefined',
+            termSetId: typeof args.options.termSetId !== 'undefined',
+            termSetName: typeof args.options.termSetName !== 'undefined'
+        });
+    });
+}, _SpoTermGetCommand_initOptions = function _SpoTermGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '--termGroupId [termGroupId]'
+    }, {
+        option: '--termGroupName [termGroupName]'
+    }, {
+        option: '--termSetId [termSetId]'
+    }, {
+        option: '--termSetName [termSetName]'
+    });
+}, _SpoTermGetCommand_initValidators = function _SpoTermGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
             if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
@@ -135,7 +145,9 @@ class SpoTermGetCommand extends SpoCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+}, _SpoTermGetCommand_initOptionSets = function _SpoTermGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
 module.exports = new SpoTermGetCommand();
 //# sourceMappingURL=term-get.js.map

package/dist/m365/spo/commands/term/term-group-add.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 _SpoTermGroupAddCommand_instances, _SpoTermGroupAddCommand_initTelemetry, _SpoTermGroupAddCommand_initOptions, _SpoTermGroupAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const Command_1 = require("../../../../Command");
@@ -8,18 +23,19 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTermGroupAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoTermGroupAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTermGroupAddCommand_instances, "m", _SpoTermGroupAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTermGroupAddCommand_instances, "m", _SpoTermGroupAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTermGroupAddCommand_instances, "m", _SpoTermGroupAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.TERM_GROUP_ADD;
     }
     get description() {
         return 'Adds taxonomy term group';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.description = typeof args.options.id !== 'undefined';
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let formDigest = '';
         let termGroup;
@@ -103,29 +119,31 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-d, --description [description]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoTermGroupAddCommand_instances = new WeakSet(), _SpoTermGroupAddCommand_initTelemetry = function _SpoTermGroupAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            description: typeof args.options.id !== 'undefined',
+            id: typeof args.options.id !== 'undefined'
+        });
+    });
+}, _SpoTermGroupAddCommand_initOptions = function _SpoTermGroupAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-d, --description [description]'
+    });
+}, _SpoTermGroupAddCommand_initValidators = function _SpoTermGroupAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
             if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoTermGroupAddCommand();
 //# sourceMappingURL=term-group-add.js.map

package/dist/m365/spo/commands/term/term-group-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 _SpoTermGroupGetCommand_instances, _SpoTermGroupGetCommand_initTelemetry, _SpoTermGroupGetCommand_initOptions, _SpoTermGroupGetCommand_initValidators, _SpoTermGroupGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -7,18 +22,20 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTermGroupGetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoTermGroupGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermGroupGetCommand_instances, "m", _SpoTermGroupGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.TERM_GROUP_GET;
     }
     get description() {
         return 'Gets information about the specified taxonomy term group';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
         utils_1.spo
@@ -58,32 +75,31 @@ class SpoTermGroupGetCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name but not both';
-        }
+}
+_SpoTermGroupGetCommand_instances = new WeakSet(), _SpoTermGroupGetCommand_initTelemetry = function _SpoTermGroupGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _SpoTermGroupGetCommand_initOptions = function _SpoTermGroupGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    });
+}, _SpoTermGroupGetCommand_initValidators = function _SpoTermGroupGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
             if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
         return true;
-    }
-}
+    }));
+}, _SpoTermGroupGetCommand_initOptionSets = function _SpoTermGroupGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
 module.exports = new SpoTermGroupGetCommand();
 //# sourceMappingURL=term-group-get.js.map

package/dist/m365/spo/commands/term/term-list.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 _SpoTermListCommand_instances, _SpoTermListCommand_initTelemetry, _SpoTermListCommand_initOptions, _SpoTermListCommand_initValidators, _SpoTermListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -7,20 +22,20 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTermListCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoTermListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.TERM_LIST;
     }
     get description() {
         return 'Lists taxonomy terms from the given term set';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.termGroupId = typeof args.options.termGroupId !== 'undefined';
-        telemetryProps.termGroupName = typeof args.options.termGroupName !== 'undefined';
-        telemetryProps.termSetId = typeof args.options.termSetId !== 'undefined';
-        telemetryProps.termSetName = typeof args.options.termSetName !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['Id', 'Name'];
     }
@@ -66,49 +81,42 @@ class SpoTermListCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '--termGroupId [termGroupId]'
-            },
-            {
-                option: '--termGroupName [termGroupName]'
-            },
-            {
-                option: '--termSetId [termSetId]'
-            },
-            {
-                option: '--termSetName [termSetName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify either termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify either termGroupId or termGroupName but not both';
-        }
+}
+_SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry = function _SpoTermListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            termGroupId: typeof args.options.termGroupId !== 'undefined',
+            termGroupName: typeof args.options.termGroupName !== 'undefined',
+            termSetId: typeof args.options.termSetId !== 'undefined',
+            termSetName: typeof args.options.termSetName !== 'undefined'
+        });
+    });
+}, _SpoTermListCommand_initOptions = function _SpoTermListCommand_initOptions() {
+    this.options.unshift({
+        option: '--termGroupId [termGroupId]'
+    }, {
+        option: '--termGroupName [termGroupName]'
+    }, {
+        option: '--termSetId [termSetId]'
+    }, {
+        option: '--termSetName [termSetName]'
+    });
+}, _SpoTermListCommand_initValidators = function _SpoTermListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
             }
         }
-        if (!args.options.termSetId && !args.options.termSetName) {
-            return 'Specify either termSetId or termSetName';
-        }
-        if (args.options.termSetId && args.options.termSetName) {
-            return 'Specify either termSetId or termSetName but not both';
-        }
         if (args.options.termSetId) {
             if (!utils_1.validation.isValidGuid(args.options.termSetId)) {
                 return `${args.options.termSetId} is not a valid GUID`;
             }
         }
         return true;
-    }
-}
+    }));
+}, _SpoTermListCommand_initOptionSets = function _SpoTermListCommand_initOptionSets() {
+    this.optionSets.push(['termGroupId', 'termGroupName'], ['termSetId', 'termSetName']);
+};
 module.exports = new SpoTermListCommand();
 //# sourceMappingURL=term-list.js.map