promptopskit 0.3.6 → 0.3.8

package/dist/index.cjs

@@ -251,12 +251,28 @@ var ResponseSchema = import_zod.z.object({
 var HistorySchema = import_zod.z.object({
   max_items: import_zod.z.number().int().positive().optional()
 });
+var ContextRegexSchema = import_zod.z.union([
+  import_zod.z.string(),
+  import_zod.z.object({
+    pattern: import_zod.z.string(),
+    flags: import_zod.z.string().optional(),
+    return_message: import_zod.z.string().optional()
+  })
+]);
+var ContextBuiltInValidatorSchema = import_zod.z.union([
+  import_zod.z.boolean(),
+  import_zod.z.object({
+    return_message: import_zod.z.string().optional()
+  })
+]);
 var ContextInputDefinitionObjectSchema = import_zod.z.object({
   name: import_zod.z.string(),
   max_size: import_zod.z.number().int().positive().optional(),
   trim: import_zod.z.union([import_zod.z.boolean(), import_zod.z.enum(["start", "end", "both"])]).optional(),
-  allow_regex: import_zod.z.string().optional(),
-  deny_regex: import_zod.z.string().optional()
+  allow_regex: ContextRegexSchema.optional(),
+  deny_regex: ContextRegexSchema.optional(),
+  non_empty: ContextBuiltInValidatorSchema.optional(),
+  reject_secrets: ContextBuiltInValidatorSchema.optional()
 });
 var ContextInputDefinitionSchema = import_zod.z.union([
   import_zod.z.string(),
@@ -601,6 +617,8 @@ function resolveInlinePromptSource(source, options = {}) {
 
 // src/context.ts
 var textEncoder = new TextEncoder();
+var REJECT_SECRETS_PATTERN = "(secret|api[_-]?key|password)";
+var REJECT_SECRETS_FLAGS = "i";
 function getContextInputs(asset) {
   return (asset.context?.inputs ?? []).map(normalizeContextInput);
 }
@@ -615,8 +633,102 @@ 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 })}`);
+  }
+}
+function getRejectSecretsRegex() {
+  return {
+    pattern: REJECT_SECRETS_PATTERN,
+    flags: REJECT_SECRETS_FLAGS,
+    raw: JSON.stringify({ pattern: REJECT_SECRETS_PATTERN, flags: REJECT_SECRETS_FLAGS })
   };
 }
 function isTrimEnabled(mode) {
@@ -688,8 +800,23 @@ function sanitizeContextVariables(asset, variables = {}, options = {}) {
     sanitized[input.name] = candidate;
     if (input.allow_regex) {
       const candidate2 = sanitized[input.name];
-      const matcher = new RegExp(input.allow_regex);
+      const matcher = compileContextRegex(input.allow_regex, {
+        promptId: asset.id,
+        variable: input.name,
+        field: "allow_regex"
+      });
       if (!matcher.test(candidate2)) {
+        if (input.allow_regex.returnMessage) {
+          return {
+            variables: sanitized,
+            shortCircuit: {
+              returnMessage: input.allow_regex.returnMessage,
+              code: "POK031",
+              variable: input.name,
+              field: "allow_regex"
+            }
+          };
+        }
         throw new Error(
           `POK031: Context variable "${input.name}" failed allow_regex validation for prompt "${asset.id}".`
         );
@@ -697,15 +824,69 @@ function sanitizeContextVariables(asset, variables = {}, options = {}) {
     }
     if (input.deny_regex) {
       const candidate2 = sanitized[input.name];
-      const matcher = new RegExp(input.deny_regex);
+      const matcher = compileContextRegex(input.deny_regex, {
+        promptId: asset.id,
+        variable: input.name,
+        field: "deny_regex"
+      });
       if (matcher.test(candidate2)) {
+        if (input.deny_regex.returnMessage) {
+          return {
+            variables: sanitized,
+            shortCircuit: {
+              returnMessage: input.deny_regex.returnMessage,
+              code: "POK032",
+              variable: input.name,
+              field: "deny_regex"
+            }
+          };
+        }
         throw new Error(
           `POK032: Context variable "${input.name}" matched deny_regex for prompt "${asset.id}".`
         );
       }
     }
+    if (input.non_empty && candidate.trim().length === 0) {
+      if (input.non_empty.returnMessage) {
+        return {
+          variables: sanitized,
+          shortCircuit: {
+            returnMessage: input.non_empty.returnMessage,
+            code: "POK033",
+            variable: input.name,
+            field: "non_empty"
+          }
+        };
+      }
+      throw new Error(
+        `POK033: Context variable "${input.name}" failed non_empty validation for prompt "${asset.id}".`
+      );
+    }
+    if (input.reject_secrets) {
+      const matcher = compileContextRegex(getRejectSecretsRegex(), {
+        promptId: asset.id,
+        variable: input.name,
+        field: "reject_secrets"
+      });
+      if (matcher.test(candidate)) {
+        if (input.reject_secrets.returnMessage) {
+          return {
+            variables: sanitized,
+            shortCircuit: {
+              returnMessage: input.reject_secrets.returnMessage,
+              code: "POK034",
+              variable: input.name,
+              field: "reject_secrets"
+            }
+          };
+        }
+        throw new Error(
+          `POK034: Context variable "${input.name}" matched reject_secrets validation for prompt "${asset.id}".`
+        );
+      }
+    }
   }
-  return sanitized;
+  return { variables: sanitized };
 }
 function measureContextValueSize(value) {
   return textEncoder.encode(value).length;
@@ -755,12 +936,19 @@ function withPromptInputSupport(adapter) {
   };
   const renderPrompt2 = async (input, runtime) => {
     const resolved = await resolveProviderPromptInput(input, runtime);
-    const variables = sanitizeContextVariables(resolved, runtime.variables, {
+    const sanitization = sanitizeContextVariables(resolved, runtime.variables, {
       onContextOverflow: runtime.onContextOverflow
     });
+    if (sanitization.shortCircuit) {
+      return {
+        provider: adapter.name,
+        model: resolved.model ?? "",
+        returnMessage: sanitization.shortCircuit.returnMessage
+      };
+    }
     return adapter.render(resolved, {
       ...runtime,
-      variables
+      variables: sanitization.variables
     });
   };
   return {
@@ -1168,16 +1356,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
         });
       }
@@ -1664,10 +1856,17 @@ var PromptOpsKit = class {
 ` + validation.errors.map((e) => `  - ${e}`).join("\n")
       );
     }
-    const sanitizedVariables = sanitizeContextVariables(resolved, options.variables, {
+    const sanitization = sanitizeContextVariables(resolved, options.variables, {
       onContextOverflow: options.onContextOverflow
     });
-    const contextSizeWarnings = collectContextSizeWarnings(resolved, sanitizedVariables).map(
+    if (sanitization.shortCircuit) {
+      return {
+        resolved,
+        returnMessage: sanitization.shortCircuit.returnMessage,
+        warnings: validation.warnings
+      };
+    }
+    const contextSizeWarnings = collectContextSizeWarnings(resolved, sanitization.variables).map(
       (warning) => formatContextSizeWarning(resolved, warning)
     );
     const contextWarningPolicy = this.config.warnings?.contextSize;
@@ -1677,7 +1876,7 @@ var PromptOpsKit = class {
       }
     }
     const request = adapter.render(resolved, {
-      variables: sanitizedVariables,
+      variables: sanitization.variables,
       history: options.history,
       toolRegistry: options.toolRegistry,
       strict: options.strict