@pnp/cli-microsoft365 10.1.0-beta.f17d225 → 10.1.0

package/dist/m365/spe/commands/container/container-list.js

@@ -0,0 +1,87 @@
+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 _SpeContainerListCommand_instances, _SpeContainerListCommand_initTelemetry, _SpeContainerListCommand_initOptions, _SpeContainerListCommand_initValidators, _SpeContainerListCommand_initOptionSets, _SpeContainerListCommand_initTypes;
+import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
+import { validation } from '../../../../utils/validation.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { spo } from '../../../../utils/spo.js';
+class SpeContainerListCommand extends GraphCommand {
+    get name() {
+        return commands.CONTAINER_LIST;
+    }
+    get description() {
+        return 'Lists all Container Types';
+    }
+    defaultProperties() {
+        return ['id', 'displayName', 'containerTypeId', 'createdDateTime'];
+    }
+    constructor() {
+        super();
+        _SpeContainerListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpeContainerListCommand_instances, "m", _SpeContainerListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpeContainerListCommand_instances, "m", _SpeContainerListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpeContainerListCommand_instances, "m", _SpeContainerListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpeContainerListCommand_instances, "m", _SpeContainerListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpeContainerListCommand_instances, "m", _SpeContainerListCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving list of Containers...`);
+            }
+            const containerTypeId = await this.getContainerTypeId(logger, args.options);
+            const allContainers = await odata.getAllItems(`${this.resource}/v1.0/storage/fileStorage/containers?$filter=containerTypeId eq ${formatting.encodeQueryParameter(containerTypeId)}`);
+            await logger.log(allContainers);
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
+    async getContainerTypeId(logger, options) {
+        if (options.containerTypeId) {
+            return options.containerTypeId;
+        }
+        const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+        const containerTypes = await spo.getAllContainerTypes(spoAdminUrl, logger, this.debug);
+        // Get id of the container type by name
+        const containerType = containerTypes.find(c => c.DisplayName === options.containerTypeName);
+        if (!containerType) {
+            throw new Error(`Container type with name ${options.containerTypeName} not found`);
+        }
+        // The value is returned as "/Guid(073269af-f1d2-042d-2ef5-5bdd6ac83115)/". We need to extract the GUID from it.
+        const containerTypeValue = containerType.ContainerTypeId.toString();
+        return containerTypeValue.substring(containerTypeValue.indexOf('(') + 1, containerTypeValue.lastIndexOf(')'));
+    }
+}
+_SpeContainerListCommand_instances = new WeakSet(), _SpeContainerListCommand_initTelemetry = function _SpeContainerListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            containerTypeId: typeof args.options.containerTypeId !== 'undefined',
+            containerTypeName: typeof args.options.containerTypeName !== 'undefined'
+        });
+    });
+}, _SpeContainerListCommand_initOptions = function _SpeContainerListCommand_initOptions() {
+    this.options.unshift({
+        option: '--containerTypeId [containerTypeId]'
+    }, {
+        option: '--containerTypeName [containerTypeName]'
+    });
+}, _SpeContainerListCommand_initValidators = function _SpeContainerListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.containerTypeId && !validation.isValidGuid(args.options.containerTypeId)) {
+            return `${args.options.containerTypeId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _SpeContainerListCommand_initOptionSets = function _SpeContainerListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['containerTypeId', 'containerTypeName'] });
+}, _SpeContainerListCommand_initTypes = function _SpeContainerListCommand_initTypes() {
+    this.types.string.push('containerTypeId', 'containerTypeName');
+};
+export default new SpeContainerListCommand();
+//# sourceMappingURL=container-list.js.map

package/dist/m365/spe/commands/containertype/containertype-get.js

@@ -0,0 +1,103 @@
+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 _SpeContainertypeGetCommand_instances, _SpeContainertypeGetCommand_initTelemetry, _SpeContainertypeGetCommand_initOptions, _SpeContainertypeGetCommand_initOptionSets, _SpeContainertypeGetCommand_initValidators, _SpeContainertypeGetCommand_initTypes;
+import config from '../../../../config.js';
+import request from '../../../../request.js';
+import { spo } from '../../../../utils/spo.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpeContainertypeGetCommand extends SpoCommand {
+    get name() {
+        return commands.CONTAINERTYPE_GET;
+    }
+    get description() {
+        return 'Get a Container Type';
+    }
+    constructor() {
+        super();
+        _SpeContainertypeGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpeContainertypeGetCommand_instances, "m", _SpeContainertypeGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpeContainertypeGetCommand_instances, "m", _SpeContainertypeGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpeContainertypeGetCommand_instances, "m", _SpeContainertypeGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpeContainertypeGetCommand_instances, "m", _SpeContainertypeGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpeContainertypeGetCommand_instances, "m", _SpeContainertypeGetCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            if (this.verbose) {
+                await logger.logToStderr(`Getting the Container type...`);
+            }
+            const containerTypeId = await this.getContainerTypeId(args.options, spoAdminUrl, logger);
+            const allContainerTypes = await this.getContainerTypeById(containerTypeId, spoAdminUrl, logger);
+            await logger.log(allContainerTypes);
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
+    async getContainerTypeById(containerTypeId, spoAdminUrl, logger) {
+        const formDigestInfo = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, this.debug);
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': formDigestInfo.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><ObjectPath Id="49" ObjectPathId="48" /><Method Name="GetSPOContainerTypeById" Id="50" ObjectPathId="48"><Parameters><Parameter Type="Guid">{${containerTypeId}}</Parameter><Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="48" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const res = await request.post(requestOptions);
+        const json = JSON.parse(res);
+        const response = json[0];
+        if (response.ErrorInfo) {
+            throw response.ErrorInfo.ErrorMessage;
+        }
+        const containerTypes = json[json.length - 1];
+        return containerTypes;
+    }
+    async getContainerTypeId(options, spoAdminUrl, logger) {
+        if (options.id) {
+            return options.id;
+        }
+        const containerTypes = await spo.getAllContainerTypes(spoAdminUrl, logger, this.debug);
+        // Get id of the container type by name
+        const containerType = containerTypes.find(c => c.DisplayName === options.name);
+        if (!containerType) {
+            throw new Error(`Container type with name ${options.name} not found`);
+        }
+        const match = containerType.ContainerTypeId.match(/\/Guid\(([^)]+)\)\//);
+        return match[1];
+    }
+}
+_SpeContainertypeGetCommand_instances = new WeakSet(), _SpeContainertypeGetCommand_initTelemetry = function _SpeContainertypeGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _SpeContainertypeGetCommand_initOptions = function _SpeContainertypeGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    });
+}, _SpeContainertypeGetCommand_initOptionSets = function _SpeContainertypeGetCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['id', 'name']
+    });
+}, _SpeContainertypeGetCommand_initValidators = function _SpeContainertypeGetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _SpeContainertypeGetCommand_initTypes = function _SpeContainertypeGetCommand_initTypes() {
+    this.types.string.push('id', 'name');
+};
+export default new SpeContainertypeGetCommand();
+//# sourceMappingURL=containertype-get.js.map

package/dist/m365/spe/commands/containertype/containertype-list.js

@@ -1,8 +1,6 @@
-import config from '../../../../config.js';
-import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { spo } from '../../../../utils/spo.js';
 class SpeContainertypeListCommand extends SpoCommand {
     get name() {
         return commands.CONTAINERTYPE_LIST;
@@ -19,31 +17,13 @@ class SpeContainertypeListCommand extends SpoCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving list of Container types...`);
             }
-            const allContainerTypes = await this.getAllContainerTypes(spoAdminUrl, logger);
+            const allContainerTypes = await spo.getAllContainerTypes(spoAdminUrl, logger, this.debug);
             await logger.log(allContainerTypes);
         }
         catch (err) {
             this.handleRejectedPromise(err);
         }
     }
-    async getAllContainerTypes(spoAdminUrl, logger) {
-        const formDigestInfo = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, this.debug);
-        const requestOptions = {
-            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                'X-RequestDigest': formDigestInfo.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><ObjectPath Id="46" ObjectPathId="45" /><Method Name="GetSPOContainerTypes" Id="47" ObjectPathId="45"><Parameters><Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="45" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-        };
-        const res = await request.post(requestOptions);
-        const json = JSON.parse(res);
-        const response = json[0];
-        if (response.ErrorInfo) {
-            throw response.ErrorInfo.ErrorMessage;
-        }
-        const containerTypes = json[json.length - 1];
-        return containerTypes;
-    }
 }
 export default new SpeContainertypeListCommand();
 //# sourceMappingURL=containertype-list.js.map

package/dist/m365/spe/commands.js

@@ -1,6 +1,8 @@
 const prefix = 'spe';
 export default {
+    CONTAINER_LIST: `${prefix} container list`,
     CONTAINERTYPE_ADD: `${prefix} containertype add`,
+    CONTAINERTYPE_GET: `${prefix} containertype get`,
     CONTAINERTYPE_LIST: `${prefix} containertype list`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -167,7 +167,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
         return webPartName.replace(/ /g, '-');
     }
     static getWebPartAlias(webPartName) {
-        return 'AutoWP' + webPartName.replace(/[^a-zA-Z0-9]/g, '').substr(0, 40);
+        return 'AutoWP' + webPartName.replace(/[^a-zA-Z0-9]/g, '').substring(0, 40);
     }
 }
 _a = SpfxPackageGenerateCommand, _SpfxPackageGenerateCommand_instances = new WeakSet(), _SpfxPackageGenerateCommand_initTelemetry = function _SpfxPackageGenerateCommand_initTelemetry() {

package/dist/m365/spfx/commands/project/JsonRule.js

@@ -51,9 +51,9 @@ export class JsonRule extends Rule {
             isArray = true;
             const pos = currentProperty.indexOf('[') + 1;
             // get array element from the property name
-            arrayElement = currentProperty.substr(pos, currentProperty.length - pos - 1);
+            arrayElement = currentProperty.substring(pos, currentProperty.length - 1);
             // remove array element from the property name
-            currentProperty = currentProperty.substr(0, pos - 1);
+            currentProperty = currentProperty.substring(0, pos - 1);
         }
         for (let i = 0; i < node.children.length; i++) {
             let currentNode = node.children[i];

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

@@ -40,8 +40,8 @@ export class FN016004_TS_property_pane_property_import extends TsRule {
                 .filter(n => n.getText().indexOf('@microsoft/sp-webpart-base') > 0);
             obj.forEach(n => {
                 const resource = n.getText();
-                const importsText = resource.replace(/\s/g, '').substr(resource.indexOf('{'));
-                const imports = importsText.substr(0, importsText.indexOf('}')).split(',');
+                const importsText = resource.replace(/\s/g, '').substring(resource.indexOf('{'));
+                const imports = importsText.substring(0, importsText.indexOf('}')).split(',');
                 const importsToStay = [];
                 const importsToBeMoved = [];
                 imports.forEach(importName => {

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

@@ -929,7 +929,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
         });
     }
     getNodeVersion() {
-        return process.version.substr(1);
+        return process.version.substring(1);
     }
     async checkStatus(what, versionFound, versionCheck) {
         if (versionFound) {

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

@@ -40,10 +40,10 @@ class SpoContentTypeGetCommand extends SpoCommand {
         }
         requestUrl += "/contenttypes";
         if (args.options.id) {
-            requestUrl += `('${formatting.encodeQueryParameter(args.options.id)}')`;
+            requestUrl += `('${formatting.encodeQueryParameter(args.options.id)}')?$expand=Parent`;
         }
         else if (args.options.name) {
-            requestUrl += `?$filter=Name eq '${formatting.encodeQueryParameter(args.options.name)}'`;
+            requestUrl += `?$filter=Name eq '${formatting.encodeQueryParameter(args.options.name)}'&$expand=Parent`;
         }
         const requestOptions = {
             url: requestUrl,

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

@@ -3,7 +3,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 _SpoContentTypeListCommand_instances, _SpoContentTypeListCommand_initTelemetry, _SpoContentTypeListCommand_initOptions, _SpoContentTypeListCommand_initValidators;
+var _SpoContentTypeListCommand_instances, _SpoContentTypeListCommand_initTelemetry, _SpoContentTypeListCommand_initOptions, _SpoContentTypeListCommand_initValidators, _SpoContentTypeListCommand_initTypes;
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -25,12 +25,13 @@ class SpoContentTypeListCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
-            let requestUrl = `${args.options.webUrl}/_api/web/ContentTypes`;
+            let requestUrl = `${args.options.webUrl}/_api/web/ContentTypes?$expand=Parent`;
             if (args.options.category) {
-                requestUrl += `?$filter=Group eq '${formatting.encodeQueryParameter(args.options.category)}'`;
+                requestUrl += `&$filter=Group eq '${formatting.encodeQueryParameter(args.options.category)}'`;
             }
             const res = await odata.getAllItems(requestUrl);
             await logger.log(res);
@@ -54,6 +55,8 @@ _SpoContentTypeListCommand_instances = new WeakSet(), _SpoContentTypeListCommand
     });
 }, _SpoContentTypeListCommand_initValidators = function _SpoContentTypeListCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+}, _SpoContentTypeListCommand_initTypes = function _SpoContentTypeListCommand_initTypes() {
+    this.types.string.push('webUrl', 'category');
 };
 export default new SpoContentTypeListCommand();
 //# sourceMappingURL=contenttype-list.js.map

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

@@ -283,7 +283,7 @@ class SpoFileAddCommand extends SpoCommand {
             const isLastChunk = info.Position >= info.Size;
             if (isLastChunk) {
                 // trim buffer for last chunk
-                fileBuffer = fileBuffer.slice(0, readCount);
+                fileBuffer = fileBuffer.subarray(0, readCount);
             }
             const requestOptions = {
                 url: `${info.WebUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,

package/dist/m365/spo/commands/file/file-retentionlabel-ensure.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 _SpoFileRetentionLabelEnsureCommand_instances, _SpoFileRetentionLabelEnsureCommand_initTelemetry, _SpoFileRetentionLabelEnsureCommand_initOptions, _SpoFileRetentionLabelEnsureCommand_initValidators, _SpoFileRetentionLabelEnsureCommand_initOptionSets, _SpoFileRetentionLabelEnsureCommand_initTypes;
-import * as url from 'url';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,7 +30,7 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand {
     async commandAction(logger, args) {
         try {
             const fileProperties = await this.getFileProperties(logger, args);
-            const parsedUrl = url.parse(args.options.webUrl);
+            const parsedUrl = new URL(args.options.webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
             const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, fileProperties.listServerRelativeUrl);
             if (args.options.assetId) {

package/dist/m365/spo/commands/file/file-retentionlabel-remove.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 _SpoFileRetentionLabelRemoveCommand_instances, _SpoFileRetentionLabelRemoveCommand_initTelemetry, _SpoFileRetentionLabelRemoveCommand_initOptions, _SpoFileRetentionLabelRemoveCommand_initValidators, _SpoFileRetentionLabelRemoveCommand_initOptionSets, _SpoFileRetentionLabelRemoveCommand_initTypes;
-import * as url from 'url';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -43,7 +42,7 @@ class SpoFileRetentionLabelRemoveCommand extends SpoCommand {
     async removeFileRetentionLabel(logger, args) {
         try {
             const fileProperties = await this.getFileProperties(logger, args);
-            const parsedUrl = url.parse(args.options.webUrl);
+            const parsedUrl = new URL(args.options.webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
             const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, fileProperties.listServerRelativeUrl);
             await spo.removeRetentionLabelFromListItems(args.options.webUrl, listAbsoluteUrl, [parseInt(fileProperties.listItemId)], logger, args.options.verbose);

package/dist/m365/spo/commands/folder/folder-retentionlabel-ensure.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 _SpoFolderRetentionLabelEnsureCommand_instances, _SpoFolderRetentionLabelEnsureCommand_initTelemetry, _SpoFolderRetentionLabelEnsureCommand_initOptions, _SpoFolderRetentionLabelEnsureCommand_initValidators, _SpoFolderRetentionLabelEnsureCommand_initOptionSets, _SpoFolderRetentionLabelEnsureCommand_initTypes;
-import * as url from 'url';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -32,7 +31,7 @@ class SpoFolderRetentionLabelEnsureCommand extends SpoCommand {
         try {
             const folderProperties = await this.getFolderProperties(logger, args);
             if (folderProperties.ListItemAllFields) {
-                const parsedUrl = url.parse(args.options.webUrl);
+                const parsedUrl = new URL(args.options.webUrl);
                 const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
                 const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, folderProperties.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl);
                 await spo.applyRetentionLabelToListItems(args.options.webUrl, args.options.name, listAbsoluteUrl, [parseInt(folderProperties.ListItemAllFields.Id)], logger, args.options.verbose);

package/dist/m365/spo/commands/folder/folder-retentionlabel-remove.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 _SpoFolderRetentionLabelRemoveCommand_instances, _SpoFolderRetentionLabelRemoveCommand_initTelemetry, _SpoFolderRetentionLabelRemoveCommand_initOptions, _SpoFolderRetentionLabelRemoveCommand_initValidators, _SpoFolderRetentionLabelRemoveCommand_initOptionSets, _SpoFolderRetentionLabelRemoveCommand_initTypes;
-import * as url from 'url';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -44,7 +43,7 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand {
         try {
             const folderProperties = await this.getFolderProperties(logger, args);
             if (folderProperties.ListItemAllFields) {
-                const parsedUrl = url.parse(args.options.webUrl);
+                const parsedUrl = new URL(args.options.webUrl);
                 const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
                 const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, folderProperties.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl);
                 await spo.removeRetentionLabelFromListItems(args.options.webUrl, listAbsoluteUrl, [parseInt(folderProperties.ListItemAllFields.Id)], logger, args.options.verbose);

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

@@ -3,7 +3,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 _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_initTelemetry, _SpoListContentTypeListCommand_initOptions, _SpoListContentTypeListCommand_initValidators, _SpoListContentTypeListCommand_initOptionSets;
+var _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_initTelemetry, _SpoListContentTypeListCommand_initOptions, _SpoListContentTypeListCommand_initValidators, _SpoListContentTypeListCommand_initOptionSets, _SpoListContentTypeListCommand_initTypes;
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -27,6 +27,7 @@ class SpoListContentTypeListCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -45,7 +46,7 @@ class SpoListContentTypeListCommand extends SpoCommand {
             requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
         }
         try {
-            const res = await odata.getAllItems(`${requestUrl}/ContentTypes`);
+            const res = await odata.getAllItems(`${requestUrl}/ContentTypes?$expand=Parent`);
             await logger.log(res);
         }
         catch (err) {
@@ -86,6 +87,8 @@ _SpoListContentTypeListCommand_instances = new WeakSet(), _SpoListContentTypeLis
     });
 }, _SpoListContentTypeListCommand_initOptionSets = function _SpoListContentTypeListCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+}, _SpoListContentTypeListCommand_initTypes = function _SpoListContentTypeListCommand_initTypes() {
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl');
 };
 export default new SpoListContentTypeListCommand();
 //# sourceMappingURL=list-contenttype-list.js.map

package/dist/m365/spo/commands/listitem/listitem-batch-remove.js

@@ -40,7 +40,8 @@ class SpoListItemBatchRemoveCommand extends SpoCommand {
                 if (args.options.filePath) {
                     const csvContent = fs.readFileSync(args.options.filePath, 'utf-8');
                     const jsonContent = formatting.parseCsvToJson(csvContent);
-                    idsToRemove = jsonContent.map((item) => item['ID']);
+                    const idKey = Object.keys(jsonContent[0]).find(key => key.toLowerCase() === 'id');
+                    idsToRemove = jsonContent.map((item) => item[idKey]);
                 }
                 else {
                     idsToRemove = formatting.splitAndTrim(args.options.ids);
@@ -193,18 +194,19 @@ _SpoListItemBatchRemoveCommand_instances = new WeakSet(), _SpoListItemBatchRemov
             }
             const fileContent = fs.readFileSync(args.options.filePath, 'utf-8');
             const jsonContent = formatting.parseCsvToJson(fileContent);
-            if (!jsonContent[0].hasOwnProperty('ID')) {
+            const idKey = Object.keys(jsonContent[0]).find(key => key.toLowerCase() === 'id');
+            if (!idKey) {
                 return `The file does not contain the required header row with the column name 'ID'.`;
             }
-            const nonNumbers = jsonContent.filter(element => isNaN(Number(element['ID'].toString().trim()))).map(element => element['ID']);
-            if (nonNumbers.length > 0) {
-                return `The specified ids '${nonNumbers.join(', ')}' are invalid numbers.`;
+            const invalidIDs = validation.isValidPositiveIntegerArray(jsonContent.map(element => element[idKey].toString().trim()).join(','));
+            if (invalidIDs !== true) {
+                return `The file contains one or more invalid IDs: '${invalidIDs}'.`;
             }
         }
         if (args.options.ids) {
-            const nonNumbers = formatting.splitAndTrim(args.options.ids).filter(element => isNaN(Number(element)));
-            if (nonNumbers.length > 0) {
-                return `The specified ids '${nonNumbers.join(', ')}' are invalid numbers.`;
+            const isValidIntegerArray = validation.isValidPositiveIntegerArray(args.options.ids);
+            if (isValidIntegerArray !== true) {
+                return `Option 'ids' contains one or more invalid IDs: '${isValidIntegerArray}'.`;
             }
         }
         return true;

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

@@ -117,7 +117,7 @@ class SpoListItemBatchSetCommand extends SpoCommand {
                         actionString += `<Method Name="SetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="Array">${lookupMultiString.join('')}</Parameter></Parameters></Method>`;
                         break;
                     default:
-                        actionString += `<Method Name="ParseAndSetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="String">${row[field.InternalName].toString()}</Parameter></Parameters></Method>`;
+                        actionString += `<Method Name="ParseAndSetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="String">${formatting.escapeXml(row[field.InternalName].toString())}</Parameter></Parameters></Method>`;
                         break;
                 }
             }

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-ensure.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 _SpoListItemRetentionLabelEnsureCommand_instances, _SpoListItemRetentionLabelEnsureCommand_initTelemetry, _SpoListItemRetentionLabelEnsureCommand_initOptions, _SpoListItemRetentionLabelEnsureCommand_initValidators, _SpoListItemRetentionLabelEnsureCommand_initOptionSets;
-import * as url from 'url';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -60,7 +59,7 @@ class SpoListItemRetentionLabelEnsureCommand extends SpoCommand {
         return label.TagName;
     }
     async getListAbsoluteUrl(options, logger) {
-        const parsedUrl = url.parse(options.webUrl);
+        const parsedUrl = new URL(options.webUrl);
         const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
         if (options.listUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-remove.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 _SpoListItemRetentionLabelRemoveCommand_instances, _SpoListItemRetentionLabelRemoveCommand_initTelemetry, _SpoListItemRetentionLabelRemoveCommand_initOptions, _SpoListItemRetentionLabelRemoveCommand_initValidators, _SpoListItemRetentionLabelRemoveCommand_initOptionSets;
-import * as url from 'url';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -49,7 +48,7 @@ class SpoListItemRetentionLabelRemoveCommand extends SpoCommand {
         }
     }
     async getListAbsoluteUrl(options, logger) {
-        const parsedUrl = url.parse(options.webUrl);
+        const parsedUrl = new URL(options.webUrl);
         const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
         if (options.listUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);

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

@@ -34,7 +34,7 @@ class SpoPageAddCommand extends SpoCommand {
         let bannerImageUrl = '';
         let canvasContent1 = '';
         let layoutWebpartsContent = '';
-        const pageTitle = args.options.title ? args.options.title : (args.options.name.indexOf('.aspx') > -1 ? args.options.name.substr(0, args.options.name.indexOf('.aspx')) : args.options.name);
+        const pageTitle = args.options.title ? args.options.title : (args.options.name.indexOf('.aspx') > -1 ? args.options.name.substring(0, args.options.name.indexOf('.aspx')) : args.options.name);
         let pageId = null;
         const pageDescription = args.options.description || "";
         if (!pageName.endsWith('.aspx')) {

package/dist/m365/spo/commands/site/site-admin-add.js

@@ -47,22 +47,14 @@ class SpoSiteAdminAddCommand extends SpoCommand {
             await logger.logToStderr('Adding site administrator as an administrator...');
         }
         const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        const siteId = await this.getSiteIdBasedOnUrl(args.options.siteUrl, logger);
-        const siteAdmins = (await this.getSiteAdmins(adminUrl, siteId)).map(u => u.loginName);
+        const tenantSiteProperties = await spo.getSiteAdminPropertiesByUrl(args.options.siteUrl, false, logger, this.verbose);
+        const siteAdmins = (await this.getSiteAdmins(adminUrl, tenantSiteProperties.SiteId)).map(u => u.loginName);
         siteAdmins.push(loginNameToAdd);
-        await this.setSiteAdminsAsAdmin(adminUrl, siteId, siteAdmins);
+        await this.setSiteAdminsAsAdmin(adminUrl, tenantSiteProperties.SiteId, siteAdmins);
         if (args.options.primary) {
-            await this.setPrimaryAdminAsAdmin(adminUrl, siteId, loginNameToAdd);
+            await this.setPrimaryAdminAsAdmin(adminUrl, tenantSiteProperties.SiteId, loginNameToAdd);
         }
     }
-    async getSiteIdBasedOnUrl(siteUrl, logger) {
-        const siteGraphId = await spo.getSiteId(siteUrl, logger, this.verbose);
-        const match = siteGraphId.match(/,([a-f0-9\-]{36}),/i);
-        if (!match) {
-            throw `Site with URL ${siteUrl} not found`;
-        }
-        return match[1];
-    }
     async getSiteAdmins(adminUrl, siteId) {
         const requestOptions = {
             url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${siteId}'`,

package/dist/m365/spo/commands/site/site-admin-list.js

@@ -45,16 +45,16 @@ class SpoSiteAdminListCommand extends SpoCommand {
             await logger.logToStderr('Retrieving site administrators as an administrator...');
         }
         const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        const siteId = await this.getSiteId(args.options.siteUrl, logger);
+        const tenantSiteProperties = await spo.getSiteAdminPropertiesByUrl(args.options.siteUrl, false, logger, this.verbose);
         const requestOptions = {
-            url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${siteId}'`,
+            url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${tenantSiteProperties.SiteId}'`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         const response = await request.post(requestOptions);
-        const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, siteId, logger, this.verbose);
+        const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, tenantSiteProperties.SiteId, logger, this.verbose);
         const mappedResult = response.value.map((u) => ({
             Email: u.email,
             LoginName: u.loginName,
@@ -63,14 +63,6 @@ class SpoSiteAdminListCommand extends SpoCommand {
         }));
         await logger.log(mappedResult);
     }
-    async getSiteId(siteUrl, logger) {
-        const siteGraphId = await spo.getSiteId(siteUrl, logger, this.verbose);
-        const match = siteGraphId.match(/,([a-f0-9\-]{36}),/i);
-        if (!match) {
-            throw `Site with URL ${siteUrl} not found`;
-        }
-        return match[1];
-    }
     async callAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr('Retrieving site administrators...');