@pnp/cli-microsoft365 11.9.0-beta.93bd508 → 11.9.0-beta.9bd71dd

package/dist/m365/external/commands/connection/connection-get.js

@@ -1,13 +1,14 @@
-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 _ExternalConnectionGetCommand_instances, _ExternalConnectionGetCommand_initTelemetry, _ExternalConnectionGetCommand_initOptions, _ExternalConnectionGetCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().optional().alias('i'),
+    name: z.string().optional().alias('n')
+});
 class ExternalConnectionGetCommand extends GraphCommand {
     get name() {
         return commands.CONNECTION_GET;
@@ -18,12 +19,18 @@ class ExternalConnectionGetCommand extends GraphCommand {
     alias() {
         return [commands.EXTERNALCONNECTION_GET];
     }
-    constructor() {
-        super();
-        _ExternalConnectionGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ExternalConnectionGetCommand_instances, "m", _ExternalConnectionGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _ExternalConnectionGetCommand_instances, "m", _ExternalConnectionGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _ExternalConnectionGetCommand_instances, "m", _ExternalConnectionGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.name].filter(x => x !== undefined).length === 1, {
+            message: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async commandAction(logger, args) {
         let url = `${this.resource}/v1.0/external/connections`;
@@ -55,21 +62,5 @@ class ExternalConnectionGetCommand extends GraphCommand {
         }
     }
 }
-_ExternalConnectionGetCommand_instances = new WeakSet(), _ExternalConnectionGetCommand_initTelemetry = function _ExternalConnectionGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _ExternalConnectionGetCommand_initOptions = function _ExternalConnectionGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    });
-}, _ExternalConnectionGetCommand_initOptionSets = function _ExternalConnectionGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new ExternalConnectionGetCommand();
 //# sourceMappingURL=connection-get.js.map

package/dist/m365/external/commands/connection/connection-remove.js

@@ -1,14 +1,16 @@
-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 _ExternalConnectionRemoveCommand_instances, _ExternalConnectionRemoveCommand_initTelemetry, _ExternalConnectionRemoveCommand_initOptions, _ExternalConnectionRemoveCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().optional(),
+    name: z.string().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class ExternalConnectionRemoveCommand extends GraphCommand {
     get name() {
         return commands.CONNECTION_REMOVE;
@@ -19,12 +21,18 @@ class ExternalConnectionRemoveCommand extends GraphCommand {
     alias() {
         return [commands.EXTERNALCONNECTION_REMOVE];
     }
-    constructor() {
-        super();
-        _ExternalConnectionRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ExternalConnectionRemoveCommand_instances, "m", _ExternalConnectionRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _ExternalConnectionRemoveCommand_instances, "m", _ExternalConnectionRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _ExternalConnectionRemoveCommand_instances, "m", _ExternalConnectionRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.name].filter(x => x !== undefined).length === 1, {
+            message: `Specify either 'id' or 'name', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        });
     }
     async getExternalConnectionId(args) {
         if (args.options.id) {
@@ -76,18 +84,5 @@ class ExternalConnectionRemoveCommand extends GraphCommand {
         }
     }
 }
-_ExternalConnectionRemoveCommand_instances = new WeakSet(), _ExternalConnectionRemoveCommand_initTelemetry = function _ExternalConnectionRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _ExternalConnectionRemoveCommand_initOptions = function _ExternalConnectionRemoveCommand_initOptions() {
-    this.options.unshift({ option: '--id [id]' }, { option: '--name [name]' }, { option: '-f, --force' });
-}, _ExternalConnectionRemoveCommand_initOptionSets = function _ExternalConnectionRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new ExternalConnectionRemoveCommand();
 //# sourceMappingURL=connection-remove.js.map

package/dist/m365/external/commands/connection/connection-schema-add.js

@@ -1,12 +1,57 @@
-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 _ExternalConnectionSchemaAddCommand_instances, _ExternalConnectionSchemaAddCommand_initOptions, _ExternalConnectionSchemaAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    externalConnectionId: z.string()
+        .min(3, 'externalConnectionId must be between 3 and 32 characters in length.')
+        .max(32, 'externalConnectionId must be between 3 and 32 characters in length.')
+        .refine(id => !/[^\w]|_/g.test(id), {
+        message: 'externalConnectionId must only contain alphanumeric characters.'
+    })
+        .refine(id => !(id.length > 9 && id.startsWith('Microsoft')), {
+        message: 'ID cannot begin with Microsoft'
+    })
+        .alias('i'),
+    schema: z.string()
+        .refine(val => {
+        try {
+            JSON.parse(val);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }, {
+        message: 'The schema is not a valid JSON string'
+    })
+        .refine(val => {
+        try {
+            const obj = JSON.parse(val);
+            return obj.baseType === 'microsoft.graph.externalItem';
+        }
+        catch {
+            return true;
+        }
+    }, {
+        message: `The schema needs a required property 'baseType' with value 'microsoft.graph.externalItem'`
+    })
+        .refine(val => {
+        try {
+            const obj = JSON.parse(val);
+            return obj.properties && obj.properties.length > 0 && obj.properties.length <= 128;
+        }
+        catch {
+            return true;
+        }
+    }, {
+        message: 'We need at least one property and a maximum of 128 properties in the schema object'
+    })
+        .alias('s'),
+    wait: z.boolean().optional()
+});
 class ExternalConnectionSchemaAddCommand extends GraphCommand {
     get name() {
         return commands.CONNECTION_SCHEMA_ADD;
@@ -17,11 +62,8 @@ class ExternalConnectionSchemaAddCommand extends GraphCommand {
     alias() {
         return [commands.EXTERNALCONNECTION_SCHEMA_ADD];
     }
-    constructor() {
-        super();
-        _ExternalConnectionSchemaAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ExternalConnectionSchemaAddCommand_instances, "m", _ExternalConnectionSchemaAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _ExternalConnectionSchemaAddCommand_instances, "m", _ExternalConnectionSchemaAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -74,36 +116,5 @@ class ExternalConnectionSchemaAddCommand extends GraphCommand {
         }
     }
 }
-_ExternalConnectionSchemaAddCommand_instances = new WeakSet(), _ExternalConnectionSchemaAddCommand_initOptions = function _ExternalConnectionSchemaAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --externalConnectionId <externalConnectionId>'
-    }, {
-        option: '-s, --schema <schema>'
-    }, {
-        option: '--wait'
-    });
-}, _ExternalConnectionSchemaAddCommand_initValidators = function _ExternalConnectionSchemaAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.externalConnectionId.length < 3 || args.options.externalConnectionId.length > 32) {
-            return 'externalConnectionId must be between 3 and 32 characters in length.';
-        }
-        const alphaNumericRegEx = /[^\w]|_/g;
-        if (alphaNumericRegEx.test(args.options.externalConnectionId)) {
-            return 'externalConnectionId must only contain alphanumeric characters.';
-        }
-        if (args.options.externalConnectionId.length > 9 &&
-            args.options.externalConnectionId.startsWith('Microsoft')) {
-            return 'ID cannot begin with Microsoft';
-        }
-        const schemaObject = JSON.parse(args.options.schema);
-        if (schemaObject.baseType === undefined || schemaObject.baseType !== 'microsoft.graph.externalItem') {
-            return `The schema needs a required property 'baseType' with value 'microsoft.graph.externalItem'`;
-        }
-        if (!schemaObject.properties || schemaObject.properties.length > 128) {
-            return `We need at least one property and a maximum of 128 properties in the schema object`;
-        }
-        return true;
-    });
-};
 export default new ExternalConnectionSchemaAddCommand();
 //# sourceMappingURL=connection-schema-add.js.map

package/dist/m365/external/commands/connection/connection-urltoitemresolver-add.js

@@ -1,12 +1,16 @@
-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 _ExternalConnectionUrlToItemResolverAddCommand_instances, _ExternalConnectionUrlToItemResolverAddCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    externalConnectionId: z.string().alias('c'),
+    baseUrls: z.string(),
+    urlPattern: z.string(),
+    itemId: z.string().alias('i'),
+    priority: z.number().alias('p')
+});
 class ExternalConnectionUrlToItemResolverAddCommand extends GraphCommand {
     get name() {
         return commands.CONNECTION_URLTOITEMRESOLVER_ADD;
@@ -14,10 +18,8 @@ class ExternalConnectionUrlToItemResolverAddCommand extends GraphCommand {
     get description() {
         return 'Adds a URL to item resolver to an external connection';
     }
-    constructor() {
-        super();
-        _ExternalConnectionUrlToItemResolverAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ExternalConnectionUrlToItemResolverAddCommand_instances, "m", _ExternalConnectionUrlToItemResolverAddCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const baseUrls = args.options.baseUrls.split(',').map(b => b.trim());
@@ -52,18 +54,5 @@ class ExternalConnectionUrlToItemResolverAddCommand extends GraphCommand {
         }
     }
 }
-_ExternalConnectionUrlToItemResolverAddCommand_instances = new WeakSet(), _ExternalConnectionUrlToItemResolverAddCommand_initOptions = function _ExternalConnectionUrlToItemResolverAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-c, --externalConnectionId <externalConnectionId>'
-    }, {
-        option: '--baseUrls <baseUrls>'
-    }, {
-        option: '--urlPattern <urlPattern>'
-    }, {
-        option: '-i, --itemId <itemId>'
-    }, {
-        option: '-p, --priority <priority>'
-    });
-};
 export default new ExternalConnectionUrlToItemResolverAddCommand();
 //# sourceMappingURL=connection-urltoitemresolver-add.js.map

package/dist/m365/external/commands/item/item-add.js

@@ -1,12 +1,40 @@
-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 _ExternalItemAddCommand_instances, _a, _ExternalItemAddCommand_initTelemetry, _ExternalItemAddCommand_initOptions, _ExternalItemAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+const contentTypes = ['text', 'html'];
+export const options = z.object({
+    ...globalOptionsZod.shape,
+    id: z.string(),
+    externalConnectionId: z.string(),
+    content: z.string(),
+    contentType: z.enum(contentTypes).optional(),
+    acls: z.string()
+        .refine(val => {
+        const acls = val.split(';');
+        return acls.every(acl => acl.split(',').length === 3);
+    }, {
+        message: 'The value for option acls is not in the correct format. The correct format is "accessType,type,value", eg. "grant,everyone,everyone"'
+    })
+        .refine(val => {
+        const acls = val.split(';');
+        const accessTypeValues = ['grant', 'deny'];
+        return acls.every(acl => accessTypeValues.includes(acl.split(',')[0]));
+    }, {
+        message: 'The accessType value for option acls is not valid. Allowed values are grant, deny'
+    })
+        .refine(val => {
+        const acls = val.split(';');
+        const aclTypeValues = ['user', 'group', 'everyone', 'everyoneExceptGuests', 'externalGroup'];
+        return acls.every(acl => {
+            const parts = acl.split(',');
+            return parts.length >= 2 && aclTypeValues.includes(parts[1]);
+        });
+    }, {
+        message: 'The type value for option acls is not valid. Allowed values are user, group, everyone, everyoneExceptGuests, externalGroup'
+    })
+}).passthrough();
 class ExternalItemAddCommand extends GraphCommand {
     get name() {
         return commands.ITEM_ADD;
@@ -14,12 +42,8 @@ class ExternalItemAddCommand extends GraphCommand {
     get description() {
         return 'Creates external item';
     }
-    constructor() {
-        super();
-        _ExternalItemAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ExternalItemAddCommand_instances, "m", _ExternalItemAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _ExternalItemAddCommand_instances, "m", _ExternalItemAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _ExternalItemAddCommand_instances, "m", _ExternalItemAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     allowUnknownOptions() {
         return true;
@@ -47,7 +71,7 @@ class ExternalItemAddCommand extends GraphCommand {
         // we need to rewrite the @odata properties to the correct format
         // to extract multiple values for collections into arrays
         this.rewriteCollectionProperties(args.options);
-        this.addUnknownOptionsToPayload(requestBody.properties, args.options);
+        this.addUnknownOptionsToPayloadZod(requestBody.properties, args.options);
         const requestOptions = {
             url: `${this.resource}/v1.0/external/connections/${args.options.externalConnectionId}/items/${args.options.id}`,
             headers: {
@@ -91,52 +115,5 @@ class ExternalItemAddCommand extends GraphCommand {
         });
     }
 }
-_a = ExternalItemAddCommand, _ExternalItemAddCommand_instances = new WeakSet(), _ExternalItemAddCommand_initTelemetry = function _ExternalItemAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            contentType: typeof args.options.contentType
-        });
-        this.trackUnknownOptions(this.telemetryProperties, args.options);
-    });
-}, _ExternalItemAddCommand_initOptions = function _ExternalItemAddCommand_initOptions() {
-    this.options.unshift({
-        option: '--id <id>'
-    }, {
-        option: '--externalConnectionId <externalConnectionId>'
-    }, {
-        option: '--content <content>'
-    }, {
-        option: '--contentType [contentType]',
-        autocomplete: _a.contentType
-    }, {
-        option: '--acls <acls>'
-    });
-}, _ExternalItemAddCommand_initValidators = function _ExternalItemAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.contentType &&
-            _a.contentType.indexOf(args.options.contentType) < 0) {
-            return `${args.options.contentType} is not a valid value for contentType. Allowed values are ${_a.contentType.join(', ')}`;
-        }
-        // verify that each value for ACLs consists of three parts
-        // and that the values are correct
-        const acls = args.options.acls.split(';');
-        for (let i = 0; i < acls.length; i++) {
-            const acl = acls[i].split(',');
-            if (acl.length !== 3) {
-                return `The value ${acls[i]} for option acls is not in the correct format. The correct format is "accessType,type,value", eg. "grant,everyone,everyone"`;
-            }
-            const accessTypeValues = ['grant', 'deny'];
-            if (accessTypeValues.indexOf(acl[0]) < 0) {
-                return `The value ${acl[0]} for option acls is not valid. Allowed values are ${accessTypeValues.join(', ')}}`;
-            }
-            const aclTypeValues = ['user', 'group', 'everyone', 'everyoneExceptGuests', 'externalGroup'];
-            if (aclTypeValues.indexOf(acl[1]) < 0) {
-                return `The value ${acl[1]} for option acls is not valid. Allowed values are ${aclTypeValues.join(', ')}}`;
-            }
-        }
-        return true;
-    });
-};
-ExternalItemAddCommand.contentType = ['text', 'html'];
 export default new ExternalItemAddCommand();
 //# sourceMappingURL=item-add.js.map

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