@pnp/cli-microsoft365 12.0.0-beta.c9bd7f3 → 12.0.0-beta.d0b29c1

package/dist/googleAnalytics.js

@@ -0,0 +1,96 @@
+import Axios from 'axios';
+import Configstore from 'configstore';
+import crypto from 'crypto';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import url from 'url';
+import config from './config.js';
+import { app } from './utils/app.js';
+const measurementId = 'G-4BNT8MQCYT';
+const apiSecret = 'mm_3WD_TRuO-9MKsuZnhDQ';
+const endpoint = 'https://www.google-analytics.com/mp/collect';
+const clientIdSetting = 'telemetryClientId';
+const requestTimeout = 3000;
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+const commonProperties = {
+    version: `${app.packageJson().version}${fs.existsSync(path.join(__dirname, `..${path.sep}src`)) ? '-dev' : ''}`,
+    node: process.version,
+    os: os.platform(),
+    env: process.env.CLIMICROSOFT365_ENV ?? '',
+    ci: Boolean(process.env.CI).toString()
+};
+function getClientId() {
+    const store = new Configstore(config.configstoreName);
+    let clientId = store.get(clientIdSetting);
+    if (!clientId) {
+        clientId = crypto.randomUUID();
+        store.set(clientIdSetting, clientId);
+    }
+    return clientId;
+}
+function getSessionId(sessionId) {
+    return parseInt(crypto.createHash('sha256').update(sessionId).digest('hex').substring(0, 12), 16);
+}
+function toEventValue(value) {
+    if (typeof value === 'number') {
+        return value;
+    }
+    return String(value);
+}
+function getEvents(commandName, properties, context) {
+    const sessionId = getSessionId(context.sessionId);
+    const eventProperties = Object.entries(properties).reduce((result, [name, value]) => {
+        if (typeof value !== 'undefined') {
+            result[name] = toEventValue(value);
+        }
+        return result;
+    }, {});
+    return [{
+            name: 'command_used',
+            params: {
+                ['command_name']: commandName,
+                ...commonProperties,
+                shell: context.shell,
+                ...eventProperties,
+                ['session_id']: sessionId,
+                ['engagement_time_msec']: 1
+            }
+        }];
+}
+async function sendEvents(events) {
+    const clientId = getClientId();
+    const response = await Axios.post(`${endpoint}?measurement_id=${measurementId}&api_secret=${apiSecret}`, {
+        ['client_id']: clientId,
+        events
+    }, {
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        timeout: requestTimeout,
+        validateStatus: () => true
+    });
+    if (response.status < 200 || response.status >= 300) {
+        throw new Error(`Google Analytics returned ${response.status}`);
+    }
+}
+export const googleAnalytics = {
+    commonProperties,
+    trackEvent: async (commandName, properties, context) => {
+        await sendEvents(getEvents(commandName, properties, context));
+    },
+    trackException: async (exception, context) => {
+        const description = exception instanceof Error ? exception.message : String(exception);
+        await sendEvents([{
+                name: 'exception',
+                params: {
+                    description: description.substring(0, 100),
+                    ...commonProperties,
+                    shell: context.shell,
+                    ['session_id']: getSessionId(context.sessionId),
+                    ['engagement_time_msec']: 1
+                }
+            }]);
+    }
+};
+//# sourceMappingURL=googleAnalytics.js.map

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

@@ -32,10 +32,6 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.skipRecycleBin) {
-            await this.warn(logger, `Option 'skipRecycleBin' is deprecated. Please use 'permanent' instead.`);
-            args.options.permanent = true;
-        }
         const removeGroup = async () => {
             if (this.verbose) {
                 await logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id || args.options.displayName}...`);
@@ -173,7 +169,7 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: (!(!args.options.force)).toString(),
-            permanent: !!(args.options.permanent || args.options.skipRecycleBin)
+            permanent: !!args.options.permanent
         });
     });
 }, _EntraM365GroupRemoveCommand_initOptions = function _EntraM365GroupRemoveCommand_initOptions() {
@@ -185,8 +181,6 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
         option: '-f, --force'
     }, {
         option: '--permanent'
-    }, {
-        option: '--skipRecycleBin'
     });
 }, _EntraM365GroupRemoveCommand_initValidators = function _EntraM365GroupRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -199,7 +193,7 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     this.optionSets.push({ options: ['id', 'displayName'] });
 }, _EntraM365GroupRemoveCommand_initTypes = function _EntraM365GroupRemoveCommand_initTypes() {
     this.types.string.push('id', 'displayName');
-    this.types.boolean.push('permanent', 'skipRecycleBin');
+    this.types.boolean.push('permanent');
 };
 EntraM365GroupRemoveCommand.maxRetries = 10;
 export default new EntraM365GroupRemoveCommand();

package/dist/m365/spfx/commands/SpfxCompatibilityMatrix.js

@@ -653,6 +653,21 @@ export const versions = {
             range: '^4 || ^5 || ^6 || ^7',
             fix: 'npm i -g yo@7'
         }
+    },
+    '1.24.0-rc.0': {
+        heft: {
+            range: '^1',
+            fix: 'npm i -g @rushstack/heft@1'
+        },
+        node: {
+            range: '>=22.14.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0',
+            fix: 'Install Node.js >=22.14.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0'
+        },
+        sp: SharePointVersion.SPO,
+        yo: {
+            range: '^4 || ^5 || ^6 || ^7',
+            fix: 'npm i -g yo@7'
+        }
     }
 };
 //# sourceMappingURL=SpfxCompatibilityMatrix.js.map

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.24.0-rc.0.js

@@ -0,0 +1,19 @@
+import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
+import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
+import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react.js';
+import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
+import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
+import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
+import { FN002022_DEVDEP_typescript } from './rules/FN002022_DEVDEP_typescript.js';
+import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
+export default [
+    new FN001008_DEP_react({ supportedRange: '18' }),
+    new FN001009_DEP_react_dom({ supportedRange: '18' }),
+    new FN001035_DEP_fluentui_react({ supportedRange: '^8.106.4' }),
+    new FN002013_DEVDEP_types_webpack_env({ supportedRange: '~1.15.2' }),
+    new FN002015_DEVDEP_types_react({ supportedRange: '18' }),
+    new FN002016_DEVDEP_types_react_dom({ supportedRange: '18' }),
+    new FN002022_DEVDEP_typescript({ supportedRange: '~5.8.0' }),
+    new FN021001_PKG_spfx_deps_versions_match_project_version({ includeDevDeps: true })
+];
+//# sourceMappingURL=doctor-1.24.0-rc.0.js.map

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -78,7 +78,8 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.22.1',
             '1.22.2',
             '1.23.0',
-            '1.23.2'
+            '1.23.2',
+            '1.24.0-rc.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN012021_TSC_excludeDirectories.js

@@ -0,0 +1,43 @@
+import { JsonRule } from '../../JsonRule.js';
+export class FN012021_TSC_excludeDirectories extends JsonRule {
+    constructor(options) {
+        super();
+        this.directories = options.directories;
+    }
+    get id() {
+        return 'FN012021';
+    }
+    get title() {
+        return 'tsconfig.json watchOptions.excludeDirectories property';
+    }
+    get description() {
+        return `Update tsconfig.json watchOptions.excludeDirectories property`;
+    }
+    get resolution() {
+        return `{
+  "watchOptions": {
+    "excludeDirectories": ${JSON.stringify(this.directories)}
+  }
+}`;
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './tsconfig.json';
+    }
+    visit(project, findings) {
+        if (!project.tsConfigJson) {
+            return;
+        }
+        if (!project.tsConfigJson.watchOptions?.excludeDirectories ||
+            JSON.stringify(project.tsConfigJson.watchOptions.excludeDirectories) !== JSON.stringify(this.directories)) {
+            const node = this.getAstNodeFromFile(project.tsConfigJson, 'watchOptions.excludeDirectories');
+            this.addFindingWithPosition(findings, node);
+        }
+    }
+}
+//# sourceMappingURL=FN012021_TSC_excludeDirectories.js.map

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN027002_OVERRIDES_qs.js

@@ -0,0 +1,33 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN027002_OVERRIDES_qs extends DependencyRule {
+    constructor(options) {
+        super({ packageName: 'qs', packageVersion: options.version, isOverride: true });
+    }
+    get id() {
+        return 'FN027002';
+    }
+    visit(project, findings) {
+        // If an override entry for the package already exists in package.json,
+        // emit an extra finding to remove the existing override first. This avoids
+        // having to use a separate remove-override rule (e.g. FN027002) in the upgrade scripts.
+        if (project.packageJson?.overrides?.[this.packageName] &&
+            project.packageJson.overrides[this.packageName] !== this.packageVersion) {
+            const node = this.getAstNodeFromFile(project.packageJson, `overrides.${this.packageName}`);
+            findings.push({
+                id: `${this.id}_REMOVE`,
+                title: this.packageName,
+                description: `Remove existing SharePoint Framework override dependency package ${this.packageName}`,
+                occurrences: [{
+                        file: this.file,
+                        resolution: `removeOverride overrides.${this.packageName}`,
+                        position: this.getPositionFromNode(node)
+                    }],
+                resolutionType: 'cmd',
+                severity: 'Required',
+                supersedes: []
+            });
+        }
+        super.visit(project, findings);
+    }
+}
+//# sourceMappingURL=FN027002_OVERRIDES_qs.js.map

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN027003_OVERRIDES_uuid.js

@@ -0,0 +1,33 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN027003_OVERRIDES_uuid extends DependencyRule {
+    constructor(options) {
+        super({ packageName: 'uuid', packageVersion: options.version, isOverride: true });
+    }
+    get id() {
+        return 'FN027003';
+    }
+    visit(project, findings) {
+        // If an override entry for the package already exists in package.json,
+        // emit an extra finding to remove the existing override first. This avoids
+        // having to use a separate remove-override rule (e.g. FN027003) in the upgrade scripts.
+        if (project.packageJson?.overrides?.[this.packageName] &&
+            project.packageJson.overrides[this.packageName] !== this.packageVersion) {
+            const node = this.getAstNodeFromFile(project.packageJson, `overrides.${this.packageName}`);
+            findings.push({
+                id: `${this.id}_REMOVE`,
+                title: this.packageName,
+                description: `Remove existing SharePoint Framework override dependency package ${this.packageName}`,
+                occurrences: [{
+                        file: this.file,
+                        resolution: `removeOverride overrides.${this.packageName}`,
+                        position: this.getPositionFromNode(node)
+                    }],
+                resolutionType: 'cmd',
+                severity: 'Required',
+                supersedes: []
+            });
+        }
+        super.visit(project, findings);
+    }
+}
+//# sourceMappingURL=FN027003_OVERRIDES_uuid.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.24.0-rc.0.js

@@ -0,0 +1,77 @@
+import { FN001001_DEP_microsoft_sp_core_library } from './rules/FN001001_DEP_microsoft_sp_core_library.js';
+import { FN001002_DEP_microsoft_sp_lodash_subset } from './rules/FN001002_DEP_microsoft_sp_lodash_subset.js';
+import { FN001003_DEP_microsoft_sp_office_ui_fabric_core } from './rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core.js';
+import { FN001004_DEP_microsoft_sp_webpart_base } from './rules/FN001004_DEP_microsoft_sp_webpart_base.js';
+import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
+import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
+import { FN001011_DEP_microsoft_sp_dialog } from './rules/FN001011_DEP_microsoft_sp_dialog.js';
+import { FN001012_DEP_microsoft_sp_application_base } from './rules/FN001012_DEP_microsoft_sp_application_base.js';
+import { FN001013_DEP_microsoft_decorators } from './rules/FN001013_DEP_microsoft_decorators.js';
+import { FN001014_DEP_microsoft_sp_listview_extensibility } from './rules/FN001014_DEP_microsoft_sp_listview_extensibility.js';
+import { FN001021_DEP_microsoft_sp_property_pane } from './rules/FN001021_DEP_microsoft_sp_property_pane.js';
+import { FN001023_DEP_microsoft_sp_component_base } from './rules/FN001023_DEP_microsoft_sp_component_base.js';
+import { FN001024_DEP_microsoft_sp_diagnostics } from './rules/FN001024_DEP_microsoft_sp_diagnostics.js';
+import { FN001025_DEP_microsoft_sp_dynamic_data } from './rules/FN001025_DEP_microsoft_sp_dynamic_data.js';
+import { FN001026_DEP_microsoft_sp_extension_base } from './rules/FN001026_DEP_microsoft_sp_extension_base.js';
+import { FN001027_DEP_microsoft_sp_http } from './rules/FN001027_DEP_microsoft_sp_http.js';
+import { FN001028_DEP_microsoft_sp_list_subscription } from './rules/FN001028_DEP_microsoft_sp_list_subscription.js';
+import { FN001029_DEP_microsoft_sp_loader } from './rules/FN001029_DEP_microsoft_sp_loader.js';
+import { FN001030_DEP_microsoft_sp_module_interfaces } from './rules/FN001030_DEP_microsoft_sp_module_interfaces.js';
+import { FN001031_DEP_microsoft_sp_odata_types } from './rules/FN001031_DEP_microsoft_sp_odata_types.js';
+import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_microsoft_sp_page_context.js';
+import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.js';
+import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
+import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
+import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
+import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
+import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
+import { FN002030_DEVDEP_microsoft_spfx_web_build_rig } from './rules/FN002030_DEVDEP_microsoft_spfx_web_build_rig.js';
+import { FN002031_DEVDEP_rushstack_heft } from './rules/FN002031_DEVDEP_rushstack_heft.js';
+import { FN002034_DEVDEP_microsoft_spfx_heft_plugins } from './rules/FN002034_DEVDEP_microsoft_spfx_heft_plugins.js';
+import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
+import { FN012021_TSC_excludeDirectories } from './rules/FN012021_TSC_excludeDirectories.js';
+import { FN020001_RES_types_react } from './rules/FN020001_RES_types_react.js';
+import { FN021003_PKG_engines_node } from './rules/FN021003_PKG_engines_node.js';
+import { FN027001_OVERRIDES_rushstack_heft } from './rules/FN027001_OVERRIDES_rushstack_heft.js';
+import { FN027002_OVERRIDES_qs } from './rules/FN027002_OVERRIDES_qs.js';
+import { FN027003_OVERRIDES_uuid } from './rules/FN027003_OVERRIDES_uuid.js';
+export default [
+    new FN001001_DEP_microsoft_sp_core_library({ packageVersion: '1.24.0-rc.0' }),
+    new FN001002_DEP_microsoft_sp_lodash_subset({ packageVersion: '1.24.0-rc.0' }),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core({ packageVersion: '1.24.0-rc.0' }),
+    new FN001004_DEP_microsoft_sp_webpart_base({ packageVersion: '1.24.0-rc.0' }),
+    new FN001008_DEP_react({ packageVersion: '18.3.1' }),
+    new FN001009_DEP_react_dom({ packageVersion: '18.3.1' }),
+    new FN001011_DEP_microsoft_sp_dialog({ packageVersion: '1.24.0-rc.0' }),
+    new FN001012_DEP_microsoft_sp_application_base({ packageVersion: '1.24.0-rc.0' }),
+    new FN001014_DEP_microsoft_sp_listview_extensibility({ packageVersion: '1.24.0-rc.0' }),
+    new FN001021_DEP_microsoft_sp_property_pane({ packageVersion: '1.24.0-rc.0' }),
+    new FN001023_DEP_microsoft_sp_component_base({ packageVersion: '1.24.0-rc.0' }),
+    new FN001024_DEP_microsoft_sp_diagnostics({ packageVersion: '1.24.0-rc.0' }),
+    new FN001025_DEP_microsoft_sp_dynamic_data({ packageVersion: '1.24.0-rc.0' }),
+    new FN001026_DEP_microsoft_sp_extension_base({ packageVersion: '1.24.0-rc.0' }),
+    new FN001027_DEP_microsoft_sp_http({ packageVersion: '1.24.0-rc.0' }),
+    new FN001028_DEP_microsoft_sp_list_subscription({ packageVersion: '1.24.0-rc.0' }),
+    new FN001029_DEP_microsoft_sp_loader({ packageVersion: '1.24.0-rc.0' }),
+    new FN001030_DEP_microsoft_sp_module_interfaces({ packageVersion: '1.24.0-rc.0' }),
+    new FN001031_DEP_microsoft_sp_odata_types({ packageVersion: '1.24.0-rc.0' }),
+    new FN001032_DEP_microsoft_sp_page_context({ packageVersion: '1.24.0-rc.0' }),
+    new FN001013_DEP_microsoft_decorators({ packageVersion: '1.24.0-rc.0' }),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base({ packageVersion: '1.24.0-rc.0' }),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces({ packageVersion: '1.24.0-rc.0' }),
+    new FN002015_DEVDEP_types_react({ packageVersion: '18.2.79' }),
+    new FN002016_DEVDEP_types_react_dom({ packageVersion: '18.2.25' }),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx({ packageVersion: '1.24.0-rc.0' }),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx({ packageVersion: '1.24.0-rc.0' }),
+    new FN002030_DEVDEP_microsoft_spfx_web_build_rig({ packageVersion: '1.24.0-rc.0' }),
+    new FN002031_DEVDEP_rushstack_heft({ packageVersion: '1.3.2' }),
+    new FN002034_DEVDEP_microsoft_spfx_heft_plugins({ packageVersion: '1.24.0-rc.0' }),
+    new FN010001_YORC_version({ version: '1.24.0-rc.0' }),
+    new FN012021_TSC_excludeDirectories({ directories: ['**/teams', '**/temp/copilot'] }),
+    new FN020001_RES_types_react({ packageVersion: '18.2.79' }),
+    new FN021003_PKG_engines_node({ version: '>=22.14.0 <23.0.0 || >=24.0.0 <25.0.0 || >=26.0.0 <27.0.0' }),
+    new FN027001_OVERRIDES_rushstack_heft({ version: '1.3.2' }),
+    new FN027002_OVERRIDES_qs({ version: '>=6.15.2' }),
+    new FN027003_OVERRIDES_uuid({ version: '>=11.1.1' })
+];
+//# sourceMappingURL=upgrade-1.24.0-rc.0.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 // Uncomment to support upgrading to preview releases
-// import { prerelease } from 'semver';
+import { prerelease } from 'semver';
 import { z } from 'zod';
 import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
@@ -87,7 +87,8 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.22.1',
             '1.22.2',
             '1.23.0',
-            '1.23.2'
+            '1.23.2',
+            '1.24.0-rc.0'
         ];
     }
     async commandAction(logger, args) {
@@ -97,15 +98,15 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // Uncomment to support upgrading to preview releases
-        // if (!args.options.toVersion &&
-        //   !args.options.preview &&
-        //   prerelease(this.toVersion)) {
-        //   // no version and no preview specified while the current version to
-        //   // upgrade to is a prerelease so let's grab the first non-preview version
-        //   // since we're supporting only one preview version, it's sufficient for
-        //   // us to take second to last version
-        //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if (!args.options.toVersion &&
+            !args.options.preview &&
+            prerelease(this.toVersion)) {
+            // no version and no preview specified while the current version to
+            // upgrade to is a prerelease so let's grab the first non-preview version
+            // since we're supporting only one preview version, it's sufficient for
+            // us to take second to last version
+            this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'powershell';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {

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

@@ -1,17 +1,34 @@
-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 _SpoAppAddCommand_instances, _SpoAppAddCommand_initTelemetry, _SpoAppAddCommand_initOptions, _SpoAppAddCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { SpoAppBaseCommand } from './SpoAppBaseCommand.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    filePath: z.string()
+        .refine(filePath => fs.existsSync(path.resolve(filePath)), {
+        error: e => `File '${path.resolve(e.input)}' not found`,
+        abort: true
+    })
+        .refine(filePath => !fs.lstatSync(path.resolve(filePath)).isDirectory(), {
+        error: e => `Path '${path.resolve(e.input)}' points to a directory`
+    })
+        .alias('p'),
+    overwrite: z.boolean().optional(),
+    appCatalogScope: zod.coercedEnum({ tenant: 'tenant', sitecollection: 'sitecollection' }).optional().alias('s'),
+    appCatalogUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .optional()
+        .alias('u')
+});
 class SpoAppAddCommand extends SpoAppBaseCommand {
     get name() {
         return commands.APP_ADD;
@@ -19,13 +36,18 @@ class SpoAppAddCommand extends SpoAppBaseCommand {
     get description() {
         return 'Adds an app to the specified SharePoint Online app catalog';
     }
-    constructor() {
-        super();
-        _SpoAppAddCommand_instances.add(this);
-        this.appCatalogScopeOptions = ['tenant', 'sitecollection'];
-        __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.appCatalogScope !== 'sitecollection' || opts.appCatalogUrl !== undefined, {
+            error: 'You must specify appCatalogUrl when appCatalogScope is sitecollection',
+            path: ['appCatalogUrl'],
+            params: {
+                customCode: 'required'
+            }
+        });
     }
     async commandAction(logger, args) {
         const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
@@ -60,48 +82,5 @@ class SpoAppAddCommand extends SpoAppBaseCommand {
         }
     }
 }
-_SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = function _SpoAppAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            overwrite: !!args.options.overwrite,
-            appCatalogScope: args.options.appCatalogScope || 'tenant',
-            appCatalogUrl: typeof args.options.appCatalogUrl !== 'undefined'
-        });
-    });
-}, _SpoAppAddCommand_initOptions = function _SpoAppAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-p, --filePath <filePath>'
-    }, {
-        option: '-s, --appCatalogScope [appCatalogScope]',
-        autocomplete: this.appCatalogScopeOptions
-    }, {
-        option: '-u, --appCatalogUrl [appCatalogUrl]'
-    }, {
-        option: '--overwrite [overwrite]'
-    });
-}, _SpoAppAddCommand_initValidators = function _SpoAppAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appCatalogScope) {
-            const appCatalogScope = args.options.appCatalogScope.toLowerCase();
-            if (this.appCatalogScopeOptions.indexOf(appCatalogScope) === -1) {
-                return `${args.options.appCatalogScope} is not a valid appCatalogScope. Allowed values are: ${this.appCatalogScopeOptions.join(', ')}`;
-            }
-            if (appCatalogScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when appCatalogScope is sitecollection`;
-            }
-        }
-        const fullPath = path.resolve(args.options.filePath);
-        if (!fs.existsSync(fullPath)) {
-            return `File '${fullPath}' not found`;
-        }
-        if (fs.lstatSync(fullPath).isDirectory()) {
-            return `Path '${fullPath}' points to a directory`;
-        }
-        if (args.options.appCatalogUrl) {
-            return validation.isValidSharePointUrl(args.options.appCatalogUrl);
-        }
-        return true;
-    });
-};
 export default new SpoAppAddCommand();
 //# sourceMappingURL=app-add.js.map