@servicetitan/startup 39.1.0 → 39.2.0

package/src/cli/commands/utils/__tests__/purge-cache.test.ts

@@ -1,40 +1,42 @@
 import { runCommandOutput } from '../../../utils';
+import { getUnpkgHost } from '../get-unpkg-host';
 import { purgeCache } from '../purge-cache';
 
+jest.mock('@servicetitan/install', () => ({ isCI: jest.fn() }));
 jest.mock('../../../utils', () => ({
     ...jest.requireActual('../../../utils'),
     runCommandOutput: jest.fn(),
 }));
+jest.mock('../get-unpkg-host', () => ({
+    getUnpkgHost: jest.fn(),
+}));
 
 describe(purgeCache.name, () => {
-    let args: Parameters<typeof purgeCache>[0];
+    const unpkgHost = 'https://foo.com';
     const packageName = '@servicetitan/foo';
+    const registry = 'https://bar.com';
     const tag = 'prod';
+    let args: Parameters<typeof purgeCache>[0];
 
     beforeEach(() => {
         jest.clearAllMocks();
-        args = { packageName, tag };
+        jest.mocked(getUnpkgHost).mockReturnValue(unpkgHost);
+        args = { packageName, registry, tag };
     });
 
     const subject = () => purgeCache(args);
 
-    test('runs mfe-purge-cache with host "https://unpkg.servicetitan.com", package name and tag', () => {
+    test('fetches host for registry', () => {
         subject();
 
-        expect(runCommandOutput).toHaveBeenCalledWith(
-            `npx startup mfe-purge-cache --host https://unpkg.servicetitan.com --package-name ${packageName} --tag ${tag}`
-        );
+        expect(getUnpkgHost).toHaveBeenCalledWith(registry);
     });
 
-    describe('when registry is "https://verdaccio.st.dev"', () => {
-        beforeEach(() => (args.registry = 'https://verdaccio.st.dev'));
-
-        test('runs mfe-purge-cache with host "https://unpkg.st.dev"', () => {
-            subject();
+    test('runs mfe-purge-cache', () => {
+        subject();
 
-            expect(runCommandOutput).toHaveBeenCalledWith(
-                expect.stringContaining(`--host https://unpkg.st.dev`)
-            );
-        });
+        expect(runCommandOutput).toHaveBeenCalledWith(
+            `npx startup mfe-purge-cache --host ${unpkgHost} --package-name ${packageName} --tag ${tag}`
+        );
     });
 });

package/src/cli/commands/utils/get-mfe-registry.ts

@@ -0,0 +1,6 @@
+export const PROD_MFE_REGISTRY = 'https://verdaccio.servicetitan.com';
+export const DEV_MFE_REGISTRY = 'https://verdaccio.st.dev';
+
+export function getMfeRegistry(registry?: string): string {
+    return registry ?? PROD_MFE_REGISTRY;
+}

package/src/cli/commands/utils/get-unpkg-host.ts

@@ -0,0 +1,8 @@
+import { DEV_MFE_REGISTRY, getMfeRegistry } from './get-mfe-registry';
+
+const PROD_UNPKG_HOST = 'https://unpkg.servicetitan.com';
+const DEV_UNPKG_HOST = 'https://unpkg.st.dev';
+
+export function getUnpkgHost(registry?: string): string {
+    return getMfeRegistry(registry) === DEV_MFE_REGISTRY ? DEV_UNPKG_HOST : PROD_UNPKG_HOST;
+}

package/src/cli/commands/utils/index.ts

@@ -1,3 +1,5 @@
 export * from './build-rollback-tag';
-export * from './constants';
+export * from './get-mfe-registry';
+export * from './get-unpkg-host';
+export * from './login';
 export * from './purge-cache';

package/src/cli/commands/utils/login.ts

@@ -0,0 +1,38 @@
+import { npmWhoAmI } from '@servicetitan/install';
+import chalk from 'chalk';
+import readline from 'readline/promises';
+import { isTTY, runCommand } from '../../utils';
+import { DEV_MFE_REGISTRY, PROD_MFE_REGISTRY } from './get-mfe-registry';
+
+const OKTA_REGISTRIES: string[] = [PROD_MFE_REGISTRY, DEV_MFE_REGISTRY];
+
+export async function login(registry: string) {
+    if (npmWhoAmI({ registry }) !== undefined) {
+        return;
+    }
+
+    if (!OKTA_REGISTRIES.includes(registry)) {
+        throw new Error(`Registry ${registry} is not recognized. Please log in manually.`);
+    }
+
+    const message = `This machine is not authorized to access ${registry}.`;
+    if (!isTTY()) {
+        throw new Error(message);
+    }
+
+    const answer = await ask(chalk.bold.cyan(`${message} Authorize? [Y/n] `));
+    if (answer && answer !== 'y') {
+        throw new Error('Not authorized');
+    }
+
+    await runCommand(`npx --yes verdaccio-okta-oauth@latest --registry=${registry}`, {
+        quiet: true,
+    });
+}
+
+async function ask(question: string) {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const answer = await rl.question(question);
+    rl.close();
+    return answer.trim().toLowerCase();
+}

package/src/cli/commands/utils/purge-cache.ts

@@ -1,12 +1,9 @@
 import { runCommandOutput } from '../../utils';
-
-const DEV_MFE_REGISTRY = 'https://verdaccio.st.dev';
-const DEFAULT_UNPKG_HOST = 'https://unpkg.servicetitan.com';
-const DEV_UNPKG_HOST = 'https://unpkg.st.dev';
+import { getUnpkgHost } from './get-unpkg-host';
 
 export function purgeCache(options: { packageName: string; registry?: string; tag: string }) {
     const { packageName, registry, tag } = options;
-    const host = registry === DEV_MFE_REGISTRY ? DEV_UNPKG_HOST : DEFAULT_UNPKG_HOST;
+    const host = getUnpkgHost(registry);
     runCommandOutput(
         `npx startup mfe-purge-cache --host ${host} --package-name ${packageName} --tag ${tag}`
     );

package/src/cli/index.ts

@@ -40,7 +40,8 @@ function addCommand(name: CommandName, y: typeof yargs) {
     const { description, options: { _, ...options } = {} } = entry;
     const nameWithArgs = name + (_?.description ? ` ${_.description}` : '');
     const groupedOptions = Object.entries(options).reduce((result, [key, value]) => {
-        result[kebabCase(key)] = { group: 'Command Options:', ...value };
+        const suffix = /\W+$/.exec(key)?.[0] ?? ''; // fix for kebabCase dropping `\u00A0` suffixes
+        result[kebabCase(key) + suffix] = { group: 'Command Options:', ...value };
         return result;
     }, {} as CommandOptions);
     const handler = (argv: any) => handleCommand(name, argv);

package/dist/cli/commands/utils/constants.d.ts

@@ -1,2 +0,0 @@
-export declare const DEFAULT_MFE_REGISTRY = "https://verdaccio.servicetitan.com";
-//# sourceMappingURL=constants.d.ts.map

package/dist/cli/commands/utils/constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,uCAAuC,CAAC"}

package/dist/cli/commands/utils/constants.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "DEFAULT_MFE_REGISTRY", {
-    enumerable: true,
-    get: function() {
-        return DEFAULT_MFE_REGISTRY;
-    }
-});
-const DEFAULT_MFE_REGISTRY = 'https://verdaccio.servicetitan.com';
-
-//# sourceMappingURL=constants.js.map

package/dist/cli/commands/utils/constants.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/cli/commands/utils/constants.ts"],"sourcesContent":["export const DEFAULT_MFE_REGISTRY = 'https://verdaccio.servicetitan.com';\n"],"names":["DEFAULT_MFE_REGISTRY"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,uBAAuB"}

package/src/cli/commands/utils/constants.ts

@@ -1 +0,0 @@
-export const DEFAULT_MFE_REGISTRY = 'https://verdaccio.servicetitan.com';