@pnp/cli-microsoft365 7.0.0-beta.90ef876 → 7.0.0-beta.df9f285

package/dist/m365/spfx/commands/project/project-externalize/rules/DynamicRule.js

@@ -1,4 +1,13 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicRule = void 0;
 const fs = require("fs");
@@ -12,36 +21,32 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
         this.fileVariationSuffixes = ['.min', '.bundle', '-min', '.bundle.min'];
     }
     visit(project) {
-        if (!project.packageJson ||
-            !project.packageJson.dependencies) {
-            return Promise.resolve({ entries: [], suggestions: [] });
-        }
-        const validPackageNames = Object.getOwnPropertyNames(project.packageJson.dependencies)
-            .filter(x => this.restrictedNamespaces.map(y => x.indexOf(y) === -1).reduce((y, z) => y && z))
-            .filter(x => this.restrictedModules.indexOf(x) === -1);
-        return Promise
-            .all(validPackageNames.map((x) => this.getExternalEntryForPackage(x, project)))
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!project.packageJson || !project.packageJson.dependencies) {
+                return { entries: [], suggestions: [] };
+            }
+            const validPackageNames = Object.getOwnPropertyNames(project.packageJson.dependencies)
+                .filter(x => this.restrictedNamespaces.map(y => x.indexOf(y) === -1).reduce((y, z) => y && z))
+                .filter(x => this.restrictedModules.indexOf(x) === -1);
+            const res = yield Promise.all(validPackageNames.map((x) => this.getExternalEntryForPackage(x, project)));
             return {
-                entries: res
-                    .filter(x => x !== undefined)
-                    .map(x => x),
+                entries: res.filter(x => x !== undefined),
                 suggestions: []
             };
         });
     }
     getExternalEntryForPackage(packageName, project) {
-        const version = project.packageJson.dependencies[packageName];
-        const filesPaths = this.getFilePath(packageName).map(x => this.cleanFilePath(x));
-        if (!version || filesPaths.length === 0) {
-            return Promise.resolve(undefined);
-        }
-        const filesPathsVariations = filesPaths
-            .map(x => this.fileVariationSuffixes.map(y => x.indexOf(y) === -1 ? x.replace('.js', `${y}.js`) : x))
-            .reduce((x, y) => [...x, ...y]);
-        const pathsAndVariations = [...filesPaths, ...filesPathsVariations];
-        return Promise.all(pathsAndVariations.map(x => this.getExternalEntryForFilePath(x, packageName, version)))
-            .then((externalizeEntryCandidates) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const version = project.packageJson.dependencies[packageName];
+            const filesPaths = this.getFilePath(packageName).map(x => this.cleanFilePath(x));
+            if (!version || filesPaths.length === 0) {
+                return undefined;
+            }
+            const filesPathsVariations = filesPaths
+                .map(x => this.fileVariationSuffixes.map(y => x.indexOf(y) === -1 ? x.replace('.js', `${y}.js`) : x))
+                .reduce((x, y) => [...x, ...y]);
+            const pathsAndVariations = [...filesPaths, ...filesPathsVariations];
+            const externalizeEntryCandidates = yield Promise.all(pathsAndVariations.map(x => this.getExternalEntryForFilePath(x, packageName, version)));
             const dExternalizeEntryCandidates = externalizeEntryCandidates.filter(x => x !== undefined);
             const minifiedModule = dExternalizeEntryCandidates.find(x => !x.globalName && this.pathContainsMinifySuffix(x.path));
             const minifiedNonModule = dExternalizeEntryCandidates.find(x => x.globalName && this.pathContainsMinifySuffix(x.path));
@@ -57,31 +62,29 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
             .filter(y => y > -1).length > 0;
     }
     getExternalEntryForFilePath(filePath, packageName, version) {
-        const url = this.getFileUrl(packageName, version, filePath);
-        return this
-            .testUrl(url)
-            .then((testResult) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = this.getFileUrl(packageName, version, filePath);
+            const testResult = yield this.testUrl(url);
             if (!testResult) {
-                return Promise.resolve(undefined);
+                return undefined;
+            }
+            const moduleInfo = yield this.getModuleType(url);
+            if (moduleInfo.scriptType === 'CommonJs') {
+                return undefined; //browsers don't support those module types without an additional library
+            }
+            else if (moduleInfo.scriptType === 'ES2015' || moduleInfo.scriptType === 'AMD') {
+                return {
+                    key: packageName,
+                    path: url
+                };
+            }
+            else { //TODO for non-module and UMD we should technically add dependencies as well
+                return {
+                    key: packageName,
+                    path: url,
+                    globalName: moduleInfo.exports && moduleInfo.exports.length > 0 ? moduleInfo.exports[0] : packageName // examples where this is not good https://unpkg.com/@pnp/polyfill-ie11@^1.0.2/dist/index.js https://unpkg.com/moment-timezone@^0.5.27/builds/moment-timezone-with-data.js
+                };
             }
-            return this.getModuleType(url).then((moduleInfo) => {
-                if (moduleInfo.scriptType === 'CommonJs') {
-                    return Promise.resolve(undefined); //browsers don't support those module types without an additional library
-                }
-                else if (moduleInfo.scriptType === 'ES2015' || moduleInfo.scriptType === 'AMD') {
-                    return {
-                        key: packageName,
-                        path: url
-                    };
-                }
-                else { //TODO for non-module and UMD we should technically add dependencies as well
-                    return {
-                        key: packageName,
-                        path: url,
-                        globalName: moduleInfo.exports && moduleInfo.exports.length > 0 ? moduleInfo.exports[0] : packageName // examples where this is not good https://unpkg.com/@pnp/polyfill-ie11@^1.0.2/dist/index.js https://unpkg.com/moment-timezone@^0.5.27/builds/moment-timezone-with-data.js
-                    };
-                }
-            });
         });
     }
     getModuleType(url) {
@@ -101,10 +104,15 @@ class DynamicRule extends BasicDependencyRule_1.BasicDependencyRule {
         return `https://unpkg.com/${packageName}@${version}/${filePath}`;
     }
     testUrl(url) {
-        return request_1.default
-            .head({ url: url, headers: { 'x-anonymous': 'true' } })
-            .then(() => true)
-            .catch(() => false);
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield request_1.default.head({ url: url, headers: { 'x-anonymous': 'true' } });
+                return true;
+            }
+            catch (_a) {
+                return false;
+            }
+        });
     }
     getFilePath(packageName) {
         const packageJsonFilePath = `node_modules/${packageName}/package.json`;

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFileListCommand_instances, _SpoFileListCommand_initTelemetry, _SpoFileListCommand_initOptions, _SpoFileListCommand_initValidators, _SpoFileListCommand_initOptionSets;
+var _SpoFileListCommand_instances, _SpoFileListCommand_initTelemetry, _SpoFileListCommand_initOptions, _SpoFileListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -34,18 +34,13 @@ class SpoFileListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving all files in folder '${args.options.folder}' at site '${args.options.webUrl}'${args.options.recursive ? ' (recursive)' : ''}...`);
+                logger.logToStderr(`Retrieving all files in folder '${args.options.folderUrl}' at site '${args.options.webUrl}'${args.options.recursive ? ' (recursive)' : ''}...`);
             }
             try {
-                if (args.options.folder) {
-                    args.options.folderUrl = args.options.folder;
-                    this.warn(logger, `Option 'folder' is deprecated. Please use 'folderUrl' instead`);
-                }
                 const fieldProperties = this.formatSelectProperties(args.options.fields, args.options.output);
                 const allFiles = [];
                 const allFolders = args.options.recursive
@@ -157,8 +152,6 @@ class SpoFileListCommand extends SpoCommand_1.default {
 _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry = function _SpoFileListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            folder: typeof args.options.folder !== 'undefined',
-            folderUrl: typeof args.options.folderUrl !== 'undefined',
             recursive: args.options.recursive,
             fields: typeof args.options.fields !== 'undefined',
             filter: typeof args.options.filter !== 'undefined'
@@ -168,9 +161,7 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '--folder [folder]'
-    }, {
-        option: '--folderUrl [folderUrl]'
+        option: '-f, --folderUrl <folderUrl>'
     }, {
         option: '--fields [fields]'
     }, {
@@ -180,8 +171,6 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
     });
 }, _SpoFileListCommand_initValidators = function _SpoFileListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
-}, _SpoFileListCommand_initOptionSets = function _SpoFileListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['folder', 'folderUrl'] });
 };
 SpoFileListCommand.pageSize = 5000;
 module.exports = new SpoFileListCommand();

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

@@ -38,34 +38,8 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeFolder = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.verbose) {
-                    logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
-                }
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
-                if (args.options.recycle) {
-                    requestUrl += `/recycle()`;
-                }
-                const requestOptions = {
-                    url: requestUrl,
-                    method: 'POST',
-                    headers: {
-                        'X-HTTP-Method': 'DELETE',
-                        'If-Match': '*',
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                try {
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.force) {
-                yield removeFolder();
+                yield this.removeFolder(logger, args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -75,11 +49,39 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.url} located in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
-                    yield removeFolder();
+                    yield this.removeFolder(logger, args.options);
                 }
             }
         });
     }
+    removeFolder(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing folder in site at ${options.webUrl}...`);
+            }
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.url);
+            let requestUrl = `${options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            if (options.recycle) {
+                requestUrl += `/recycle()`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                method: 'POST',
+                headers: {
+                    'X-HTTP-Method': 'DELETE',
+                    'If-Match': '*',
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initTelemetry = function _SpoFolderRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -78,9 +78,6 @@ class SpoListAddCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.schemaXml) {
-                this.warn(logger, `Option 'schemaXml' is deprecated.`);
-            }
             if (this.verbose) {
                 logger.logToStderr(`Creating list in site at ${args.options.webUrl}...`);
             }
@@ -114,9 +111,6 @@ class SpoListAddCommand extends SpoCommand_1.default {
         if (options.templateFeatureId) {
             requestBody.TemplateFeatureId = options.templateFeatureId;
         }
-        if (options.schemaXml) {
-            requestBody.SchemaXml = options.schemaXml.replace('\\', '\\\\').replace('"', '\\"');
-        }
         if (options.allowDeletion !== undefined) {
             requestBody.AllowDeletion = options.allowDeletion;
         }
@@ -302,7 +296,6 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
             'baseTemplate',
             'description',
             'templateFeatureId',
-            'schemaXml',
             'defaultContentApprovalWorkflowId',
             'defaultDisplayFormUrl',
             'defaultEditFormUrl',
@@ -354,8 +347,6 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
         option: '--description [description]'
     }, {
         option: '--templateFeatureId [templateFeatureId]'
-    }, {
-        option: '--schemaXml [schemaXml]'
     }, {
         option: '--allowDeletion [allowDeletion]',
         autocomplete: ['true', 'false']

package/dist/m365/spo/commands/list/list-retentionlabel-ensure.js

@@ -25,9 +25,6 @@ class SpoListRetentionLabelEnsureCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.LIST_RETENTIONLABEL_ENSURE;
     }
-    alias() {
-        return [commands_1.default.LIST_LABEL_SET];
-    }
     get description() {
         return 'Sets a default retention label on the specified list or library.';
     }
@@ -41,7 +38,6 @@ class SpoListRetentionLabelEnsureCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.showDeprecationWarning(logger, commands_1.default.LIST_LABEL_SET, commands_1.default.LIST_RETENTIONLABEL_ENSURE);
             if (args.options.label) {
                 args.options.name = args.options.label;
                 this.warn(logger, `Option 'label' is deprecated. Please use 'name' instead`);

package/dist/m365/spo/commands/list/list-retentionlabel-get.js

@@ -25,9 +25,6 @@ class SpoListRetentionLabelGetCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.LIST_RETENTIONLABEL_GET;
     }
-    alias() {
-        return [commands_1.default.LIST_LABEL_GET];
-    }
     get description() {
         return 'Gets the default retention label set on the specified list or library.';
     }
@@ -41,7 +38,6 @@ class SpoListRetentionLabelGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.showDeprecationWarning(logger, commands_1.default.LIST_LABEL_GET, commands_1.default.LIST_RETENTIONLABEL_GET);
             try {
                 if (this.verbose) {
                     logger.logToStderr(`Getting label set on the list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site at ${args.options.webUrl}...`);

package/dist/m365/spo/commands/list/list-roleassignment-add.js

@@ -15,16 +15,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-const SpoUserGetCommand = require("../user/user-get");
-const SpoGroupGetCommand = require("../group/group-get");
-const SpoRoleDefinitionListCommand = require("../roledefinition/roledefinition-list");
+const spo_1 = require("../../../../utils/spo");
 class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.LIST_ROLEASSIGNMENT_ADD;
@@ -57,13 +54,15 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
                     const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                     requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                 }
-                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options);
+                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options, logger);
                 if (args.options.upn) {
-                    args.options.principalId = yield this.getUserPrincipalId(args.options);
+                    const user = yield spo_1.spo.getUserByEmail(args.options.webUrl, args.options.upn, logger, this.verbose);
+                    args.options.principalId = user.Id;
                     yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else if (args.options.groupName) {
-                    args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                    const group = yield spo_1.spo.getGroupByName(args.options.webUrl, args.options.groupName, logger, this.verbose);
+                    args.options.principalId = group.Id;
                     yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else {
@@ -89,50 +88,13 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             return request_1.default.post(requestOptions);
         });
     }
-    getRoleDefinitionId(options) {
+    getRoleDefinitionId(options, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!options.roleDefinitionName) {
                 return options.roleDefinitionId;
             }
-            const roleDefinitionListCommandOptions = {
-                webUrl: options.webUrl,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) });
-            const getRoleDefinitionListOutput = JSON.parse(output.stdout);
-            const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
-            return roleDefinitionId;
-        });
-    }
-    getGroupPrincipalId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const groupGetCommandOptions = {
-                webUrl: options.webUrl,
-                name: options.groupName,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) });
-            const getGroupOutput = JSON.parse(output.stdout);
-            return getGroupOutput.Id;
-        });
-    }
-    getUserPrincipalId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userGetCommandOptions = {
-                webUrl: options.webUrl,
-                email: options.upn,
-                id: undefined,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.Id;
+            const roleDefinition = yield spo_1.spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
+            return roleDefinition.Id;
         });
     }
 }

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

@@ -67,9 +67,6 @@ class SpoListSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.schemaXml) {
-                this.warn(logger, `Option 'schemaXml' is deprecated.`);
-            }
             if (this.verbose) {
                 logger.logToStderr(`Updating list in site at ${args.options.webUrl}...`);
             }
@@ -116,9 +113,6 @@ class SpoListSetCommand extends SpoCommand_1.default {
         if (options.templateFeatureId) {
             requestBody.TemplateFeatureId = options.templateFeatureId;
         }
-        if (options.schemaXml) {
-            requestBody.SchemaXml = options.schemaXml.replace('\\', '\\\\').replace('"', '\\"');
-        }
         if (options.allowDeletion !== undefined) {
             requestBody.AllowDeletion = options.allowDeletion;
         }
@@ -307,7 +301,6 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
             'newTitle',
             'description',
             'templateFeatureId',
-            'schemaXml',
             'defaultContentApprovalWorkflowId',
             'defaultDisplayFormUrl',
             'defaultEditFormUrl',
@@ -506,8 +499,6 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
     }, {
         option: '--restrictUserUpdates [restrictUserUpdates]',
         autocomplete: ['true', 'false']
-    }, {
-        option: '--schemaXml [schemaXml]'
     }, {
         option: '--sendToLocationName [sendToLocationName]'
     }, {

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

@@ -53,7 +53,7 @@ class SpoListItemAttachmentListCommand extends SpoCommand_1.default {
                 requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
             const requestOptions = {
-                url: `${requestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
+                url: `${requestUrl}/items(${args.options.listItemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
                 method: 'GET',
                 headers: {
                     'accept': 'application/json;odata=nometadata'
@@ -89,7 +89,7 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '--itemId <itemId>'
+        option: '--listItemId <listItemId>'
     }, {
         option: '--listId [listId]'
     }, {
@@ -106,8 +106,8 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
         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`;
+        if (isNaN(parseInt(args.options.listItemId))) {
+            return `${args.options.listItemId} is not a number`;
         }
         return true;
     }));

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

@@ -37,37 +37,8 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestDigest = '';
-            let pageName = args.options.name;
-            const removePage = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
-                    requestDigest = reqDigest.FormDigestValue;
-                    if (!pageName.endsWith('.aspx')) {
-                        pageName += '.aspx';
-                    }
-                    if (this.verbose) {
-                        logger.logToStderr(`Removing page ${pageName}...`);
-                    }
-                    const requestOptions = {
-                        url: `${args.options
-                            .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
-                        headers: {
-                            'X-RequestDigest': requestDigest,
-                            'X-HTTP-Method': 'DELETE',
-                            'content-type': 'application/json;odata=nometadata',
-                            accept: 'application/json;odata=nometadata'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.force) {
-                yield removePage();
+                yield this.removePage(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -77,11 +48,42 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the page '${args.options.name}'?`
                 });
                 if (result.continue) {
-                    yield removePage();
+                    yield this.removePage(logger, args);
                 }
             }
         });
     }
+    removePage(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestDigest = '';
+                let pageName = args.options.name;
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                requestDigest = reqDigest.FormDigestValue;
+                if (!pageName.endsWith('.aspx')) {
+                    pageName += '.aspx';
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Removing page ${pageName}...`);
+                }
+                const requestOptions = {
+                    url: `${args.options
+                        .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                    headers: {
+                        'X-RequestDigest': requestDigest,
+                        'X-HTTP-Method': 'DELETE',
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
     this.options.unshift({