@pnp/cli-microsoft365 6.0.0-beta.e031afa → 6.0.0-beta.e45a1f2

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

@@ -1,10 +1,37 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoListItemAddCommand_instances, _SpoListItemAddCommand_initTelemetry, _SpoListItemAddCommand_initOptions, _SpoListItemAddCommand_initValidators, _SpoListItemAddCommand_initTypes, _SpoListItemAddCommand_initOptionSets;
 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 SpoListItemAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoListItemAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initOptionSets).call(this);
+    }
     allowUnknownOptions() {
         return true;
     }
@@ -14,195 +41,136 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Creates a list item in the specified list';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.listId = typeof args.options.listId !== 'undefined';
-        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
-        telemetryProps.contentType = typeof args.options.contentType !== 'undefined';
-        telemetryProps.folder = typeof args.options.folder !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        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 contentTypeName = '';
-        let targetFolderServerRelativeUrl = '';
-        if (this.verbose) {
-            logger.logToStderr(`Getting content types for list...`);
-        }
-        const requestOptions = {
-            url: `${listRestUrl}/contenttypes?$select=Name,Id`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((response) => {
-            if (args.options.contentType) {
-                const foundContentType = response.value.filter((ct) => {
-                    const contentTypeMatch = ct.Id.StringValue === args.options.contentType || ct.Name === args.options.contentType;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                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 contentTypeName = '';
+                let targetFolderServerRelativeUrl = '';
+                if (this.verbose) {
+                    logger.logToStderr(`Getting content types for list ${args.options.listId || args.options.listTitle || args.options.listUrl}...`);
+                }
+                let requestOptions = {
+                    url: `${requestUrl}/contenttypes?$select=Name,Id`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const ctypes = yield request_1.default.get(requestOptions);
+                if (args.options.contentType) {
+                    const foundContentType = ctypes.value.filter((ct) => {
+                        const contentTypeMatch = ct.Id.StringValue === args.options.contentType || ct.Name === args.options.contentType;
+                        if (this.debug) {
+                            logger.logToStderr(`Checking content type value [${ct.Name}]: ${contentTypeMatch}`);
+                        }
+                        return contentTypeMatch;
+                    });
                     if (this.debug) {
-                        logger.logToStderr(`Checking content type value [${ct.Name}]: ${contentTypeMatch}`);
+                        logger.logToStderr('content type filter output...');
+                        logger.logToStderr(foundContentType);
+                    }
+                    if (foundContentType.length > 0) {
+                        contentTypeName = foundContentType[0].Name;
+                    }
+                    // After checking for content types, throw an error if the name is blank
+                    if (!contentTypeName || contentTypeName === '') {
+                        throw `Specified content type '${args.options.contentType}' doesn't exist on the target list`;
+                    }
+                    if (this.debug) {
+                        logger.logToStderr(`using content type name: ${contentTypeName}`);
                     }
-                    return contentTypeMatch;
-                });
-                if (this.debug) {
-                    logger.logToStderr('content type filter output...');
-                    logger.logToStderr(foundContentType);
                 }
-                if (foundContentType.length > 0) {
-                    contentTypeName = foundContentType[0].Name;
+                if (args.options.folder) {
+                    if (this.debug) {
+                        logger.logToStderr('setting up folder lookup response ...');
+                    }
+                    requestOptions = {
+                        url: `${requestUrl}/rootFolder`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const rootFolderResponse = yield request_1.default.get(requestOptions);
+                    targetFolderServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(rootFolderResponse["ServerRelativeUrl"], args.options.folder);
+                    yield spo_1.spo.ensureFolder(args.options.webUrl, targetFolderServerRelativeUrl, logger, this.debug);
                 }
-                // After checking for content types, throw an error if the name is blank
-                if (!contentTypeName || contentTypeName === '') {
-                    return Promise.reject(`Specified content type '${args.options.contentType}' doesn't exist on the target list`);
+                if (this.verbose) {
+                    logger.logToStderr(`Creating item in list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}...`);
                 }
-                if (this.debug) {
-                    logger.logToStderr(`using content type name: ${contentTypeName}`);
+                const requestBody = {
+                    formValues: this.mapRequestBody(args.options)
+                };
+                if (args.options.folder) {
+                    requestBody.listItemCreateInfo = {
+                        FolderPath: {
+                            DecodedUrl: targetFolderServerRelativeUrl
+                        }
+                    };
                 }
-            }
-            if (args.options.folder) {
-                if (this.debug) {
-                    logger.logToStderr('setting up folder lookup response ...');
+                if (args.options.contentType && contentTypeName !== '') {
+                    if (this.debug) {
+                        logger.logToStderr(`Specifying content type name [${contentTypeName}] in request body`);
+                    }
+                    requestBody.formValues.push({
+                        FieldName: 'ContentType',
+                        FieldValue: contentTypeName
+                    });
                 }
-                const requestOptions = {
-                    url: `${listRestUrl}/rootFolder`,
+                requestOptions = {
+                    url: `${requestUrl}/AddValidateUpdateItemUsingPath()`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
+                    data: requestBody,
                     responseType: 'json'
                 };
-                return request_1.default
-                    .get(requestOptions)
-                    .then(rootFolderResponse => {
-                    targetFolderServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(rootFolderResponse["ServerRelativeUrl"], args.options.folder);
-                    return utils_1.spo.ensureFolder(args.options.webUrl, targetFolderServerRelativeUrl, logger, this.debug);
+                const response = yield request_1.default.post(requestOptions);
+                // Response is from /AddValidateUpdateItemUsingPath POST call, perform get on added item to get all field values
+                const fieldValues = response.value;
+                const idField = fieldValues.filter((thisField) => {
+                    return (thisField.FieldName === "Id");
                 });
-            }
-            else {
-                return Promise.resolve();
-            }
-        })
-            .then(() => {
-            if (this.verbose) {
-                logger.logToStderr(`Creating item in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
-            }
-            const requestBody = {
-                formValues: this.mapRequestBody(args.options)
-            };
-            if (args.options.folder) {
-                requestBody.listItemCreateInfo = {
-                    FolderPath: {
-                        DecodedUrl: targetFolderServerRelativeUrl
-                    }
-                };
-            }
-            if (args.options.contentType && contentTypeName !== '') {
                 if (this.debug) {
-                    logger.logToStderr(`Specifying content type name [${contentTypeName}] in request body`);
+                    logger.logToStderr(`field values returned:`);
+                    logger.logToStderr(fieldValues);
+                    logger.logToStderr(`Id returned by AddValidateUpdateItemUsingPath: ${idField}`);
                 }
-                requestBody.formValues.push({
-                    FieldName: 'ContentType',
-                    FieldValue: contentTypeName
-                });
-            }
-            const requestOptions = {
-                url: `${listRestUrl}/AddValidateUpdateItemUsingPath()`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: requestBody,
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((response) => {
-            // Response is from /AddValidateUpdateItemUsingPath POST call, perform get on added item to get all field values
-            const fieldValues = response.value;
-            const idField = fieldValues.filter((thisField) => {
-                return (thisField.FieldName === "Id");
-            });
-            if (this.debug) {
-                logger.logToStderr(`field values returned:`);
-                logger.logToStderr(fieldValues);
-                logger.logToStderr(`Id returned by AddValidateUpdateItemUsingPath: ${idField}`);
-            }
-            if (idField.length === 0) {
-                return Promise.reject(`Item didn't add successfully`);
+                if (idField.length === 0) {
+                    throw `Item didn't add successfully`;
+                }
+                requestOptions = {
+                    url: `${requestUrl}/items(${idField[0].FieldValue})`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const item = yield request_1.default.get(requestOptions);
+                logger.log(item);
             }
-            const requestOptions = {
-                url: `${listRestUrl}/items(${idField[0].FieldValue})`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((response) => {
-            logger.log(response);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-l, --listId [listId]'
-            },
-            {
-                option: '-t, --listTitle [listTitle]'
-            },
-            {
-                option: '-c, --contentType [contentType]'
-            },
-            {
-                option: '-f, --folder [folder]'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    types() {
-        return {
-            string: [
-                'webUrl',
-                'listId',
-                'listTitle',
-                'contentType',
-                'folder'
-            ]
-        };
-    }
-    validate(args) {
-        const isValidSharePointUrl = utils_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.listId &&
-            !utils_1.validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} in option listId is not a valid GUID`;
-        }
-        return true;
+        });
     }
     mapRequestBody(options) {
         const requestBody = [];
         const excludeOptions = [
             'listTitle',
             'listId',
+            'listUrl',
             'webUrl',
             'contentType',
             'folder',
@@ -218,5 +186,46 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
         return requestBody;
     }
 }
+_SpoListItemAddCommand_instances = new WeakSet(), _SpoListItemAddCommand_initTelemetry = function _SpoListItemAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            contentType: typeof args.options.contentType !== 'undefined',
+            folder: typeof args.options.folder !== 'undefined'
+        });
+    });
+}, _SpoListItemAddCommand_initOptions = function _SpoListItemAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-l, --listId [listId]'
+    }, {
+        option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '-c, --contentType [contentType]'
+    }, {
+        option: '-f, --folder [folder]'
+    });
+}, _SpoListItemAddCommand_initValidators = function _SpoListItemAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.listId &&
+            !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} in option listId is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoListItemAddCommand_initTypes = function _SpoListItemAddCommand_initTypes() {
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'contentType', 'folder');
+}, _SpoListItemAddCommand_initOptionSets = function _SpoListItemAddCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+};
 module.exports = new SpoListItemAddCommand();
 //# sourceMappingURL=listitem-add.js.map

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

@@ -1,90 +1,118 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _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 {
+    constructor() {
+        super();
+        _SpoListItemAttachmentListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.LISTITEM_ATTACHMENT_LIST;
     }
     get description() {
         return 'Gets the attachments associated to a list item';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.listId = typeof args.options.listId !== 'undefined';
-        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['FileName', 'ServerRelativeUrl'];
     }
-    commandAction(logger, args, cb) {
-        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)}')`);
-        const requestOptions = {
-            url: `${listRestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((attachmentFiles) => {
-            if (attachmentFiles.AttachmentFiles && attachmentFiles.AttachmentFiles.length > 0) {
-                logger.log(attachmentFiles.AttachmentFiles);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/web`;
+            if (args.options.listId) {
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No attachments found');
+            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}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const attachmentFiles = yield request_1.default.get(requestOptions);
+                if (attachmentFiles.AttachmentFiles && attachmentFiles.AttachmentFiles.length > 0) {
+                    logger.log(attachmentFiles.AttachmentFiles);
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No attachments found');
+                    }
                 }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--itemId <itemId>'
-            },
-            {
-                option: '--listId [listId]'
-            },
-            {
-                option: '--listTitle [listTitle]'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachmentListCommand_initTelemetry = function _SpoListItemAttachmentListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
+        });
+    });
+}, _SpoListItemAttachmentListCommand_initOptions = function _SpoListItemAttachmentListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--itemId <itemId>'
+    }, {
+        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 = 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.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))) {
             return `${args.options.itemId} is not a number`;
         }
         return true;
-    }
-}
+    }));
+}, _SpoListItemAttachmentListCommand_initOptionSets = function _SpoListItemAttachmentListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+};
 module.exports = new SpoListItemAttachmentListCommand();
 //# sourceMappingURL=listitem-attachment-list.js.map