@lsst/pik-core 0.5.3 → 0.6.0

package/dist/index.js

@@ -121,17 +121,56 @@ 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
    */
@@ -253,11 +292,11 @@ class SingleSwitcher extends Switcher {
     this.validateOption(selector, optionName);
     const lines = content.split("\n");
     const useBlockStyle = selector.options.some((opt) => {
-      const line = lines[opt.line - 1];
+      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);

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;CAkBxB"}
+{"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;CAwBxE"}
+{"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/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.3",
+  "version": "0.6.0",
   "description": "Core library for parsing and switching @pik config markers",
   "type": "module",
   "license": "MIT",