@pnp/cli-microsoft365 10.1.0-beta.f17d225 → 10.2.0-beta.382f561

package/dist/m365/pp/commands/{chatbot/chatbot-get.js → copilot/copilot-get.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 _PpChatbotGetCommand_instances, _PpChatbotGetCommand_initTelemetry, _PpChatbotGetCommand_initOptions, _PpChatbotGetCommand_initOptionSets, _PpChatbotGetCommand_initValidators;
+var _PpCopilotGetCommand_instances, _PpCopilotGetCommand_initTelemetry, _PpCopilotGetCommand_initOptions, _PpCopilotGetCommand_initOptionSets, _PpCopilotGetCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
@@ -11,38 +11,42 @@ import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
-class PpChatbotGetCommand extends PowerPlatformCommand {
+class PpCopilotGetCommand extends PowerPlatformCommand {
     get name() {
-        return commands.CHATBOT_GET;
+        return commands.COPILOT_GET;
     }
     get description() {
-        return 'Get information about the specified chatbot';
+        return 'Get information about the specified copilot';
+    }
+    alias() {
+        return [commands.CHATBOT_GET];
     }
     defaultProperties() {
         return ['name', 'botid', 'publishedon', 'createdon', 'modifiedon'];
     }
     constructor() {
         super();
-        _PpChatbotGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpChatbotGetCommand_instances, "m", _PpChatbotGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpChatbotGetCommand_instances, "m", _PpChatbotGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpChatbotGetCommand_instances, "m", _PpChatbotGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpChatbotGetCommand_instances, "m", _PpChatbotGetCommand_initOptionSets).call(this);
+        _PpCopilotGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpCopilotGetCommand_instances, "m", _PpCopilotGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpCopilotGetCommand_instances, "m", _PpCopilotGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PpCopilotGetCommand_instances, "m", _PpCopilotGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PpCopilotGetCommand_instances, "m", _PpCopilotGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, commands.CHATBOT_GET, commands.COPILOT_GET);
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving chatbot '${args.options.id || args.options.name}'...`);
+            await logger.logToStderr(`Retrieving copilot '${args.options.id || args.options.name}'...`);
         }
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const res = await this.getChatbot(dynamicsApiUrl, args.options);
+            const res = await this.getCopilot(dynamicsApiUrl, args.options);
             await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getChatbot(dynamicsApiUrl, options) {
+    async getCopilot(dynamicsApiUrl, options) {
         const requestOptions = {
             headers: {
                 accept: 'application/json;odata.metadata=none'
@@ -58,15 +62,15 @@ class PpChatbotGetCommand extends PowerPlatformCommand {
         const result = await request.get(requestOptions);
         if (result.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('botid', result.value);
-            return await cli.handleMultipleResultsFound(`Multiple chatbots with name '${options.name}' found.`, resultAsKeyValuePair);
+            return await cli.handleMultipleResultsFound(`Multiple copilots with name '${options.name}' found.`, resultAsKeyValuePair);
         }
         if (result.value.length === 0) {
-            throw `The specified chatbot '${options.name}' does not exist.`;
+            throw `The specified copilot '${options.name}' does not exist.`;
         }
         return result.value[0];
     }
 }
-_PpChatbotGetCommand_instances = new WeakSet(), _PpChatbotGetCommand_initTelemetry = function _PpChatbotGetCommand_initTelemetry() {
+_PpCopilotGetCommand_instances = new WeakSet(), _PpCopilotGetCommand_initTelemetry = function _PpCopilotGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
@@ -74,7 +78,7 @@ _PpChatbotGetCommand_instances = new WeakSet(), _PpChatbotGetCommand_initTelemet
             asAdmin: !!args.options.asAdmin
         });
     });
-}, _PpChatbotGetCommand_initOptions = function _PpChatbotGetCommand_initOptions() {
+}, _PpCopilotGetCommand_initOptions = function _PpCopilotGetCommand_initOptions() {
     this.options.unshift({
         option: '-e, --environmentName <environmentName>'
     }, {
@@ -84,9 +88,9 @@ _PpChatbotGetCommand_instances = new WeakSet(), _PpChatbotGetCommand_initTelemet
     }, {
         option: '--asAdmin'
     });
-}, _PpChatbotGetCommand_initOptionSets = function _PpChatbotGetCommand_initOptionSets() {
+}, _PpCopilotGetCommand_initOptionSets = function _PpCopilotGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });
-}, _PpChatbotGetCommand_initValidators = function _PpChatbotGetCommand_initValidators() {
+}, _PpCopilotGetCommand_initValidators = function _PpCopilotGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
@@ -94,5 +98,5 @@ _PpChatbotGetCommand_instances = new WeakSet(), _PpChatbotGetCommand_initTelemet
         return true;
     });
 };
-export default new PpChatbotGetCommand();
-//# sourceMappingURL=chatbot-get.js.map
+export default new PpCopilotGetCommand();
+//# sourceMappingURL=copilot-get.js.map

package/dist/m365/pp/commands/{chatbot/chatbot-list.js → copilot/copilot-list.js}

@@ -3,30 +3,34 @@ 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 _PpChatbotListCommand_instances, _PpChatbotListCommand_initTelemetry, _PpChatbotListCommand_initOptions;
+var _PpCopilotListCommand_instances, _PpCopilotListCommand_initTelemetry, _PpCopilotListCommand_initOptions;
 import { odata } from '../../../../utils/odata.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-class PpChatbotListCommand extends PowerPlatformCommand {
+class PpCopilotListCommand extends PowerPlatformCommand {
     get name() {
-        return commands.CHATBOT_LIST;
+        return commands.COPILOT_LIST;
     }
     get description() {
-        return 'Lists Microsoft Power Platform chatbots in the specified Power Platform environment';
+        return 'Lists Microsoft Power Platform copilots in the specified Power Platform environment';
+    }
+    alias() {
+        return [commands.CHATBOT_LIST];
     }
     defaultProperties() {
         return ['name', 'botid', 'publishedOn', 'createdOn', 'botModifiedOn'];
     }
     constructor() {
         super();
-        _PpChatbotListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpChatbotListCommand_instances, "m", _PpChatbotListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpChatbotListCommand_instances, "m", _PpChatbotListCommand_initOptions).call(this);
+        _PpCopilotListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpCopilotListCommand_instances, "m", _PpCopilotListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpCopilotListCommand_instances, "m", _PpCopilotListCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, commands.CHATBOT_LIST, commands.COPILOT_LIST);
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving list of chatbots for environment '${args.options.environmentName}'.`);
+            await logger.logToStderr(`Retrieving list of copilots for environment '${args.options.environmentName}'.`);
         }
         const fetchXml = `
       <fetch mapping='logical' version='1.0' >
@@ -78,18 +82,18 @@ class PpChatbotListCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpChatbotListCommand_instances = new WeakSet(), _PpChatbotListCommand_initTelemetry = function _PpChatbotListCommand_initTelemetry() {
+_PpCopilotListCommand_instances = new WeakSet(), _PpCopilotListCommand_initTelemetry = function _PpCopilotListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             asAdmin: !!args.options.asAdmin
         });
     });
-}, _PpChatbotListCommand_initOptions = function _PpChatbotListCommand_initOptions() {
+}, _PpCopilotListCommand_initOptions = function _PpCopilotListCommand_initOptions() {
     this.options.unshift({
         option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });
 };
-export default new PpChatbotListCommand();
-//# sourceMappingURL=chatbot-list.js.map
+export default new PpCopilotListCommand();
+//# sourceMappingURL=copilot-list.js.map

package/dist/m365/pp/commands/{chatbot/chatbot-remove.js → copilot/copilot-remove.js}

@@ -3,44 +3,48 @@ 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 _PpChatbotRemoveCommand_instances, _PpChatbotRemoveCommand_initTelemetry, _PpChatbotRemoveCommand_initOptions, _PpChatbotRemoveCommand_initOptionSets, _PpChatbotRemoveCommand_initValidators;
+var _PpCopilotRemoveCommand_instances, _PpCopilotRemoveCommand_initTelemetry, _PpCopilotRemoveCommand_initOptions, _PpCopilotRemoveCommand_initOptionSets, _PpCopilotRemoveCommand_initValidators;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import ppChatbotGetCommand from './chatbot-get.js';
-class PpChatbotRemoveCommand extends PowerPlatformCommand {
+import ppCopilotGetCommand from './copilot-get.js';
+class PpCopilotRemoveCommand extends PowerPlatformCommand {
     get name() {
-        return commands.CHATBOT_REMOVE;
+        return commands.COPILOT_REMOVE;
     }
     get description() {
-        return 'Removes the specified chatbot';
+        return 'Removes the specified copilot';
+    }
+    alias() {
+        return [commands.CHATBOT_REMOVE];
     }
     constructor() {
         super();
-        _PpChatbotRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpChatbotRemoveCommand_instances, "m", _PpChatbotRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpChatbotRemoveCommand_instances, "m", _PpChatbotRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _PpChatbotRemoveCommand_instances, "m", _PpChatbotRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _PpChatbotRemoveCommand_instances, "m", _PpChatbotRemoveCommand_initOptionSets).call(this);
+        _PpCopilotRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpCopilotRemoveCommand_instances, "m", _PpCopilotRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpCopilotRemoveCommand_instances, "m", _PpCopilotRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PpCopilotRemoveCommand_instances, "m", _PpCopilotRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PpCopilotRemoveCommand_instances, "m", _PpCopilotRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, commands.CHATBOT_REMOVE, commands.COPILOT_REMOVE);
         if (this.verbose) {
-            await logger.logToStderr(`Removing chatbot '${args.options.id || args.options.name}'...`);
+            await logger.logToStderr(`Removing copilot '${args.options.id || args.options.name}'...`);
         }
         if (args.options.force) {
-            await this.deleteChatbot(args);
+            await this.deleteCopilot(args);
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove chatbot '${args.options.id || args.options.name}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove copilot '${args.options.id || args.options.name}'?` });
             if (result) {
-                await this.deleteChatbot(args);
+                await this.deleteCopilot(args);
             }
         }
     }
-    async getChatbotId(args) {
+    async getCopilotId(args) {
         if (args.options.id) {
             return args.options.id;
         }
@@ -51,14 +55,14 @@ class PpChatbotRemoveCommand extends PowerPlatformCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const output = await cli.executeCommandWithOutput(ppChatbotGetCommand, { options: { ...options, _: [] } });
+        const output = await cli.executeCommandWithOutput(ppCopilotGetCommand, { options: { ...options, _: [] } });
         const getBotOutput = JSON.parse(output.stdout);
         return getBotOutput.botid;
     }
-    async deleteChatbot(args) {
+    async deleteCopilot(args) {
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const botId = await this.getChatbotId(args);
+            const botId = await this.getCopilotId(args);
             const requestOptions = {
                 url: `${dynamicsApiUrl}/api/data/v9.1/bots(${botId})/Microsoft.Dynamics.CRM.PvaDeleteBot?tag=deprovisionbotondelete`,
                 headers: {
@@ -74,7 +78,7 @@ class PpChatbotRemoveCommand extends PowerPlatformCommand {
         }
     }
 }
-_PpChatbotRemoveCommand_instances = new WeakSet(), _PpChatbotRemoveCommand_initTelemetry = function _PpChatbotRemoveCommand_initTelemetry() {
+_PpCopilotRemoveCommand_instances = new WeakSet(), _PpCopilotRemoveCommand_initTelemetry = function _PpCopilotRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
@@ -83,7 +87,7 @@ _PpChatbotRemoveCommand_instances = new WeakSet(), _PpChatbotRemoveCommand_initT
             force: !!args.options.force
         });
     });
-}, _PpChatbotRemoveCommand_initOptions = function _PpChatbotRemoveCommand_initOptions() {
+}, _PpCopilotRemoveCommand_initOptions = function _PpCopilotRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-e, --environmentName <environmentName>'
     }, {
@@ -95,9 +99,9 @@ _PpChatbotRemoveCommand_instances = new WeakSet(), _PpChatbotRemoveCommand_initT
     }, {
         option: '-f, --force'
     });
-}, _PpChatbotRemoveCommand_initOptionSets = function _PpChatbotRemoveCommand_initOptionSets() {
+}, _PpCopilotRemoveCommand_initOptionSets = function _PpCopilotRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });
-}, _PpChatbotRemoveCommand_initValidators = function _PpChatbotRemoveCommand_initValidators() {
+}, _PpCopilotRemoveCommand_initValidators = function _PpCopilotRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
@@ -105,5 +109,5 @@ _PpChatbotRemoveCommand_instances = new WeakSet(), _PpChatbotRemoveCommand_initT
         return true;
     });
 };
-export default new PpChatbotRemoveCommand();
-//# sourceMappingURL=chatbot-remove.js.map
+export default new PpCopilotRemoveCommand();
+//# sourceMappingURL=copilot-remove.js.map

package/dist/m365/pp/commands.js

@@ -10,6 +10,9 @@ export default {
     CHATBOT_GET: `${prefix} chatbot get`,
     CHATBOT_LIST: `${prefix} chatbot list`,
     CHATBOT_REMOVE: `${prefix} chatbot remove`,
+    COPILOT_GET: `${prefix} copilot get`,
+    COPILOT_LIST: `${prefix} copilot list`,
+    COPILOT_REMOVE: `${prefix} copilot remove`,
     DATAVERSE_TABLE_LIST: `${prefix} dataverse table list`,
     DATAVERSE_TABLE_GET: `${prefix} dataverse table get`,
     DATAVERSE_TABLE_REMOVE: `${prefix} dataverse table remove`,

package/dist/m365/spe/ContainerProperties.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ContainerProperties.js.map

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,