@lsst/pik-core 0.6.7 → 0.7.0

package/dist/index.d.ts

@@ -1,8 +1,9 @@
-export type { Option, Selector, ParseResult, PikPlugin } from './lib/types/index.js';
+export type { Option, BlockOption, Selector, ParseResult, PikPlugin } from './lib/types/index.js';
 export { CommentStyle } from './lib/types/index.js';
 export { defineConfig, loadConfig, findLocalConfig, isValidPlugin, type PikConfig, } from './lib/config.js';
 export { Parser } from './lib/parser.js';
 export { Switcher } from './lib/switcher.js';
 export { SingleSwitcher } from './lib/single-switcher.js';
+export { BlockSwitcher } from './lib/block-switcher.js';
 export { CommentManipulator } from './lib/comment-manipulator.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EACL,YAAY,EACZ,UAAU,EACV,eAAe,EACf,aAAa,EACb,KAAK,SAAS,GACf,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAClG,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EACL,YAAY,EACZ,UAAU,EACV,eAAe,EACf,aAAa,EACb,KAAK,SAAS,GACf,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/index.js

@@ -97,6 +97,8 @@ class Parser {
   }
   static SELECT_REGEX = /@pik:select\s+(\S+)/;
   static OPTION_REGEX = /@pik:option\s+(\S+)/;
+  static BLOCK_START_REGEX = /@pik:block-start\s+(\S+)/;
+  static BLOCK_END_REGEX = /@pik:block-end/;
   /**
    * Create a parser for a file path
    */
@@ -110,6 +112,7 @@ class Parser {
     const lines = content.split("\n");
     const selectors = [];
     let currentSelector = null;
+    let currentBlock = null;
     for (let i = 0; i < lines.length; i++) {
       const line = lines[i];
       const lineNumber = i + 1;
@@ -118,11 +121,39 @@ class Parser {
         currentSelector = {
           name: selectMatch[1],
           line: lineNumber,
-          options: []
+          options: [],
+          blockOptions: []
         };
         selectors.push(currentSelector);
         continue;
       }
+      const blockStartMatch = line.match(Parser.BLOCK_START_REGEX);
+      if (blockStartMatch && currentSelector) {
+        currentBlock = {
+          name: blockStartMatch[1],
+          startLine: lineNumber,
+          contentLines: []
+        };
+        continue;
+      }
+      const blockEndMatch = line.match(Parser.BLOCK_END_REGEX);
+      if (blockEndMatch && currentSelector && currentBlock) {
+        const isActive = currentBlock.contentLines.length > 0 ? !this.isLineCommented(lines[currentBlock.contentLines[0] - 1]) : false;
+        const blockOption = {
+          name: currentBlock.name,
+          startLine: currentBlock.startLine,
+          endLine: lineNumber,
+          contentLines: currentBlock.contentLines,
+          isActive
+        };
+        currentSelector.blockOptions.push(blockOption);
+        currentBlock = null;
+        continue;
+      }
+      if (currentBlock) {
+        currentBlock.contentLines.push(lineNumber);
+        continue;
+      }
       const optionMatch = line.match(Parser.OPTION_REGEX);
       if (optionMatch && currentSelector) {
         const isStandalone = this.isStandaloneMarker(line);
@@ -336,7 +367,53 @@ class SingleSwitcher extends Switcher {
     return lines.join("\n");
   }
 }
+class BlockSwitcher extends CommentManipulator {
+  /**
+   * Create a switcher for a file path
+   */
+  static forFilePath(filePath) {
+    return new BlockSwitcher(CommentStyle.fromFilePath(filePath));
+  }
+  /**
+   * Switch to a specific block option, deactivating all others.
+   * - Selected block: all content lines uncommented
+   * - Other blocks: all content lines commented
+   */
+  switch(content, selector, blockName) {
+    this.validateBlockOption(selector, blockName);
+    const lines = content.split("\n");
+    const useBlockStyle = selector.blockOptions.some((block) => {
+      if (block.contentLines.length === 0) return false;
+      const line = lines[block.contentLines[0] - 1];
+      return this.isBlockCommented(line);
+    });
+    for (const block of selector.blockOptions) {
+      for (const lineNum of block.contentLines) {
+        const lineIndex = lineNum - 1;
+        const line = lines[lineIndex];
+        if (block.name === blockName) {
+          lines[lineIndex] = this.uncommentLine(line);
+        } else {
+          lines[lineIndex] = this.commentLine(line, useBlockStyle);
+        }
+      }
+    }
+    return lines.join("\n");
+  }
+  /**
+   * Validate that the block option exists in the selector
+   */
+  validateBlockOption(selector, blockName) {
+    const block = selector.blockOptions.find((b) => b.name === blockName);
+    if (!block) {
+      throw new Error(
+        `Block option "${blockName}" not found in selector "${selector.name}"`
+      );
+    }
+  }
+}
 export {
+  BlockSwitcher,
   CommentManipulator,
   CommentStyle,
   Parser,

package/dist/lib/block-switcher.d.ts

@@ -0,0 +1,22 @@
+import type { Selector } from './types/index.js';
+import { CommentManipulator } from './comment-manipulator.js';
+/**
+ * Switcher that handles multi-line block options
+ */
+export declare class BlockSwitcher extends CommentManipulator {
+    /**
+     * Create a switcher for a file path
+     */
+    static forFilePath(filePath: string): BlockSwitcher;
+    /**
+     * Switch to a specific block option, deactivating all others.
+     * - Selected block: all content lines uncommented
+     * - Other blocks: all content lines commented
+     */
+    switch(content: string, selector: Selector, blockName: string): string;
+    /**
+     * Validate that the block option exists in the selector
+     */
+    private validateBlockOption;
+}
+//# sourceMappingURL=block-switcher.d.ts.map

package/dist/lib/block-switcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"block-switcher.d.ts","sourceRoot":"","sources":["../../src/lib/block-switcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;GAEG;AACH,qBAAa,aAAc,SAAQ,kBAAkB;IACnD;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa;IAInD;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IA4BtE;;OAEG;IACH,OAAO,CAAC,mBAAmB;CAQ5B"}

package/dist/lib/parser.d.ts

@@ -7,6 +7,8 @@ export declare class Parser {
     private readonly commentStyle;
     private static readonly SELECT_REGEX;
     private static readonly OPTION_REGEX;
+    private static readonly BLOCK_START_REGEX;
+    private static readonly BLOCK_END_REGEX;
     constructor(commentStyle: CommentStyle);
     /**
      * Create a parser for a file path

package/dist/lib/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/lib/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAU,WAAW,EAAY,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;GAEG;AACH,qBAAa,MAAM;IAIL,OAAO,CAAC,QAAQ,CAAC,YAAY;IAHzC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAyB;IAC7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAyB;gBAEhC,YAAY,EAAE,YAAY;IAEvD;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI5C;;OAEG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW;IAuDnC;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA6B1B;;OAEG;IACH,OAAO,CAAC,eAAe;CAkBxB"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/lib/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,WAAW,EAAY,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;GAEG;AACH,qBAAa,MAAM;IAML,OAAO,CAAC,QAAQ,CAAC,YAAY;IALzC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAyB;IAC7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAyB;IAC7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAA8B;IACvE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAoB;gBAE9B,YAAY,EAAE,YAAY;IAEvD;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI5C;;OAEG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW;IA8FnC;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA6B1B;;OAEG;IACH,OAAO,CAAC,eAAe;CAkBxB"}

package/dist/lib/types/block-option.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Represents a multi-line block option within a selector
+ */
+export interface BlockOption {
+    /** Option name (e.g., "Development", "Production") */
+    name: string;
+    /** Line number where @pik:block-start is located (1-based) */
+    startLine: number;
+    /** Line number where @pik:block-end is located (1-based) */
+    endLine: number;
+    /** Line numbers of content lines between start/end (1-based) */
+    contentLines: number[];
+    /** Whether this block is currently active (content lines are not commented out) */
+    isActive: boolean;
+}
+//# sourceMappingURL=block-option.d.ts.map

package/dist/lib/types/block-option.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"block-option.d.ts","sourceRoot":"","sources":["../../../src/lib/types/block-option.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,SAAS,EAAE,MAAM,CAAC;IAClB,4DAA4D;IAC5D,OAAO,EAAE,MAAM,CAAC;IAChB,gEAAgE;IAChE,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,mFAAmF;IACnF,QAAQ,EAAE,OAAO,CAAC;CACnB"}

package/dist/lib/types/index.d.ts

@@ -1,4 +1,5 @@
 export type { Option } from './option.js';
+export type { BlockOption } from './block-option.js';
 export type { Selector } from './selector.js';
 export type { ParseResult } from './parse-result.js';
 export { CommentStyle } from './comment-style.js';

package/dist/lib/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/types/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/types/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}

package/dist/lib/types/selector.d.ts

@@ -1,4 +1,5 @@
 import type { Option } from './option.js';
+import type { BlockOption } from './block-option.js';
 /**
  * Represents a selector with its options
  */
@@ -7,7 +8,9 @@ export interface Selector {
     name: string;
     /** Line number where the selector is defined (1-based) */
     line: number;
-    /** All options belonging to this selector */
+    /** All single-line options belonging to this selector */
     options: Option[];
+    /** All multi-line block options belonging to this selector */
+    blockOptions: BlockOption[];
 }
 //# sourceMappingURL=selector.d.ts.map

package/dist/lib/types/selector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selector.d.ts","sourceRoot":"","sources":["../../../src/lib/types/selector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,0CAA0C;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB"}
+{"version":3,"file":"selector.d.ts","sourceRoot":"","sources":["../../../src/lib/types/selector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,0CAA0C;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,8DAA8D;IAC9D,YAAY,EAAE,WAAW,EAAE,CAAC;CAC7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lsst/pik-core",
-  "version": "0.6.7",
+  "version": "0.7.0",
   "description": "Core library for parsing and switching @pik config markers",
   "type": "module",
   "license": "MIT",