@pnp/cli-microsoft365 6.0.0-beta.ff232be → 6.1.0-beta.17b053d

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

@@ -1,186 +1,171 @@
 "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");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        this.requestDigest = '';
-        this.siteId = '';
-        this.webId = '';
-        this.fieldLink = null;
-    }
     get name() {
         return commands_1.default.CONTENTTYPE_FIELD_SET;
     }
     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']
-        };
+    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 = '';
+        this.fieldLink = null;
     }
-    commandAction(logger, args, cb) {
-        let schemaXmlWithResourceTokens = '';
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving field link for field ${args.options.fieldId}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.fieldId}')`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res["odata.null"] !== true) {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let schemaXmlWithResourceTokens = '';
                 if (this.verbose) {
-                    logger.logToStderr('Field link found');
+                    logger.logToStderr(`Retrieving field link for field ${args.options.id}...`);
+                }
+                let requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const fieldLink = yield request_1.default.get(requestOptions);
+                if (fieldLink["odata.null"] !== true) {
+                    if (this.verbose) {
+                        logger.logToStderr('Field link found');
+                    }
+                    this.fieldLink = fieldLink;
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('Field link not found. Creating...');
+                        logger.logToStderr(`Retrieving information about site column ${args.options.id}...`);
+                    }
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')?$select=SchemaXmlWithResourceTokens`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const field = yield request_1.default.get(requestOptions);
+                    schemaXmlWithResourceTokens = field.SchemaXmlWithResourceTokens;
+                    yield this.createFieldLink(logger, args, schemaXmlWithResourceTokens);
+                }
+                if (!this.fieldLink) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Retrieving information about field link for field ${args.options.id}...`);
+                    }
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const fieldLinkResult = yield request_1.default.get(requestOptions);
+                    if (fieldLinkResult && fieldLinkResult["odata.null"] !== true) {
+                        this.fieldLink = fieldLinkResult;
+                    }
+                }
+                if (!this.fieldLink) {
+                    throw `Couldn't find field link for field ${args.options.id}`;
+                }
+                let updateHidden = false;
+                let updateRequired = false;
+                if (typeof args.options.hidden !== 'undefined' &&
+                    this.fieldLink.Hidden !== args.options.hidden) {
+                    updateHidden = true;
+                }
+                if (typeof args.options.required !== 'undefined' &&
+                    this.fieldLink.Required !== args.options.required) {
+                    updateRequired = true;
+                }
+                if (!updateHidden && !updateRequired) {
+                    if (this.verbose) {
+                        logger.logToStderr('Field link already up-to-date');
+                    }
+                    throw 'DONE';
+                }
+                if (!this.siteId) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Retrieving site collection id...`);
+                    }
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/site?$select=Id`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const site = yield request_1.default.get(requestOptions);
+                    this.siteId = site.Id;
+                }
+                if (!this.webId) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Retrieving site id...`);
+                    }
+                    requestOptions = {
+                        url: `${args.options.webUrl}/_api/web?$select=Id`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const web = yield request_1.default.get(requestOptions);
+                    this.webId = web.Id;
                 }
-                this.fieldLink = res;
-                return Promise.resolve(undefined);
-            }
-            if (this.verbose) {
-                logger.logToStderr('Field link not found. Creating...');
-                logger.logToStderr(`Retrieving information about site column ${args.options.fieldId}...`);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/fields('${args.options.fieldId}')?$select=SchemaXmlWithResourceTokens`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
-            }
-            schemaXmlWithResourceTokens = res.SchemaXmlWithResourceTokens;
-            return this.createFieldLink(logger, args, schemaXmlWithResourceTokens);
-        })
-            .then(() => {
-            if (this.fieldLink) {
-                return Promise.resolve(undefined);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving information about field link for field ${args.options.fieldId}...`);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.fieldId}')`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (res && res["odata.null"] !== true) {
-                this.fieldLink = res;
-            }
-            if (!this.fieldLink) {
-                return Promise.reject(`Couldn't find field link for field ${args.options.fieldId}`);
-            }
-            let updateHidden = false;
-            let updateRequired = false;
-            if (typeof args.options.hidden !== 'undefined' &&
-                this.fieldLink.Hidden !== (args.options.hidden === 'true')) {
-                updateHidden = true;
-            }
-            if (typeof args.options.required !== 'undefined' &&
-                this.fieldLink.Required !== (args.options.required === 'true')) {
-                updateRequired = true;
-            }
-            if (!updateHidden && !updateRequired) {
                 if (this.verbose) {
-                    logger.logToStderr('Field link already up-to-date');
+                    logger.logToStderr(`Updating field link...`);
+                }
+                const requiredProperty = typeof args.options.required !== 'undefined' &&
+                    this.fieldLink.Required !== args.options.required ? `<SetProperty Id="122" ObjectPathId="121" Name="Required"><Parameter Type="Boolean">${args.options.required}</Parameter></SetProperty>` : '';
+                const hiddenProperty = typeof args.options.hidden !== 'undefined' &&
+                    this.fieldLink.Hidden !== args.options.hidden ? `<SetProperty Id="123" ObjectPathId="121" Name="Hidden"><Parameter Type="Boolean">${args.options.hidden}</Parameter></SetProperty>` : '';
+                requestOptions = {
+                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    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>${requiredProperty}${hiddenProperty}<Method Name="Update" Id="124" ObjectPathId="19"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="121" Name="716a7b9e-3012-0000-22fb-84acfcc67d04|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}:fl:${this.fieldLink.Id}" /><Identity Id="19" Name="716a7b9e-3012-0000-22fb-84acfcc67d04|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
                 }
-                return Promise.reject('DONE');
-            }
-            if (this.siteId) {
-                return Promise.resolve(undefined);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving site collection id...`);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/site?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (res) {
-                this.siteId = res.Id;
-            }
-            if (this.webId) {
-                return Promise.resolve(undefined);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving site id...`);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (res) {
-                this.webId = res.Id;
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Updating field link...`);
-            }
-            const requiredProperty = typeof args.options.required !== 'undefined' &&
-                this.fieldLink.Required !== (args.options.required === 'true') ? `<SetProperty Id="122" ObjectPathId="121" Name="Required"><Parameter Type="Boolean">${args.options.required}</Parameter></SetProperty>` : '';
-            const hiddenProperty = typeof args.options.hidden !== 'undefined' &&
-                this.fieldLink.Hidden !== (args.options.hidden === 'true') ? `<SetProperty Id="123" ObjectPathId="121" Name="Hidden"><Parameter Type="Boolean">${args.options.hidden}</Parameter></SetProperty>` : '';
-            const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                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>${requiredProperty}${hiddenProperty}<Method Name="Update" Id="124" ObjectPathId="19"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="121" Name="716a7b9e-3012-0000-22fb-84acfcc67d04|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${utils_1.formatting.escapeXml(args.options.contentTypeId)}:fl:${this.fieldLink.Id}" /><Identity Id="19" Name="716a7b9e-3012-0000-22fb-84acfcc67d04|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${utils_1.formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-            }
-            else {
-                cb();
-            }
-        }, (error) => {
-            if (error === 'DONE') {
-                cb();
             }
-            else {
-                this.handleRejectedODataJsonPromise(error, logger, cb);
+            catch (err) {
+                if (err !== 'DONE') {
+                    this.handleRejectedODataJsonPromise(err);
+                }
             }
         });
     }
@@ -239,7 +224,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:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -261,7 +246,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 +258,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',
@@ -306,7 +291,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
             if (this.debug) {
                 logger.logToStderr('Retrieving request digest...');
             }
-            utils_1.spo
+            spo_1.spo
                 .getRequestDigest(siteUrl)
                 .then((res) => {
                 this.requestDigest = res.FormDigestValue;
@@ -316,45 +301,38 @@ 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`;
-        }
-        if (typeof args.options.required !== 'undefined') {
-            if (args.options.required !== 'true' &&
-                args.options.required !== 'false') {
-                return `${args.options.required} is not a valid boolean value. Allowed values are true|false`;
-            }
-        }
-        if (typeof args.options.hidden !== 'undefined') {
-            if (args.options.hidden !== 'true' &&
-                args.options.hidden !== 'false') {
-                return `${args.options.hidden} is not a valid boolean value. Allowed values are true|false`;
-            }
-        }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-    }
 }
+_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]',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '--hidden [hidden]',
+        autocomplete: ['true', 'false']
+    });
+}, _SpoContentTypeFieldSetCommand_initValidators = function _SpoContentTypeFieldSetCommand_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`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoContentTypeFieldSetCommand_initTypes = function _SpoContentTypeFieldSetCommand_initTypes() {
+    this.types.string.push('contentTypeId', 'c');
+    this.types.boolean.push('required', 'hidden');
+};
 module.exports = new SpoContentTypeFieldSetCommand();
 //# sourceMappingURL=contenttype-field-set.js.map

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

@@ -1,8 +1,24 @@
 "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");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoContentTypeGetCommand extends SpoCommand_1.default {
@@ -12,80 +28,106 @@ class SpoContentTypeGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Retrieves information about the specified list or site content type';
     }
-    types() {
-        return {
-            string: ['id', 'i']
-        };
+    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);
     }
-    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) {
-            requestUrl += `('${encodeURIComponent(args.options.id)}')`;
-        }
-        else if (args.options.name) {
-            requestUrl += `?$filter=Name eq '${encodeURIComponent(args.options.name)}'`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            let errorMessage = '';
-            if (args.options.name) {
-                if (res.value.length === 0) {
-                    errorMessage = `Content type with name ${args.options.name} not found`;
-                }
-                else {
-                    res = res.value[0];
-                }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/web`;
+            if (args.options.listId) {
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
             }
-            if (args.options.id && res['odata.null'] === true) {
-                errorMessage = `Content type with ID ${args.options.id} not found`;
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             }
-            if (errorMessage) {
-                cb(new Command_1.CommandError(errorMessage));
-                return;
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
-            logger.log(res);
-            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]'
+            requestUrl += "/contenttypes";
+            if (args.options.id) {
+                requestUrl += `('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+            }
+            else if (args.options.name) {
+                requestUrl += `?$filter=Name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`;
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                let res = yield request_1.default.get(requestOptions);
+                let errorMessage = '';
+                if (args.options.name) {
+                    if (res.value.length === 0) {
+                        errorMessage = `Content type with name ${args.options.name} not found`;
+                    }
+                    else {
+                        res = res.value[0];
+                    }
+                }
+                if (args.options.id && res['odata.null'] === true) {
+                    errorMessage = `Content type with ID ${args.options.id} not found`;
+                }
+                if (errorMessage) {
+                    throw errorMessage;
+                }
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_SpoContentTypeGetCommand_instances = new WeakSet(), _SpoContentTypeGetCommand_initTelemetry = function _SpoContentTypeGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== '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: '--listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        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 = validation_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';
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _SpoContentTypeGetCommand_initTypes = function _SpoContentTypeGetCommand_initTypes() {
+    this.types.string.push('id', 'i');
+}, _SpoContentTypeGetCommand_initOptionSets = function _SpoContentTypeGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'name'] });
+};
 module.exports = new SpoContentTypeGetCommand();
 //# sourceMappingURL=contenttype-get.js.map