Fix up tests for making --cli-package parameter optional

Author: Peter Hauge

tests/unit/cli/init-command.test.ts

@@ -51,12 +51,13 @@ describe('init-command', () => {
       expect(envOpt?.defaultValue).toBe('dev,prod');
     });
 
-    it('should have --cli-package required option', () => {
+    it('should have --cli-package optional option', () => {
       const cmd = createInitCommand();
       const opts = cmd.options;
       const cliPkgOpt = opts.find((o) => o.long === '--cli-package');
       expect(cliPkgOpt).toBeDefined();
-      expect(cliPkgOpt?.required).toBe(true);
+      // The option itself is not mandatory, but when present it requires a value
+      expect(cliPkgOpt?.mandatory).toBe(false);
     });
 
     it('should have --force option defaulting to false', () => {
@@ -67,11 +68,11 @@ describe('init-command', () => {
       expect(forceOpt?.defaultValue).toBe(false);
     });
 
-    it('should have all required options for non-interactive mode', () => {
+    it('should have all expected options for non-interactive mode', () => {
       const cmd = createInitCommand();
-      const requiredOptions = ['--ci', '--non-interactive', '--artifact-dir', '--environments', '--cli-package', '--force'];
+      const expectedOptions = ['--ci', '--non-interactive', '--artifact-dir', '--environments', '--cli-package', '--force'];
 
-      requiredOptions.forEach((optName) => {
+      expectedOptions.forEach((optName) => {
         const opt = cmd.options.find((o) => o.long === optName);
         expect(opt).toBeDefined();
       });

tests/unit/services/init-service.test.ts

@@ -378,7 +378,7 @@ describe('init-service', () => {
       );
     });
 
-    it('should generate package.json with file: dependency to tarball', async () => {
+    it('should generate package.json with file: dependency to tarball in local mode', async () => {
       const config: InitConfig = {
         ciProvider: 'github-actions',
         nonInteractive: true,
@@ -402,6 +402,49 @@ describe('init-service', () => {
       expect(pkg.dependencies.apiops).toContain('apiops-0.1.0.tgz');
     });
 
+    it('should generate package.json with npm dependency when cliPackage not provided', async () => {
+      const config: InitConfig = {
+        ciProvider: 'github-actions',
+        nonInteractive: true,
+        artifactDir: './apim-artifacts',
+        environments: ['dev'],
+        outputDir: '/test',
+        // cliPackage is omitted — npm mode
+        force: false,
+      };
+
+      const result = await initService.run(config);
+
+      expect(result.configs).toContain('package.json');
+      const pkgCalls = vi.mocked(fs.writeFile).mock.calls.filter(
+        (call) => call[0] === path.join('/test', 'package.json')
+      );
+      expect(pkgCalls).toHaveLength(1);
+      const content = pkgCalls[0][1] as string;
+      const pkg = JSON.parse(content);
+      expect(pkg.dependencies['@peterhauge/apiops-cli']).toBe('latest');
+      expect(pkg.dependencies.apiops).toBeUndefined();
+    });
+
+    it('should NOT copy tarball or create .apiops directory in npm mode', async () => {
+      const config: InitConfig = {
+        ciProvider: 'github-actions',
+        nonInteractive: true,
+        artifactDir: './apim-artifacts',
+        environments: ['dev'],
+        outputDir: '/test',
+        // cliPackage is omitted — npm mode
+        force: false,
+      };
+
+      const result = await initService.run(config);
+
+      // .apiops should NOT be in generated directories
+      expect(result.directories).not.toContain('.apiops');
+      // copyFile should NOT have been called
+      expect(vi.mocked(fs.copyFile)).not.toHaveBeenCalled();
+    });
+
     it('should throw if CLI package tarball does not exist', async () => {
       vi.mocked(fs.access).mockRejectedValue(new Error('ENOENT'));
 

tests/unit/templates/configs/package-json.test.ts

@@ -7,40 +7,79 @@ import { generatePackageJson } from '../../../../src/templates/configs/package-j
 
 describe('configs/package-json', () => {
   describe('generatePackageJson', () => {
-    it('should generate valid JSON', () => {
-      const content = generatePackageJson({ tarballRelPath: '.apiops/apiops-0.1.0.tgz' });
-      expect(() => JSON.parse(content)).not.toThrow();
-    });
+    describe('local mode', () => {
+      it('should generate valid JSON', () => {
+        const content = generatePackageJson({ mode: 'local', tarballRelPath: '.apiops/apiops-0.1.0.tgz' });
+        expect(() => JSON.parse(content)).not.toThrow();
+      });
 
-    it('should include file: dependency for the tarball', () => {
-      const content = generatePackageJson({ tarballRelPath: '.apiops/apiops-0.1.0.tgz' });
-      const pkg = JSON.parse(content);
-      expect(pkg.dependencies.apiops).toBe('file:.apiops/apiops-0.1.0.tgz');
-    });
+      it('should include file: dependency for the tarball', () => {
+        const content = generatePackageJson({ mode: 'local', tarballRelPath: '.apiops/apiops-0.1.0.tgz' });
+        const pkg = JSON.parse(content);
+        expect(pkg.dependencies.apiops).toBe('file:.apiops/apiops-0.1.0.tgz');
+      });
 
-    it('should set private to true', () => {
-      const content = generatePackageJson({ tarballRelPath: '.apiops/apiops-0.1.0.tgz' });
-      const pkg = JSON.parse(content);
-      expect(pkg.private).toBe(true);
-    });
+      it('should set private to true', () => {
+        const content = generatePackageJson({ mode: 'local', tarballRelPath: '.apiops/apiops-0.1.0.tgz' });
+        const pkg = JSON.parse(content);
+        expect(pkg.private).toBe(true);
+      });
 
-    it('should include name and version', () => {
-      const content = generatePackageJson({ tarballRelPath: '.apiops/apiops-0.1.0.tgz' });
-      const pkg = JSON.parse(content);
-      expect(pkg.name).toBeTruthy();
-      expect(pkg.version).toBeTruthy();
-    });
+      it('should include name and version', () => {
+        const content = generatePackageJson({ mode: 'local', tarballRelPath: '.apiops/apiops-0.1.0.tgz' });
+        const pkg = JSON.parse(content);
+        expect(pkg.name).toBeTruthy();
+        expect(pkg.version).toBeTruthy();
+      });
+
+      it('should use forward slashes in dependency path', () => {
+        // Even if path.join produces backslashes on Windows, the output should use /
+        const content = generatePackageJson({ mode: 'local', tarballRelPath: '.apiops\\apiops-0.1.0.tgz' });
+        const pkg = JSON.parse(content);
+        expect(pkg.dependencies.apiops).toBe('file:.apiops/apiops-0.1.0.tgz');
+      });
 
-    it('should use forward slashes in dependency path', () => {
-      // Even if path.join produces backslashes on Windows, the output should use /
-      const content = generatePackageJson({ tarballRelPath: '.apiops\\apiops-0.1.0.tgz' });
-      const pkg = JSON.parse(content);
-      expect(pkg.dependencies.apiops).toBe('file:.apiops/apiops-0.1.0.tgz');
+      it('should end with a newline', () => {
+        const content = generatePackageJson({ mode: 'local', tarballRelPath: '.apiops/apiops-0.1.0.tgz' });
+        expect(content.endsWith('\n')).toBe(true);
+      });
     });
 
-    it('should end with a newline', () => {
-      const content = generatePackageJson({ tarballRelPath: '.apiops/apiops-0.1.0.tgz' });
-      expect(content.endsWith('\n')).toBe(true);
+    describe('npm mode', () => {
+      it('should generate valid JSON', () => {
+        const content = generatePackageJson({ mode: 'npm' });
+        expect(() => JSON.parse(content)).not.toThrow();
+      });
+
+      it('should include @peterhauge/apiops-cli dependency', () => {
+        const content = generatePackageJson({ mode: 'npm' });
+        const pkg = JSON.parse(content);
+        expect(pkg.dependencies['@peterhauge/apiops-cli']).toBe('latest');
+      });
+
+      it('should NOT include apiops dependency', () => {
+        const content = generatePackageJson({ mode: 'npm' });
+        const pkg = JSON.parse(content);
+        expect(pkg.dependencies.apiops).toBeUndefined();
+      });
+
+      it('should set private to true', () => {
+        const content = generatePackageJson({ mode: 'npm' });
+        const pkg = JSON.parse(content);
+        expect(pkg.private).toBe(true);
+      });
+
+      it('should include name and version', () => {
+        const content = generatePackageJson({ mode: 'npm' });
+        const pkg = JSON.parse(content);
+        expect(pkg.name).toBeTruthy();
+        expect(pkg.version).toBeTruthy();
+      });
+
+      it('should end with a newline', () => {
+        const content = generatePackageJson({ mode: 'npm' });
+        expect(content.endsWith('\n')).toBe(true);
+      });
     });
   });
 });