@lsst/pik 0.2.0 → 0.4.1

package/dist/lib/commands/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,eAAO,MAAM,WAAW,SAuCpB,CAAC"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,eAAO,MAAM,WAAW,SA6DpB,CAAC"}

package/dist/lib/commands/list.js

@@ -6,14 +6,34 @@ import { Scanner } from '../scanner.js';
 export const listCommand = new Command('list')
     .alias('ls')
     .description('List all selectors and their current state')
-    .action(async () => {
+    .option('--json', 'Output in JSON format')
+    .action(async (options) => {
     const config = await loadConfig();
     if (!config) {
-        console.error(pc.red('No pik.config.ts found'));
+        if (options.json) {
+            console.log(JSON.stringify({ error: 'No pik.config.ts found' }));
+        }
+        else {
+            console.error(pc.red('No pik.config.ts found'));
+        }
         process.exit(1);
     }
     const scanner = new Scanner(config);
     const results = await scanner.scan();
+    if (options.json) {
+        const jsonOutput = results.flatMap((file) => file.selectors.map((selector) => ({
+            name: selector.name,
+            file: relative(process.cwd(), file.path),
+            line: selector.line,
+            activeOption: selector.options.find((o) => o.isActive)?.name ?? null,
+            options: selector.options.map((o) => ({
+                name: o.name,
+                isActive: o.isActive,
+            })),
+        })));
+        console.log(JSON.stringify(jsonOutput, null, 2));
+        return;
+    }
     if (results.length === 0) {
         console.log(pc.yellow('No selectors found'));
         return;

package/dist/lib/commands/switch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"switch.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/switch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAcpC,eAAO,MAAM,aAAa,SAoEtB,CAAC"}
+{"version":3,"file":"switch.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/switch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqBpC,eAAO,MAAM,aAAa,SA0GtB,CAAC"}

package/dist/lib/commands/switch.js

@@ -1,11 +1,16 @@
 import { Command } from 'commander';
 import { writeFile } from 'fs/promises';
 import { extname, relative } from 'path';
-import { select } from '@inquirer/prompts';
+import { select, Separator } from '@inquirer/prompts';
 import pc from 'picocolors';
 import { SingleSwitcher } from '@lsst/pik-core';
 import { loadConfig } from '../config.js';
 import { Scanner } from '../scanner.js';
+const BACK_VALUE = Symbol('back');
+const EXIT_VALUE = Symbol('exit');
+function isExitPromptError(error) {
+    return error instanceof Error && error.name === 'ExitPromptError';
+}
 export const switchCommand = new Command('switch')
     .alias('sw')
     .description('Interactively switch options')
@@ -28,32 +33,68 @@ export const switchCommand = new Command('switch')
             choices.push({ file, selector });
         }
     }
-    // Select which selector to switch
-    const selectedChoice = await select({
-        message: 'Select a selector to switch',
-        choices: choices.map((choice) => {
-            const relativePath = relative(process.cwd(), choice.file.path);
-            const activeOption = choice.selector.options.find((o) => o.isActive);
-            const current = activeOption ? pc.dim(` (${activeOption.name})`) : '';
-            return {
-                name: `${choice.selector.name}${current} ${pc.dim(`- ${relativePath}`)}`,
-                value: choice,
-            };
-        }),
-    });
-    // Select which option to activate
-    const selectedOption = await select({
-        message: `Select option for ${pc.bold(selectedChoice.selector.name)}`,
-        choices: selectedChoice.selector.options.map((option) => ({
-            name: option.isActive ? `${option.name} ${pc.green('(current)')}` : option.name,
-            value: option.name,
-        })),
-    });
-    // Apply the change
-    const extension = extname(selectedChoice.file.path);
-    const switcher = SingleSwitcher.forExtension(extension);
-    const newContent = switcher.switch(selectedChoice.file.content, selectedChoice.selector, selectedOption);
-    await writeFile(selectedChoice.file.path, newContent);
-    const relativePath = relative(process.cwd(), selectedChoice.file.path);
-    console.log(pc.green(`✓ Set ${pc.bold(selectedChoice.selector.name)} to ${pc.bold(selectedOption)} in ${relativePath}`));
+    // Main loop for navigation
+    while (true) {
+        let selectedChoice;
+        // Select which selector to switch
+        try {
+            selectedChoice = await select({
+                message: 'Select a selector to switch',
+                choices: [
+                    ...choices.map((choice) => {
+                        const relativePath = relative(process.cwd(), choice.file.path);
+                        const activeOption = choice.selector.options.find((o) => o.isActive);
+                        const current = activeOption ? pc.dim(` (${activeOption.name})`) : '';
+                        return {
+                            name: `${choice.selector.name}${current} ${pc.dim(`- ${relativePath}`)}`,
+                            value: choice,
+                        };
+                    }),
+                    new Separator(),
+                    { name: pc.dim('Exit'), value: EXIT_VALUE },
+                ],
+            });
+        }
+        catch (error) {
+            if (isExitPromptError(error)) {
+                return;
+            }
+            throw error;
+        }
+        if (selectedChoice === EXIT_VALUE) {
+            return;
+        }
+        // Select which option to activate
+        let selectedOption;
+        try {
+            selectedOption = await select({
+                message: `Select option for ${pc.bold(selectedChoice.selector.name)}`,
+                choices: [
+                    ...selectedChoice.selector.options.map((option) => ({
+                        name: option.isActive ? `${option.name} ${pc.green('(current)')}` : option.name,
+                        value: option.name,
+                    })),
+                    new Separator(),
+                    { name: pc.dim('← Back'), value: BACK_VALUE },
+                ],
+            });
+        }
+        catch (error) {
+            if (isExitPromptError(error)) {
+                return;
+            }
+            throw error;
+        }
+        if (selectedOption === BACK_VALUE) {
+            continue; // Go back to selector selection
+        }
+        // Apply the change
+        const extension = extname(selectedChoice.file.path);
+        const switcher = SingleSwitcher.forExtension(extension);
+        const newContent = switcher.switch(selectedChoice.file.content, selectedChoice.selector, selectedOption);
+        await writeFile(selectedChoice.file.path, newContent);
+        const relativePath = relative(process.cwd(), selectedChoice.file.path);
+        console.log(pc.green(`✓ Set ${pc.bold(selectedChoice.selector.name)} to ${pc.bold(selectedOption)} in ${relativePath}`));
+        return;
+    }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lsst/pik",
-  "version": "0.2.0",
+  "version": "0.4.1",
   "description": "CLI tool for switching config options in source files",
   "type": "module",
   "license": "MIT",