@pnp/cli-microsoft365 6.0.0-beta.8352f49 → 6.0.0-beta.9e3459d

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

@@ -1,171 +1,152 @@
 "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 _SpoListItemListCommand_instances, _SpoListItemListCommand_initTelemetry, _SpoListItemListCommand_initOptions, _SpoListItemListCommand_initValidators, _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 validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemListCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoListItemListCommand_instances.add(this);
+        __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_initTypes).call(this);
+    }
     get name() {
         return commands_1.default.LISTITEM_LIST;
     }
     get description() {
         return 'Gets a list of items from the specified list';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.listId = typeof args.options.listId !== 'undefined';
-        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
-        telemetryProps.title = typeof args.options.title !== 'undefined';
-        telemetryProps.fields = typeof args.options.fields !== 'undefined';
-        telemetryProps.filter = typeof args.options.filter !== 'undefined';
-        telemetryProps.pageNumber = typeof args.options.pageNumber !== 'undefined';
-        telemetryProps.pageSize = typeof args.options.pageSize !== 'undefined';
-        telemetryProps.camlQuery = typeof args.options.camlQuery !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        if (args.options.id) {
-            this.warn(logger, `Option 'id' is deprecated. Please use 'listId' instead.`);
-        }
-        if (args.options.title) {
-            this.warn(logger, `Option 'title' is deprecated. Please use 'listTitle' instead.`);
-        }
-        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 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)}')`;
-        (() => {
-            if (args.options.camlQuery) {
-                if (this.debug) {
-                    logger.logToStderr(`getting request digest for query request`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const listIdArgument = args.options.listId || '';
+            const listTitleArgument = args.options.listTitle || '';
+            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) {
+                        logger.logToStderr(`getting request digest for query request`);
+                    }
+                    const res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                    formDigestValue = res.FormDigestValue;
                 }
-                return utils_1.spo.getRequestDigest(args.options.webUrl);
-            }
-            else {
-                return Promise.resolve();
-            }
-        })()
-            .then((res) => {
-            formDigestValue = args.options.camlQuery ? res.FormDigestValue : '';
-            if (args.options.pageNumber && Number(args.options.pageNumber) > 0) {
-                const rowLimit = `$top=${Number(args.options.pageSize) * Number(args.options.pageNumber)}`;
+                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 fieldSelect = `?$select=Id&${rowLimit}&${filter}`;
+                    const requestOptions = {
+                        url: `${listRestUrl}/items${fieldSelect}`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'X-RequestDigest': formDigestValue
+                        },
+                        responseType: 'json'
+                    };
+                    res = yield request_1.default.get(requestOptions);
+                }
+                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 fieldSelect = `?$select=Id&${rowLimit}&${filter}`;
+                const fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
+                const fieldSelect = fieldsArray.length > 0 ?
+                    `?$select=${encodeURIComponent(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
+                    `?${rowLimit}&${skipToken}&${filter}`;
+                const requestBody = args.options.camlQuery ?
+                    {
+                        "query": {
+                            "ViewXml": args.options.camlQuery
+                        }
+                    }
+                    : ``;
                 const requestOptions = {
-                    url: `${listRestUrl}/items${fieldSelect}`,
+                    url: `${listRestUrl}/${args.options.camlQuery ? `GetItems` : `items${fieldSelect}`}`,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
                         'X-RequestDigest': formDigestValue
                     },
-                    responseType: 'json'
+                    responseType: 'json',
+                    data: requestBody
                 };
-                return request_1.default.get(requestOptions);
+                const listItemInstances = args.options.camlQuery ? yield request_1.default.post(requestOptions) : yield request_1.default.get(requestOptions);
+                listItemInstances.value.forEach(v => delete v['ID']);
+                logger.log(listItemInstances.value);
             }
-            else {
-                return Promise.resolve();
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        })
-            .then((res) => {
-            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 fieldSelect = fieldsArray.length > 0 ?
-                `?$select=${encodeURIComponent(fieldsArray.join(","))}&${rowLimit}&${skipToken}&${filter}` :
-                `?${rowLimit}&${skipToken}&${filter}`;
-            const requestBody = args.options.camlQuery ?
-                {
-                    "query": {
-                        "ViewXml": args.options.camlQuery
-                    }
-                }
-                : ``;
-            const requestOptions = {
-                url: `${listRestUrl}/${args.options.camlQuery ? `GetItems` : `items${fieldSelect}`}`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'X-RequestDigest': formDigestValue
-                },
-                responseType: 'json',
-                data: requestBody
-            };
-            return args.options.camlQuery ? request_1.default.post(requestOptions) : request_1.default.get(requestOptions);
-        })
-            .then((listItemInstances) => {
-            listItemInstances.value.forEach(v => delete v['ID']);
-            logger.log(listItemInstances.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--id [id]'
-            },
-            {
-                option: '--title [title]'
-            },
-            {
-                option: '-i, --listId [listId]'
-            },
-            {
-                option: '-t, --listTitle [listTitle]'
-            },
-            {
-                option: '-s, --pageSize [pageSize]'
-            },
-            {
-                option: '-n, --pageNumber [pageNumber]'
-            },
-            {
-                option: '-q, --camlQuery [camlQuery]'
-            },
-            {
-                option: '-f, --fields [fields]'
-            },
-            {
-                option: '-l, --filter [filter]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    types() {
-        return {
-            string: [
-                'webUrl',
-                'id',
-                'title',
-                'camlQuery',
-                'pageSize',
-                'pageNumber',
-                'fields',
-                'filter'
-            ]
-        };
-    }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initTelemetry = function _SpoListItemListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            fields: typeof args.options.fields !== 'undefined',
+            filter: typeof args.options.filter !== 'undefined',
+            pageNumber: typeof args.options.pageNumber !== 'undefined',
+            pageSize: typeof args.options.pageSize !== 'undefined',
+            camlQuery: typeof args.options.camlQuery !== 'undefined'
+        });
+    });
+}, _SpoListItemListCommand_initOptions = function _SpoListItemListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --listId [listId]'
+    }, {
+        option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '-s, --pageSize [pageSize]'
+    }, {
+        option: '-n, --pageNumber [pageNumber]'
+    }, {
+        option: '-q, --camlQuery [camlQuery]'
+    }, {
+        option: '-f, --fields [fields]'
+    }, {
+        option: '-l, --filter [filter]'
+    });
+}, _SpoListItemListCommand_initValidators = function _SpoListItemListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.id && !args.options.title && !args.options.listId && !args.options.listTitle) {
+        if (!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`;
-        }
-        // 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) {
+            return `Specify listId or listTitle but not both`;
         }
         if (args.options.camlQuery && args.options.fields) {
             return `Specify camlQuery or fields but not both`;
@@ -185,14 +166,13 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         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`;
         }
-        if (args.options.id && !utils_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', 'camlQuery', 'pageSize', 'pageNumber', 'fields', 'filter');
+};
 module.exports = new SpoListItemListCommand();
 //# sourceMappingURL=listitem-list.js.map

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

@@ -1,77 +1,93 @@
 "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 _SpoListItemRecordDeclareCommand_instances, _SpoListItemRecordDeclareCommand_initTelemetry, _SpoListItemRecordDeclareCommand_initOptions, _SpoListItemRecordDeclareCommand_initValidators, _SpoListItemRecordDeclareCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoListItemRecordDeclareCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListItemRecordDeclareCommand_instances, "m", _SpoListItemRecordDeclareCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRecordDeclareCommand_instances, "m", _SpoListItemRecordDeclareCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRecordDeclareCommand_instances, "m", _SpoListItemRecordDeclareCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRecordDeclareCommand_instances, "m", _SpoListItemRecordDeclareCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.LISTITEM_RECORD_DECLARE;
     }
     get description() {
         return "Declares the specified list item as a record";
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.listId = typeof args.options.listId !== 'undefined';
-        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
-        telemetryProps.date = typeof args.options.date !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        let formDigestValue = '';
-        let webIdentity = '';
-        let listId = '';
-        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)}')`;
-        utils_1.spo
-            .getRequestDigest(args.options.webUrl)
-            .then((contextResponse) => {
-            formDigestValue = contextResponse.FormDigestValue;
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-        })
-            .then((webIdentityResp) => {
-            webIdentity = webIdentityResp.objectIdentity;
-            if (args.options.listId) {
-                return Promise.resolve({ Id: args.options.listId });
-            }
-            const requestOptions = {
-                url: `${listRestUrl}?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            listId = res.Id;
-            const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.id, args.options.date || '');
-            const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'Content-Type': 'text/xml',
-                    'X-RequestDigest': formDigestValue
-                },
-                data: requestBody
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
+    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;
+                if (args.options.listId) {
+                    listId = args.options.listId;
+                }
+                else {
+                    const requestOptions = {
+                        url: `${listRestUrl}?$select=Id`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const list = yield request_1.default.get(requestOptions);
+                    listId = list.Id;
+                }
+                const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.listItemId, args.options.date || '');
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'Content-Type': 'text/xml',
+                        'X-RequestDigest': formDigestValue
+                    },
+                    data: requestBody
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    const result = json[json.length - 1];
+                    logger.log(result);
+                }
             }
-            else {
-                const result = json[json.length - 1];
-                logger.log(result);
-                cb();
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     getDeclareRecordRequestBody(webIdentity, listId, id, date) {
         let requestBody = '';
@@ -83,53 +99,50 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
         }
         return requestBody;
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-l, --listId [listId]'
-            },
-            {
-                option: '-t, --listTitle [listTitle]'
-            },
-            {
-                option: '-i, --id <id>'
-            },
-            {
-                option: '-d, --date [date]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDeclareCommand_initTelemetry = function _SpoListItemRecordDeclareCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            date: typeof args.options.date !== 'undefined'
+        });
+    });
+}, _SpoListItemRecordDeclareCommand_initOptions = function _SpoListItemRecordDeclareCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-l, --listId [listId]'
+    }, {
+        option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '-i, --listItemId <listItemId>'
+    }, {
+        option: '-d, --date [date]'
+    });
+}, _SpoListItemRecordDeclareCommand_initValidators = function _SpoListItemRecordDeclareCommand_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`;
         }
-        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`;
         }
-        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']);
+};
 module.exports = new SpoListItemRecordDeclareCommand();
 //# sourceMappingURL=listitem-record-declare.js.map