@lsst/pik-plugin-select 0.6.6 → 0.7.0

package/README.md

@@ -43,7 +43,9 @@ pik select set <name> <option>  # Set directly
 ## Marker Syntax
 
 - `@pik:select <name>` - Defines a selector group
-- `@pik:option <name>` - Marks an option within a selector
+- `@pik:option <name>` - Marks a single-line option within a selector
+- `@pik:block-start <name>` - Starts a multi-line block option
+- `@pik:block-end` - Ends a multi-line block option
 
 ### Inline Style
 
@@ -67,6 +69,28 @@ Marker on its own line, content on the next line (useful for HTML):
 <!-- <script src="http://localhost:3000/viewer.js"></script> -->
 ```
 
+### Block Style
+
+For multi-line options where you need to switch entire blocks of configuration:
+
+```bash
+# @pik:select Environment
+# @pik:block-start Development
+API_URL=http://localhost:3000
+DEBUG=true
+LOG_LEVEL=debug
+# @pik:block-end
+# @pik:block-start Production
+# API_URL=https://api.example.com
+# DEBUG=false
+# LOG_LEVEL=error
+# @pik:block-end
+```
+
+When switching blocks:
+- The selected block's content lines are uncommented
+- All other blocks' content lines are commented out
+
 ## Supported File Types
 
 | Extensions | Comment Style |

package/dist/index.js

@@ -1,7 +1,7 @@
 import { Command } from "commander";
 import pc from "picocolors";
-import { relative, extname } from "path";
-import { Parser, loadConfig, SingleSwitcher } from "@lsst/pik-core";
+import { relative } from "path";
+import { Parser, loadConfig, BlockSwitcher, SingleSwitcher } from "@lsst/pik-core";
 import { readFile, writeFile } from "fs/promises";
 import { glob } from "glob";
 import { select, Separator } from "@inquirer/prompts";
@@ -27,6 +27,21 @@ class Scanner {
     return results;
   }
 }
+function hasBlockOptions$2(selector) {
+  return selector.blockOptions.length > 0;
+}
+function getActiveOptionName$1(selector) {
+  if (hasBlockOptions$2(selector)) {
+    return selector.blockOptions.find((b) => b.isActive)?.name ?? null;
+  }
+  return selector.options.find((o) => o.isActive)?.name ?? null;
+}
+function getAllOptions$1(selector) {
+  if (hasBlockOptions$2(selector)) {
+    return selector.blockOptions.map((b) => ({ name: b.name, isActive: b.isActive }));
+  }
+  return selector.options.map((o) => ({ name: o.name, isActive: o.isActive }));
+}
 const listCommand = new Command("list").alias("ls").description("List all selectors and their current state").option("--json", "Output in JSON format").action(async (options) => {
   const config = await loadConfig();
   if (!config?.select) {
@@ -45,11 +60,9 @@ const listCommand = new Command("list").alias("ls").description("List all select
         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
-        }))
+        activeOption: getActiveOptionName$1(selector),
+        isBlock: hasBlockOptions$2(selector),
+        options: getAllOptions$1(selector)
       }))
     );
     console.log(JSON.stringify(jsonOutput, null, 2));
@@ -63,10 +76,11 @@ const listCommand = new Command("list").alias("ls").description("List all select
     const relativePath = relative(process.cwd(), file.path);
     console.log(pc.cyan(relativePath));
     for (const selector of file.selectors) {
-      const activeOption = selector.options.find((o) => o.isActive);
-      const activeLabel = activeOption ? pc.green(activeOption.name) : pc.yellow("none");
-      console.log(`  ${pc.bold(selector.name)}: ${activeLabel}`);
-      for (const option of selector.options) {
+      const activeOptionName = getActiveOptionName$1(selector);
+      const activeLabel = activeOptionName ? pc.green(activeOptionName) : pc.yellow("none");
+      const blockIndicator = hasBlockOptions$2(selector) ? pc.dim(" [block]") : "";
+      console.log(`  ${pc.bold(selector.name)}${blockIndicator}: ${activeLabel}`);
+      for (const option of getAllOptions$1(selector)) {
         const marker = option.isActive ? pc.green("●") : pc.dim("○");
         console.log(`    ${marker} ${option.name}`);
       }
@@ -74,6 +88,9 @@ const listCommand = new Command("list").alias("ls").description("List all select
     console.log();
   }
 });
+function hasBlockOptions$1(selector) {
+  return selector.blockOptions.length > 0;
+}
 const setCommand = new Command("set").description("Set a specific option for a selector").argument("<selector>", "Selector name").argument("<option>", "Option to activate").action(async (selectorName, optionName) => {
   const config = await loadConfig();
   if (!config?.select) {
@@ -87,10 +104,15 @@ const setCommand = new Command("set").description("Set a specific option for a s
     const selector = file.selectors.find((s) => s.name === selectorName);
     if (selector) {
       found = true;
-      const extension = extname(file.path);
-      const switcher = SingleSwitcher.forExtension(extension);
       try {
-        const newContent = switcher.switch(file.content, selector, optionName);
+        let newContent;
+        if (hasBlockOptions$1(selector)) {
+          const switcher = BlockSwitcher.forFilePath(file.path);
+          newContent = switcher.switch(file.content, selector, optionName);
+        } else {
+          const switcher = SingleSwitcher.forFilePath(file.path);
+          newContent = switcher.switch(file.content, selector, optionName);
+        }
         await writeFile(file.path, newContent);
         const relativePath = relative(process.cwd(), file.path);
         console.log(
@@ -113,6 +135,21 @@ const BACK_VALUE = /* @__PURE__ */ Symbol("back");
 function isExitPromptError(error) {
   return error instanceof Error && error.name === "ExitPromptError";
 }
+function hasBlockOptions(selector) {
+  return selector.blockOptions.length > 0;
+}
+function getActiveOptionName(selector) {
+  if (hasBlockOptions(selector)) {
+    return selector.blockOptions.find((b) => b.isActive)?.name ?? null;
+  }
+  return selector.options.find((o) => o.isActive)?.name ?? null;
+}
+function getAllOptions(selector) {
+  if (hasBlockOptions(selector)) {
+    return selector.blockOptions.map((b) => ({ name: b.name, isActive: b.isActive }));
+  }
+  return selector.options.map((o) => ({ name: o.name, isActive: o.isActive }));
+}
 const switchCommand = new Command("switch").alias("sw").description("Interactively switch options").action(async () => {
   const config = await loadConfig();
   if (!config?.select) {
@@ -139,10 +176,11 @@ const switchCommand = new Command("switch").alias("sw").description("Interactive
         choices: [
           ...choices.map((choice) => {
             const relativePath2 = relative(process.cwd(), choice.file.path);
-            const activeOption = choice.selector.options.find((o) => o.isActive);
-            const current = activeOption ? pc.dim(` (${activeOption.name})`) : "";
+            const activeOptionName = getActiveOptionName(choice.selector);
+            const current = activeOptionName ? pc.dim(` (${activeOptionName})`) : "";
+            const blockIndicator = hasBlockOptions(choice.selector) ? pc.dim(" [block]") : "";
             return {
-              name: `${choice.selector.name}${current} ${pc.dim(`- ${relativePath2}`)}`,
+              name: `${choice.selector.name}${blockIndicator}${current} ${pc.dim(`- ${relativePath2}`)}`,
               value: choice
             };
           }),
@@ -160,11 +198,12 @@ const switchCommand = new Command("switch").alias("sw").description("Interactive
       return;
     }
     let selectedOption;
+    const allOptions = getAllOptions(selectedChoice.selector);
     try {
       selectedOption = await select({
         message: `Select option for ${pc.bold(selectedChoice.selector.name)}`,
         choices: [
-          ...selectedChoice.selector.options.map((option) => ({
+          ...allOptions.map((option) => ({
             name: option.isActive ? `${option.name} ${pc.green("(current)")}` : option.name,
             value: option.name
           })),
@@ -181,12 +220,22 @@ const switchCommand = new Command("switch").alias("sw").description("Interactive
     if (selectedOption === BACK_VALUE) {
       continue;
     }
-    const switcher = SingleSwitcher.forFilePath(selectedChoice.file.path);
-    const newContent = switcher.switch(
-      selectedChoice.file.content,
-      selectedChoice.selector,
-      selectedOption
-    );
+    let newContent;
+    if (hasBlockOptions(selectedChoice.selector)) {
+      const switcher = BlockSwitcher.forFilePath(selectedChoice.file.path);
+      newContent = switcher.switch(
+        selectedChoice.file.content,
+        selectedChoice.selector,
+        selectedOption
+      );
+    } else {
+      const switcher = SingleSwitcher.forFilePath(selectedChoice.file.path);
+      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(

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;AAKpC,OAAO,aAAa,CAAC;AAMrB,eAAO,MAAM,WAAW,SA6DpB,CAAC"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,OAAO,aAAa,CAAC;AAiCrB,eAAO,MAAM,WAAW,SA4DpB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"set.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,OAAO,aAAa,CAAC;AAErB,eAAO,MAAM,UAAU,SA8CnB,CAAC"}
+{"version":3,"file":"set.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,OAAO,aAAa,CAAC;AASrB,eAAO,MAAM,UAAU,SAqDnB,CAAC"}

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;AAOpC,OAAO,aAAa,CAAC;AAarB,eAAO,MAAM,aAAa,SAyGtB,CAAC"}
+{"version":3,"file":"switch.d.ts","sourceRoot":"","sources":["../../../src/lib/commands/switch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,OAAO,aAAa,CAAC;AAwCrB,eAAO,MAAM,aAAa,SAuHtB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lsst/pik-plugin-select",
-  "version": "0.6.6",
+  "version": "0.7.0",
   "description": "Config selector plugin for pik CLI",
   "type": "module",
   "license": "MIT",