@lsst/pik-core 0.5.2 → 0.6.0

package/README.md

@@ -1,6 +1,6 @@
 # @lsst/pik-core
 
-Core library for parsing and switching `@pik` config markers in source files.
+Core library for pik - provides parsing, switching, config loading, and plugin types.
 
 ## Installation
 
@@ -8,10 +8,12 @@ Core library for parsing and switching `@pik` config markers in source files.
 npm install @lsst/pik-core
 ```
 
-## Usage
+## Parsing and Switching
+
+Parse and switch `@pik` config markers in source files:
 
 ```typescript
-import { Parser, SingleSwitcher } from '@lsst25/pik-core';
+import { Parser, SingleSwitcher } from '@lsst/pik-core';
 
 const content = `
 // @pik:select Environment
@@ -28,6 +30,55 @@ const switcher = SingleSwitcher.forExtension('ts');
 const newContent = switcher.switch(content, selectors[0], 'DEV');
 ```
 
+## Config Loading
+
+Load pik configuration from project files:
+
+```typescript
+import { loadConfig, defineConfig } from '@lsst/pik-core';
+
+// Load config (looks for pik.config.ts, .pik.config.ts, etc.)
+const config = await loadConfig();
+
+// Type-safe config definition
+export default defineConfig({
+  select: { include: ['src/**/*.ts'] },
+  worktree: { baseDir: '../' },
+});
+```
+
+## Creating Plugins
+
+Create custom plugins using the `PikPlugin` interface:
+
+```typescript
+import type { Command } from 'commander';
+import type { PikPlugin } from '@lsst/pik-core';
+
+interface MyPluginConfig {
+  apiKey: string;
+}
+
+export function myPlugin(config: MyPluginConfig): PikPlugin {
+  return {
+    name: 'My Plugin',
+    description: 'Does something cool',
+    command: 'my',
+    aliases: ['m'],
+
+    register(program: Command) {
+      program
+        .command('my')
+        .alias('m')
+        .description('My custom command')
+        .action(() => {
+          console.log(`Using: ${config.apiKey}`);
+        });
+    },
+  };
+}
+```
+
 ## API
 
 ### Parser
@@ -55,7 +106,7 @@ const newContent = switcher.switch(content, selector, 'optionName');
 ### CommentStyle
 
 ```typescript
-import { CommentStyle } from '@lsst25/pik-core';
+import { CommentStyle } from '@lsst/pik-core';
 
 // Get comment style for extension
 const style = CommentStyle.fromExtension('py'); // { lineComment: '#' }
@@ -64,6 +115,17 @@ const style = CommentStyle.fromExtension('py'); // { lineComment: '#' }
 CommentStyle.register('custom', new CommentStyle(';;'));
 ```
 
+### isValidPlugin
+
+```typescript
+import { isValidPlugin } from '@lsst/pik-core';
+
+// Validate a plugin object
+if (isValidPlugin(obj)) {
+  // obj is PikPlugin
+}
+```
+
 ## Types
 
 ```typescript
@@ -79,6 +141,19 @@ interface Option {
   content: string;
   isActive: boolean;
 }
+
+interface PikPlugin {
+  name: string;
+  description: string;
+  command: string;
+  aliases?: string[];
+  register: (program: Command) => void;
+}
+
+interface PikConfig {
+  plugins?: PikPlugin[];
+  [pluginName: string]: unknown;
+}
 ```
 
 ## License

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export type { Option, Selector, ParseResult, PikPlugin } from './lib/types/index.js';
 export { CommentStyle } from './lib/types/index.js';
-export { defineConfig, loadConfig, type PikConfig } from './lib/config.js';
+export { defineConfig, loadConfig, 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';

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,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG3E,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,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,OAAO,EACL,YAAY,EACZ,UAAU,EACV,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"}

package/dist/index.js

@@ -2,8 +2,10 @@ import { pathToFileURL } from "url";
 import { existsSync } from "fs";
 import { resolve } from "path";
 class CommentStyle {
-  constructor(lineComment) {
+  constructor(lineComment, blockOpen, blockClose) {
     this.lineComment = lineComment;
+    this.blockOpen = blockOpen;
+    this.blockClose = blockClose;
   }
   static styles = {
     // JavaScript/TypeScript
@@ -13,9 +15,9 @@ class CommentStyle {
     tsx: new CommentStyle("//"),
     mjs: new CommentStyle("//"),
     mts: new CommentStyle("//"),
-    // HTML (for script tags)
-    html: new CommentStyle("//"),
-    htm: new CommentStyle("//"),
+    // HTML - supports both // (in script) and <!-- --> (in HTML)
+    html: new CommentStyle("//", "<!--", "-->"),
+    htm: new CommentStyle("//", "<!--", "-->"),
     // Config files
     yaml: new CommentStyle("#"),
     yml: new CommentStyle("#"),
@@ -29,6 +31,16 @@ class CommentStyle {
     env: new CommentStyle("#")
   };
   static defaultStyle = new CommentStyle("//");
+  /** Block comment opening (e.g., "<!--") */
+  blockOpen;
+  /** Block comment closing (e.g., "-->") */
+  blockClose;
+  /**
+   * Check if this style supports block comments
+   */
+  get hasBlockComments() {
+    return !!(this.blockOpen && this.blockClose);
+  }
   /**
    * Get comment style for a file extension
    */
@@ -68,6 +80,13 @@ async function loadConfig(cwd = process.cwd()) {
   }
   return null;
 }
+function isValidPlugin(obj) {
+  if (typeof obj !== "object" || obj === null) {
+    return false;
+  }
+  const plugin = obj;
+  return typeof plugin.name === "string" && typeof plugin.description === "string" && typeof plugin.command === "string" && typeof plugin.register === "function";
+}
 class Parser {
   constructor(commentStyle) {
     this.commentStyle = commentStyle;
@@ -102,22 +121,71 @@ class Parser {
       }
       const optionMatch = line.match(Parser.OPTION_REGEX);
       if (optionMatch && currentSelector) {
-        const option = {
-          name: optionMatch[1],
-          line: lineNumber,
-          content: line,
-          isActive: !this.isLineCommented(line)
-        };
-        currentSelector.options.push(option);
+        const isStandalone = this.isStandaloneMarker(line);
+        if (isStandalone && i + 1 < lines.length) {
+          const contentLine = lines[i + 1];
+          const option = {
+            name: optionMatch[1],
+            line: lineNumber,
+            contentLine: lineNumber + 1,
+            content: contentLine,
+            isActive: !this.isLineCommented(contentLine)
+          };
+          currentSelector.options.push(option);
+        } else {
+          const option = {
+            name: optionMatch[1],
+            line: lineNumber,
+            contentLine: lineNumber,
+            content: line,
+            isActive: !this.isLineCommented(line)
+          };
+          currentSelector.options.push(option);
+        }
       }
     }
     return { selectors, content };
   }
+  /**
+   * Check if a line contains only a standalone marker (no other content)
+   * e.g., "<!-- @pik:option Name -->" or "# @pik:option Name"
+   */
+  isStandaloneMarker(line) {
+    const trimmed = line.trim();
+    if (this.commentStyle.hasBlockComments) {
+      const { blockOpen, blockClose } = this.commentStyle;
+      if (trimmed.startsWith(blockOpen) && trimmed.endsWith(blockClose)) {
+        const inner = trimmed.slice(blockOpen.length, -blockClose.length).trim();
+        const optionMatch = inner.match(Parser.OPTION_REGEX);
+        if (optionMatch && inner === `@pik:option ${optionMatch[1]}`) {
+          return true;
+        }
+      }
+    }
+    if (trimmed.startsWith(this.commentStyle.lineComment)) {
+      const afterComment = trimmed.slice(this.commentStyle.lineComment.length).trim();
+      const optionMatch = afterComment.match(Parser.OPTION_REGEX);
+      if (optionMatch && afterComment === `@pik:option ${optionMatch[1]}`) {
+        return true;
+      }
+    }
+    return false;
+  }
   /**
    * Check if a line is commented out
    */
   isLineCommented(line) {
-    return line.trimStart().startsWith(this.commentStyle.lineComment);
+    const trimmed = line.trimStart();
+    if (trimmed.startsWith(this.commentStyle.lineComment)) {
+      return true;
+    }
+    if (this.commentStyle.hasBlockComments) {
+      const { blockOpen, blockClose } = this.commentStyle;
+      if (trimmed.startsWith(blockOpen) && trimmed.includes(blockClose)) {
+        return true;
+      }
+    }
+    return false;
   }
 }
 class CommentManipulator {
@@ -125,31 +193,73 @@ class CommentManipulator {
     this.commentStyle = commentStyle;
   }
   /**
-   * Check if a line is commented out
+   * Check if a line is commented out (line or block comment)
    */
   isLineCommented(line) {
-    return line.trimStart().startsWith(this.commentStyle.lineComment);
+    const trimmed = line.trimStart();
+    if (trimmed.startsWith(this.commentStyle.lineComment)) {
+      return true;
+    }
+    if (this.commentStyle.hasBlockComments) {
+      const { blockOpen, blockClose } = this.commentStyle;
+      if (trimmed.startsWith(blockOpen) && trimmed.includes(blockClose)) {
+        return true;
+      }
+    }
+    return false;
   }
   /**
-   * Comment out a line if not already commented
+   * Check if a line uses block comment style
    */
-  commentLine(line) {
+  isBlockCommented(line) {
+    if (!this.commentStyle.hasBlockComments) {
+      return false;
+    }
+    const trimmed = line.trimStart();
+    const { blockOpen, blockClose } = this.commentStyle;
+    return trimmed.startsWith(blockOpen) && trimmed.includes(blockClose);
+  }
+  /**
+   * Comment out a line if not already commented.
+   * Uses the same comment style as the original if block-commented,
+   * otherwise uses line comment style.
+   */
+  commentLine(line, useBlockStyle = false) {
     const trimmed = line.trimStart();
     if (trimmed.startsWith(this.commentStyle.lineComment)) {
       return line;
     }
+    if (this.isBlockCommented(line)) {
+      return line;
+    }
     const indent = line.slice(0, line.length - trimmed.length);
+    if (useBlockStyle && this.commentStyle.hasBlockComments) {
+      const { blockOpen, blockClose } = this.commentStyle;
+      return `${indent}${blockOpen} ${trimmed} ${blockClose}`;
+    }
     return `${indent}${this.commentStyle.lineComment} ${trimmed}`;
   }
   /**
-   * Uncomment a line if commented
+   * Uncomment a line if commented (handles both line and block comments)
    */
   uncommentLine(line) {
     const trimmed = line.trimStart();
+    const indent = line.slice(0, line.length - trimmed.length);
+    if (this.commentStyle.hasBlockComments) {
+      const { blockOpen, blockClose } = this.commentStyle;
+      if (trimmed.startsWith(blockOpen)) {
+        const afterOpen = trimmed.slice(blockOpen.length);
+        const closeIndex = afterOpen.indexOf(blockClose);
+        if (closeIndex !== -1) {
+          const content2 = afterOpen.slice(0, closeIndex).trim();
+          const rest = afterOpen.slice(closeIndex + blockClose.length);
+          return `${indent}${content2}${rest}`;
+        }
+      }
+    }
     if (!trimmed.startsWith(this.commentStyle.lineComment)) {
       return line;
     }
-    const indent = line.slice(0, line.length - trimmed.length);
     const withoutComment = trimmed.slice(this.commentStyle.lineComment.length);
     const content = withoutComment.startsWith(" ") ? withoutComment.slice(1) : withoutComment;
     return `${indent}${content}`;
@@ -181,13 +291,17 @@ class SingleSwitcher extends Switcher {
   switch(content, selector, optionName) {
     this.validateOption(selector, optionName);
     const lines = content.split("\n");
+    const useBlockStyle = selector.options.some((opt) => {
+      const line = lines[opt.contentLine - 1];
+      return this.isBlockCommented(line);
+    });
     for (const option of selector.options) {
-      const lineIndex = option.line - 1;
+      const lineIndex = option.contentLine - 1;
       const line = lines[lineIndex];
       if (option.name === optionName) {
         lines[lineIndex] = this.uncommentLine(line);
       } else {
-        lines[lineIndex] = this.commentLine(line);
+        lines[lineIndex] = this.commentLine(line, useBlockStyle);
       }
     }
     return lines.join("\n");
@@ -200,5 +314,6 @@ export {
   SingleSwitcher,
   Switcher,
   defineConfig,
+  isValidPlugin,
   loadConfig
 };

package/dist/lib/comment-manipulator.d.ts

@@ -6,15 +6,21 @@ export declare abstract class CommentManipulator {
     protected readonly commentStyle: CommentStyle;
     constructor(commentStyle: CommentStyle);
     /**
-     * Check if a line is commented out
+     * Check if a line is commented out (line or block comment)
      */
     protected isLineCommented(line: string): boolean;
     /**
-     * Comment out a line if not already commented
+     * Check if a line uses block comment style
      */
-    protected commentLine(line: string): string;
+    protected isBlockCommented(line: string): boolean;
     /**
-     * Uncomment a line if commented
+     * Comment out a line if not already commented.
+     * Uses the same comment style as the original if block-commented,
+     * otherwise uses line comment style.
+     */
+    protected commentLine(line: string, useBlockStyle?: boolean): string;
+    /**
+     * Uncomment a line if commented (handles both line and block comments)
      */
     protected uncommentLine(line: string): string;
 }

package/dist/lib/comment-manipulator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comment-manipulator.d.ts","sourceRoot":"","sources":["../../src/lib/comment-manipulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;GAEG;AACH,8BAAsB,kBAAkB;IAC1B,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;gBAA1B,YAAY,EAAE,YAAY;IAEzD;;OAEG;IACH,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIhD;;OAEG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAU3C;;OAEG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAe9C"}
+{"version":3,"file":"comment-manipulator.d.ts","sourceRoot":"","sources":["../../src/lib/comment-manipulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;GAEG;AACH,8BAAsB,kBAAkB;IAC1B,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;gBAA1B,YAAY,EAAE,YAAY;IAEzD;;OAEG;IACH,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAmBhD;;OAEG;IACH,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAUjD;;;;OAIG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,MAAM;IAwBlE;;OAEG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAkC9C"}

package/dist/lib/config.d.ts

@@ -1,7 +1,23 @@
+import type { PikPlugin } from './types/plugin.js';
 /**
  * Base config interface - plugins extend this via declaration merging
  */
 export interface PikConfig {
+    /**
+     * External plugins to load.
+     * Each plugin should be a factory function call that returns a PikPlugin:
+     * @example
+     * ```ts
+     * import { myPlugin } from 'pik-plugin-my';
+     *
+     * export default {
+     *   plugins: [
+     *     myPlugin({ someOption: 'value' }),
+     *   ],
+     * }
+     * ```
+     */
+    plugins?: PikPlugin[];
     [pluginName: string]: unknown;
 }
 /**
@@ -12,4 +28,8 @@ export declare function defineConfig<T extends PikConfig>(config: T): T;
  * Load pik config from the current directory
  */
 export declare function loadConfig(cwd?: string): Promise<PikConfig | null>;
+/**
+ * Validate that an object satisfies the PikPlugin interface
+ */
+export declare function isValidPlugin(obj: unknown): obj is PikPlugin;
 //# sourceMappingURL=config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;CAC/B;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,SAAS,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAE9D;AAaD;;GAEG;AACH,wBAAsB,UAAU,CAAC,GAAG,GAAE,MAAsB,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAYvF"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC;IACtB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;CAC/B;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,SAAS,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAE9D;AAaD;;GAEG;AACH,wBAAsB,UAAU,CAAC,GAAG,GAAE,MAAsB,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAYvF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,SAAS,CAa5D"}

package/dist/lib/parser.d.ts

@@ -16,6 +16,11 @@ export declare class Parser {
      * Parse content string for pik selectors and options
      */
     parse(content: string): ParseResult;
+    /**
+     * Check if a line contains only a standalone marker (no other content)
+     * e.g., "<!-- @pik:option Name -->" or "# @pik:option Name"
+     */
+    private isStandaloneMarker;
     /**
      * Check if a line is commented out
      */

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,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAI9C;;OAEG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW;IAqCnC;;OAEG;IACH,OAAO,CAAC,eAAe;CAGxB"}
+{"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,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAI9C;;OAEG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW;IAuDnC;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA6B1B;;OAEG;IACH,OAAO,CAAC,eAAe;CAkBxB"}

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

@@ -1 +1 @@
-{"version":3,"file":"single-switcher.d.ts","sourceRoot":"","sources":["../../src/lib/single-switcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC;;GAEG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc;IAItD;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;CAkBxE"}
+{"version":3,"file":"single-switcher.d.ts","sourceRoot":"","sources":["../../src/lib/single-switcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC;;GAEG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc;IAItD;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;CAyBxE"}

package/dist/lib/types/comment-style.d.ts

@@ -6,9 +6,17 @@ export declare class CommentStyle {
     readonly lineComment: string;
     private static readonly styles;
     private static readonly defaultStyle;
+    /** Block comment opening (e.g., "<!--") */
+    readonly blockOpen?: string;
+    /** Block comment closing (e.g., "-->") */
+    readonly blockClose?: string;
     constructor(
     /** Line comment prefix (e.g., "//", "#") */
-    lineComment: string);
+    lineComment: string, blockOpen?: string, blockClose?: string);
+    /**
+     * Check if this style supports block comments
+     */
+    get hasBlockComments(): boolean;
     /**
      * Get comment style for a file extension
      */

package/dist/lib/types/comment-style.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comment-style.d.ts","sourceRoot":"","sources":["../../../src/lib/types/comment-style.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,qBAAa,YAAY;IA4BrB,4CAA4C;aAC5B,WAAW,EAAE,MAAM;IA5BrC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAsB5B;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAA0B;;IAG5D,4CAA4C;IAC5B,WAAW,EAAE,MAAM;IAGrC;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY;IAKrD;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI;CAI9D"}
+{"version":3,"file":"comment-style.d.ts","sourceRoot":"","sources":["../../../src/lib/types/comment-style.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,qBAAa,YAAY;IAiCrB,4CAA4C;aAC5B,WAAW,EAAE,MAAM;IAjCrC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAsB5B;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAA0B;IAE9D,2CAA2C;IAC3C,SAAgB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnC,0CAA0C;IAC1C,SAAgB,UAAU,CAAC,EAAE,MAAM,CAAC;;IAGlC,4CAA4C;IAC5B,WAAW,EAAE,MAAM,EACnC,SAAS,CAAC,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM;IAMrB;;OAEG;IACH,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY;IAKrD;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI;CAI9D"}

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

@@ -4,9 +4,11 @@
 export interface Option {
     /** Option name (e.g., "DEV", "LOCAL") */
     name: string;
-    /** Line number (1-based) */
+    /** Line number where the marker is (1-based) */
     line: number;
-    /** Full content of the line */
+    /** Line number where the content is (1-based). Same as `line` for inline markers, next line for standalone markers. */
+    contentLine: number;
+    /** Full content of the content line */
     content: string;
     /** Whether this option is currently active (not commented out) */
     isActive: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"option.d.ts","sourceRoot":"","sources":["../../../src/lib/types/option.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,QAAQ,EAAE,OAAO,CAAC;CACnB"}
+{"version":3,"file":"option.d.ts","sourceRoot":"","sources":["../../../src/lib/types/option.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,gDAAgD;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,uHAAuH;IACvH,WAAW,EAAE,MAAM,CAAC;IACpB,uCAAuC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,QAAQ,EAAE,OAAO,CAAC;CACnB"}

package/package.json

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