@pnp/cli-microsoft365 6.0.0-beta.c5b75e1 → 6.0.0-beta.c63e3b2

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpfxDoctorCommand_instances, _SpfxDoctorCommand_initTelemetry, _SpfxDoctorCommand_initOptions, _SpfxDoctorCommand_initValidators, _SpfxDoctorCommand_initTypes;
+var _SpfxDoctorCommand_instances, _SpfxDoctorCommand_initTelemetry, _SpfxDoctorCommand_initOptions, _SpfxDoctorCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const child_process = require("child_process");
@@ -428,12 +428,29 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^4',
                     fix: 'npm i -g yo@4'
                 }
+            },
+            '1.16.0': {
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
+                },
+                node: {
+                    range: '>=16.13.0 <17.0.0',
+                    fix: 'Install Node.js >=16.13.0 <17.0.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4',
+                    fix: 'npm i -g yo@4'
+                }
             }
         };
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTypes).call(this);
+    }
+    get allowedOutputs() {
+        return ['text'];
     }
     get name() {
         return commands_1.default.DOCTOR;
@@ -442,6 +459,7 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         return 'Verifies environment configuration for using the specific version of the SharePoint Framework';
     }
     commandAction(logger, args) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!args.options.output) {
                 args.options.output = 'text';
@@ -454,7 +472,7 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             let prerequisites;
             const fixes = [];
             try {
-                spfxVersion = yield this.getSharePointFrameworkVersion(logger);
+                spfxVersion = (_a = args.options.spfxVersion) !== null && _a !== void 0 ? _a : yield this.getSharePointFrameworkVersion(logger);
                 if (!spfxVersion) {
                     logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework`));
                     throw `SharePoint Framework not found`;
@@ -464,7 +482,13 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework v${spfxVersion}`));
                     throw `spfx doctor doesn't support SPFx v${spfxVersion} at this moment`;
                 }
-                logger.log(this.getStatus(CheckStatus.Success, `SharePoint Framework v${spfxVersion}`));
+                if (args.options.spfxVersion) {
+                    yield this.checkSharePointFrameworkVersion(args.options.spfxVersion, fixes, logger);
+                }
+                else {
+                    // spfx was detected and if we are here, it means that we support it
+                    logger.log(this.getStatus(CheckStatus.Success, `SharePoint Framework v${spfxVersion}`));
+                }
                 yield this.checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger);
                 yield this.checkNodeVersion(prerequisites, fixes, logger);
                 yield this.checkYo(prerequisites, fixes, logger);
@@ -517,6 +541,23 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             this.checkStatus('Node', nodeVersion, prerequisites.node, OptionalOrRequired.Required, fixes, logger);
         });
     }
+    checkSharePointFrameworkVersion(spfxVersionRequested, fixes, logger) {
+        return this
+            .getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
+            .then((spfxVersionDetected) => {
+            const versionCheck = {
+                range: spfxVersionRequested,
+                fix: `npm i -g @microsoft/generator-sharepoint@${spfxVersionRequested}`
+            };
+            if (spfxVersionDetected) {
+                this.checkStatus(`SharePoint Framework`, spfxVersionDetected, versionCheck, OptionalOrRequired.Required, fixes, logger);
+            }
+            else {
+                logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework v${spfxVersionRequested} not found`));
+                fixes.push(versionCheck.fix);
+            }
+        });
+    }
     checkYo(prerequisites, fixes, logger) {
         return this
             .getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
@@ -695,13 +736,17 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
 _SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry = function _SpfxDoctorCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            env: args.options.env
+            env: args.options.env,
+            spfxVersion: args.options.spfxVersion
         });
     });
 }, _SpfxDoctorCommand_initOptions = function _SpfxDoctorCommand_initOptions() {
     this.options.unshift({
         option: '-e, --env [env]',
         autocomplete: ['sp2016', 'sp2019', 'spo']
+    }, {
+        option: '-v, --spfxVersion [spfxVersion]',
+        autocomplete: Object.keys(this.versions)
     });
 }, _SpfxDoctorCommand_initValidators = function _SpfxDoctorCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -711,13 +756,13 @@ _SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry =
                 return `${args.options.env} is not a valid SharePoint version. Valid versions are sp2016, sp2019 or spo`;
             }
         }
-        if (args.options.output && args.options.output !== 'text') {
-            return `The output option only accepts the type 'text'`;
+        if (args.options.spfxVersion) {
+            if (!this.versions[args.options.spfxVersion]) {
+                return `${args.options.spfxVersion} is not a supported SharePoint Framework version. Supported versions are ${Object.keys(this.versions).join(', ')}`;
+            }
         }
         return true;
     }));
-}, _SpfxDoctorCommand_initTypes = function _SpfxDoctorCommand_initTypes() {
-    this.types.string.push('e', 'env');
 };
 module.exports = new SpfxDoctorCommand();
 //# sourceMappingURL=spfx-doctor.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppGetCommand_instances, _SpoAppGetCommand_initTelemetry, _SpoAppGetCommand_initOptions, _SpoAppGetCommand_initValidators, _SpoAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
@@ -63,7 +64,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                     logger.logToStderr(`Retrieving information for app ${appId}...`);
                 }
                 const requestOptions = {
-                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(appId)}')`,
+                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(appId)}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

package/dist/m365/spo/commands/app/app-install.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppInstallCommand_instances, _SpoAppInstallCommand_initTelemetry, _SpoAppInstallCommand_initOptions, _SpoAppInstallCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -40,7 +41,7 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Installing app '${args.options.id}' in site '${args.options.siteUrl}'...`);
             }
             const requestOptions = {
-                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/install`,
+                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/install`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 }

package/dist/m365/spo/commands/app/app-remove.js

@@ -17,6 +17,7 @@ var _SpoAppRemoveCommand_instances, _SpoAppRemoveCommand_initTelemetry, _SpoAppR
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
@@ -46,7 +47,7 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                         logger.logToStderr(`Retrieved app catalog URL ${appCatalogUrl}. Removing app from the app catalog...`);
                     }
                     const requestOptions = {
-                        url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/remove`,
+                        url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/remove`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         }

package/dist/m365/spo/commands/app/app-retract.js

@@ -17,6 +17,7 @@ var _SpoAppRetractCommand_instances, _SpoAppRetractCommand_initTelemetry, _SpoAp
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
@@ -46,7 +47,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                         logger.logToStderr(`Retracting app...`);
                     }
                     const requestOptions = {
-                        url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/retract`,
+                        url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/retract`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         }

package/dist/m365/spo/commands/app/app-teamspackage-download.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
@@ -103,7 +104,7 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCo
                 url += `GetList('${serverRelativeAppCatalogListUrl}')/GetItemById(${args.options.appItemId})?$expand=File&$select=File/Name`;
             }
             else if (args.options.appName) {
-                url += `getfolderbyserverrelativeurl('${appCatalogListName}')/files('${encodeURIComponent(args.options.appName)}')/ListItemAllFields?$select=Id`;
+                url += `getfolderbyserverrelativeurl('${appCatalogListName}')/files('${formatting_1.formatting.encodeQueryParameter(args.options.appName)}')/ListItemAllFields?$select=Id`;
             }
             const requestOptions = {
                 url,

package/dist/m365/spo/commands/app/app-uninstall.js

@@ -17,6 +17,7 @@ var _SpoAppUninstallCommand_instances, _SpoAppUninstallCommand_initTelemetry, _S
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -42,7 +43,7 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Uninstalling app '${args.options.id}' from the site '${args.options.siteUrl}'...`);
                 }
                 const requestOptions = {
-                    url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/uninstall`,
+                    url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/uninstall`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     }

package/dist/m365/spo/commands/app/app-upgrade.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppUpgradeCommand_instances, _SpoAppUpgradeCommand_initTelemetry, _SpoAppUpgradeCommand_initOptions, _SpoAppUpgradeCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -40,7 +41,7 @@ class SpoAppUpgradeCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Upgrading app '${args.options.id}' in site '${args.options.siteUrl}'...`);
             }
             const requestOptions = {
-                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/upgrade`,
+                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/upgrade`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 }

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

@@ -20,6 +20,7 @@ const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -42,7 +43,13 @@ class SpoContentTypeAddCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const parentInfo = yield this.getParentInfo(args.options.listTitle, args.options.webUrl, logger);
+                let parentInfo = '';
+                if (!args.options.listId && !args.options.listTitle && !args.options.listUrl) {
+                    parentInfo = '<Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" />';
+                }
+                else {
+                    parentInfo = yield this.getParentInfo(args.options, logger);
+                }
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving request digest...`);
                 }
@@ -69,6 +76,8 @@ class SpoContentTypeAddCommand extends SpoCommand_1.default {
                 const options = {
                     webUrl: args.options.webUrl,
                     listTitle: args.options.listTitle,
+                    listUrl: args.options.listUrl,
+                    listId: args.options.listId,
                     id: args.options.id,
                     output: 'json',
                     debug: this.debug,
@@ -90,60 +99,79 @@ class SpoContentTypeAddCommand extends SpoCommand_1.default {
             }
         });
     }
-    getParentInfo(listTitle, webUrl, logger) {
-        return new Promise((resolve, reject) => {
-            if (!listTitle) {
-                resolve('<Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" />');
-                return;
+    getParentInfo(options, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const siteId = yield this.getSiteId(options.webUrl, logger);
+            const webId = yield this.getWebId(options.webUrl, logger);
+            const listId = yield this.getListId(options, logger);
+            return `<Identity Id="5" Name="1a48869e-c092-0000-1f61-81ec89809537|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${listId}" />`;
+        });
+    }
+    getSiteId(webUrl, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving site collection id...`);
             }
-            let siteId = '';
-            let webId = '';
-            (() => {
-                if (this.verbose) {
-                    logger.logToStderr(`Retrieving site collection id...`);
-                }
-                const requestOptions = {
-                    url: `${webUrl}/_api/site?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
-            })()
-                .then((res) => {
-                siteId = res.Id;
-                if (this.verbose) {
-                    logger.logToStderr(`Retrieving site id...`);
-                }
+            const requestOptions = {
+                url: `${webUrl}/_api/site?$select=Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const siteResponse = yield request_1.default.get(requestOptions);
+            return siteResponse.Id;
+        });
+    }
+    getWebId(webUrl, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving web id...`);
+            }
+            const requestOptions = {
+                url: `${webUrl}/_api/web?$select=Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const webResponse = yield request_1.default.get(requestOptions);
+            return webResponse.Id;
+        });
+    }
+    getListId(options, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list id...`);
+            }
+            let listId = '';
+            if (options.listId) {
+                return options.listId;
+            }
+            else if (options.listTitle) {
                 const requestOptions = {
-                    url: `${webUrl}/_api/web?$select=Id`,
+                    url: `${options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')?$select=Id`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },
                     responseType: 'json'
                 };
-                return request_1.default.get(requestOptions);
-            })
-                .then((res) => {
-                webId = res.Id;
-                if (this.verbose) {
-                    logger.logToStderr(`Retrieving list id...`);
-                }
+                const listResponse = yield request_1.default.get(requestOptions);
+                listId = listResponse.Id;
+            }
+            else if (options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
                 const requestOptions = {
-                    url: `${webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(listTitle)}')?$select=Id`,
+                    url: `${options.webUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=Id`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },
                     responseType: 'json'
                 };
-                return request_1.default.get(requestOptions);
-            })
-                .then((res) => {
-                resolve(`<Identity Id="5" Name="1a48869e-c092-0000-1f61-81ec89809537|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${res.Id}" />`);
-            }, (error) => {
-                reject(error);
-            });
+                const listResponse = yield request_1.default.get(requestOptions);
+                listId = listResponse.Id;
+            }
+            return listId;
         });
     }
 }
@@ -160,6 +188,10 @@ _SpoContentTypeAddCommand_instances = new WeakSet(), _SpoContentTypeAddCommand_i
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id <id>'
     }, {
@@ -170,7 +202,14 @@ _SpoContentTypeAddCommand_instances = new WeakSet(), _SpoContentTypeAddCommand_i
         option: '-g, --group [group]'
     });
 }, _SpoContentTypeAddCommand_initValidators = function _SpoContentTypeAddCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.listId) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
+                return `${args.options.listId} is not a valid GUID`;
+            }
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
 }, _SpoContentTypeAddCommand_initTypes = function _SpoContentTypeAddCommand_initTypes() {
     this.types.string.push('id', 'i');
 };

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

@@ -19,6 +19,7 @@ const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -72,30 +73,25 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand_1.default {
                         logger.logToStderr(`WebId: ${webId}`);
                     }
                     let listId = undefined;
-                    // If ListTitle is provided
-                    if (args.options.listTitle) {
-                        // Request for the ListId
-                        const requestOptions = {
-                            url: `${args.options.webUrl}/_api/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$select=Id`,
-                            headers: {
-                                accept: 'application/json;odata=nometadata'
-                            },
-                            responseType: 'json'
-                        };
-                        const list = yield request_1.default.get(requestOptions);
-                        listId = list.Id;
-                        if (this.debug) {
-                            logger.logToStderr(`ListId: ${listId}`);
-                        }
+                    if (args.options.listId) {
+                        listId = args.options.listId;
+                    }
+                    else if (args.options.listTitle) {
+                        listId = yield this.getListIdFromListTitle(args.options.webUrl, args.options.listTitle);
+                    }
+                    else if (args.options.listUrl) {
+                        listId = yield this.getListIdFromListUrl(args.options.webUrl, args.options.listUrl);
+                    }
+                    if (this.debug) {
+                        logger.logToStderr(`ListId: ${listId}`);
                     }
                     const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                     const requestDigest = reqDigest.FormDigestValue;
-                    const updateChildContentTypes = args.options.listTitle ? false : args.options.updateChildContentTypes === true;
+                    const updateChildContentTypes = args.options.listTitle || args.options.listId || args.options.listUrl ? false : args.options.updateChildContentTypes === true;
                     if (this.debug) {
-                        const additionalLog = args.options.listTitle ? `; ListTitle='${args.options.listTitle}'` : ` ; UpdateChildContentTypes='${updateChildContentTypes}`;
+                        const additionalLog = args.options.listTitle ? `; ListTitle='${args.options.listTitle}'` : args.options.listId ? `; ListId='${args.options.listId}'` : args.options.listUrl ? `; ListUrl='${args.options.listUrl}'` : ` ; UpdateChildContentTypes='${updateChildContentTypes}`;
                         logger.logToStderr(`Remove FieldLink from ContentType. FieldLinkId='${args.options.fieldLinkId}' ; ContentTypeId='${args.options.contentTypeId}' ${additionalLog}`);
                         logger.logToStderr(`Execute ProcessQuery.`);
-                        logger.logToStderr('');
                     }
                     let requestBody = '';
                     if (listId) {
@@ -138,13 +134,42 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand_1.default {
             }
         });
     }
+    getListIdFromListTitle(webUrl, listTitle) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${webUrl}/_api/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(listTitle)}')?$select=Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const list = yield request_1.default.get(requestOptions);
+            return list.Id;
+        });
+    }
+    getListIdFromListUrl(webUrl, listUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webUrl, listUrl);
+            const requestOptions = {
+                url: `${webUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const list = yield request_1.default.get(requestOptions);
+            return list.Id;
+        });
+    }
 }
 _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()
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listId: typeof args.options.listId !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            updateChildContentTypes: !!args.options.updateChildContentTypes,
+            confirm: !!args.options.confirm
         });
     });
 }, _SpoContentTypeFieldRemoveCommand_initOptions = function _SpoContentTypeFieldRemoveCommand_initOptions() {
@@ -152,6 +177,10 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --contentTypeId <contentTypeId>'
     }, {
@@ -166,6 +195,9 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
         if (!validation_1.validation.isValidGuid(args.options.fieldLinkId)) {
             return `${args.options.fieldLinkId} is not a valid GUID`;
         }
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
+        }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoContentTypeFieldRemoveCommand_initTypes = function _SpoContentTypeFieldRemoveCommand_initTypes() {

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

@@ -49,7 +49,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Retrieving field link for field ${args.options.id}...`);
                 }
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
+                    url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },
@@ -83,7 +83,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                         logger.logToStderr(`Retrieving information about field link for field ${args.options.id}...`);
                     }
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
+                        url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },