@pnp/cli-microsoft365 6.9.0-beta.289ab69 → 6.9.0-beta.6a23aba

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/powershell:alpine-3.12
+FROM mcr.microsoft.com/powershell:alpine-3.17
 
 ARG CLI_VERSION=latest
 
@@ -48,6 +48,7 @@ RUN bash -c 'echo "export PATH=$PATH:/home/cli-microsoft365/.npm-global/bin:/hom
   && bash -c 'm365 cli completion sh setup' \
   && pwsh -c 'm365 cli completion pwsh setup --profile $profile'
 
+RUN pip install setuptools==58
 RUN pip install jmespath-terminal
 
 CMD [ "bash", "-l" ]

package/dist/chili/chili.js

@@ -38,7 +38,7 @@ function getPromptFromArgs(args) {
     showHelp = args.indexOf('--help') > -1 || args.indexOf('-h') > -1;
     if (showHelp) {
         const commandsFolder = path.join(__dirname, '..', 'm365');
-        const pathChunks = [commandsFolder, '..', '..', 'docs', 'docs', 'user-guide', 'chili.md'];
+        const pathChunks = [commandsFolder, '..', '..', 'docs', 'docs', 'user-guide', 'chili.mdx'];
         const helpFilePath = path.join(...pathChunks);
         if (fs.existsSync(helpFilePath)) {
             let helpContents = fs.readFileSync(helpFilePath, 'utf8');

package/dist/cli/Cli.js

@@ -571,14 +571,14 @@ class Cli {
         }
         const pathChunks = [this.commandsFolder, '..', '..', 'docs', 'docs', 'cmd'];
         if (commandNameWords.length === 1) {
-            pathChunks.push(`${commandNameWords[0]}.md`);
+            pathChunks.push(`${commandNameWords[0]}.mdx`);
         }
         else {
             if (commandNameWords.length === 2) {
-                pathChunks.push(commandNameWords[0], `${commandNameWords.join('-')}.md`);
+                pathChunks.push(commandNameWords[0], `${commandNameWords.join('-')}.mdx`);
             }
             else {
-                pathChunks.push(commandNameWords[0], commandNameWords[1], commandNameWords.slice(1).join('-') + '.md');
+                pathChunks.push(commandNameWords[0], commandNameWords[1], commandNameWords.slice(1).join('-') + '.mdx');
             }
         }
         helpFilePath = path.join(...pathChunks);

package/dist/m365/flow/commands/flow-list.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions;
+var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const formatting_1 = require("../../../utils/formatting");
 const AzmgmtItemsListCommand_1 = require("../../base/AzmgmtItemsListCommand");
@@ -31,14 +31,28 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
     constructor() {
         super();
         _FlowListCommand_instances.add(this);
+        this.allowedSharingStatusses = ['all', 'personal', 'ownedByMe', 'sharedWithMe'];
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initValidators).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const url = `${this.resource}providers/Microsoft.ProcessSimple${args.options.asAdmin ? '/scopes/admin' : ''}/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows?api-version=2016-11-01`;
             try {
-                yield this.getAllItems(url, logger, true);
+                if (args.options.asAdmin || !args.options.sharingStatus || args.options.sharingStatus === 'ownedByMe') {
+                    yield this.getAllItems(url, logger, true);
+                }
+                else if (args.options.sharingStatus === 'personal') {
+                    yield this.getFilteredItems(url, logger, 'personal', true);
+                }
+                else if (args.options.sharingStatus === 'sharedWithMe') {
+                    yield this.getFilteredItems(url, logger, 'team', true);
+                }
+                else {
+                    yield this.getFilteredItems(url, logger, 'personal', true);
+                    yield this.getFilteredItems(url, logger, 'team', false);
+                }
                 if (this.items.length > 0) {
                     this.items.forEach(i => {
                         i.displayName = i.properties.displayName;
@@ -56,19 +70,38 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
             }
         });
     }
+    getFilteredItems(url, logger, filter, firstRun) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.getAllItems(`${url}&$filter=search('${filter}')`, logger, firstRun);
+        });
+    }
 }
 _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = function _FlowListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            sharingStatus: typeof args.options.sharingStatus !== 'undefined',
             asAdmin: !!args.options.asAdmin
         });
     });
 }, _FlowListCommand_initOptions = function _FlowListCommand_initOptions() {
     this.options.unshift({
         option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--sharingStatus [sharingStatus]',
+        autocomplete: this.allowedSharingStatusses
     }, {
         option: '--asAdmin'
     });
+}, _FlowListCommand_initValidators = function _FlowListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.asAdmin && args.options.sharingStatus) {
+            return `The options asAdmin and sharingStatus cannot be specified together.`;
+        }
+        if (args.options.sharingStatus && !this.allowedSharingStatusses.some(status => status === args.options.sharingStatus)) {
+            return `${args.options.sharingStatus} is not a valid sharing status. Allowed values are: ${this.allowedSharingStatusses.join(',')}`;
+        }
+        return true;
+    }));
 };
 module.exports = new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

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

@@ -91,13 +91,12 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Updating content type...`);
             }
-            const payload = this.getRequestPayload(options);
             const requestOptions = {
                 url: `${options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
                     'Content-Type': 'text/xml'
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload}</Actions><ObjectPaths><Identity Id="9" Name="fc4179a0-e0d7-5000-c38b-bc3506fbab6f|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:contenttype:${formatting_1.formatting.escapeXml(contentTypeId)}" /></ObjectPaths></Request>`
+                data: yield this.getCsomCallXmlBody(options, siteId, webId, contentTypeId)
             };
             const res = yield request_1.default.post(requestOptions);
             const json = JSON.parse(res);
@@ -107,6 +106,13 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
             }
         });
     }
+    getCsomCallXmlBody(options, siteId, webId, contentTypeId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const payload = this.getRequestPayload(options);
+            const list = yield this.getListId(options);
+            return `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload}</Actions><ObjectPaths><Identity Id="9" Name="fc4179a0-e0d7-5000-c38b-bc3506fbab6f|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}${list}:contenttype:${formatting_1.formatting.escapeXml(contentTypeId)}" /></ObjectPaths></Request>`;
+        });
+    }
     getRequestPayload(options) {
         const excludeOptions = [
             'webUrl',
@@ -130,6 +136,9 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
         if (options.updateChildren) {
             payload.push(`<Method Name="Update" Id="${i++}" ObjectPathId="9"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method>`);
         }
+        else {
+            payload.push(`<Method Name="Update" Id="${i++}" ObjectPathId="9"><Parameters><Parameter Type="Boolean">false</Parameter></Parameters></Method>`);
+        }
         return payload.join('');
     }
     getSiteId(logger, webUrl) {
@@ -164,6 +173,41 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
             return web.Id;
         });
     }
+    getListId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!options.listId && !options.listTitle && !options.listUrl) {
+                return '';
+            }
+            let baseString = ':list:';
+            if (options.listId) {
+                return baseString += options.listId;
+            }
+            else if (options.listTitle) {
+                const requestOptions = {
+                    url: `${options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')?$select=Id`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const listResponse = yield request_1.default.get(requestOptions);
+                baseString += listResponse.Id;
+            }
+            else if (options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                const requestOptions = {
+                    url: `${options.webUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=Id`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const listResponse = yield request_1.default.get(requestOptions);
+                baseString += listResponse.Id;
+            }
+            return baseString;
+        });
+    }
 }
 _SpoContentTypeSetCommand_instances = new WeakSet(), _SpoContentTypeSetCommand_initTelemetry = function _SpoContentTypeSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -204,6 +248,9 @@ _SpoContentTypeSetCommand_instances = new WeakSet(), _SpoContentTypeSetCommand_i
         if ((args.options.listId && (args.options.listTitle || args.options.listUrl)) || (args.options.listTitle && args.options.listUrl)) {
             return `Specify either listTitle, listId or listUrl.`;
         }
+        if ((args.options.listId || args.options.listTitle || args.options.listUrl) && args.options.updateChildren) {
+            return 'It is impossible to pass updateChildren when trying to update a list content type.';
+        }
         return true;
     }));
 }, _SpoContentTypeSetCommand_initTypes = function _SpoContentTypeSetCommand_initTypes() {

package/dist/m365/spo/commands/term/term-group-add.js

@@ -42,14 +42,14 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
             let formDigest = '';
             let termGroup;
             try {
-                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const webUrl = args.options.webUrl || (yield spo_1.spo.getSpoAdminUrl(logger, this.debug));
+                const res = yield spo_1.spo.getRequestDigest(webUrl);
                 formDigest = res.FormDigestValue;
                 if (this.verbose) {
                     logger.logToStderr(`Getting taxonomy term store...`);
                 }
                 const requestOptionsPost = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
@@ -67,7 +67,7 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Adding taxonomy term group...`);
                 }
                 const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': formDigest
                     },
@@ -86,7 +86,7 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
                         logger.logToStderr(`Setting taxonomy term group description...`);
                     }
                     const requestOptionsQuery = {
-                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': formDigest
                         },
@@ -117,7 +117,8 @@ _SpoTermGroupAddCommand_instances = new WeakSet(), _SpoTermGroupAddCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             description: typeof args.options.id !== 'undefined',
-            id: typeof args.options.id !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            webUrl: typeof args.options.webUrl !== 'undefined'
         });
     });
 }, _SpoTermGroupAddCommand_initOptions = function _SpoTermGroupAddCommand_initOptions() {
@@ -127,13 +128,16 @@ _SpoTermGroupAddCommand_instances = new WeakSet(), _SpoTermGroupAddCommand_initT
         option: '-i, --id [id]'
     }, {
         option: '-d, --description [description]'
+    }, {
+        option: '-u, --webUrl [webUrl]'
     });
 }, _SpoTermGroupAddCommand_initValidators = function _SpoTermGroupAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id) {
-            if (!validation_1.validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.webUrl) {
+            return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         }
         return true;
     }));

package/dist/m365/teams/commands/team/team-add.js

@@ -13,20 +13,13 @@ 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 _TeamsTeamAddCommand_instances, _TeamsTeamAddCommand_initTelemetry, _TeamsTeamAddCommand_initOptions, _TeamsTeamAddCommand_initValidators;
+var _TeamsTeamAddCommand_instances, _TeamsTeamAddCommand_initTelemetry, _TeamsTeamAddCommand_initOptions, _TeamsTeamAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-var TeamsAsyncOperationStatus;
-(function (TeamsAsyncOperationStatus) {
-    TeamsAsyncOperationStatus["Invalid"] = "invalid";
-    TeamsAsyncOperationStatus["NotStarted"] = "notStarted";
-    TeamsAsyncOperationStatus["InProgress"] = "inProgress";
-    TeamsAsyncOperationStatus["Succeeded"] = "succeeded";
-    TeamsAsyncOperationStatus["Failed"] = "failed";
-})(TeamsAsyncOperationStatus || (TeamsAsyncOperationStatus = {}));
+const promises_1 = require("timers/promises");
 class TeamsTeamAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.TEAM_ADD;
@@ -40,7 +33,7 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
         this.pollingInterval = 30000;
         __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -64,6 +57,9 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
                 }
             }
             else {
+                if (this.verbose) {
+                    logger.logToStderr(`Creating team with name ${args.options.name} and description ${args.options.description}`);
+                }
                 requestBody = {
                     'template@odata.bind': `https://graph.microsoft.com/v1.0/teamsTemplates('standard')`,
                     displayName: args.options.name,
@@ -87,50 +83,57 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
                     },
                     responseType: 'json'
                 };
-                const teamsAsyncOperation = yield new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                    const teamsAsyncOperation = yield request_1.default.get(requestOptions);
-                    if (!args.options.wait) {
-                        resolve(teamsAsyncOperation);
-                    }
-                    else {
-                        setTimeout(() => {
-                            this.waitUntilFinished(requestOptions, resolve, reject, logger);
-                        }, this.pollingInterval);
-                    }
-                }));
-                let output;
+                const teamsAsyncOperation = yield request_1.default.get(requestOptions);
                 if (!args.options.wait) {
-                    output = teamsAsyncOperation;
+                    logger.log(teamsAsyncOperation);
                 }
                 else {
-                    output = yield aadGroup_1.aadGroup.getGroupById(teamsAsyncOperation.targetResourceId);
+                    yield this.waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger);
+                    const aadGroup = yield this.getAadGroup(teamsAsyncOperation.targetResourceId, logger);
+                    logger.log(aadGroup);
                 }
-                logger.log(output);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
-    waitUntilFinished(requestOptions, resolve, reject, logger) {
-        request_1.default
-            .get(requestOptions)
-            .then((teamsAsyncOperation) => {
-            if (teamsAsyncOperation.status === TeamsAsyncOperationStatus.Succeeded) {
+    waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (teamsAsyncOperation.status === 'succeeded') {
                 if (this.verbose) {
-                    process.stdout.write('\n');
+                    logger.logToStderr('Team provisioned succesfully. Returning...');
                 }
-                resolve(teamsAsyncOperation);
                 return;
             }
-            if (teamsAsyncOperation.error) {
-                reject(teamsAsyncOperation.error);
-                return;
+            else if (teamsAsyncOperation.error) {
+                throw teamsAsyncOperation.error;
+            }
+            else {
+                if (this.verbose) {
+                    logger.logToStderr(`Team still provisioning. Retrying in ${this.pollingInterval / 1000} seconds...`);
+                }
+                yield (0, promises_1.setTimeout)(this.pollingInterval);
+                teamsAsyncOperation = yield request_1.default.get(requestOptions);
+                yield this.waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger);
+            }
+        });
+    }
+    getAadGroup(id, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let group;
+            try {
+                group = yield aadGroup_1.aadGroup.getGroupById(id);
+            }
+            catch (_a) {
+                if (this.verbose) {
+                    logger.logToStderr(`Error occured on retrieving the aad group. Retrying in ${this.pollingInterval / 1000} seconds.`);
+                }
+                yield (0, promises_1.setTimeout)(this.pollingInterval);
+                return yield this.getAadGroup(id, logger);
             }
-            setTimeout(() => {
-                this.waitUntilFinished(requestOptions, resolve, reject, logger);
-            }, this.pollingInterval);
-        }).catch(err => reject(err));
+            return group;
+        });
     }
 }
 _TeamsTeamAddCommand_instances = new WeakSet(), _TeamsTeamAddCommand_initTelemetry = function _TeamsTeamAddCommand_initTelemetry() {
@@ -152,18 +155,18 @@ _TeamsTeamAddCommand_instances = new WeakSet(), _TeamsTeamAddCommand_initTelemet
     }, {
         option: '--wait'
     });
-}, _TeamsTeamAddCommand_initValidators = function _TeamsTeamAddCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.template) {
-            if (!args.options.name) {
-                return `Required parameter name missing`;
-            }
-            if (!args.options.description) {
-                return `Required parameter description missing`;
-            }
+}, _TeamsTeamAddCommand_initOptionSets = function _TeamsTeamAddCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['name'],
+        runsWhen: (args) => {
+            return !args.options.template;
         }
-        return true;
-    }));
+    }, {
+        options: ['description'],
+        runsWhen: (args) => {
+            return !args.options.template;
+        }
+    });
 };
 module.exports = new TeamsTeamAddCommand();
 //# sourceMappingURL=team-add.js.map

package/dist/utils/md.js

@@ -16,15 +16,20 @@ function convertHeadings(md) {
     });
 }
 function convertAdmonitions(md) {
-    const regex = new RegExp('^!!!\\s(.*)' + os_1.EOL + '\\s+', 'gm');
-    return md.replace(regex, (match, content) => {
-        return content.toLocaleUpperCase() + os_1.EOL + os_1.EOL;
-    });
+    const regex = new RegExp(/^:::(\w+)([\s\S]*?):::$/, 'gm');
+    return md.replace(regex, (_, label, content) => label.toLocaleUpperCase() + os_1.EOL + os_1.EOL + content.trim());
 }
 function includeContent(md, rootFolder) {
-    return md.replace(/^--8<-- "([^"]+)"/gm, (match, filePath) => {
-        return fs.readFileSync(path.join(rootFolder, filePath), 'utf8');
+    const mdxImports = [
+        { tag: "<Global />", location: "docs/cmd/_global.mdx" },
+        { tag: "<CLISettings />", location: "docs/_clisettings.mdx" }
+    ];
+    mdxImports.forEach(mdxImport => {
+        md = md.replace(mdxImport.tag, () => {
+            return fs.readFileSync(path.join(rootFolder, mdxImport.location), 'utf8');
+        }).replace(/(```\r\n)\r\n(```md defintion-list\r\n)/g, "$1$2");
     });
+    return md;
 }
 function convertDd(md) {
     return md.replace(/^:\s(.*)/gm, (match, content) => {
@@ -47,16 +52,11 @@ function convertHyperlinks(md) {
     });
 }
 function convertContentTabs(md) {
-    const regex = new RegExp('^=== "(.+?)"(?:\r\n|\n){2}((?:^    (?:.*?(?:\r\n|\n))?)+)', 'gms');
-    return md.replace(regex, (match, title, content) => {
-        return `  ${title}${os_1.EOL}${os_1.EOL}${content.replace(/^    /gms, '')}`;
-    });
-}
-function convertMdOutput(md) {
-    const regex = new RegExp('(?<=^    ```md)(.*)(?=    ```)', 'gms');
-    return md.replace(regex, (match, content) => {
-        return content.replace(/^    /gms, '');
-    });
+    return md
+        .replace(/<TabItem value="([^"]+)">/gm, '$1')
+        .replace(/.*<\/?(Tabs|TabItem)>.*\n?/g, '')
+        .replace(/```(?:\w+)?\s*([\s\S]*?)\s*```/g, '$1')
+        .trim();
 }
 function convertCodeFences(md) {
     const regex = new RegExp('^```.*?(?:\r\n|\n)(.*?)```(?:\r\n|\n)', 'gms');
@@ -72,6 +72,12 @@ function removeTooManyEmptyLines(md) {
     const regex = new RegExp('(' + os_1.EOL + '){4,}', 'g');
     return md.replace(regex, Array(4).join(os_1.EOL));
 }
+function removeFrontmatter(md) {
+    return md.replace(/^---[\s\S]*?---/gm, '').trim();
+}
+function removeImports(md) {
+    return md.replace(/^import .+;$/gms, '').trim();
+}
 function escapeMd(mdString) {
     if (!mdString) {
         return mdString;
@@ -86,11 +92,12 @@ const convertFunctions = [
     convertAdmonitions,
     convertDd,
     convertHyperlinks,
-    convertMdOutput,
-    convertContentTabs,
     convertCodeFences,
+    convertContentTabs,
     removeInlineMarkup,
-    removeTooManyEmptyLines
+    removeTooManyEmptyLines,
+    removeFrontmatter,
+    removeImports
 ];
 exports.md = {
     md2plain(md, rootFolderDocs) {

package/docs/docs/cmd/_global.mdx

@@ -0,0 +1,16 @@
+```md definition-list
+`-h, --help [help]`
+: Output usage information. Optionally, specify which section of command's help you want to see. Allowed values are `options`, `examples`, `remarks`, `response`, `full`. Default is `full`.
+
+`--query [query]`
+: JMESPath query string. See [http://jmespath.org/](http://jmespath.org/) for more information and examples.
+
+`-o, --output [output]`
+: Output type. `json`, `text`, `csv`, `md`. Default `json`.
+
+`--verbose`
+: Runs command with verbose logging.
+
+`--debug`
+: Runs command with debug logging.
+```