promptopskit 0.3.6 → 0.3.8

package/dist/cli/index.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 
+// src/cli/index.ts
+import { readFileSync as readFileSync2 } from "fs";
+
 // src/cli/commands/validate.ts
 import { readdir } from "fs/promises";
 import { join as join2, extname } from "path";
@@ -41,12 +44,28 @@ var ResponseSchema = z.object({
 var HistorySchema = z.object({
   max_items: z.number().int().positive().optional()
 });
+var ContextRegexSchema = z.union([
+  z.string(),
+  z.object({
+    pattern: z.string(),
+    flags: z.string().optional(),
+    return_message: z.string().optional()
+  })
+]);
+var ContextBuiltInValidatorSchema = z.union([
+  z.boolean(),
+  z.object({
+    return_message: z.string().optional()
+  })
+]);
 var ContextInputDefinitionObjectSchema = z.object({
   name: z.string(),
   max_size: z.number().int().positive().optional(),
   trim: z.union([z.boolean(), z.enum(["start", "end", "both"])]).optional(),
-  allow_regex: z.string().optional(),
-  deny_regex: z.string().optional()
+  allow_regex: ContextRegexSchema.optional(),
+  deny_regex: ContextRegexSchema.optional(),
+  non_empty: ContextBuiltInValidatorSchema.optional(),
+  reject_secrets: ContextBuiltInValidatorSchema.optional()
 });
 var ContextInputDefinitionSchema = z.union([
   z.string(),
@@ -346,10 +365,97 @@ function normalizeContextInput(input) {
     name: input.name,
     max_size: input.max_size,
     trim: input.trim,
-    allow_regex: input.allow_regex,
-    deny_regex: input.deny_regex
+    allow_regex: normalizeContextRegex(input.allow_regex),
+    deny_regex: normalizeContextRegex(input.deny_regex),
+    non_empty: normalizeBuiltInValidator(input.non_empty),
+    reject_secrets: normalizeBuiltInValidator(input.reject_secrets)
+  };
+}
+function normalizeContextRegex(value) {
+  if (value === void 0) {
+    return void 0;
+  }
+  if (typeof value === "string") {
+    const literal = parseRegexLiteral(value);
+    if (value.startsWith("/") && !literal) {
+      return {
+        pattern: value,
+        flags: "",
+        raw: value,
+        invalidLiteral: true
+      };
+    }
+    return {
+      pattern: literal?.pattern ?? value,
+      flags: literal?.flags ?? "",
+      raw: value
+    };
+  }
+  return {
+    pattern: value.pattern,
+    flags: value.flags ?? "",
+    raw: JSON.stringify(value),
+    returnMessage: value.return_message
   };
 }
+function normalizeBuiltInValidator(value) {
+  if (value === void 0 || value === false) {
+    return void 0;
+  }
+  if (value === true) {
+    return {};
+  }
+  return {
+    returnMessage: value.return_message
+  };
+}
+function parseRegexLiteral(value) {
+  if (!value.startsWith("/")) {
+    return void 0;
+  }
+  for (let index = value.length - 1; index > 0; index -= 1) {
+    if (value[index] !== "/") {
+      continue;
+    }
+    let backslashCount = 0;
+    for (let cursor = index - 1; cursor >= 0 && value[cursor] === "\\"; cursor -= 1) {
+      backslashCount += 1;
+    }
+    if (backslashCount % 2 === 1) {
+      continue;
+    }
+    return {
+      pattern: value.slice(1, index),
+      flags: value.slice(index + 1)
+    };
+  }
+  return void 0;
+}
+function formatInvalidContextRegexMessage(details) {
+  return [
+    `Invalid context regex for prompt "${details.promptId}"`,
+    `variable "${details.variable}"`,
+    `field "${details.field}"`,
+    `value ${JSON.stringify(details.raw)}: ${details.reason}`
+  ].join(", ");
+}
+function compileContextRegex(regex, details) {
+  if (regex.invalidLiteral) {
+    throw new Error(
+      `POK013: ${formatInvalidContextRegexMessage({
+        ...details,
+        raw: regex.raw,
+        reason: "Malformed regex literal. Use /pattern/flags or { pattern, flags }."
+      })}`
+    );
+  }
+  try {
+    return new RegExp(regex.pattern, regex.flags);
+  } catch (error) {
+    const reason = error instanceof Error ? error.message : String(error);
+    throw new Error(`POK013: ${formatInvalidContextRegexMessage({ ...details, raw: regex.raw, reason })}`);
+  }
+}
 
 // src/validation/levenshtein.ts
 function levenshtein(a, b) {
@@ -471,16 +577,20 @@ function validateAsset(asset, frontMatterKeys, filePath) {
       });
     }
     const checks = [];
-    if (input.allow_regex) checks.push({ pattern: input.allow_regex, kind: "allow_regex" });
-    if (input.deny_regex) checks.push({ pattern: input.deny_regex, kind: "deny_regex" });
+    if (input.allow_regex) checks.push({ regex: input.allow_regex, kind: "allow_regex" });
+    if (input.deny_regex) checks.push({ regex: input.deny_regex, kind: "deny_regex" });
     for (const check of checks) {
       try {
-        new RegExp(check.pattern);
+        compileContextRegex(check.regex, {
+          promptId: asset.id,
+          variable: input.name,
+          field: check.kind
+        });
       } catch (error) {
-        const reason = error instanceof Error ? error.message : String(error);
+        const reason = error instanceof Error ? error.message.replace(/^POK013:\s*/, "") : String(error);
         errors.push({
           code: "POK013",
-          message: `Invalid context ${check.kind} for "${input.name}": ${reason}`,
+          message: reason,
           filePath
         });
       }
@@ -523,82 +633,6 @@ function findClosestMatch(input, candidates) {
   return best;
 }
 
-// src/cli/commands/validate.ts
-var HELP = `
-promptopskit validate <dir>
-
-Validate all prompt .md files in a directory.
-
-Options:
-  --strict       Treat warnings as errors
-  --help, -h     Show this help
-`.trim();
-async function validate(args) {
-  if (args.includes("--help") || args.includes("-h")) {
-    console.log(HELP);
-    return;
-  }
-  const dir = args.find((a) => !a.startsWith("--"));
-  if (!dir) {
-    console.error("Error: Please provide a directory to validate.");
-    process.exit(1);
-  }
-  const strict = args.includes("--strict");
-  const files = await collectPromptFiles(dir);
-  if (files.length === 0) {
-    console.log(`No .md prompt files found in ${dir}`);
-    return;
-  }
-  let errorCount = 0;
-  let warnCount = 0;
-  for (const file of files) {
-    try {
-      const { asset, raw } = await loadPromptFile(file, { defaultsRoot: dir });
-      const result = await validateAssetWithIncludes(asset, file, Object.keys(raw.frontMatter));
-      if (result.errors.length > 0) {
-        errorCount += result.errors.length;
-        console.error(`  \u2717 ${file}`);
-        for (const err of result.errors) {
-          console.error(`    ${err.code}: ${err.message}`);
-        }
-      } else {
-        console.log(`  \u2713 ${file}`);
-      }
-      if (result.warnings.length > 0) {
-        warnCount += result.warnings.length;
-        for (const warn of result.warnings) {
-          const suggestion = warn.suggestion ? ` (${warn.suggestion})` : "";
-          console.warn(`    \u26A0 ${warn.code}: ${warn.message}${suggestion}`);
-        }
-      }
-    } catch (err) {
-      errorCount++;
-      const message = err instanceof Error ? err.message : String(err);
-      console.error(`  \u2717 ${file}`);
-      console.error(`    ${message}`);
-    }
-  }
-  console.log();
-  console.log(`Validated ${files.length} file(s): ${errorCount} error(s), ${warnCount} warning(s)`);
-  if (errorCount > 0 || strict && warnCount > 0) {
-    process.exit(1);
-  }
-}
-async function collectPromptFiles(dir) {
-  const results = [];
-  const entries = await readdir(dir, { withFileTypes: true, recursive: true });
-  for (const entry of entries) {
-    if (entry.isFile() && extname(entry.name) === ".md" && !entry.name.endsWith(".test.md") && entry.name !== "defaults.md") {
-      results.push(join2(entry.parentPath ?? dir, entry.name));
-    }
-  }
-  return results.sort();
-}
-
-// src/cli/commands/compile.ts
-import { readdir as readdir2, writeFile, mkdir, rm } from "fs/promises";
-import { join as join3, extname as extname2, relative, dirname as dirname3 } from "path";
-
 // src/prompt-resolution.ts
 import { readFile as readFile3 } from "fs/promises";
 import { existsSync, statSync as statSync2 } from "fs";
@@ -690,7 +724,103 @@ function defaultCompiledDirForFormat(format) {
 }
 var sharedPromptCache = new PromptCache();
 
+// src/cli/commands/validate.ts
+var HELP = `
+promptopskit validate [sourceDir] [options]
+
+Validate all prompt .md files in a directory.
+
+Options:
+  --source, -s  Source directory (default: ./prompts)
+  --strict       Treat warnings as errors
+  --help, -h     Show this help
+`.trim();
+async function validate(args) {
+  if (args.includes("--help") || args.includes("-h")) {
+    console.log(HELP);
+    return;
+  }
+  const positional = getPositionalArgs(args, /* @__PURE__ */ new Set(["--source", "-s"]));
+  const dir = getFlag(args, "--source", "-s") ?? positional[0] ?? DEFAULT_PROMPTS_DIR;
+  const strict = args.includes("--strict");
+  const files = await collectPromptFiles(dir);
+  if (files.length === 0) {
+    console.log(`No .md prompt files found in ${dir}`);
+    return;
+  }
+  let errorCount = 0;
+  let warnCount = 0;
+  for (const file of files) {
+    try {
+      const { asset, raw } = await loadPromptFile(file, { defaultsRoot: dir });
+      const result = await validateAssetWithIncludes(asset, file, Object.keys(raw.frontMatter));
+      if (result.errors.length > 0) {
+        errorCount += result.errors.length;
+        console.error(`  \u2717 ${file}`);
+        for (const err of result.errors) {
+          console.error(`    ${err.code}: ${err.message}`);
+        }
+      } else {
+        console.log(`  \u2713 ${file}`);
+      }
+      if (result.warnings.length > 0) {
+        warnCount += result.warnings.length;
+        for (const warn of result.warnings) {
+          const suggestion = warn.suggestion ? ` (${warn.suggestion})` : "";
+          console.warn(`    \u26A0 ${warn.code}: ${warn.message}${suggestion}`);
+        }
+      }
+    } catch (err) {
+      errorCount++;
+      const message = err instanceof Error ? err.message : String(err);
+      console.error(`  \u2717 ${file}`);
+      console.error(`    ${message}`);
+    }
+  }
+  console.log();
+  console.log(`Validated ${files.length} file(s): ${errorCount} error(s), ${warnCount} warning(s)`);
+  if (errorCount > 0 || strict && warnCount > 0) {
+    process.exit(1);
+  }
+}
+function getPositionalArgs(args, flagsWithValues) {
+  const positional = [];
+  for (let index = 0; index < args.length; index++) {
+    const arg = args[index];
+    if (flagsWithValues.has(arg)) {
+      index += 1;
+      continue;
+    }
+    if (arg.startsWith("-")) {
+      continue;
+    }
+    positional.push(arg);
+  }
+  return positional;
+}
+function getFlag(args, ...flags) {
+  for (const flag of flags) {
+    const index = args.indexOf(flag);
+    if (index >= 0 && index + 1 < args.length) {
+      return args[index + 1];
+    }
+  }
+  return void 0;
+}
+async function collectPromptFiles(dir) {
+  const results = [];
+  const entries = await readdir(dir, { withFileTypes: true, recursive: true });
+  for (const entry of entries) {
+    if (entry.isFile() && extname(entry.name) === ".md" && !entry.name.endsWith(".test.md") && entry.name !== "defaults.md") {
+      results.push(join2(entry.parentPath ?? dir, entry.name));
+    }
+  }
+  return results.sort();
+}
+
 // src/cli/commands/compile.ts
+import { readdir as readdir2, writeFile, mkdir, rm } from "fs/promises";
+import { join as join3, extname as extname2, relative, dirname as dirname3 } from "path";
 var HELP2 = `
 promptopskit compile [sourceDir] [outputDir] [options]
 
@@ -709,16 +839,16 @@ async function compile(args) {
     console.log(HELP2);
     return;
   }
-  const positional = getPositionalArgs(args, /* @__PURE__ */ new Set(["--format", "--source", "--output", "-s", "-o"]));
+  const positional = getPositionalArgs2(args, /* @__PURE__ */ new Set(["--format", "--source", "--output", "-s", "-o"]));
   const dryRun = args.includes("--dry-run");
   const noClean = args.includes("--no-clean");
-  const format = getFlag(args, "--format") ?? "json";
+  const format = getFlag2(args, "--format") ?? "json";
   if (format !== "json" && format !== "esm") {
     console.error(`Error: Unknown format "${format}". Use "json" or "esm".`);
     process.exit(1);
   }
-  const sourceDir = getFlag(args, "--source", "-s") ?? positional[0] ?? DEFAULT_PROMPTS_DIR;
-  const outputDir = getFlag(args, "--output", "-o") ?? positional[1] ?? defaultCompiledDirForFormat(format);
+  const sourceDir = getFlag2(args, "--source", "-s") ?? positional[0] ?? DEFAULT_PROMPTS_DIR;
+  const outputDir = getFlag2(args, "--output", "-o") ?? positional[1] ?? defaultCompiledDirForFormat(format);
   const files = await collectPromptFiles2(sourceDir);
   if (files.length === 0) {
     console.log(`No .md prompt files found in ${sourceDir}`);
@@ -734,7 +864,11 @@ async function compile(args) {
     const outExt = format === "esm" ? ".mjs" : ".json";
     const outPath = join3(outputDir, rel + outExt);
     try {
-      const { asset: parsed } = await loadPromptFile(file, { defaultsRoot: sourceDir });
+      const { asset: parsed, raw } = await loadPromptFile(file, { defaultsRoot: sourceDir });
+      const validation = await validateAssetWithIncludes(parsed, file, Object.keys(raw.frontMatter));
+      if (validation.errors.length > 0) {
+        throw new Error(validation.errors.map((error) => `${error.code}: ${error.message}`).join("\n    "));
+      }
       const asset = parsed.includes && parsed.includes.length > 0 ? await resolveIncludes(parsed, file) : parsed;
       if (dryRun) {
         console.log(`  Would create: ${outPath}`);
@@ -767,7 +901,7 @@ async function compile(args) {
     process.exit(1);
   }
 }
-function getPositionalArgs(args, flagsWithValues) {
+function getPositionalArgs2(args, flagsWithValues) {
   const positional = [];
   for (let index = 0; index < args.length; index++) {
     const arg = args[index];
@@ -782,7 +916,7 @@ function getPositionalArgs(args, flagsWithValues) {
   }
   return positional;
 }
-function getFlag(args, ...flags) {
+function getFlag2(args, ...flags) {
   for (const flag of flags) {
     const idx = args.indexOf(flag);
     if (idx >= 0 && idx + 1 < args.length) {
@@ -846,14 +980,15 @@ async function render(args) {
     console.log(HELP3);
     return;
   }
-  const file = args.find((a) => !a.startsWith("--"));
+  const positional = getPositionalArgs3(args, /* @__PURE__ */ new Set(["--env", "--tier", "--vars"]));
+  const file = positional[0];
   if (!file) {
     console.error("Error: Please provide a prompt file to render.");
     process.exit(1);
   }
-  const env = getFlag2(args, "--env");
-  const tier = getFlag2(args, "--tier");
-  const varsFile = getFlag2(args, "--vars");
+  const env = getFlag3(args, "--env");
+  const tier = getFlag3(args, "--tier");
+  const varsFile = getFlag3(args, "--vars");
   const jsonOutput = args.includes("--json");
   let variables = {};
   if (varsFile) {
@@ -912,7 +1047,22 @@ ${sidecarContent}---
   console.log(`Model:  ${overridden.model ?? "not set"}`);
   console.log("\u2500".repeat(60));
 }
-function getFlag2(args, flag) {
+function getPositionalArgs3(args, flagsWithValues) {
+  const positional = [];
+  for (let index = 0; index < args.length; index++) {
+    const arg = args[index];
+    if (flagsWithValues.has(arg)) {
+      index += 1;
+      continue;
+    }
+    if (arg.startsWith("-")) {
+      continue;
+    }
+    positional.push(arg);
+  }
+  return positional;
+}
+function getFlag3(args, flag) {
   const idx = args.indexOf(flag);
   if (idx >= 0 && idx + 1 < args.length) {
     return args[idx + 1];
@@ -1277,8 +1427,9 @@ Usage:
 
 Commands:
   init [dir]                           Scaffold a prompts directory with starter files
-  validate <dir>                       Validate prompt files
-  compile [src] [out] [options]        Compile .md prompts to JSON/ESM artifacts
+  validate [sourceDir] [options]       Validate prompt files
+  compile [sourceDir] [outputDir] [options]
+                                       Compile .md prompts to JSON/ESM artifacts
   render <file> [options]              Render a prompt preview
   inspect <file>                       Print normalized prompt asset
   skill [options]                      Deploy AI agent instructions into your project
@@ -1297,7 +1448,8 @@ async function main() {
     process.exit(0);
   }
   if (command === "--version" || command === "-v") {
-    console.log("0.0.1");
+    const pkg = JSON.parse(readFileSync2(new URL("../../package.json", import.meta.url), "utf-8"));
+    console.log(pkg.version);
     process.exit(0);
   }
   const commandArgs = args.slice(1);