@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5ea1353

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListItemAttachmentListCommand_instances, _SpoListItemAttachmentListCommand_initTelemetry, _SpoListItemAttachmentListCommand_initOptions, _SpoListItemAttachmentListCommand_initValidators, _SpoListItemAttachmentListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 SpoListItemAttachmentListCommand extends SpoCommand_1.default {
@@ -39,13 +41,19 @@ class SpoListItemAttachmentListCommand 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'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_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)}')`;
+            }
             const requestOptions = {
-                url: `${listRestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
+                url: `${requestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
                 method: 'GET',
                 headers: {
                     'accept': 'application/json;odata=nometadata'
@@ -73,7 +81,8 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
     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'
         });
     });
 }, _SpoListItemAttachmentListCommand_initOptions = function _SpoListItemAttachmentListCommand_initOptions() {
@@ -85,14 +94,16 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListItemAttachmentListCommand_initValidators = function _SpoListItemAttachmentListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         if (isNaN(parseInt(args.options.itemId))) {
@@ -101,7 +112,7 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
         return true;
     }));
 }, _SpoListItemAttachmentListCommand_initOptionSets = function _SpoListItemAttachmentListCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemAttachmentListCommand();
 //# sourceMappingURL=listitem-attachment-list.js.map

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListItemGetCommand_instances, _SpoListItemGetCommand_initTelemetry, _SpoListItemGetCommand_initOptions, _SpoListItemGetCommand_initValidators, _SpoListItemGetCommand_initTypes, _SpoListItemGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 SpoListItemGetCommand extends SpoCommand_1.default {
@@ -40,18 +42,24 @@ class SpoListItemGetCommand 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'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')` :
-                `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_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)}')`;
+            }
             const propertiesSelect = args.options.properties ? args.options.properties.split(',') : [];
             const propertiesWithSlash = propertiesSelect.filter(item => item.includes('/'));
             const propertiesToExpand = propertiesWithSlash.map(e => e.split('/')[0]);
             const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
             const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
             const requestOptions = {
-                url: `${listRestUrl}/items(${args.options.id})?$select=${encodeURIComponent(propertiesSelect.join(","))}${fieldExpand}`,
+                url: `${requestUrl}/items(${args.options.id})?$select=${formatting_1.formatting.encodeQueryParameter(propertiesSelect.join(","))}${fieldExpand}`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -72,7 +80,8 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
     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'
         });
     });
 }, _SpoListItemGetCommand_initOptions = function _SpoListItemGetCommand_initOptions() {
@@ -84,17 +93,19 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-p, --properties [properties]'
     });
 }, _SpoListItemGetCommand_initValidators = function _SpoListItemGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId &&
-            !utils_1.validation.isValidGuid(args.options.listId)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         if (isNaN(parseInt(args.options.id))) {
@@ -105,7 +116,7 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
 }, _SpoListItemGetCommand_initTypes = function _SpoListItemGetCommand_initTypes() {
     this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'properties');
 }, _SpoListItemGetCommand_initOptionSets = function _SpoListItemGetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemGetCommand();
 //# sourceMappingURL=listitem-get.js.map

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

@@ -18,7 +18,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 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 urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemIsRecordCommand extends SpoCommand_1.default {
@@ -39,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'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_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) {
@@ -58,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'
                         },
@@ -73,11 +82,11 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
                 if (this.debug) {
                     logger.logToStderr(`Getting request digest for request`);
                 }
-                const reqDigest = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 formDigestValue = reqDigest.FormDigestValue;
-                const webIdentityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, 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 = {
@@ -120,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() {
@@ -132,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* () {
@@ -142,18 +154,18 @@ _SpoListItemIsRecordCommand_instances = new WeakSet(), _SpoListItemIsRecordComma
         if (id < 1) {
             return `Item ID must be a positive number`;
         }
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId &&
-            !utils_1.validation.isValidGuid(args.options.listId)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         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

@@ -13,10 +13,13 @@ 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 _SpoListItemListCommand_instances, _SpoListItemListCommand_initTelemetry, _SpoListItemListCommand_initOptions, _SpoListItemListCommand_initValidators, _SpoListItemListCommand_initTypes;
+var _SpoListItemListCommand_instances, _SpoListItemListCommand_initTelemetry, _SpoListItemListCommand_initOptions, _SpoListItemListCommand_initValidators, _SpoListItemListCommand_initOptionSets, _SpoListItemListCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+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");
 class SpoListItemListCommand extends SpoCommand_1.default {
@@ -26,6 +29,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initOptionSets).call(this);
         __classPrivateFieldGet(this, _SpoListItemListCommand_instances, "m", _SpoListItemListCommand_initTypes).call(this);
     }
     get name() {
@@ -36,32 +40,38 @@ class SpoListItemListCommand 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 || '';
+            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 = '';
             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'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`;
             try {
                 if (args.options.camlQuery) {
                     if (this.debug) {
                         logger.logToStderr(`getting request digest for query request`);
                     }
-                    const res = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                    const res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                     formDigestValue = res.FormDigestValue;
                 }
                 let res;
                 if (args.options.pageNumber && Number(args.options.pageNumber) > 0) {
                     const rowLimit = `$top=${Number(args.options.pageSize) * Number(args.options.pageNumber)}`;
-                    const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
+                    const filter = args.options.filter ? `$filter=${formatting_1.formatting.encodeQueryParameter(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
@@ -73,10 +83,10 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                 const skipTokenId = (res && res.value && res.value.length && res.value[res.value.length - 1]) ? res.value[res.value.length - 1].Id : 0;
                 const skipToken = (args.options.pageNumber && Number(args.options.pageNumber) > 0 && skipTokenId > 0) ? `$skiptoken=Paged=TRUE%26p_ID=${res.value[res.value.length - 1].Id}` : ``;
                 const rowLimit = args.options.pageSize ? `$top=${args.options.pageSize}` : ``;
-                const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
+                const filter = args.options.filter ? `$filter=${formatting_1.formatting.encodeQueryParameter(args.options.filter)}` : ``;
                 const fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
                 const fieldSelect = fieldsArray.length > 0 ?
-                    `?$select=${encodeURIComponent(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
+                    `?$select=${formatting_1.formatting.encodeQueryParameter(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
                     `?${rowLimit}&${skipToken}&${filter}`;
                 const requestBody = args.options.camlQuery ?
                     {
@@ -86,7 +96,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
@@ -109,6 +119,7 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== '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',
@@ -123,6 +134,8 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-s, --pageSize [pageSize]'
     }, {
@@ -136,16 +149,10 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
     });
 }, _SpoListItemListCommand_initValidators = function _SpoListItemListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.listId && !args.options.listTitle) {
-            return `Specify listId or listTitle`;
-        }
-        if (args.options.listId && args.options.listTitle) {
-            return `Specify listId or listTitle but not both`;
-        }
         if (args.options.camlQuery && args.options.fields) {
             return `Specify camlQuery or fields but not both`;
         }
@@ -164,11 +171,13 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         if (args.options.pageNumber && isNaN(Number(args.options.pageNumber))) {
             return `pageNumber must be numeric`;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         return true;
     }));
+}, _SpoListItemListCommand_initOptionSets = function _SpoListItemListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 }, _SpoListItemListCommand_initTypes = function _SpoListItemListCommand_initTypes() {
     this.types.string.push('webUrl', 'camlQuery', 'pageSize', 'pageNumber', 'fields', 'filter');
 };

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

@@ -17,7 +17,10 @@ var _SpoListItemRecordDeclareCommand_instances, _SpoListItemRecordDeclareCommand
 Object.defineProperty(exports, "__esModule", { value: true });
 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 urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
@@ -37,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'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`
-                    : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-                const contextResponse = yield utils_1.spo.getRequestDigest(args.options.webUrl);
-                formDigestValue = contextResponse.FormDigestValue;
-                const webIdentityResp = yield utils_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'
                         },
@@ -62,6 +64,10 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
                     const list = yield request_1.default.get(requestOptions);
                     listId = list.Id;
                 }
+                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`,
@@ -103,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'
         });
     });
@@ -113,6 +120,8 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --listItemId <listItemId>'
     }, {
@@ -120,11 +129,11 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
     });
 }, _SpoListItemRecordDeclareCommand_initValidators = function _SpoListItemRecordDeclareCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        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.listItemId);
@@ -134,13 +143,13 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
         if (id < 1) {
             return `Item ID must be a positive number`;
         }
-        if (args.options.date && !utils_1.validation.isValidISODate(args.options.date)) {
+        if (args.options.date && !validation_1.validation.isValidISODate(args.options.date)) {
             return `${args.options.date} in option date is not in ISO format (yyyy-mm-dd)`;
         }
         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

@@ -17,7 +17,10 @@ var _SpoListItemRecordUndeclareCommand_instances, _SpoListItemRecordUndeclareCom
 Object.defineProperty(exports, "__esModule", { value: true });
 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 urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
@@ -37,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'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_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 utils_1.spo.getRequestDigest(args.options.webUrl);
-                formDigestValue = reqDigest.FormDigestValue;
-                const objectIdentity = yield utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                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`,
@@ -77,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.listItemId},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
@@ -92,7 +94,8 @@ _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() {
@@ -104,6 +107,8 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
         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* () {
@@ -111,18 +116,18 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
         if (isNaN(id)) {
             return `${args.options.listItemId} is not a valid list item ID`;
         }
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId &&
-            !utils_1.validation.isValidGuid(args.options.listId)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         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