@pnp/cli-microsoft365 11.4.0-beta.87732f5 → 11.4.0-beta.f54089d

package/dist/Auth.js

@@ -798,7 +798,7 @@ export class Auth {
         const existingConnection = allConnections.find(c => c.name === newName);
         const oldName = connection.name;
         if (existingConnection) {
-            throw new CommandError(`The connection name '${newName}' is already in use`);
+            throw new CommandError(`The connection name '${newName}' is already in use.`);
         }
         connection.name = newName;
         if (this.connection.name === oldName) {

package/dist/AuthServer.js

@@ -1,5 +1,4 @@
 import http from 'http';
-import url from 'url';
 import { Auth } from './Auth.js';
 import { browserUtil } from './utils/browserUtil.js';
 export class AuthServer {
@@ -34,9 +33,8 @@ export class AuthServer {
                 await this.logger.logToStderr(request.url);
                 await this.logger.logToStderr('');
             }
-            // url.parse is deprecated but we can't move to URL, because it doesn't
-            // support server-relative URLs
-            const queryString = url.parse(request.url, true).query;
+            const urlObj = new URL(request.url, 'http://localhost');
+            const queryString = Object.fromEntries(urlObj.searchParams.entries());
             const hasCode = queryString.code !== undefined;
             const hasError = queryString.error !== undefined;
             let body = "";

package/dist/Command.js

@@ -13,9 +13,9 @@ import { settingsNames } from './settingsNames.js';
 import { telemetry } from './telemetry.js';
 import { accessToken } from './utils/accessToken.js';
 import { md } from './utils/md.js';
+import { optionsUtils } from './utils/optionsUtils.js';
 import { prompt } from './utils/prompt.js';
 import { zod } from './utils/zod.js';
-import { optionsUtils } from './utils/optionsUtils.js';
 export class CommandError {
     constructor(message, code) {
         this.message = message;
@@ -30,7 +30,7 @@ export class CommandErrorWithOutput {
 }
 export const globalOptionsZod = z.object({
     query: z.string().optional(),
-    output: zod.alias('o', z.enum(['csv', 'json', 'md', 'text', 'none']).optional()),
+    output: z.enum(['csv', 'json', 'md', 'text', 'none']).optional().alias('o'),
     debug: z.boolean().default(false),
     verbose: z.boolean().default(false)
 });

package/dist/cli/cli.js

@@ -145,7 +145,7 @@ async function execute(rawArgs) {
     if (cli.commandToExecute?.command.schema) {
         while (true) {
             const startValidation = process.hrtime.bigint();
-            const result = cli.commandToExecute.command.getSchemaToParse().safeParse(cli.optionsFromArgs.options);
+            const result = await cli.commandToExecute.command.getSchemaToParse().safeParseAsync(cli.optionsFromArgs.options);
             const endValidation = process.hrtime.bigint();
             timings.validation.push(Number(endValidation - startValidation));
             if (result.success) {
@@ -153,13 +153,13 @@ async function execute(rawArgs) {
                 break;
             }
             else {
-                const hasNonRequiredErrors = result.error.errors.some(e => e.code !== 'invalid_type' || e.received !== 'undefined');
+                const hasNonRequiredErrors = result.error.issues.some(i => i.code !== 'invalid_type');
                 const shouldPrompt = cli.getSettingWithDefaultValue(settingsNames.prompt, true);
                 if (hasNonRequiredErrors === false &&
                     shouldPrompt) {
                     await cli.error('🌶️  Provide values for the following parameters:');
-                    for (const error of result.error.errors) {
-                        const optionName = error.path.join('.');
+                    for (const issue of result.error.issues) {
+                        const optionName = issue.path.join('.');
                         const optionInfo = cli.commandToExecute.options.find(o => o.name === optionName);
                         const answer = await cli.promptForValue(optionInfo);
                         // coerce the answer to the correct type
@@ -173,10 +173,10 @@ async function execute(rawArgs) {
                     }
                 }
                 else {
-                    result.error.errors.forEach(e => {
-                        if (e.code === 'invalid_type' &&
-                            e.received === 'undefined') {
-                            e.message = `Required option not specified`;
+                    result.error.issues.forEach(i => {
+                        if (i.code === 'invalid_type' &&
+                            i.input === undefined) {
+                            i.message = `Required option not specified`;
                         }
                     });
                     return cli.closeWithError(result.error, cli.optionsFromArgs, true);
@@ -793,7 +793,7 @@ async function closeWithError(error, args, showHelpIfEnabled = false) {
     }
     let errorMessage = error instanceof CommandError ? error.message : error;
     if (error instanceof ZodError) {
-        errorMessage = error.errors.map(e => (e.path.length > 0 ? `${e.path.join('.')}: ${e.message}` : e.message)).join(os.EOL);
+        errorMessage = error.issues.map(i => (i.path.length > 0 ? `${i.path.join('.')}: ${i.message}` : i.message)).join(os.EOL);
     }
     if ((!args.options.output || args.options.output === 'json') &&
         !cli.getSettingWithDefaultValue(settingsNames.printErrorsAsPlainText, true)) {

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -5,17 +5,16 @@ import { optionsUtils } from '../../../utils/optionsUtils.js';
 import { zod } from '../../../utils/zod.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
-export const options = globalOptionsZod
-    .extend({
+export const options = z.looseObject({
+    ...globalOptionsZod.shape,
     url: z.string(),
-    title: zod.alias('t', z.string().optional()),
-    description: zod.alias('d', z.string().optional()),
-    imageUrl: zod.alias('i', z.string().optional()),
-    actionUrl: zod.alias('a', z.string().optional()),
+    title: z.string().optional().alias('t'),
+    description: z.string().optional().alias('d'),
+    imageUrl: z.string().optional().alias('i'),
+    actionUrl: z.string().optional().alias('a'),
     card: z.string().optional(),
     cardData: z.string().optional()
-})
-    .passthrough();
+});
 class AdaptiveCardSendCommand extends AnonymousCommand {
     get name() {
         return commands.SEND;
@@ -29,7 +28,7 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.cardData || options.card, {
-            message: 'When you specify cardData, you must also specify card.',
+            error: 'When you specify cardData, you must also specify card.',
             path: ['cardData']
         })
             .refine(options => {
@@ -44,7 +43,7 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
             }
             return true;
         }, {
-            message: 'Specified card is not a valid JSON string.',
+            error: 'Specified card is not a valid JSON string.',
             path: ['card']
         })
             .refine(options => {
@@ -59,7 +58,7 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
             }
             return true;
         }, {
-            message: 'Specified cardData is not a valid JSON string.',
+            error: 'Specified cardData is not a valid JSON string.',
             path: ['cardData']
         });
     }

package/dist/m365/app/commands/app-open.js

@@ -4,11 +4,10 @@ import { settingsNames } from '../../../settingsNames.js';
 import { browserUtil } from '../../../utils/browserUtil.js';
 import AppCommand, { appCommandOptions } from '../../base/AppCommand.js';
 import commands from '../commands.js';
-const options = appCommandOptions
-    .extend({
+export const options = z.strictObject({
+    ...appCommandOptions.shape,
     preview: z.boolean().optional().default(false)
-})
-    .strict();
+});
 class AppOpenCommand extends AppCommand {
     get name() {
         return commands.OPEN;

package/dist/m365/app/commands/permission/permission-add.js

@@ -5,13 +5,12 @@ import { odata } from '../../../../utils/odata.js';
 import AppCommand, { appCommandOptions } from '../../../base/AppCommand.js';
 import commands from '../../commands.js';
 import { entraServicePrincipal } from '../../../../utils/entraServicePrincipal.js';
-const options = appCommandOptions
-    .extend({
+export const options = z.strictObject({
+    ...appCommandOptions.shape,
     applicationPermissions: z.string().optional(),
     delegatedPermissions: z.string().optional(),
     grantAdminConsent: z.boolean().optional()
-})
-    .strict();
+});
 var ScopeType;
 (function (ScopeType) {
     ScopeType["Role"] = "Role";
@@ -30,7 +29,7 @@ class AppPermissionAddCommand extends AppCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => options.applicationPermissions || options.delegatedPermissions, {
-            message: 'Specify at least one of applicationPermissions or delegatedPermissions, or both.',
+            error: 'Specify at least one of applicationPermissions or delegatedPermissions, or both.',
             path: ['delegatedPermissions']
         });
     }

package/dist/m365/base/AppCommand.js

@@ -3,9 +3,9 @@ import { z } from 'zod';
 import { cli } from '../../cli/cli.js';
 import Command, { CommandError, globalOptionsZod } from '../../Command.js';
 import { formatting } from '../../utils/formatting.js';
-export const appCommandOptions = globalOptionsZod
-    .extend({
-    appId: z.string().uuid().optional()
+export const appCommandOptions = z.object({
+    ...globalOptionsZod.shape,
+    appId: z.uuid().optional()
 });
 export default class AppCommand extends Command {
     get resource() {

package/dist/m365/booking/commands/business/business-get.js

@@ -3,15 +3,13 @@ import { cli } from '../../../../cli/cli.js';
 import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
-import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod
-    .extend({
-    id: zod.alias('i', z.string().optional()),
-    name: zod.alias('n', z.string().optional())
-})
-    .strict();
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().optional().alias('i'),
+    name: z.string().optional().alias('n')
+});
 class BookingBusinessGetCommand extends GraphCommand {
     get name() {
         return commands.BUSINESS_GET;
@@ -25,7 +23,7 @@ class BookingBusinessGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => options.id || options.name, {
-            message: 'Specify either id or name'
+            error: 'Specify either id or name'
         });
     }
     async commandAction(logger, args) {

package/dist/m365/booking/commands/business/business-list.js

@@ -1,8 +1,9 @@
+import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod.strict();
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class BookingBusinessListCommand extends GraphCommand {
     get name() {
         return commands.BUSINESS_LIST;

package/dist/m365/cli/commands/app/app-add.js

@@ -1,6 +1,5 @@
 import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
-import { zod } from '../../../../utils/zod.js';
 import config from '../../../../config.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -8,13 +7,12 @@ import { cli } from '../../../../cli/cli.js';
 import { entraApp } from '../../../../utils/entraApp.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import auth from '../../../../Auth.js';
-const options = globalOptionsZod
-    .extend({
-    name: zod.alias('n', z.string().optional().default('CLI for M365')),
-    scopes: zod.alias('s', z.string().optional().default('minimal')),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().optional().default('CLI for M365').alias('n'),
+    scopes: z.string().optional().default('minimal').alias('s'),
     saveToConfig: z.boolean().optional()
-})
-    .strict();
+});
 class CliAppAddCommand extends GraphCommand {
     get name() {
         return commands.APP_ADD;

package/dist/m365/commands/docs.js

@@ -5,7 +5,7 @@ import { app } from '../../utils/app.js';
 import { browserUtil } from '../../utils/browserUtil.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
 import commands from './commands.js';
-const options = globalOptionsZod.strict();
+export const options = globalOptionsZod.strict();
 class DocsCommand extends AnonymousCommand {
     get name() {
         return commands.DOCS;

package/dist/m365/commands/login.js

@@ -6,25 +6,28 @@ import { cli } from '../../cli/cli.js';
 import { settingsNames } from '../../settingsNames.js';
 import { zod } from '../../utils/zod.js';
 import commands from './commands.js';
-const options = globalOptionsZod
-    .extend({
-    authType: zod.alias('t', zod.coercedEnum(AuthType).optional()),
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    authType: zod.coercedEnum(AuthType).optional().alias('t'),
     cloud: zod.coercedEnum(CloudType).optional().default(CloudType.Public),
-    userName: zod.alias('u', z.string().optional()),
-    password: zod.alias('p', z.string().optional()),
-    certificateFile: zod.alias('c', z.string().optional()
-        .refine(filePath => !filePath || fs.existsSync(filePath), filePath => ({
-        message: `Certificate file ${filePath} does not exist`
-    }))),
+    userName: z.string().optional().alias('u'),
+    password: z.string().optional().alias('p'),
+    certificateFile: z.string().optional().alias('c')
+        .refine(filePath => !filePath || fs.existsSync(filePath), {
+        error: e => `Certificate file ${e.input} does not exist`
+    }),
     certificateBase64Encoded: z.string().optional(),
     thumbprint: z.string().optional(),
     appId: z.string().optional(),
     tenant: z.string().optional(),
-    secret: zod.alias('s', z.string().optional()),
-    connectionName: z.string().optional(),
+    secret: z.string().optional().alias('s'),
+    connectionName: z.string()
+        .refine(async (name) => !(await auth.getAllConnections()).some(c => c.name === name), {
+        error: e => `Connection with name '${e.input}' already exists.`
+    })
+        .optional(),
     ensure: z.boolean().optional()
-})
-    .strict();
+});
 class LoginCommand extends Command {
     get name() {
         return commands.LOGIN;
@@ -38,19 +41,19 @@ class LoginCommand extends Command {
     getRefinedSchema(schema) {
         return schema
             .refine(options => typeof options.appId !== 'undefined' || cli.getClientId() || options.authType === 'identity' || options.authType === 'federatedIdentity', {
-            message: `appId is required. TIP: use the "m365 setup" command to configure the default appId.`,
+            error: `appId is required. TIP: use the "m365 setup" command to configure the default appId.`,
             path: ['appId']
         })
             .refine(options => options.authType !== 'password' || options.userName, {
-            message: 'Username is required when using password authentication.',
+            error: 'Username is required when using password authentication.',
             path: ['userName']
         })
             .refine(options => options.authType !== 'password' || options.password, {
-            message: 'Password is required when using password authentication.',
+            error: 'Password is required when using password authentication.',
             path: ['password']
         })
             .refine(options => options.authType !== 'certificate' || !(options.certificateFile && options.certificateBase64Encoded), {
-            message: 'Specify either certificateFile or certificateBase64Encoded, but not both.',
+            error: 'Specify either certificateFile or certificateBase64Encoded, but not both.',
             path: ['certificateBase64Encoded']
         })
             .refine(options => options.authType !== 'certificate' ||
@@ -58,13 +61,13 @@ class LoginCommand extends Command {
             options.certificateBase64Encoded ||
             cli.getConfig().get(settingsNames.clientCertificateFile) ||
             cli.getConfig().get(settingsNames.clientCertificateBase64Encoded), {
-            message: 'Specify either certificateFile or certificateBase64Encoded.',
+            error: 'Specify either certificateFile or certificateBase64Encoded.',
             path: ['certificateFile']
         })
             .refine(options => options.authType !== 'secret' ||
             options.secret ||
             cli.getConfig().get(settingsNames.clientSecret), {
-            message: 'Secret is required when using secret authentication.',
+            error: 'Secret is required when using secret authentication.',
             path: ['secret']
         });
     }

package/dist/m365/commands/logout.js

@@ -1,7 +1,7 @@
 import auth from '../../Auth.js';
 import Command, { CommandError, globalOptionsZod } from '../../Command.js';
 import commands from './commands.js';
-const options = globalOptionsZod.strict();
+export const options = globalOptionsZod.strict();
 class LogoutCommand extends Command {
     get name() {
         return commands.LOGOUT;

package/dist/m365/commands/status.js

@@ -1,7 +1,8 @@
+import { z } from 'zod';
 import auth from '../../Auth.js';
 import Command, { CommandError, globalOptionsZod } from '../../Command.js';
 import commands from './commands.js';
-const options = globalOptionsZod.strict();
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class StatusCommand extends Command {
     get name() {
         return commands.STATUS;

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

@@ -1,8 +1,9 @@
 import assert from 'assert';
+import { z } from 'zod';
 import auth from '../../../Auth.js';
 import Command, { CommandError, globalOptionsZod } from '../../../Command.js';
 import commands from '../commands.js';
-const options = globalOptionsZod.strict();
+export const options = z.strictObject({ ...globalOptionsZod.shape });
 class ConnectionListCommand extends Command {
     get name() {
         return commands.LIST;

package/dist/m365/connection/commands/connection-set.js

@@ -1,12 +1,18 @@
-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 _ConnectionSetCommand_instances, _ConnectionSetCommand_initOptions, _ConnectionSetCommand_initValidators, _ConnectionSetCommand_initTypes;
 import auth from '../../../Auth.js';
 import commands from '../commands.js';
-import Command, { CommandError } from '../../../Command.js';
+import Command, { CommandError, globalOptionsZod } from '../../../Command.js';
+import z from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n')
+        .refine(async (name) => (await auth.getAllConnections()).some(c => c.name === name), {
+        error: e => `Connection with name '${e.input}' does not exist.`
+    }),
+    newName: z.string()
+        .refine(async (newName) => !(await auth.getAllConnections()).some(c => c.name === newName), {
+        error: e => `Connection with name '${e.input}' already exists.`
+    })
+});
 class ConnectionSetCommand extends Command {
     get name() {
         return commands.SET;
@@ -14,12 +20,8 @@ class ConnectionSetCommand extends Command {
     get description() {
         return 'Rename the specified connection';
     }
-    constructor() {
-        super();
-        _ConnectionSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ConnectionSetCommand_instances, "m", _ConnectionSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _ConnectionSetCommand_instances, "m", _ConnectionSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _ConnectionSetCommand_instances, "m", _ConnectionSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const connection = await auth.getConnection(args.options.name);
@@ -39,21 +41,5 @@ class ConnectionSetCommand extends Command {
         await this.commandAction(logger, args);
     }
 }
-_ConnectionSetCommand_instances = new WeakSet(), _ConnectionSetCommand_initOptions = function _ConnectionSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '--newName <newName>'
-    });
-}, _ConnectionSetCommand_initValidators = function _ConnectionSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.name === args.options.newName) {
-            return `Choose a name different from the current one`;
-        }
-        return true;
-    });
-}, _ConnectionSetCommand_initTypes = function _ConnectionSetCommand_initTypes() {
-    this.types.string.push('name', 'newName');
-};
 export default new ConnectionSetCommand();
 //# sourceMappingURL=connection-set.js.map

package/dist/m365/context/commands/context-remove.js

@@ -2,14 +2,12 @@ import fs from 'fs';
 import { z } from 'zod';
 import { cli } from '../../../cli/cli.js';
 import { CommandError, globalOptionsZod } from '../../../Command.js';
-import { zod } from '../../../utils/zod.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
-const options = globalOptionsZod
-    .extend({
-    force: zod.alias('f', z.boolean().optional())
-})
-    .strict();
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    force: z.boolean().optional().alias('f')
+});
 class ContextRemoveCommand extends AnonymousCommand {
     get name() {
         return commands.REMOVE;

package/dist/m365/context/commands/option/option-remove.js

@@ -2,15 +2,13 @@ import fs from 'fs';
 import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
 import { CommandError, globalOptionsZod } from '../../../../Command.js';
-import { zod } from '../../../../utils/zod.js';
 import ContextCommand from '../../../base/ContextCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod
-    .extend({
-    name: zod.alias('n', z.string()),
-    force: zod.alias('f', z.boolean().optional())
-})
-    .strict();
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n'),
+    force: z.boolean().optional().alias('f')
+});
 class ContextOptionRemoveCommand extends ContextCommand {
     get name() {
         return commands.OPTION_REMOVE;

package/dist/m365/entra/commands/administrativeunit/administrativeunit-add.js

@@ -1,16 +1,14 @@
 import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
 import request from "../../../../request.js";
-import { zod } from '../../../../utils/zod.js';
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
-const options = globalOptionsZod
-    .extend({
-    displayName: zod.alias('n', z.string()),
-    description: zod.alias('d', z.string().optional()),
+const options = z.looseObject({
+    ...globalOptionsZod.shape,
+    displayName: z.string().alias('n'),
+    description: z.string().optional().alias('d'),
     hiddenMembership: z.boolean().optional()
-})
-    .passthrough();
+});
 class EntraAdministrativeUnitAddCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_ADD;

package/dist/m365/entra/commands/administrativeunit/administrativeunit-get.js

@@ -4,14 +4,12 @@ import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
 import { entraAdministrativeUnit } from "../../../../utils/entraAdministrativeUnit.js";
 import { globalOptionsZod } from "../../../../Command.js";
-import { zod } from "../../../../utils/zod.js";
-const options = globalOptionsZod
-    .extend({
-    id: zod.alias('i', z.string().uuid().optional()),
-    displayName: zod.alias('n', z.string().optional()),
-    properties: zod.alias('p', z.string().optional())
-})
-    .strict();
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n'),
+    properties: z.string().optional().alias('p')
+});
 class EntraAdministrativeUnitGetCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_GET;
@@ -25,7 +23,7 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.id, options.displayName].filter(Boolean).length === 1, {
-            message: 'Specify either id or displayName'
+            error: 'Specify either id or displayName'
         });
     }
     async commandAction(logger, args) {

package/dist/m365/entra/commands/administrativeunit/administrativeunit-list.js

@@ -1,13 +1,12 @@
 import { z } from 'zod';
 import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
-import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod
-    .extend({
-    properties: zod.alias('p', z.string().optional())
-}).strict();
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    properties: z.string().optional().alias('p')
+});
 class EntraAdministrativeUnitListCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_LIST;

package/dist/m365/entra/commands/administrativeunit/administrativeunit-remove.js

@@ -3,16 +3,14 @@ import { cli } from '../../../../cli/cli.js';
 import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
-import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-const options = globalOptionsZod
-    .extend({
-    id: zod.alias('i', z.string().uuid().optional()),
-    displayName: zod.alias('n', z.string().optional()),
-    force: zod.alias('f', z.boolean().optional())
-})
-    .strict();
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.uuid().optional().alias('i'),
+    displayName: z.string().optional().alias('n'),
+    force: z.boolean().optional().alias('f')
+});
 class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_REMOVE;
@@ -26,10 +24,10 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => options.id || options.displayName, {
-            message: 'Specify either id or displayName'
+            error: 'Specify either id or displayName'
         })
             .refine(options => !(options.id && options.displayName), {
-            message: 'Specify either id or displayName but not both'
+            error: 'Specify either id or displayName but not both'
         });
     }
     async commandAction(logger, args) {

package/dist/m365/entra/commands/license/license-list.js

@@ -2,7 +2,7 @@ import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { globalOptionsZod } from '../../../../Command.js';
-const options = globalOptionsZod.strict();
+export const options = globalOptionsZod.strict();
 class EntraLicenseListCommand extends GraphCommand {
     get name() {
         return commands.LICENSE_LIST;

package/dist/m365/entra/commands/m365group/m365group-remove.js

@@ -89,7 +89,7 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
             await logger.logToStderr(`Deleting the group site: '${url}'...`);
         }
         const requestOptions = {
-            url: `${spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${url}'`,
+            url: `${spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${formatting.encodeQueryParameter(url)}'`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },