@pnp/cli-microsoft365 5.9.0-beta.fd6d022 → 6.0.0-beta.01ba480

package/dist/m365/spo/commands/listitem/listitem-isrecord.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");
@@ -41,11 +42,17 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const resource = Auth_1.Auth.getResourceFromUrl(args.options.webUrl);
-            const listIdArgument = args.options.listId || '';
-            const listTitleArgument = args.options.listTitle || '';
-            const listRestUrl = (args.options.listId ?
-                `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                : `${args.options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
+            let requestUrl = `${args.options.webUrl}/_api/web`;
+            if (args.options.listId) {
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
             let formDigestValue = '';
             let listId = '';
             if (this.debug) {
@@ -60,10 +67,10 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
                 }
                 else {
                     if (this.verbose) {
-                        logger.logToStderr(`Getting list id...`);
+                        logger.logToStderr(`Getting list id for list ${args.options.listTitle ? args.options.listTitle : args.options.listUrl}`);
                     }
                     const requestOptions = {
-                        url: `${listRestUrl}?$select=Id`,
+                        url: `${requestUrl}?$select=Id`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },
@@ -79,7 +86,7 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
                 formDigestValue = reqDigest.FormDigestValue;
                 const webIdentityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
                 if (this.verbose) {
-                    logger.logToStderr(`Checking if list item is a record in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
+                    logger.logToStderr(`Checking if list item is a record in list ${args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl} in site ${args.options.webUrl}...`);
                 }
                 const requestBody = this.getIsRecordRequestBody(webIdentityResp.objectIdentity, listId, args.options.id);
                 const requestOptions = {
@@ -122,7 +129,8 @@ _SpoListItemIsRecordCommand_instances = new WeakSet(), _SpoListItemIsRecordComma
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined'
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
         });
     });
 }, _SpoListItemIsRecordCommand_initOptions = function _SpoListItemIsRecordCommand_initOptions() {
@@ -134,6 +142,8 @@ _SpoListItemIsRecordCommand_instances = new WeakSet(), _SpoListItemIsRecordComma
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListItemIsRecordCommand_initValidators = function _SpoListItemIsRecordCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -155,7 +165,7 @@ _SpoListItemIsRecordCommand_instances = new WeakSet(), _SpoListItemIsRecordComma
         return true;
     }));
 }, _SpoListItemIsRecordCommand_initOptionSets = function _SpoListItemIsRecordCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemIsRecordCommand();
 //# sourceMappingURL=listitem-isrecord.js.map

package/dist/m365/spo/commands/listitem/listitem-list.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -38,23 +39,23 @@ class SpoListItemListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.id) {
-                this.warn(logger, `Option 'id' is deprecated. Please use 'listId' instead.`);
+            let requestUrl = `${args.options.webUrl}/_api/web`;
+            if (args.options.listId) {
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
             }
-            if (args.options.title) {
-                this.warn(logger, `Option 'title' is deprecated. Please use 'listTitle' instead.`);
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
-            const listIdArgument = args.options.listId || args.options.id || '';
-            const listTitleArgument = args.options.listTitle || args.options.title || '';
             let formDigestValue = '';
             const fieldsArray = args.options.fields ? args.options.fields.split(",")
                 : (!args.options.output || args.options.output === "text") ? ["Title", "Id"] : [];
             const fieldsWithSlash = fieldsArray.filter(item => item.includes('/'));
             const fieldsToExpand = fieldsWithSlash.map(e => e.split('/')[0]);
             const expandFieldsArray = fieldsToExpand.filter((item, pos) => fieldsToExpand.indexOf(item) === pos);
-            const listRestUrl = listIdArgument ?
-                `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                : `${args.options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(listTitleArgument)}')`;
             try {
                 if (args.options.camlQuery) {
                     if (this.debug) {
@@ -69,7 +70,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                     const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
                     const fieldSelect = `?$select=Id&${rowLimit}&${filter}`;
                     const requestOptions = {
-                        url: `${listRestUrl}/items${fieldSelect}`,
+                        url: `${requestUrl}/items${fieldSelect}`,
                         headers: {
                             'accept': 'application/json;odata=nometadata',
                             'X-RequestDigest': formDigestValue
@@ -94,7 +95,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                     }
                     : ``;
                 const requestOptions = {
-                    url: `${listRestUrl}/${args.options.camlQuery ? `GetItems` : `items${fieldSelect}`}`,
+                    url: `${requestUrl}/${args.options.camlQuery ? `GetItems` : `items${fieldSelect}`}`,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
                         'X-RequestDigest': formDigestValue
@@ -115,10 +116,9 @@ class SpoListItemListCommand extends SpoCommand_1.default {
 _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initTelemetry = function _SpoListItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             fields: typeof args.options.fields !== 'undefined',
             filter: typeof args.options.filter !== 'undefined',
             pageNumber: typeof args.options.pageNumber !== 'undefined',
@@ -129,14 +129,12 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
 }, _SpoListItemListCommand_initOptions = function _SpoListItemListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--id [id]'
-    }, {
-        option: '--title [title]'
     }, {
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-s, --pageSize [pageSize]'
     }, {
@@ -154,15 +152,11 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.id && !args.options.title && !args.options.listId && !args.options.listTitle) {
-            return `Specify listId or listTitle`;
-        }
-        if (args.options.id && args.options.title) {
-            return `Specify list id or title but not both`;
+        if (!args.options.listId && !args.options.listTitle && !args.options.listUrl) {
+            return `Specify listId or listTitle or listUrl`;
         }
-        // Check if only one of the 4 options is specified
-        if ([args.options.id, args.options.title, args.options.listId, args.options.listTitle].filter(o => o).length > 1) {
-            return 'Specify listId or listTitle but not both';
+        if ([args.options.listId, args.options.listTitle, args.options.listUrl].filter(o => o).length > 1) {
+            return 'Specify listId or listTitle or listUrl but not multiple';
         }
         if (args.options.camlQuery && args.options.fields) {
             return `Specify camlQuery or fields but not both`;
@@ -185,13 +179,10 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
-        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} in option id is not a valid GUID`;
-        }
         return true;
     }));
 }, _SpoListItemListCommand_initTypes = function _SpoListItemListCommand_initTypes() {
-    this.types.string.push('webUrl', 'id', 'title', 'camlQuery', 'pageSize', 'pageNumber', 'fields', 'filter');
+    this.types.string.push('webUrl', 'camlQuery', 'pageSize', 'pageNumber', 'fields', 'filter');
 };
 module.exports = new SpoListItemListCommand();
 //# sourceMappingURL=listitem-list.js.map

package/dist/m365/spo/commands/listitem/listitem-record-declare.js

@@ -19,6 +19,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");
@@ -39,23 +40,22 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let formDigestValue = '';
-            let webIdentity = '';
-            let listId = '';
             try {
-                const listRestUrl = args.options.listId
-                    ? `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`
-                    : `${args.options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-                const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
-                formDigestValue = contextResponse.FormDigestValue;
-                const webIdentityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-                webIdentity = webIdentityResp.objectIdentity;
+                let listId = '';
                 if (args.options.listId) {
                     listId = args.options.listId;
                 }
                 else {
+                    let requestUrl = `${args.options.webUrl}/_api/web`;
+                    if (args.options.listTitle) {
+                        requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                    }
                     const requestOptions = {
-                        url: `${listRestUrl}?$select=Id`,
+                        url: `${requestUrl}?$select=Id`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },
@@ -64,7 +64,11 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
                     const list = yield request_1.default.get(requestOptions);
                     listId = list.Id;
                 }
-                const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.id, args.options.date || '');
+                const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                const formDigestValue = contextResponse.FormDigestValue;
+                const webIdentityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
+                const webIdentity = webIdentityResp.objectIdentity;
+                const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.listItemId, args.options.date || '');
                 const requestOptions = {
                     url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
@@ -105,6 +109,7 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             date: typeof args.options.date !== 'undefined'
         });
     });
@@ -116,7 +121,9 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
     }, {
         option: '-t, --listTitle [listTitle]'
     }, {
-        option: '-i, --id <id>'
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '-i, --listItemId <listItemId>'
     }, {
         option: '-d, --date [date]'
     });
@@ -129,9 +136,9 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
         if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        const id = parseInt(args.options.id);
+        const id = parseInt(args.options.listItemId);
         if (isNaN(id)) {
-            return `${args.options.id} is not a number`;
+            return `${args.options.listItemId} is not a number`;
         }
         if (id < 1) {
             return `Item ID must be a positive number`;
@@ -142,7 +149,7 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
         return true;
     }));
 }, _SpoListItemRecordDeclareCommand_initOptionSets = function _SpoListItemRecordDeclareCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemRecordDeclareCommand();
 //# sourceMappingURL=listitem-record-declare.js.map

package/dist/m365/spo/commands/listitem/listitem-record-undeclare.js

@@ -19,6 +19,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");
@@ -39,39 +40,38 @@ class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const listIdArgument = args.options.listId || '';
-            const listTitleArgument = args.options.listTitle || '';
-            const listRestUrl = (args.options.listId ?
-                `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                : `${args.options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
-            let formDigestValue = '';
-            let environmentListId = '';
             try {
-                if (typeof args.options.listId !== 'undefined') {
-                    environmentListId = args.options.listId;
+                let listId = '';
+                if (args.options.listId) {
+                    listId = args.options.listId;
                 }
                 else {
-                    if (this.verbose) {
-                        logger.logToStderr(`Getting list id...`);
+                    let requestUrl = `${args.options.webUrl}/_api/web`;
+                    if (args.options.listTitle) {
+                        requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
                     }
-                    const listRequestOptions = {
-                        url: `${listRestUrl}/id`,
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                    }
+                    const requestOptions = {
+                        url: `${requestUrl}?$select=Id`,
                         headers: {
-                            'accept': 'application/json;odata=nometadata'
+                            accept: 'application/json;odata=nometadata'
                         },
                         responseType: 'json'
                     };
-                    const idResp = yield request_1.default.get(listRequestOptions);
-                    environmentListId = idResp.value;
+                    const list = yield request_1.default.get(requestOptions);
+                    listId = list.Id;
                 }
                 if (this.debug) {
                     logger.logToStderr(`getting request digest for request`);
                 }
                 const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
-                formDigestValue = reqDigest.FormDigestValue;
+                const formDigestValue = reqDigest.FormDigestValue;
                 const objectIdentity = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
                 if (this.verbose) {
-                    logger.logToStderr(`Undeclare list item as a record in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
+                    logger.logToStderr(`Undeclare list item as a record in list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}...`);
                 }
                 const requestOptions = {
                     url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
@@ -79,7 +79,7 @@ class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
                         'Content-Type': 'text/xml',
                         'X-RequestDigest': formDigestValue
                     },
-                    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><StaticMethod TypeId="{ea8e1356-5910-4e69-bc05-d0c30ed657fc}" Name="UndeclareItemAsRecord" Id="53"><Parameters><Parameter ObjectPathId="49" /></Parameters></StaticMethod></Actions><ObjectPaths><Identity Id="49" Name="${objectIdentity.objectIdentity}:list:${environmentListId}:item:${args.options.id},1" /></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><StaticMethod TypeId="{ea8e1356-5910-4e69-bc05-d0c30ed657fc}" Name="UndeclareItemAsRecord" Id="53"><Parameters><Parameter ObjectPathId="49" /></Parameters></StaticMethod></Actions><ObjectPaths><Identity Id="49" Name="${objectIdentity.objectIdentity}:list:${listId}:item:${args.options.listItemId},1" /></ObjectPaths></Request>`
                 };
                 yield request_1.default.post(requestOptions);
                 // REST post call doesn't return anything
@@ -94,24 +94,27 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined'
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
         });
     });
 }, _SpoListItemRecordUndeclareCommand_initOptions = function _SpoListItemRecordUndeclareCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-i, --id <id>'
+        option: '-i, --listItemId <listItemId>'
     }, {
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListItemRecordUndeclareCommand_initValidators = function _SpoListItemRecordUndeclareCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const id = parseInt(args.options.id);
+        const id = parseInt(args.options.listItemId);
         if (isNaN(id)) {
-            return `${args.options.id} is not a valid list item ID`;
+            return `${args.options.listItemId} is not a valid list item ID`;
         }
         const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
@@ -124,7 +127,7 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
         return true;
     }));
 }, _SpoListItemRecordUndeclareCommand_initOptionSets = function _SpoListItemRecordUndeclareCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemRecordUndeclareCommand();
 //# sourceMappingURL=listitem-record-undeclare.js.map

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 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");
@@ -40,14 +41,18 @@ class SpoListItemRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeListItem = () => __awaiter(this, void 0, void 0, function* () {
                 if (this.verbose) {
-                    logger.logToStderr(`Removing list item in site at ${args.options.webUrl}...`);
+                    logger.logToStderr(`Removing list from list ${args.options.listId || args.options.listTitle || args.options.listUrl} item in site at ${args.options.webUrl}...`);
                 }
-                let requestUrl = '';
+                let requestUrl = `${args.options.webUrl}/_api/web`;
                 if (args.options.listId) {
-                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                    requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
                 }
-                else {
-                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                else if (args.options.listTitle) {
+                    requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                }
+                else if (args.options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                 }
                 requestUrl += `/items(${args.options.id})`;
                 if (args.options.recycle) {
@@ -79,7 +84,7 @@ class SpoListItemRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the list item ${args.options.id} from list ${args.options.listId || args.options.listTitle} located in site ${args.options.webUrl}?`
+                    message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the list item ${args.options.id} from list ${args.options.listId || args.options.listTitle || args.options.listUrl} located in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
                     yield removeListItem();
@@ -91,10 +96,11 @@ class SpoListItemRemoveCommand extends SpoCommand_1.default {
 _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_initTelemetry = function _SpoListItemRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            listId: (!(!args.options.listId)).toString(),
-            listTitle: (!(!args.options.listTitle)).toString(),
-            recycle: (!(!args.options.recycle)).toString(),
-            confirm: (!(!args.options.confirm)).toString()
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            recycle: !!args.options.recycle,
+            confirm: !!args.options.confirm
         });
     });
 }, _SpoListItemRemoveCommand_initOptions = function _SpoListItemRemoveCommand_initOptions() {
@@ -106,6 +112,8 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--recycle'
     }, {
@@ -128,7 +136,7 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
         return true;
     }));
 }, _SpoListItemRemoveCommand_initOptionSets = function _SpoListItemRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemRemoveCommand();
 //# sourceMappingURL=listitem-remove.js.map