@pnp/cli-microsoft365 6.0.0-beta.b689fd4 → 6.0.0-beta.c377306

package/dist/m365/spo/commands/cdn/cdn-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 _SpoCdnSetCommand_instances, _SpoCdnSetCommand_initTelemetry, _SpoCdnSetCommand_initOptions, _SpoCdnSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -7,19 +22,19 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCdnSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoCdnSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.CDN_SET;
     }
     get description() {
         return 'Enable or disable the specified Microsoft 365 CDN';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.cdnType = args.options.type || 'Public';
-        telemetryProps.enabled = args.options.enabled === 'true';
-        telemetryProps.noDefaultOrigins = (!(!args.options.noDefaultOrigins)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const cdnTypeString = args.options.type || 'Public';
         const enabled = args.options.enabled === 'true';
@@ -99,7 +114,27 @@ class SpoCdnSetCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    validate(args) {
+}
+_SpoCdnSetCommand_instances = new WeakSet(), _SpoCdnSetCommand_initTelemetry = function _SpoCdnSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            cdnType: args.options.type || 'Public',
+            enabled: args.options.enabled === 'true',
+            noDefaultOrigins: (!(!args.options.noDefaultOrigins)).toString()
+        });
+    });
+}, _SpoCdnSetCommand_initOptions = function _SpoCdnSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --enabled <enabled>',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '-t, --type [type]',
+        autocomplete: ['Public', 'Private', 'Both']
+    }, {
+        option: '--noDefaultOrigins'
+    });
+}, _SpoCdnSetCommand_initValidators = function _SpoCdnSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.type) {
             if (args.options.type !== 'Public' && args.options.type !== 'Both' &&
                 args.options.type !== 'Private') {
@@ -111,24 +146,7 @@ class SpoCdnSetCommand extends SpoCommand_1.default {
             return `${args.options.enabled} is not a valid boolean value. Allowed values are true|false`;
         }
         return true;
-    }
-    options() {
-        const options = [
-            {
-                option: '-e, --enabled <enabled>',
-                autocomplete: ['true', 'false']
-            },
-            {
-                option: '-t, --type [type]',
-                autocomplete: ['Public', 'Private', 'Both']
-            },
-            {
-                option: '--noDefaultOrigins'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-}
+    }));
+};
 module.exports = new SpoCdnSetCommand();
 //# sourceMappingURL=cdn-set.js.map

package/dist/m365/spo/commands/contenttype/contenttype-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 _SpoContentTypeAddCommand_instances, _SpoContentTypeAddCommand_initTelemetry, _SpoContentTypeAddCommand_initOptions, _SpoContentTypeAddCommand_initValidators, _SpoContentTypeAddCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
@@ -9,17 +24,20 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoContentTypeGetCommand = require("./contenttype-get");
 class SpoContentTypeAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoContentTypeAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoContentTypeAddCommand_instances, "m", _SpoContentTypeAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeAddCommand_instances, "m", _SpoContentTypeAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeAddCommand_instances, "m", _SpoContentTypeAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeAddCommand_instances, "m", _SpoContentTypeAddCommand_initTypes).call(this);
+    }
     get name() {
         return commands_1.default.CONTENTTYPE_ADD;
     }
     get description() {
         return 'Adds a new list or site content type';
     }
-    types() {
-        return {
-            string: ['id', 'i']
-        };
-    }
     commandAction(logger, args, cb) {
         let parentInfo = '';
         this
@@ -131,33 +149,33 @@ class SpoContentTypeAddCommand extends SpoCommand_1.default {
             });
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-l, --listTitle [listTitle]'
-            },
-            {
-                option: '-i, --id <id>'
-            },
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '-g, --group [group]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-    }
 }
+_SpoContentTypeAddCommand_instances = new WeakSet(), _SpoContentTypeAddCommand_initTelemetry = function _SpoContentTypeAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            description: typeof args.options.description !== 'undefined',
+            group: typeof args.options.group !== 'undefined'
+        });
+    });
+}, _SpoContentTypeAddCommand_initOptions = function _SpoContentTypeAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '-i, --id <id>'
+    }, {
+        option: '-n, --name <name>'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '-g, --group [group]'
+    });
+}, _SpoContentTypeAddCommand_initValidators = function _SpoContentTypeAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+}, _SpoContentTypeAddCommand_initTypes = function _SpoContentTypeAddCommand_initTypes() {
+    this.types.string.push('id', 'i');
+};
 module.exports = new SpoContentTypeAddCommand();
 //# sourceMappingURL=contenttype-add.js.map

package/dist/m365/spo/commands/contenttype/contenttype-field-remove.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 _SpoContentTypeFieldRemoveCommand_instances, _SpoContentTypeFieldRemoveCommand_initTelemetry, _SpoContentTypeFieldRemoveCommand_initOptions, _SpoContentTypeFieldRemoveCommand_initValidators, _SpoContentTypeFieldRemoveCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
@@ -7,24 +22,20 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoContentTypeFieldRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoContentTypeFieldRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoContentTypeFieldRemoveCommand_instances, "m", _SpoContentTypeFieldRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeFieldRemoveCommand_instances, "m", _SpoContentTypeFieldRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeFieldRemoveCommand_instances, "m", _SpoContentTypeFieldRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeFieldRemoveCommand_instances, "m", _SpoContentTypeFieldRemoveCommand_initTypes).call(this);
+    }
     get name() {
         return commands_1.default.CONTENTTYPE_FIELD_REMOVE;
     }
     get description() {
         return 'Removes a column from a site- or list content type';
     }
-    types() {
-        return {
-            string: ['i', 'contentTypeId']
-        };
-    }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.listTitle = (!(!args.options.listTitle)).toString();
-        telemetryProps.updateChildContentTypes = (!(!args.options.updateChildContentTypes)).toString();
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let webId = '';
         let siteId = '';
@@ -143,36 +154,38 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-l, --listTitle [listTitle]'
-            },
-            {
-                option: '-i, --contentTypeId <contentTypeId>'
-            },
-            {
-                option: '-f, --fieldLinkId <fieldLinkId>'
-            },
-            {
-                option: '-c, --updateChildContentTypes'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFieldRemoveCommand_initTelemetry = function _SpoContentTypeFieldRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listTitle: (!(!args.options.listTitle)).toString(),
+            updateChildContentTypes: (!(!args.options.updateChildContentTypes)).toString(),
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoContentTypeFieldRemoveCommand_initOptions = function _SpoContentTypeFieldRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '-i, --contentTypeId <contentTypeId>'
+    }, {
+        option: '-f, --fieldLinkId <fieldLinkId>'
+    }, {
+        option: '-c, --updateChildContentTypes'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoContentTypeFieldRemoveCommand_initValidators = function _SpoContentTypeFieldRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!utils_1.validation.isValidGuid(args.options.fieldLinkId)) {
             return `${args.options.fieldLinkId} is not a valid GUID`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-    }
-}
+    }));
+}, _SpoContentTypeFieldRemoveCommand_initTypes = function _SpoContentTypeFieldRemoveCommand_initTypes() {
+    this.types.string.push('i', 'contentTypeId');
+};
 module.exports = new SpoContentTypeFieldRemoveCommand();
 //# sourceMappingURL=contenttype-field-remove.js.map

package/dist/m365/spo/commands/contenttype/contenttype-field-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 _SpoContentTypeFieldSetCommand_instances, _SpoContentTypeFieldSetCommand_initTelemetry, _SpoContentTypeFieldSetCommand_initOptions, _SpoContentTypeFieldSetCommand_initValidators, _SpoContentTypeFieldSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -9,6 +24,11 @@ const commands_1 = require("../../commands");
 class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
     constructor() {
         super();
+        _SpoContentTypeFieldSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoContentTypeFieldSetCommand_instances, "m", _SpoContentTypeFieldSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeFieldSetCommand_instances, "m", _SpoContentTypeFieldSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeFieldSetCommand_instances, "m", _SpoContentTypeFieldSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeFieldSetCommand_instances, "m", _SpoContentTypeFieldSetCommand_initTypes).call(this);
         this.requestDigest = '';
         this.siteId = '';
         this.webId = '';
@@ -20,24 +40,13 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds or updates a site column reference in a site content type';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.hidden = args.options.hidden;
-        telemetryProps.required = args.options.required;
-        return telemetryProps;
-    }
-    types() {
-        return {
-            string: ['contentTypeId', 'c']
-        };
-    }
     commandAction(logger, args, cb) {
         let schemaXmlWithResourceTokens = '';
         if (this.verbose) {
-            logger.logToStderr(`Retrieving field link for field ${args.options.fieldId}...`);
+            logger.logToStderr(`Retrieving field link for field ${args.options.id}...`);
         }
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.fieldId}')`,
+            url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -55,10 +64,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
             }
             if (this.verbose) {
                 logger.logToStderr('Field link not found. Creating...');
-                logger.logToStderr(`Retrieving information about site column ${args.options.fieldId}...`);
+                logger.logToStderr(`Retrieving information about site column ${args.options.id}...`);
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/fields('${args.options.fieldId}')?$select=SchemaXmlWithResourceTokens`,
+                url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')?$select=SchemaXmlWithResourceTokens`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
@@ -78,10 +87,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                 return Promise.resolve(undefined);
             }
             if (this.verbose) {
-                logger.logToStderr(`Retrieving information about field link for field ${args.options.fieldId}...`);
+                logger.logToStderr(`Retrieving information about field link for field ${args.options.id}...`);
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.fieldId}')`,
+                url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
@@ -94,7 +103,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                 this.fieldLink = res;
             }
             if (!this.fieldLink) {
-                return Promise.reject(`Couldn't find field link for field ${args.options.fieldId}`);
+                return Promise.reject(`Couldn't find field link for field ${args.options.id}`);
             }
             let updateHidden = false;
             let updateRequired = false;
@@ -239,7 +248,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': this.requestDigest
                     },
-                    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="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.fieldId}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${utils_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></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="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.id}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${utils_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -261,7 +270,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
         return new Promise((resolve, reject) => {
             if (!requiresUpdate) {
                 if (this.verbose) {
-                    logger.logToStderr(`Schema of field ${args.options.fieldId} is already up-to-date`);
+                    logger.logToStderr(`Schema of field ${args.options.id} is already up-to-date`);
                 }
                 resolve();
                 return;
@@ -273,7 +282,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Updating field schema...`);
                 }
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/fields('${args.options.fieldId}')`,
+                    url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata',
                         'content-type': 'application/json;odata=nometadata',
@@ -316,30 +325,30 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
             });
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-c, --contentTypeId <contentTypeId>'
-            },
-            {
-                option: '-f, --fieldId <fieldId>'
-            },
-            {
-                option: '-r, --required [required]'
-            },
-            {
-                option: '--hidden [hidden]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.fieldId)) {
-            return `${args.options.fieldId} is not a valid GUID`;
+}
+_SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSetCommand_initTelemetry = function _SpoContentTypeFieldSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            hidden: args.options.hidden,
+            required: args.options.required
+        });
+    });
+}, _SpoContentTypeFieldSetCommand_initOptions = function _SpoContentTypeFieldSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-c, --contentTypeId <contentTypeId>'
+    }, {
+        option: '-f, --id <id>'
+    }, {
+        option: '-r, --required [required]'
+    }, {
+        option: '--hidden [hidden]'
+    });
+}, _SpoContentTypeFieldSetCommand_initValidators = function _SpoContentTypeFieldSetCommand_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`;
         }
         if (typeof args.options.required !== 'undefined') {
             if (args.options.required !== 'true' &&
@@ -354,7 +363,9 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
             }
         }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-    }
-}
+    }));
+}, _SpoContentTypeFieldSetCommand_initTypes = function _SpoContentTypeFieldSetCommand_initTypes() {
+    this.types.string.push('contentTypeId', 'c');
+};
 module.exports = new SpoContentTypeFieldSetCommand();
 //# sourceMappingURL=contenttype-field-set.js.map

package/dist/m365/spo/commands/contenttype/contenttype-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 _SpoContentTypeGetCommand_instances, _SpoContentTypeGetCommand_initTelemetry, _SpoContentTypeGetCommand_initOptions, _SpoContentTypeGetCommand_initValidators, _SpoContentTypeGetCommand_initTypes, _SpoContentTypeGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
@@ -6,17 +21,21 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoContentTypeGetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoContentTypeGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeGetCommand_instances, "m", _SpoContentTypeGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.CONTENTTYPE_GET;
     }
     get description() {
         return 'Retrieves information about the specified list or site content type';
     }
-    types() {
-        return {
-            string: ['id', 'i']
-        };
-    }
     commandAction(logger, args, cb) {
         let requestUrl = `${args.options.webUrl}/_api/web/${(args.options.listTitle ? `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/` : '')}contenttypes`;
         if (args.options.id) {
@@ -55,37 +74,37 @@ class SpoContentTypeGetCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-l, --listTitle [listTitle]'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoContentTypeGetCommand_instances = new WeakSet(), _SpoContentTypeGetCommand_initTelemetry = function _SpoContentTypeGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _SpoContentTypeGetCommand_initOptions = function _SpoContentTypeGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    });
+}, _SpoContentTypeGetCommand_initValidators = function _SpoContentTypeGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.id && args.options.name) {
-            return 'Specify id or name, but not both';
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify id or name, one is required';
-        }
         return true;
-    }
-}
+    }));
+}, _SpoContentTypeGetCommand_initTypes = function _SpoContentTypeGetCommand_initTypes() {
+    this.types.string.push('id', 'i');
+}, _SpoContentTypeGetCommand_initOptionSets = function _SpoContentTypeGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
 module.exports = new SpoContentTypeGetCommand();
 //# sourceMappingURL=contenttype-get.js.map