@pnp/cli-microsoft365 7.6.0 → 7.7.0-beta.7b57cf9

package/dist/m365/spfx/commands/project/project-doctor/rules/FN021001_PKG_spfx_deps_versions_match_project_version.js

@@ -2,8 +2,9 @@ import { satisfies } from 'semver';
 import { JsonRule } from '../../JsonRule.js';
 import * as spfxDeps from '../spfx-deps.js';
 export class FN021001_PKG_spfx_deps_versions_match_project_version extends JsonRule {
-    constructor() {
+    constructor(includeDevDeps = true) {
         super();
+        this.includeDevDeps = includeDevDeps;
     }
     get id() {
         return 'FN021001';
@@ -38,7 +39,7 @@ export class FN021001_PKG_spfx_deps_versions_match_project_version extends JsonR
                 findings
             });
         }
-        if (project.packageJson.devDependencies) {
+        if (this.includeDevDeps && project.packageJson.devDependencies) {
             const projectDevDeps = Object.keys(project.packageJson.devDependencies);
             this.validateDependencies({
                 dependencies: projectDevDeps,

package/dist/m365/spfx/commands/project/project-doctor/rules/FN021013_PKG_spfx_devdeps_match_version.js

@@ -0,0 +1,58 @@
+import { satisfies } from 'semver';
+import { JsonRule } from '../../JsonRule.js';
+import * as spfxDeps from '../spfx-deps.js';
+export class FN021013_PKG_spfx_devdeps_match_version extends JsonRule {
+    constructor(version) {
+        super();
+        this.version = version;
+    }
+    get id() {
+        return 'FN021013';
+    }
+    get title() {
+        return '';
+    }
+    get description() {
+        return '';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './package.json';
+    }
+    get resolutionType() {
+        return 'cmd';
+    }
+    visit(project, findings) {
+        if (!project.packageJson || !project.packageJson.devDependencies) {
+            return;
+        }
+        if (project.packageJson.devDependencies) {
+            const projectDevDeps = Object.keys(project.packageJson.devDependencies);
+            this.validateDependencies({
+                dependencies: projectDevDeps,
+                spfxDeps: spfxDeps.devDeps,
+                project,
+                version: this.version,
+                findings
+            });
+        }
+    }
+    validateDependencies({ dependencies, spfxDeps, project, version, findings }) {
+        dependencies.forEach(dep => {
+            const depVersion = project.packageJson.devDependencies[dep];
+            if (!spfxDeps.includes(dep) ||
+                satisfies(version, depVersion)) {
+                return;
+            }
+            const node = this.getAstNodeFromFile(project.packageJson, 'devDependencies');
+            this.addFindingWithCustomInfo(`${dep} doesn't match project version`, `${dep}@${depVersion} doesn't match the project version ${project.version}`, [{
+                    file: this.file,
+                    resolution: `installDev ${dep}@${project.version}`,
+                    position: this.getPositionFromNode(node)
+                }], findings);
+        });
+    }
+}
+//# sourceMappingURL=FN021013_PKG_spfx_devdeps_match_version.js.map

package/dist/m365/spfx/commands/project/project-doctor/spfx-deps.js

@@ -19,6 +19,8 @@ export const deps = [
     '@microsoft/sp-page-context'
 ];
 export const devDeps = [
+    '@microsoft/eslint-config-spfx',
+    '@microsoft/eslint-plugin-spfx',
     '@microsoft/sp-build-web',
     '@microsoft/sp-module-interfaces',
     '@microsoft/sp-tslint-rules'

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -69,7 +69,8 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.17.4',
             '1.18.0',
             '1.18.1',
-            '1.18.2'
+            '1.18.2',
+            '1.19.0-beta.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.19.0-beta.0.js

@@ -0,0 +1,53 @@
+import { FN001001_DEP_microsoft_sp_core_library } from './rules/FN001001_DEP_microsoft_sp_core_library.js';
+import { FN001002_DEP_microsoft_sp_lodash_subset } from './rules/FN001002_DEP_microsoft_sp_lodash_subset.js';
+import { FN001003_DEP_microsoft_sp_office_ui_fabric_core } from './rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core.js';
+import { FN001004_DEP_microsoft_sp_webpart_base } from './rules/FN001004_DEP_microsoft_sp_webpart_base.js';
+import { FN001011_DEP_microsoft_sp_dialog } from './rules/FN001011_DEP_microsoft_sp_dialog.js';
+import { FN001012_DEP_microsoft_sp_application_base } from './rules/FN001012_DEP_microsoft_sp_application_base.js';
+import { FN001013_DEP_microsoft_decorators } from './rules/FN001013_DEP_microsoft_decorators.js';
+import { FN001014_DEP_microsoft_sp_listview_extensibility } from './rules/FN001014_DEP_microsoft_sp_listview_extensibility.js';
+import { FN001021_DEP_microsoft_sp_property_pane } from './rules/FN001021_DEP_microsoft_sp_property_pane.js';
+import { FN001023_DEP_microsoft_sp_component_base } from './rules/FN001023_DEP_microsoft_sp_component_base.js';
+import { FN001024_DEP_microsoft_sp_diagnostics } from './rules/FN001024_DEP_microsoft_sp_diagnostics.js';
+import { FN001025_DEP_microsoft_sp_dynamic_data } from './rules/FN001025_DEP_microsoft_sp_dynamic_data.js';
+import { FN001026_DEP_microsoft_sp_extension_base } from './rules/FN001026_DEP_microsoft_sp_extension_base.js';
+import { FN001027_DEP_microsoft_sp_http } from './rules/FN001027_DEP_microsoft_sp_http.js';
+import { FN001028_DEP_microsoft_sp_list_subscription } from './rules/FN001028_DEP_microsoft_sp_list_subscription.js';
+import { FN001029_DEP_microsoft_sp_loader } from './rules/FN001029_DEP_microsoft_sp_loader.js';
+import { FN001030_DEP_microsoft_sp_module_interfaces } from './rules/FN001030_DEP_microsoft_sp_module_interfaces.js';
+import { FN001031_DEP_microsoft_sp_odata_types } from './rules/FN001031_DEP_microsoft_sp_odata_types.js';
+import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_microsoft_sp_page_context.js';
+import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.js';
+import { FN002001_DEVDEP_microsoft_sp_build_web } from './rules/FN002001_DEVDEP_microsoft_sp_build_web.js';
+import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
+import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
+import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
+import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
+export default [
+    new FN001001_DEP_microsoft_sp_core_library('1.19.0-beta.0'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.19.0-beta.0'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.19.0-beta.0'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.19.0-beta.0'),
+    new FN001011_DEP_microsoft_sp_dialog('1.19.0-beta.0'),
+    new FN001012_DEP_microsoft_sp_application_base('1.19.0-beta.0'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.19.0-beta.0'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.19.0-beta.0'),
+    new FN001023_DEP_microsoft_sp_component_base('1.19.0-beta.0'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.19.0-beta.0'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.19.0-beta.0'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.19.0-beta.0'),
+    new FN001027_DEP_microsoft_sp_http('1.19.0-beta.0'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.19.0-beta.0'),
+    new FN001029_DEP_microsoft_sp_loader('1.19.0-beta.0'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.19.0-beta.0'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.19.0-beta.0'),
+    new FN001032_DEP_microsoft_sp_page_context('1.19.0-beta.0'),
+    new FN001013_DEP_microsoft_decorators('1.19.0-beta.0'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.19.0-beta.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.20.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.20.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.20.1'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.20.1'),
+    new FN010001_YORC_version('1.19.0-beta.0')
+];
+//# sourceMappingURL=upgrade-1.19.0-beta.0.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -7,6 +7,8 @@ var _SpfxProjectUpgradeCommand_instances, _a, _SpfxProjectUpgradeCommand_initTel
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
+// uncomment to support upgrading to preview releases
+import { prerelease } from 'semver';
 import { CommandError } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import { packageManager } from '../../../../utils/packageManager.js';
@@ -71,7 +73,8 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.17.4',
             '1.18.0',
             '1.18.1',
-            '1.18.2'
+            '1.18.2',
+            '1.19.0-beta.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -84,15 +87,15 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        // if (!args.options.toVersion &&
-        //   !args.options.preview &&
-        //   prerelease(this.toVersion)) {
-        //   // no version and no preview specified while the current version to
-        //   // upgrade to is a prerelease so let's grab the first non-preview version
-        //   // since we're supporting only one preview version, it's sufficient for
-        //   // us to take second to last version
-        //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if (!args.options.toVersion &&
+            !args.options.preview &&
+            prerelease(this.toVersion)) {
+            // no version and no preview specified while the current version to
+            // upgrade to is a prerelease so let's grab the first non-preview version
+            // since we're supporting only one preview version, it's sufficient for
+            // us to take second to last version
+            this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'bash';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -481,9 +484,9 @@ _a = SpfxProjectUpgradeCommand, _SpfxProjectUpgradeCommand_instances = new WeakS
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
+            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -568,6 +568,21 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     range: '^4 || ^5',
                     fix: 'npm i -g yo@5'
                 }
+            },
+            '1.19.0-beta.0': {
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
+                },
+                node: {
+                    range: '>=18.17.1 <19.0.0',
+                    fix: 'Install Node.js >=18.17.1 <19.0.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4 || ^5',
+                    fix: 'npm i -g yo@5'
+                }
             }
         };
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);

package/dist/m365/spo/commands/contenttype/contenttype-sync.js

@@ -0,0 +1,139 @@
+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 _SpoContentTypeSyncCommand_instances, _SpoContentTypeSyncCommand_initTelemetry, _SpoContentTypeSyncCommand_initOptions, _SpoContentTypeSyncCommand_initValidators, _SpoContentTypeSyncCommand_initTypes, _SpoContentTypeSyncCommand_initOptionSets;
+import { formatting } from '../../../../utils/formatting.js';
+import request from '../../../../request.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { odata } from '../../../../utils/odata.js';
+import { spo } from '../../../../utils/spo.js';
+class SpoContentTypeSyncCommand extends SpoCommand {
+    get name() {
+        return commands.CONTENTTYPE_SYNC;
+    }
+    get description() {
+        return 'Adds a published content type from the content type hub to a site or syncs its latest changes';
+    }
+    constructor() {
+        super();
+        _SpoContentTypeSyncCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoContentTypeSyncCommand_instances, "m", _SpoContentTypeSyncCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeSyncCommand_instances, "m", _SpoContentTypeSyncCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeSyncCommand_instances, "m", _SpoContentTypeSyncCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeSyncCommand_instances, "m", _SpoContentTypeSyncCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeSyncCommand_instances, "m", _SpoContentTypeSyncCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        const { listId, listTitle, listUrl, webUrl } = args.options;
+        const url = new URL(webUrl);
+        const baseUrl = 'https://graph.microsoft.com/v1.0/sites/';
+        try {
+            const siteUrl = url.pathname === '/' ? url.host : await spo.getSiteId(webUrl, logger, this.verbose);
+            const listPath = listId || listTitle || listUrl ? `/lists/${listId || listTitle || await this.getListIdByUrl(webUrl, listUrl, logger)}` : '';
+            const contentTypeId = await this.getContentTypeId(baseUrl, url, args.options, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Adding or syncing the content type...`);
+            }
+            const requestOptions = {
+                url: `${baseUrl}${siteUrl}${listPath}/contenttypes/addCopyFromContentTypeHub`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false'
+                },
+                responseType: 'json',
+                data: {
+                    contentTypeId: contentTypeId
+                }
+            };
+            const response = await request.post(requestOptions);
+            // The endpoint only returns a response if the content type has been added for the first time
+            // When syncing, the response will be an empty string, which should not be logged.
+            if (typeof response === 'object') {
+                await logger.log(response);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getContentTypeId(baseUrl, url, options, logger) {
+        if (options.id) {
+            return options.id;
+        }
+        const siteId = await spo.getSiteId(`${url.origin}/sites/contenttypehub`, logger, this.verbose);
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving content type Id by name...`);
+        }
+        const contentTypes = await odata.getAllItems(`${baseUrl}${siteId}/contenttypes?$filter=name eq '${options.name}'&$select=id,name`);
+        if (contentTypes.length === 0) {
+            throw `Content type with name ${options.name} not found.`;
+        }
+        return contentTypes[0].id;
+    }
+    async getListIdByUrl(webUrl, listUrl, logger) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving list id to sync the content type to...`);
+        }
+        const listServerRelativeUrl = urlUtil.getServerRelativePath(webUrl, listUrl);
+        const requestOptions = {
+            url: `${webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=id`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        return response.Id;
+    }
+}
+_SpoContentTypeSyncCommand_instances = new WeakSet(), _SpoContentTypeSyncCommand_initTelemetry = function _SpoContentTypeSyncCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
+        });
+    });
+}, _SpoContentTypeSyncCommand_initOptions = function _SpoContentTypeSyncCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '--listTitle [listTitle]'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
+    });
+}, _SpoContentTypeSyncCommand_initValidators = function _SpoContentTypeSyncCommand_initValidators() {
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _SpoContentTypeSyncCommand_initTypes = function _SpoContentTypeSyncCommand_initTypes() {
+    this.types.string.push('webUrl', 'id', 'name', 'listTitle', 'listId', 'listUrl');
+}, _SpoContentTypeSyncCommand_initOptionSets = function _SpoContentTypeSyncCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['id', 'name']
+    }, {
+        options: ['listId', 'listTitle', 'listUrl'],
+        runsWhen: (args) => args.options.listId || args.options.listTitle || args.options.listUrl
+    });
+};
+export default new SpoContentTypeSyncCommand();
+//# sourceMappingURL=contenttype-sync.js.map

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

@@ -4,8 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoListItemSetCommand_instances, _SpoListItemSetCommand_initTelemetry, _SpoListItemSetCommand_initOptions, _SpoListItemSetCommand_initValidators, _SpoListItemSetCommand_initTypes, _SpoListItemSetCommand_initOptionSets;
-import os from 'os';
-import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { basic } from '../../../../utils/basic.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -35,11 +33,9 @@ class SpoListItemSetCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         let contentTypeName = '';
-        let listId = '';
         try {
             let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.listId) {
-                listId = args.options.listId;
                 requestUrl += `/lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')`;
             }
             else if (args.options.listTitle) {
@@ -49,20 +45,6 @@ class SpoListItemSetCommand extends SpoCommand {
                 const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 requestUrl += `/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
-            if (args.options.systemUpdate && !args.options.listId) {
-                if (this.verbose) {
-                    await logger.logToStderr(`Getting list id...`);
-                }
-                const listRequestOptions = {
-                    url: `${requestUrl}?$select=Id`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const list = await request.get(listRequestOptions);
-                listId = list.Id;
-            }
             if (args.options.contentType) {
                 if (this.verbose) {
                     await logger.logToStderr(`Getting content types for list...`);
@@ -101,94 +83,10 @@ class SpoListItemSetCommand extends SpoCommand {
                     await logger.logToStderr(`using content type name: ${contentTypeName}`);
                 }
             }
-            let res = undefined;
-            if (args.options.systemUpdate) {
-                if (this.debug) {
-                    await logger.logToStderr(`getting request digest for systemUpdate request`);
-                }
-                res = await spo.getRequestDigest(args.options.webUrl);
-            }
-            if (this.verbose) {
-                await logger.logToStderr(`Updating item in list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}...`);
-            }
-            const formDigestValue = args.options.systemUpdate ? res['FormDigestValue'] : '';
-            let objectIdentity = '';
-            if (args.options.systemUpdate) {
-                objectIdentity = await this.requestObjectIdentity(args.options.webUrl, logger, formDigestValue);
-            }
-            const additionalContentType = (args.options.systemUpdate && args.options.contentType && contentTypeName !== '') ? `
-          <Method Name="ParseAndSetFieldValue" Id="1" ObjectPathId="147">
-            <Parameters>
-              <Parameter Type="String">ContentType</Parameter>
-              <Parameter Type="String">${contentTypeName}</Parameter>
-            </Parameters>
-          </Method>`
-                : ``;
-            const requestBody = args.options.systemUpdate ?
-                `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009">
-          <Actions>
-            ${this.mapRequestBody(args.options).join('')}${additionalContentType}
-            <Method Name="SystemUpdate" Id="2" ObjectPathId="147" />
-          </Actions>
-          <ObjectPaths>
-            <Identity Id="147" Name="${objectIdentity}:list:${listId}:item:${args.options.id},1" />
-          </ObjectPaths>
-        </Request>`
-                : {
-                    formValues: this.mapRequestBody(args.options)
-                };
-            if (args.options.contentType && contentTypeName !== '' && !args.options.systemUpdate) {
-                if (this.debug) {
-                    await logger.logToStderr(`Specifying content type name [${contentTypeName}] in request body`);
-                }
-                requestBody.formValues.push({
-                    FieldName: 'ContentType',
-                    FieldValue: contentTypeName
-                });
-            }
-            const requestOptions = args.options.systemUpdate ?
-                {
-                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'Content-Type': 'text/xml',
-                        'X-RequestDigest': formDigestValue
-                    },
-                    data: requestBody
-                } :
-                {
-                    url: `${requestUrl}/items(${args.options.id})/ValidateUpdateListItem()`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    data: requestBody,
-                    responseType: 'json'
-                };
-            const response = await request.post(requestOptions);
-            let itemId = 0;
-            if (args.options.systemUpdate) {
-                if (response.indexOf("ErrorMessage") > -1) {
-                    throw `Error occurred in systemUpdate operation - ${response}`;
-                }
-                else {
-                    itemId = Number(args.options.id);
-                }
-            }
-            else {
-                // Response is from /ValidateUpdateListItem POST call, perform get on updated item to get all field values
-                const fieldValues = response.value;
-                if (fieldValues.some(f => f.HasException)) {
-                    throw `Updating the items has failed with the following errors: ${os.EOL}${fieldValues.filter(f => f.HasException).map(f => { return `- ${f.FieldName} - ${f.ErrorMessage}`; }).join(os.EOL)}`;
-                }
-                itemId = fieldValues[0].ItemId;
-            }
-            const requestOptionsItems = {
-                url: `${requestUrl}/items(${itemId})`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const item = await request.get(requestOptionsItems);
+            const properties = this.mapRequestBody(args.options);
+            const item = args.options.systemUpdate ?
+                await spo.systemUpdateListItem(requestUrl, args.options.id, logger, this.verbose, properties, contentTypeName)
+                : await spo.updateListItem(requestUrl, args.options.id, properties, contentTypeName);
             delete item.ID;
             await logger.log(item);
         }
@@ -197,7 +95,7 @@ class SpoListItemSetCommand extends SpoCommand {
         }
     }
     mapRequestBody(options) {
-        const requestBody = [];
+        const filteredData = {};
         const excludeOptions = [
             'listTitle',
             'listId',
@@ -216,57 +114,12 @@ class SpoListItemSetCommand extends SpoCommand {
             't',
             '_'
         ];
-        Object.keys(options).forEach(key => {
-            if (excludeOptions.indexOf(key) === -1) {
-                if (options.systemUpdate) {
-                    requestBody.push(`
-          <Method Name="ParseAndSetFieldValue" Id="1" ObjectPathId="147">
-            <Parameters>
-              <Parameter Type="String">${key}</Parameter>
-              <Parameter Type="String">${options[key].toString()}</Parameter>
-            </Parameters>
-          </Method>`);
-                }
-                else {
-                    requestBody.push({ FieldName: key, FieldValue: options[key].toString() });
-                }
+        for (const key of Object.keys(options)) {
+            if (!excludeOptions.includes(key)) {
+                filteredData[key] = options[key];
             }
-        });
-        return requestBody;
-    }
-    /**
-     * Requests web object identity for the current web.
-     * This request has to be send before we can construct the property bag request.
-     * The response data looks like:
-     * _ObjectIdentity_=<GUID>|<GUID>:site:<GUID>:web:<GUID>
-     * _ObjectType_=SP.Web
-     * ServerRelativeUrl=/sites/contoso
-     * The ObjectIdentity is needed to create another request to retrieve the property bag or set property.
-     * @param webUrl web url
-     * @param cmd command cmd
-     */
-    async requestObjectIdentity(webUrl, logger, formDigestValue) {
-        const requestOptions = {
-            url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                'X-RequestDigest': formDigestValue
-            },
-            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
-        };
-        const response = await request.post(requestOptions);
-        if (this.debug) {
-            await logger.logToStderr('Attempt to get _ObjectIdentity_ key values');
-        }
-        const json = JSON.parse(response);
-        const contents = json.find(x => { return x['ErrorInfo']; });
-        if (contents && contents.ErrorInfo) {
-            throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
-        }
-        const identityObject = json.find(x => { return x['_ObjectIdentity_']; });
-        if (identityObject) {
-            return identityObject['_ObjectIdentity_'];
         }
-        throw 'Cannot proceed. _ObjectIdentity_ not found'; // this is not supposed to happen
+        return filteredData;
     }
 }
 _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTelemetry = function _SpoListItemSetCommand_initTelemetry() {

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

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddCommand_initOptions, _SpoPageAddCommand_initValidators;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -12,8 +11,6 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoFileGetCommand from '../file/file-get.js';
-import spoListItemSetCommand from '../listitem/listitem-set.js';
 import { Page, supportedPageLayouts, supportedPromoteAs } from './Page.js';
 class SpoPageAddCommand extends SpoCommand {
     get name() {
@@ -64,7 +61,8 @@ class SpoPageAddCommand extends SpoCommand {
             };
             const template = await request.post(requestOptions);
             itemId = template.UniqueId;
-            const listItemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+            const file = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
+            const listItemId = file.Id;
             const pageProps = await Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
             if (pageProps) {
                 pageId = pageProps.Id;
@@ -93,15 +91,11 @@ class SpoPageAddCommand extends SpoCommand {
                         break;
                     case 'NewsPage':
                         const listItemSetOptions = {
-                            webUrl: args.options.webUrl,
-                            listUrl: listServerRelativeUrl,
-                            id: listItemId,
-                            systemUpdate: true,
-                            FirstPublishedDate: new Date().toISOString(),
-                            verbose: this.verbose,
-                            debug: this.debug
+                            FirstPublishedDate: new Date().toISOString()
                         };
-                        await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                        const listUrl = urlUtil.getServerRelativePath(args.options.webUrl, listServerRelativeUrl);
+                        const requestUrl = `${args.options.webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listUrl)}')`;
+                        await spo.systemUpdateListItem(requestUrl, listItemId, logger, this.verbose, listItemSetOptions);
                         break;
                     case 'Template':
                         requestOptions.url = `${args.options.webUrl}/_api/SitePages/Pages(${listItemId})/SavePageAsTemplate`;
@@ -212,18 +206,6 @@ class SpoPageAddCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getFileListItemId(webUrl, serverRelativeFileUrl) {
-        const fileGetOptions = {
-            webUrl: webUrl,
-            url: serverRelativeFileUrl,
-            asListItem: true,
-            verbose: this.verbose,
-            debug: this.debug
-        };
-        const fileGetOutput = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...fileGetOptions, _: [] } });
-        const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
-        return fileGetOutputJson.Id;
-    }
 }
 _SpoPageAddCommand_instances = new WeakSet(), _SpoPageAddCommand_initTelemetry = function _SpoPageAddCommand_initTelemetry() {
     this.telemetry.push((args) => {