@optimizely/ocp-cli 1.2.7 → 1.2.9

package/dist/test/packageManagerHandler.test.js

@@ -0,0 +1,175 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/* tslint:disable:max-line-length */
+const packageManagerHandler_1 = require("../lib/packageManagerHandler");
+const TerminalOutput_1 = require("../lib/TerminalOutput");
+jest.mock('../lib/TerminalOutput', () => ({
+    TerminalOutput: {
+        exec: jest.fn(),
+    },
+}));
+describe('PackageManagerHandler', () => {
+    let packageManager;
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+    describe('isLegacyYarnAvailable', () => {
+        it('should return true when yarn 1.x is available', () => {
+            TerminalOutput_1.TerminalOutput.exec.mockReturnValue({
+                status: 0,
+                stdout: '1.22.19\n',
+                stderr: '',
+            });
+            expect(packageManagerHandler_1.default.isLegacyYarnAvailable()).toBe(true);
+        });
+        it('should return false when yarn 2.x is available', () => {
+            TerminalOutput_1.TerminalOutput.exec.mockReturnValue({
+                status: 0,
+                stdout: '2.0.0\n',
+                stderr: '',
+            });
+            expect(packageManagerHandler_1.default.isLegacyYarnAvailable()).toBe(false);
+        });
+    });
+    describe('upgradeGlobalPackageToLatest', () => {
+        it('should use yarn when the cli is installed using yarn', () => {
+            TerminalOutput_1.TerminalOutput.exec
+                .mockReturnValueOnce({
+                status: 0,
+                stdout: '/foo/bar/yarn/bin/test-cli\n',
+                stderr: '',
+            }) // yarn check
+                .mockReturnValueOnce({ status: 0, stdout: '1.22.0', stderr: '' }) // check for yarn 1.x
+                .mockReturnValueOnce({ status: 0, stdout: 'success', stderr: '' }); // upgrade command
+            packageManager = new packageManagerHandler_1.default('test-package', 'test-cli');
+            const [success, _] = packageManager.upgradeGlobalPackageToLatest();
+            expect(success).toBe(true);
+            expect(TerminalOutput_1.TerminalOutput.exec).toHaveBeenCalledWith('yarn global upgrade test-package --latest');
+        });
+        it('should notify failure when the cli is installed using yarn 1.x but current yarn version is newer than 1.x', () => {
+            TerminalOutput_1.TerminalOutput.exec
+                .mockReturnValueOnce({
+                status: 0,
+                stdout: '/foo/bar/yarn/bin/test-cli\n',
+                stderr: '',
+            }) // yarn check
+                .mockReturnValueOnce({ status: 0, stdout: '2.22.0', stderr: '' }); // check for yarn 1.x
+            packageManager = new packageManagerHandler_1.default('test-package', 'test-cli');
+            const [success, message] = packageManager.upgradeGlobalPackageToLatest();
+            expect(success).toBe(false);
+            expect(message).toContain('not compatible');
+        });
+    });
+    describe('fetchLatestPackage', () => {
+        it('should fetch latest version using --silent flag to avoid messing with the npm output', () => {
+            TerminalOutput_1.TerminalOutput.exec.mockReturnValue({
+                status: 0,
+                stdout: '1.0.0',
+                stderr: '',
+            });
+            packageManager = new packageManagerHandler_1.default('test-package', 'test-cli');
+            const [success, version] = packageManager.fetchLatestPackage();
+            expect(success).toBe(true);
+            expect(version).toBe('1.0.0');
+            expect(TerminalOutput_1.TerminalOutput.exec).toHaveBeenCalledWith(expect.stringContaining('npm show --silent'));
+        });
+    });
+    describe('getPackageDependencies', () => {
+        let mockNpmOutput;
+        beforeEach(() => {
+            mockNpmOutput = JSON.stringify({
+                dependencies: {
+                    'test-pkg': {
+                        version: '1.0.0',
+                        dependencies: {
+                            'nested-test': {
+                                version: '2.0.0',
+                            },
+                        },
+                    },
+                    'other-pkg': {
+                        version: '3.0.0',
+                    },
+                },
+            });
+            TerminalOutput_1.TerminalOutput.exec.mockReturnValue({
+                status: 0,
+                stdout: mockNpmOutput,
+                stderr: '',
+            }); // list command
+        });
+        it('should parse npm dependencies into yarn-like format', () => {
+            const [success, deps] = packageManagerHandler_1.default.getPackageDependencies(/test/);
+            expect(success).toBe(true);
+            expect(deps).toEqual({
+                type: 'tree',
+                data: {
+                    type: 'list',
+                    trees: [
+                        {
+                            name: 'test-pkg@1.0.0',
+                            children: [],
+                            hint: null,
+                            color: 'bold',
+                            depth: 0,
+                        },
+                        {
+                            name: 'nested-test@2.0.0',
+                            children: [],
+                            hint: null,
+                            color: null,
+                            depth: 1,
+                        },
+                    ],
+                },
+            });
+        });
+        it('should call the npm command with the --silent flag to avoid messing up with the ls output', () => {
+            packageManagerHandler_1.default.getPackageDependencies(/other/);
+            expect(TerminalOutput_1.TerminalOutput.exec).toHaveBeenCalledWith(expect.stringContaining('npm ls --silent'));
+        });
+    });
+    describe('getPackageUpgradeCommand', () => {
+        it('should return yarn upgrade command when cli is installed with yarn', () => {
+            TerminalOutput_1.TerminalOutput.exec
+                .mockReturnValueOnce({
+                status: 0,
+                stdout: '/foo/bar/yarn/bin/test-cli\n',
+                stderr: '',
+            }) // yarn check
+                .mockReturnValueOnce({ status: 0, stdout: '1.22.0', stderr: '' }); // check for yarn 1.x
+            packageManager = new packageManagerHandler_1.default('test-package', 'test-cli');
+            const [success, command] = packageManager.getPackageUpgradeCommand();
+            expect(success).toBe(true);
+            expect(command).toBe('yarn global upgrade test-package --latest');
+        });
+        it('should return npm upgrade command when cli is installed with npm', () => {
+            TerminalOutput_1.TerminalOutput.exec.mockReturnValueOnce({
+                status: 0,
+                stdout: '/usr/local/bin/test-cli\n',
+                stderr: '',
+            }); // npm check
+            packageManager = new packageManagerHandler_1.default('test-package', 'test-cli');
+            const [success, command] = packageManager.getPackageUpgradeCommand();
+            expect(success).toBe(true);
+            expect(command).toBe('npm install --global test-package@latest');
+        });
+        it('should return error when yarn version is not 1.x', () => {
+            TerminalOutput_1.TerminalOutput.exec
+                .mockReturnValueOnce({
+                status: 0,
+                stdout: '/foo/bar/yarn/bin/test-cli\n',
+                stderr: '',
+            }) // yarn check
+                .mockReturnValueOnce({ status: 0, stdout: '2.22.0', stderr: '' }); // check for yarn 1.x
+            packageManager = new packageManagerHandler_1.default('test-package', 'test-cli');
+            const [success, message] = packageManager.getPackageUpgradeCommand();
+            expect(success).toBe(false);
+            expect(message).toContain('not compatible');
+        });
+    });
+});
+//# sourceMappingURL=packageManagerHandler.test.js.map

package/dist/test/packageManagerHandler.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"packageManagerHandler.test.js","sourceRoot":"","sources":["../../src/test/packageManagerHandler.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimizely/ocp-cli",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "description": "Optimizely Connect Platform command line interface",
   "repository": "https://github.com/ZaiusInc/ocp-cli",
   "license": "Apache-2.0",

package/src/commands/app/BaseBuildCommand.ts

@@ -80,7 +80,7 @@ export abstract class BaseBuildCommand {
 
     console.log(chalk.gray('Performing local validation...'));
     try {
-      execSync('yarn --silent validate', {stdio: 'inherit'});
+      execSync('yarn validate', {stdio: 'inherit'});
     } catch (e) {
       process.exit(1);
     }

package/src/lib/AppUpdater.ts

@@ -1,5 +1,4 @@
 import * as chalk from 'chalk';
-import * as child_process from 'child_process';
 import fetch from 'node-fetch';
 import {compare, major} from 'semver';
 import {getDependencyFileUrl} from './Config';
@@ -8,6 +7,7 @@ import {TerminalPassthru} from './TeminalPassthru';
 import {TerminalConfirm} from './TerminalConfirm';
 import table = require('text-table');
 import {DependencyStage} from './DependencyStage';
+import PackageManagerHandler from './packageManagerHandler';
 
 export namespace AppUpdater {
   /**
@@ -20,8 +20,6 @@ export namespace AppUpdater {
     ignoreDevUpdates: boolean = true,
     stage: DependencyStage = 'stable'
   ) {
-    ensurePublicPackageUsage();
-
     const response = await fetch(getDependencyFileUrl(runtime));
     const zipModules = await response.json();
     const projectProdDeps = AppUpdater.getPackageDependencies(true);
@@ -127,21 +125,20 @@ export namespace AppUpdater {
 
   export function getPackageDependencies(prod: boolean = false): {[name: string]: string} {
     try {
-      const result = child_process.spawnSync(
-        `yarn --no-progress ${prod ? '--prod ' : ''}-s list --json --pattern=@zaiusinc/ --non-interactive`,
-        {cwd: process.cwd(), shell: true}
+      const [success, result] = PackageManagerHandler.getPackageDependencies(
+        /@zaiusinc\//,
+        prod
       );
 
-      if (result.status === 0) {
-        const tree = JSON.parse(result.stdout.toString());
+      if (success) {
         const output: {[name: string]: string} = {};
-        for (const item of tree.data.trees) {
+        for (const item of result.data.trees) {
           const [name, version] = item.name.split(/(?!^)@/);
           output[name] = version;
         }
         return output;
       } else {
-        console.error(result.stderr.toString());
+        console.error(result);
       }
     } catch (e) {
       console.error(e);
@@ -153,34 +150,4 @@ export namespace AppUpdater {
   function isCurrent(ocpVersion: string, projectModuleversion: string) {
     return compare(ocpVersion, projectModuleversion) === 0;
   }
-
-  function ensurePublicPackageUsage() {
-    try {
-      const result = child_process.spawnSync(
-        'yarn --no-progress --prod -s list --json --pattern="@zaius/app-sdk|@zaius/node-sdk" --non-interactive',
-        {cwd: process.cwd(), shell: true}
-      );
-
-      if (result.status === 0) {
-        const tree = JSON.parse(result.stdout.toString());
-        if (!tree.data.trees.length) {
-          return;
-        }
-
-        console.log(
-          chalk.red(
-            '@zaius/app-sdk & @zaius/node-sdk are no longer supported.  ' +
-            'Please update your package.json to use the @zaiusinc scope for these packages.'
-          )
-        );
-        process.exit(1);
-      } else {
-        console.error(result.stderr.toString());
-      }
-    } catch (e) {
-      console.error(e);
-    }
-    console.log(chalk.red("Unable to get package dependencies. Are you in your app's working directory?"));
-    process.exit(1);
-  }
 }

package/src/lib/checkForUpdate.ts

@@ -4,9 +4,8 @@ import * as os from 'os';
 import * as path from 'path';
 import * as semver from 'semver';
 import { ManifestDefinition } from 'oo-cli/dist/types/manifest';
-import { TerminalOutput } from './TerminalOutput';
 import { TerminalConfirm } from './TerminalConfirm';
-import { TerminalPassthru } from './TeminalPassthru';
+import PackageManagerHandler from './packageManagerHandler';
 
 interface LastCheck {
   date: Date;
@@ -20,13 +19,24 @@ export async function checkForUpdate(manifest: ManifestDefinition, noPrompt: boo
   const installed = manifest.package?.version!;
   const prerelease = semver.prerelease(installed);
   const isBeta = prerelease && prerelease[0] === 'beta';
+  const packageManagerHandler = new PackageManagerHandler(
+    '@optimizely/ocp-cli',
+    'ocp'
+  );
 
   if (isBeta) {
+    const [success, result] = packageManagerHandler.getPackageUpgradeCommand();
+    if (!success) {
+      console.log(chalk.red(result));
+      return;
+    }
     console.log(
-        chalk.yellow(
-            `You are running beta version (${installed})'. ` +
-            `${chalk.italic.grey('yarn global upgrade @optimizely/ocp-cli --latest')} to upgrade to the latest release version`
-        )
+      chalk.yellow(
+        `You are running beta version (${installed})'. ` +
+          `Run ${chalk.italic.grey(
+            `${result}`
+          )} to upgrade to the latest release version`
+      )
     );
     return;
   }
@@ -41,13 +51,18 @@ export async function checkForUpdate(manifest: ManifestDefinition, noPrompt: boo
 
   try {
     let upToDate = true;
-    const latest = await fetchLatest();
-    if (latest) {
+    const [success, latest] = packageManagerHandler.fetchLatestPackage();
+    if (success && latest) {
       if (semver.gt(latest, installed)) {
         upToDate = false;
         if (await TerminalConfirm.ask(
           chalk.yellow('A new version of OCP CLI is available. Update now?'), noPrompt, true)) {
-          TerminalPassthru.exec('yarn global upgrade @optimizely/ocp-cli --latest');
+            const [passed, error] =
+              packageManagerHandler.upgradeGlobalPackageToLatest();
+            if (!passed) {
+              console.log(chalk.red(error));
+              return;
+            }
         }
       }
     }
@@ -57,10 +72,6 @@ export async function checkForUpdate(manifest: ManifestDefinition, noPrompt: boo
   }
 }
 
-async function fetchLatest() {
-  return TerminalOutput.exec('yarn info -s @optimizely/ocp-cli dist-tags.latest').stdout.trim();
-}
-
 function getLastCheck(): LastCheck | undefined {
   const file = path.join(os.homedir(), `.ocp/${LAST_VERSION_CHECK_FILE}`);
   if (fs.existsSync(file)) {

package/src/lib/packageManagerHandler.ts

@@ -0,0 +1,178 @@
+import { TerminalOutput } from './TerminalOutput';
+
+class PackageManagerHandler {
+  public static isLegacyYarnAvailable(): boolean {
+    const [success, output] =
+      PackageManagerHandler.executeCommand('yarn --version');
+    return success && output.startsWith('1.');
+  }
+
+  /**
+   * Retrieves package dependencies based on a scope pattern and production flag.
+   *
+   * @param scope - Regular expression pattern to filter package names
+   * @param prod - When true, only returns production dependencies. Defaults to false
+   * @returns A tuple where:
+   *          - First element is a boolean indicating success/failure
+   *          - Second element is either:
+   *            - On success: An object containing dependency tree data
+   *            - On failure: An error message string
+   *
+   * @remarks
+   * - It uses NPM `ls` and transforms the dependency tree to match Yarn's format
+   *
+   * @throws Will not throw errors directly, but catches and returns them as failure results
+   *
+   * @example
+   * ```typescript
+   * const [success, dependencies] = getPackageDependencies(/^@scope\//, true);
+   * if (success) {
+   *   // Process dependency tree
+   * }
+   * ```
+   */
+  public static getPackageDependencies(
+    scope: RegExp,
+    prod: boolean = false
+  ): [boolean, any] {
+    const command = `npm ls --silent --json ${prod ? '--prod ' : ''}`;
+    try {
+      const [success, output] = PackageManagerHandler.executeCommand(command);
+      if (!success) {
+        return [false, output];
+      }
+
+      // if we're using npm, then we need to parse the tree to have a similar output to yarn
+      const tree = JSON.parse(output);
+      const trees: any[] = [];
+      function collect(deps: Record<string, any> = {}, depth = 0) {
+        for (const [name, info] of Object.entries(deps)) {
+          if (scope.test(name)) {
+            trees.push({
+              name: `${name}@${info.version ?? 'unknown'}`,
+              children: [],
+              hint: null,
+              color: depth === 0 ? 'bold' : null,
+              depth,
+            });
+          }
+          if (info.dependencies) {
+            collect(info.dependencies, depth + 1);
+          }
+        }
+      }
+
+      collect(tree.dependencies);
+
+      return [
+        true,
+        {
+          type: 'tree',
+          data: {
+            type: 'list',
+            trees,
+          },
+        },
+      ];
+    } catch (e) {
+      console.error('Unable to get package dependencies:', e);
+      return [false, 'Unable to get package dependencies.'];
+    }
+  }
+
+  private static executeCommand(command: string): [boolean, string] {
+    const result = TerminalOutput.exec(command);
+    if (result.status === 0) {
+      const output = result.stdout.trim();
+      return [true, output];
+    } else {
+      return [false, result.stderr.trim()];
+    }
+  }
+
+  private targetPackageManager: 'yarn' | 'npm' | 'none' = 'none';
+  constructor(private packageName: string, cli: string) {
+    this.targetPackageManager = this.cliInstalledWith(cli);
+  }
+
+  public getPackageUpgradeCommand(): [boolean, string] {
+    const [possible, error] = this.isUpgradePossible();
+    if (!possible) {
+      return [false, error];
+    }
+
+    return [
+      true,
+      this.useYarn()
+        ? `yarn global upgrade ${this.packageName} --latest`
+        : `npm install --global ${this.packageName}@latest`,
+    ];
+  }
+
+  /**
+   * Upgrades the specified package to its latest version globally.
+   * The function determines whether to use Yarn or NPM based on internal configuration.
+   *
+   * @returns {[boolean, string]} A tuple where:
+   *   - First element (boolean) indicates if the upgrade was successful
+   *   - Second element (string) contains error message if upgrade failed, or success message if upgrade succeeded
+   *
+   * @example
+   * const [success, message] = packageManager.upgradeGlobalPackageToLatest();
+   * if (!success) {
+   *   console.error(`Failed to upgrade package: ${message}`);
+   * }
+   */
+  public upgradeGlobalPackageToLatest(): [boolean, string] {
+    const [possible, error] = this.isUpgradePossible();
+    if (!possible) {
+      return [false, error];
+    }
+
+    const command = this.useYarn()
+      ? `yarn global upgrade ${this.packageName} --latest`
+      : `npm install --global ${this.packageName}@latest`;
+    return PackageManagerHandler.executeCommand(command);
+  }
+
+  public fetchLatestPackage(): [boolean, string] {
+    return PackageManagerHandler.executeCommand(
+      `npm show --silent ${this.packageName} dist-tags.latest`
+    );
+  }
+
+  private isUpgradePossible(): [boolean, string] {
+    if (this.useYarn() && !PackageManagerHandler.isLegacyYarnAvailable()) {
+      return [
+        false,
+        `${this.packageName} is installed using yarn 1.x, but the current version of yarn is not compatible with the upgrade command. Please use npm to install ${this.packageName} instead`,
+      ];
+    }
+    return [true, ''];
+  }
+
+  private cliInstalledWith(cli: string): 'yarn' | 'npm' | 'none' {
+    const whichCommand = process.platform === 'win32' ? 'where' : 'which';
+    const [success, output] = PackageManagerHandler.executeCommand(
+      `${whichCommand} ${cli}`
+    );
+    if (success) {
+      // just in case we have multiple paths, we just take the first one
+      const cliPath = output.split('\n')[0].trim();
+      if (cliPath.includes('yarn')) {
+        // assuming only legacy yarn (1.x) is able to install the cli globally
+        return 'yarn';
+      } else {
+        // else we assume it's npm as this is how we recommend installing the cli
+        return 'npm';
+      }
+    }
+    return 'none';
+  }
+
+  private useYarn(): boolean {
+    return this.targetPackageManager === 'yarn';
+  }
+}
+
+export default PackageManagerHandler;

package/src/test/AppUpdater.test.ts

@@ -0,0 +1,123 @@
+import { AppUpdater } from '../lib/AppUpdater';
+import PackageManagerHandler from '../lib/packageManagerHandler';
+
+jest.mock('../lib/packageManagerHandler');
+
+describe('AppUpdater', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+  describe('getPackageDependencies', () => {
+    it('should parse dependencies correctly', () => {
+      const mockDeps = {
+        type: 'tree',
+        data: {
+          type: 'list',
+          trees: [
+            {
+              name: '@zaiusinc/package1@1.0.0',
+              children: [],
+              hint: null,
+              color: 'bold',
+              depth: 0,
+            },
+            {
+              name: '@zaiusinc/package2@2.0.0',
+              children: [],
+              hint: null,
+              color: 'bold',
+              depth: 0,
+            },
+          ],
+        },
+      };
+
+      (
+        PackageManagerHandler.getPackageDependencies as jest.Mock
+      ).mockReturnValueOnce([true, mockDeps]);
+
+      const result = AppUpdater.getPackageDependencies();
+
+      expect(result).toEqual({
+        '@zaiusinc/package1': '1.0.0',
+        '@zaiusinc/package2': '2.0.0',
+      });
+    });
+
+    it('should handle prod dependencies flag', () => {
+      const mockDeps = {
+        type: 'tree',
+        data: {
+          type: 'list',
+          trees: [
+            {
+              name: '@zaiusinc/package1@1.0.0',
+              children: [],
+              hint: null,
+              color: 'bold',
+              depth: 0,
+            },
+          ],
+        },
+      };
+
+      const mockHandler = (
+        PackageManagerHandler.getPackageDependencies as jest.Mock
+      ).mockReturnValueOnce([true, mockDeps]);
+
+      AppUpdater.getPackageDependencies(true);
+
+      expect(mockHandler).toHaveBeenCalledWith(/@zaiusinc\//, true);
+    });
+
+    describe('error handling', () => {
+      let mockExit: jest.SpyInstance;
+      let mockConsole: jest.SpyInstance;
+      let mockConsoleError: jest.SpyInstance;
+      beforeEach(() => {
+        mockExit = jest
+          .spyOn(process, 'exit')
+          .mockImplementation(() => undefined as never);
+        mockConsole = jest
+          .spyOn(console, 'log')
+          .mockImplementation(() => undefined as never);
+        mockConsoleError = jest
+          .spyOn(console, 'error')
+          .mockImplementation(() => undefined as never);
+      });
+
+      afterEach(() => {
+        mockExit.mockRestore();
+        mockConsole.mockRestore();
+        mockConsoleError.mockRestore();
+      });
+
+      it('should exit with error on package manager failure', () => {
+        (
+          PackageManagerHandler.getPackageDependencies as jest.Mock
+        ).mockReturnValueOnce([false, 'error']);
+
+        AppUpdater.getPackageDependencies();
+
+        expect(mockExit).toHaveBeenCalledWith(1);
+        expect(mockConsoleError).toHaveBeenCalledWith('error');
+      });
+
+      it('should exit with error on exception', () => {
+        (
+          PackageManagerHandler.getPackageDependencies as jest.Mock
+        ).mockImplementation(() => {
+          throw new Error('test error');
+        });
+
+        AppUpdater.getPackageDependencies();
+
+        expect(mockExit).toHaveBeenCalledWith(1);
+        expect(mockConsoleError).toHaveBeenCalledWith(new Error('test error'));
+      });
+    });
+  });
+});