@pnp/cli-microsoft365 11.9.0-beta.69c1186 → 11.9.0-beta.87e70e2

package/dist/m365/file/commands/convert/convert-pdf.js

@@ -1,19 +1,19 @@
-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 _FileConvertPdfCommand_instances, _FileConvertPdfCommand_initOptions, _FileConvertPdfCommand_initValidators;
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
 import { v4 } from 'uuid';
+import { z } from 'zod';
 import auth from '../../../../Auth.js';
-import { CommandError } from '../../../../Command.js';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    sourceFile: z.string().alias('s'),
+    targetFile: z.string().alias('t')
+});
 class FileConvertPdfCommand extends GraphCommand {
     get name() {
         return commands.CONVERT_PDF;
@@ -21,11 +21,17 @@ class FileConvertPdfCommand extends GraphCommand {
     get description() {
         return 'Converts the specified file to PDF using Microsoft Graph';
     }
-    constructor() {
-        super();
-        _FileConvertPdfCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FileConvertPdfCommand_instances, "m", _FileConvertPdfCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FileConvertPdfCommand_instances, "m", _FileConvertPdfCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.sourceFile.toLowerCase().startsWith('https://') || fs.existsSync(options.sourceFile), {
+            error: e => `Specified source file ${e.input.sourceFile} doesn't exist`
+        })
+            .refine(options => options.targetFile.toLowerCase().startsWith('https://') || !fs.existsSync(options.targetFile), {
+            error: e => `Another file found at ${e.input.targetFile}`
+        });
     }
     async commandAction(logger, args) {
         let sourceFileUrl = '';
@@ -376,26 +382,5 @@ class FileConvertPdfCommand extends GraphCommand {
         return request.delete(requestOptions);
     }
 }
-_FileConvertPdfCommand_instances = new WeakSet(), _FileConvertPdfCommand_initOptions = function _FileConvertPdfCommand_initOptions() {
-    this.options.unshift({
-        option: '-s, --sourceFile <sourceFile>'
-    }, {
-        option: '-t, --targetFile <targetFile>'
-    });
-}, _FileConvertPdfCommand_initValidators = function _FileConvertPdfCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!args.options.sourceFile.toLowerCase().startsWith('https://') &&
-            !fs.existsSync(args.options.sourceFile)) {
-            // assume local path
-            return `Specified source file ${args.options.sourceFile} doesn't exist`;
-        }
-        if (!args.options.targetFile.toLowerCase().startsWith('https://') &&
-            fs.existsSync(args.options.targetFile)) {
-            // assume local path
-            return `Another file found at ${args.options.targetFile}`;
-        }
-        return true;
-    });
-};
 export default new FileConvertPdfCommand();
 //# sourceMappingURL=convert-pdf.js.map

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

@@ -1,15 +1,21 @@
-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 _FileAddCommand_instances, _FileAddCommand_initTelemetry, _FileAddCommand_initOptions, _FileAddCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
 import { validation } from '../../../utils/validation.js';
 import GraphCommand from '../../base/GraphCommand.js';
 import commands from '../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    folderUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online folder URL.`
+    })
+        .alias('u'),
+    filePath: z.string().alias('p'),
+    siteUrl: z.string().optional()
+});
 class FileAddCommand extends GraphCommand {
     get name() {
         return commands.ADD;
@@ -17,12 +23,22 @@ class FileAddCommand extends GraphCommand {
     get description() {
         return 'Uploads file to the specified site';
     }
-    constructor() {
-        super();
-        _FileAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FileAddCommand_instances, "m", _FileAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FileAddCommand_instances, "m", _FileAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FileAddCommand_instances, "m", _FileAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => fs.existsSync(options.filePath), {
+            error: e => `Specified source file ${e.input.filePath} doesn't exist`
+        })
+            .refine(options => {
+            if (options.siteUrl) {
+                return validation.isValidSharePointUrl(options.siteUrl) === true;
+            }
+            return true;
+        }, {
+            error: e => `'${e.input.siteUrl}' is not a valid SharePoint Online site URL.`
+        });
     }
     async commandAction(logger, args) {
         let folderUrlWithoutTrailingSlash = args.options.folderUrl;
@@ -211,27 +227,5 @@ class FileAddCommand extends GraphCommand {
         return drive.id;
     }
 }
-_FileAddCommand_instances = new WeakSet(), _FileAddCommand_initTelemetry = function _FileAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            siteUrl: typeof args.options.siteUrl !== 'undefined'
-        });
-    });
-}, _FileAddCommand_initOptions = function _FileAddCommand_initOptions() {
-    this.options.unshift({ option: '-u, --folderUrl <folderUrl>' }, { option: '-p, --filePath <filePath>' }, { option: '--siteUrl [siteUrl]' });
-}, _FileAddCommand_initValidators = function _FileAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!fs.existsSync(args.options.filePath)) {
-            return `Specified source file ${args.options.sourceFile} doesn't exist`;
-        }
-        if (args.options.siteUrl) {
-            const isValidSiteUrl = validation.isValidSharePointUrl(args.options.siteUrl);
-            if (isValidSiteUrl !== true) {
-                return isValidSiteUrl;
-            }
-        }
-        return validation.isValidSharePointUrl(args.options.folderUrl);
-    });
-};
 export default new FileAddCommand();
 //# sourceMappingURL=file-add.js.map

package/dist/m365/file/commands/file-copy.js

@@ -1,15 +1,24 @@
-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 _FileCopyCommand_instances, _FileCopyCommand_initTelemetry, _FileCopyCommand_initOptions, _FileCopyCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
 import { urlUtil } from '../../../utils/urlUtil.js';
 import { spo } from '../../../utils/spo.js';
 import { validation } from '../../../utils/validation.js';
 import GraphCommand from '../../base/GraphCommand.js';
 import commands from '../commands.js';
+const nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    sourceUrl: z.string().alias('s'),
+    targetUrl: z.string().alias('t'),
+    newName: z.string().optional(),
+    nameConflictBehavior: z.enum(nameConflictBehaviorOptions).optional()
+});
 class FileCopyCommand extends GraphCommand {
     get name() {
         return commands.COPY;
@@ -17,13 +26,8 @@ class FileCopyCommand extends GraphCommand {
     get description() {
         return 'Copies a file to another location using the Microsoft Graph';
     }
-    constructor() {
-        super();
-        _FileCopyCommand_instances.add(this);
-        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
-        __classPrivateFieldGet(this, _FileCopyCommand_instances, "m", _FileCopyCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FileCopyCommand_instances, "m", _FileCopyCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FileCopyCommand_instances, "m", _FileCopyCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -52,7 +56,7 @@ class FileCopyCommand extends GraphCommand {
                 const sourceFileName = sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
                 const sourceFileExtension = sourceFileName.includes('.') ? sourceFileName.substring(sourceFileName.lastIndexOf('.')) : '';
                 const newNameExtension = newName.includes('.') ? newName.substring(newName.lastIndexOf('.')) : '';
-                requestOptions.data.name = newNameExtension ? `${newName.replace(newNameExtension, "")}${sourceFileExtension}` : `${newName}${sourceFileExtension}`;
+                requestOptions.data.name = newNameExtension ? `${newName.replace(newNameExtension, '')}${sourceFileExtension}` : `${newName}${sourceFileExtension}`;
             }
             await request.post(requestOptions);
         }
@@ -127,25 +131,5 @@ class FileCopyCommand extends GraphCommand {
         return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
     }
 }
-_FileCopyCommand_instances = new WeakSet(), _FileCopyCommand_initTelemetry = function _FileCopyCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webUrl: typeof args.options.webUrl !== 'undefined',
-            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
-            targetUrl: typeof args.options.targetUrl !== 'undefined',
-            newName: typeof args.options.newName !== 'undefined',
-            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined'
-        });
-    });
-}, _FileCopyCommand_initOptions = function _FileCopyCommand_initOptions() {
-    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '-s, --sourceUrl <sourceUrl>' }, { option: '-t, --targetUrl <targetUrl>' }, { option: '--newName [newName]' }, { option: '--nameConflictBehavior [nameConflictBehavior]', autocomplete: this.nameConflictBehaviorOptions });
-}, _FileCopyCommand_initValidators = function _FileCopyCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
-            return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new FileCopyCommand();
 //# sourceMappingURL=file-copy.js.map

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

@@ -1,16 +1,26 @@
-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 _FileListCommand_instances, _FileListCommand_initTelemetry, _FileListCommand_initOptions, _FileListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
 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';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    folderUrl: z.string(),
+    recursive: z.boolean().optional()
+});
 class FileListCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.foldersToGetFilesFrom = [];
+    }
     get name() {
         return commands.LIST;
     }
@@ -20,13 +30,8 @@ class FileListCommand extends GraphCommand {
     defaultProperties() {
         return ['name', 'lastModifiedByUser'];
     }
-    constructor() {
-        super();
-        _FileListCommand_instances.add(this);
-        this.foldersToGetFilesFrom = [];
-        __classPrivateFieldGet(this, _FileListCommand_instances, "m", _FileListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FileListCommand_instances, "m", _FileListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FileListCommand_instances, "m", _FileListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let webUrl = args.options.webUrl;
@@ -161,16 +166,5 @@ class FileListCommand extends GraphCommand {
         return files;
     }
 }
-_FileListCommand_instances = new WeakSet(), _FileListCommand_initTelemetry = function _FileListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            recursive: !!args.options.recursive
-        });
-    });
-}, _FileListCommand_initOptions = function _FileListCommand_initOptions() {
-    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '--folderUrl <folderUrl>' }, { option: '--recursive' });
-}, _FileListCommand_initValidators = function _FileListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new FileListCommand();
 //# sourceMappingURL=file-list.js.map

package/dist/m365/file/commands/file-move.js

@@ -1,9 +1,5 @@
-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 _FileMoveCommand_instances, _FileMoveCommand_initTelemetry, _FileMoveCommand_initOptions, _FileMoveCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import GraphCommand from '../../base/GraphCommand.js';
 import { setTimeout } from 'timers/promises';
 import commands from '../commands.js';
@@ -12,21 +8,32 @@ import { spo } from '../../../utils/spo.js';
 import { urlUtil } from '../../../utils/urlUtil.js';
 import { drive } from '../../../utils/drive.js';
 import { validation } from '../../../utils/validation.js';
+const nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    sourceUrl: z.string().alias('s'),
+    targetUrl: z.string().alias('t'),
+    newName: z.string().optional(),
+    nameConflictBehavior: z.enum(nameConflictBehaviorOptions).optional()
+});
 class FileMoveCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.pollingInterval = 10000;
+    }
     get name() {
         return commands.MOVE;
     }
     get description() {
         return 'Moves a file to another location using the Microsoft Graph';
     }
-    constructor() {
-        super();
-        _FileMoveCommand_instances.add(this);
-        this.pollingInterval = 10000;
-        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
-        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -83,7 +90,7 @@ class FileMoveCommand extends GraphCommand {
             const sourceFileName = sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
             const sourceFileExtension = sourceFileName.includes('.') ? sourceFileName.substring(sourceFileName.lastIndexOf('.')) : '';
             const newNameExtension = newName.includes('.') ? newName.substring(newName.lastIndexOf('.')) : '';
-            requestOptions.data.name = newNameExtension ? `${newName.replace(newNameExtension, "")}${sourceFileExtension}` : `${newName}${sourceFileExtension}`;
+            requestOptions.data.name = newNameExtension ? `${newName.replace(newNameExtension, '')}${sourceFileExtension}` : `${newName}${sourceFileExtension}`;
         }
         return requestOptions;
     }
@@ -111,25 +118,5 @@ class FileMoveCommand extends GraphCommand {
         }
     }
 }
-_FileMoveCommand_instances = new WeakSet(), _FileMoveCommand_initTelemetry = function _FileMoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webUrl: typeof args.options.webUrl !== 'undefined',
-            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
-            targetUrl: typeof args.options.targetUrl !== 'undefined',
-            newName: typeof args.options.newName !== 'undefined',
-            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined'
-        });
-    });
-}, _FileMoveCommand_initOptions = function _FileMoveCommand_initOptions() {
-    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '-s, --sourceUrl <sourceUrl>' }, { option: '-t, --targetUrl <targetUrl>' }, { option: '--newName [newName]' }, { option: '--nameConflictBehavior [nameConflictBehavior]', autocomplete: this.nameConflictBehaviorOptions });
-}, _FileMoveCommand_initValidators = function _FileMoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
-            return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new FileMoveCommand();
 //# sourceMappingURL=file-move.js.map

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

@@ -1,13 +1,15 @@
-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 _FlowDisableCommand_instances, _FlowDisableCommand_initTelemetry, _FlowDisableCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
 import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n'),
+    environmentName: z.string().alias('e'),
+    asAdmin: z.boolean().optional()
+});
 class FlowDisableCommand extends PowerAutomateCommand {
     get name() {
         return commands.DISABLE;
@@ -15,11 +17,8 @@ class FlowDisableCommand extends PowerAutomateCommand {
     get description() {
         return 'Disables specified Microsoft Flow';
     }
-    constructor() {
-        super();
-        _FlowDisableCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FlowDisableCommand_instances, "m", _FlowDisableCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FlowDisableCommand_instances, "m", _FlowDisableCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -40,20 +39,5 @@ class FlowDisableCommand extends PowerAutomateCommand {
         }
     }
 }
-_FlowDisableCommand_instances = new WeakSet(), _FlowDisableCommand_initTelemetry = function _FlowDisableCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _FlowDisableCommand_initOptions = function _FlowDisableCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--asAdmin'
-    });
-};
 export default new FlowDisableCommand();
 //# sourceMappingURL=flow-disable.js.map

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

@@ -1,13 +1,15 @@
-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 _FlowEnableCommand_instances, _FlowEnableCommand_initTelemetry, _FlowEnableCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
 import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n'),
+    environmentName: z.string().alias('e'),
+    asAdmin: z.boolean().optional()
+});
 class FlowEnableCommand extends PowerAutomateCommand {
     get name() {
         return commands.ENABLE;
@@ -15,11 +17,8 @@ class FlowEnableCommand extends PowerAutomateCommand {
     get description() {
         return 'Enables specified Microsoft Flow';
     }
-    constructor() {
-        super();
-        _FlowEnableCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FlowEnableCommand_instances, "m", _FlowEnableCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FlowEnableCommand_instances, "m", _FlowEnableCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -40,20 +39,5 @@ class FlowEnableCommand extends PowerAutomateCommand {
         }
     }
 }
-_FlowEnableCommand_instances = new WeakSet(), _FlowEnableCommand_initTelemetry = function _FlowEnableCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _FlowEnableCommand_initOptions = function _FlowEnableCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--asAdmin'
-    });
-};
 export default new FlowEnableCommand();
 //# sourceMappingURL=flow-enable.js.map

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

@@ -1,17 +1,25 @@
-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 _FlowExportCommand_instances, _FlowExportCommand_initTelemetry, _FlowExportCommand_initOptions, _FlowExportCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
-import { validation } from '../../../utils/validation.js';
 import PowerPlatformCommand from '../../base/PowerPlatformCommand.js';
 import commands from '../commands.js';
 import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    environmentName: z.string().alias('e'),
+    name: z.uuid().alias('n'),
+    packageDisplayName: z.string().optional().alias('d'),
+    packageDescription: z.string().optional(),
+    packageCreatedBy: z.string().optional().alias('c'),
+    packageSourceEnvironment: z.string().optional().alias('s'),
+    format: z.string().transform(v => v.toLowerCase()).pipe(z.enum(['json', 'zip'], {
+        error: 'Option format must be json or zip. Default is zip'
+    })).optional().alias('f'),
+    path: z.string().optional().alias('p')
+});
 class FlowExportCommand extends PowerPlatformCommand {
     get name() {
         return commands.EXPORT;
@@ -19,12 +27,36 @@ class FlowExportCommand extends PowerPlatformCommand {
     get description() {
         return 'Exports the specified Microsoft Flow as a file';
     }
-    constructor() {
-        super();
-        _FlowExportCommand_instances.add(this);
-        __classPrivateFieldGet(this, _FlowExportCommand_instances, "m", _FlowExportCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _FlowExportCommand_instances, "m", _FlowExportCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _FlowExportCommand_instances, "m", _FlowExportCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.format !== 'json' || !options.packageCreatedBy, {
+            error: 'packageCreatedBy cannot be specified with output of json',
+            path: ['packageCreatedBy']
+        })
+            .refine(options => options.format !== 'json' || !options.packageDescription, {
+            error: 'packageDescription cannot be specified with output of json',
+            path: ['packageDescription']
+        })
+            .refine(options => options.format !== 'json' || !options.packageDisplayName, {
+            error: 'packageDisplayName cannot be specified with output of json',
+            path: ['packageDisplayName']
+        })
+            .refine(options => options.format !== 'json' || !options.packageSourceEnvironment, {
+            error: 'packageSourceEnvironment cannot be specified with output of json',
+            path: ['packageSourceEnvironment']
+        })
+            .refine(options => {
+            if (options.path) {
+                return fs.existsSync(path.dirname(options.path));
+            }
+            return true;
+        }, {
+            error: 'Specified path where to save the file does not exist',
+            path: ['path']
+        });
     }
     async commandAction(logger, args) {
         const formatArgument = args.options.format?.toLowerCase() || '';
@@ -139,63 +171,5 @@ class FlowExportCommand extends PowerPlatformCommand {
         }
     }
 }
-_FlowExportCommand_instances = new WeakSet(), _FlowExportCommand_initTelemetry = function _FlowExportCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            packageDisplayName: typeof args.options.packageDisplayName !== 'undefined',
-            packageDescription: typeof args.options.packageDescription !== 'undefined',
-            packageCreatedBy: typeof args.options.packageCreatedBy !== 'undefined',
-            packageSourceEnvironment: typeof args.options.packageSourceEnvironment !== 'undefined',
-            format: args.options.format,
-            path: typeof args.options.path !== 'undefined'
-        });
-    });
-}, _FlowExportCommand_initOptions = function _FlowExportCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '-d, --packageDisplayName [packageDisplayName]'
-    }, {
-        option: '--packageDescription [packageDescription]'
-    }, {
-        option: '-c, --packageCreatedBy [packageCreatedBy]'
-    }, {
-        option: '-s, --packageSourceEnvironment [packageSourceEnvironment]'
-    }, {
-        option: '-f, --format [format]'
-    }, {
-        option: '-p, --path [path]'
-    });
-}, _FlowExportCommand_initValidators = function _FlowExportCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const lowerCaseFormat = args.options.format ? args.options.format.toLowerCase() : '';
-        if (!validation.isValidGuid(args.options.name)) {
-            return `${args.options.name} is not a valid GUID`;
-        }
-        if (args.options.format && (lowerCaseFormat !== 'json' && lowerCaseFormat !== 'zip')) {
-            return 'Option format must be json or zip. Default is zip';
-        }
-        if (lowerCaseFormat === 'json') {
-            if (args.options.packageCreatedBy) {
-                return 'packageCreatedBy cannot be specified with output of json';
-            }
-            if (args.options.packageDescription) {
-                return 'packageDescription cannot be specified with output of json';
-            }
-            if (args.options.packageDisplayName) {
-                return 'packageDisplayName cannot be specified with output of json';
-            }
-            if (args.options.packageSourceEnvironment) {
-                return 'packageSourceEnvironment cannot be specified with output of json';
-            }
-        }
-        if (args.options.path && !fs.existsSync(path.dirname(args.options.path))) {
-            return 'Specified path where to save the file does not exist';
-        }
-        return true;
-    });
-};
 export default new FlowExportCommand();
 //# sourceMappingURL=flow-export.js.map