@shware/security 7.1.1 → 8.0.1

package/dist/session/types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.mts","names":[],"sources":["../../src/session/types.ts"],"mappings":";iBAEiB,uBAAuB;EACtC;EACA,YAAY;EACZ;EACA;EACA;;iBAGe;EACf;EACA,iBAAiB;;YAGP;iBAGK;EACf;EACA;EAEA,aAAa;EACb;EACA,aAAa,cAAc;EAC3B,gBAAgB;EAEhB;EACA;EACA,oBAAoB;EAEpB;EACA,uBAAuB;EAEvB;;iBAGe,kBAAkB,UAAU,UAAU;EACrD,iBAAiB;EACjB,KAAK,SAAS,IAAI;EAClB,SAAS,oBAAoB,QAAQ;EACrC,WAAW,oBAAoB;EAG/B,6BAA6B,mBAAmB,qBAAqB,QAAQ,YAAY;EACzF,oBAAoB,wBAAwB,QAAQ,YAAY;EAGhE,uBAAuB,wBAAwB;;;;;;iBAOhC;EACf,QAAQ,aAAa,eAAe,qBAAqB;EACzD,QAAQ,cAAc;EACtB,WAAW,cAAc;;;;;;;EAOzB,UAAU,aAAa,oBAAoB"}
+{"version":3,"file":"types.d.mts","names":[],"sources":["../../src/session/types.ts"],"mappings":"A,YAEY;iBAEK;EACf;EACA;EAEA,aAAa;EACb;EACA,aAAa,cAAc;EAC3B,gBAAgB;EAEhB;EACA;EACA,oBAAoB;EAEpB;EACA,uBAAuB;EAEvB;;iBAGe,kBAAkB,UAAU,UAAU;EACrD,iBAAiB;EACjB,KAAK,SAAS,IAAI;EAClB,SAAS,oBAAoB,QAAQ;EACrC,WAAW,oBAAoB;EAG/B,6BAA6B,mBAAmB,qBAAqB,QAAQ,YAAY;EACzF,oBAAoB,wBAAwB,QAAQ,YAAY;EAGhE,uBAAuB,wBAAwB;;;;;;iBAOhC;EACf,QAAQ,aAAa,eAAe,qBAAqB;EACzD,QAAQ,cAAc;EACtB,WAAW,cAAc;;;;;;;EAOzB,UAAU,aAAa,oBAAoB"}

package/dist/utils/valid.cjs

@@ -1,68 +1,50 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_auth_respond = require("../auth/respond.cjs");
 // src/utils/valid.ts
-function invalidArgument(reason) {
-	return { error: {
-		code: 400,
-		status: "INVALID_ARGUMENT",
-		message: "Invalid verification code",
-		details: [{
-			"@type": "type.googleapis.com/google.rpc.ErrorInfo",
-			reason
-		}]
-	} };
+/** The body as JSON, or a 400 for one that is not JSON. */
+async function readJson(request) {
+	try {
+		return await request.json();
+	} catch {
+		throw require_auth_respond.invalidArgument("INVALID_JSON", "Request body is not valid JSON");
+	}
 }
-function resourceExhausted(reason, message) {
-	return { error: {
-		code: 429,
-		status: "RESOURCE_EXHAUSTED",
-		message,
-		details: [{
-			"@type": "type.googleapis.com/google.rpc.ErrorInfo",
-			reason
-		}]
-	} };
+/** The body as a form, or a 400 for one that is not `application/x-www-form-urlencoded`. */
+async function readForm(request) {
+	if (!(request.headers.get("content-type")?.toLowerCase() ?? "").startsWith("application/x-www-form-urlencoded")) throw require_auth_respond.invalidArgument("INVALID_CONTENT_TYPE", "Expected application/x-www-form-urlencoded");
+	return Object.fromEntries(new URLSearchParams(await request.text()));
 }
-function valid(schema, json) {
-	const result = schema.safeParse(json);
-	if (result.success) return {
-		error: null,
-		data: result.data
-	};
-	return {
-		error: { error: {
-			code: 400,
-			status: "INVALID_ARGUMENT",
-			message: "Invalid request",
-			details: [{
-				"@type": "type.googleapis.com/google.rpc.BadRequest",
-				fieldViolations: result.error.issues.map(({ code, path, message }) => ({
-					field: path.join("."),
-					description: message,
-					reason: code.toUpperCase(),
-					localizedMessage: {
-						locale: "en-US",
-						message
-					}
-				}))
-			}]
-		} },
-		data: null
-	};
+/** `value` as `schema` reads it, or a 400 `BadRequest` naming each field that failed. */
+function parse(schema, value) {
+	const result = schema.safeParse(value);
+	if (result.success) return result.data;
+	const fieldViolations = result.error.issues.map(({ code, path, message }) => ({
+		field: path.join("."),
+		description: message,
+		reason: code.toUpperCase(),
+		localizedMessage: {
+			locale: "en-US",
+			message
+		}
+	}));
+	throw require_auth_respond.invalidArgument("INVALID_ARGUMENT", "Invalid request", [{
+		"@type": "type.googleapis.com/google.rpc.BadRequest",
+		fieldViolations
+	}]);
 }
 async function verifyTurnstileToken(secret, token) {
-	if ((await (await fetch("https://challenges.cloudflare.com/turnstile/v0/siteverify", {
+	if (!(await (await fetch("https://challenges.cloudflare.com/turnstile/v0/siteverify", {
 		method: "POST",
 		headers: { "Content-Type": "application/x-www-form-urlencoded" },
 		body: new URLSearchParams({
 			secret,
 			response: token
 		})
-	})).json()).success) return { error: null };
-	return { error: invalidArgument("TURNSTILE_VERIFICATION_FAILED") };
+	})).json()).success) throw require_auth_respond.invalidArgument("TURNSTILE_VERIFICATION_FAILED", "Turnstile verification failed");
 }
-exports.invalidArgument = invalidArgument;
-exports.resourceExhausted = resourceExhausted;
-exports.valid = valid;
+exports.parse = parse;
+exports.readForm = readForm;
+exports.readJson = readJson;
 exports.verifyTurnstileToken = verifyTurnstileToken;
 
 //# sourceMappingURL=valid.cjs.map

package/dist/utils/valid.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"valid.cjs","names":[],"sources":["../../src/utils/valid.ts"],"sourcesContent":["import type { ZodType, output } from 'zod';\nimport type { ZodMiniType, output as outputMini } from 'zod/mini';\n\ntype ErrorBody = {\n  error: {\n    code: number;\n    status: string;\n    message: string;\n    details: unknown[];\n  };\n};\n\nexport function invalidArgument(reason: string): ErrorBody {\n  return {\n    error: {\n      code: 400,\n      status: 'INVALID_ARGUMENT',\n      message: 'Invalid verification code',\n      details: [{ '@type': 'type.googleapis.com/google.rpc.ErrorInfo', reason }],\n    },\n  };\n}\n\nexport function resourceExhausted(reason: string, message: string): ErrorBody {\n  return {\n    error: {\n      code: 429,\n      status: 'RESOURCE_EXHAUSTED',\n      message,\n      details: [{ '@type': 'type.googleapis.com/google.rpc.ErrorInfo', reason }],\n    },\n  };\n}\n\ntype Result<S extends ZodType | ZodMiniType> =\n  | { error: null; data: S extends ZodType ? output<S> : outputMini<S> }\n  | { error: ErrorBody; data: null };\n\nexport function valid<S extends ZodType | ZodMiniType>(schema: S, json: unknown): Result<S> {\n  const result = schema.safeParse(json);\n  if (result.success) {\n    return {\n      error: null,\n      data: result.data as S extends ZodType ? output<S> : outputMini<S>,\n    };\n  }\n\n  const fieldViolations = result.error.issues.map(({ code, path, message }) => ({\n    field: path.join('.'),\n    description: message,\n    reason: code.toUpperCase(),\n    localizedMessage: { locale: 'en-US', message },\n  }));\n\n  const error = {\n    error: {\n      code: 400,\n      status: 'INVALID_ARGUMENT',\n      message: 'Invalid request',\n      details: [{ '@type': 'type.googleapis.com/google.rpc.BadRequest', fieldViolations }],\n    },\n  };\n\n  return { error, data: null };\n}\n\nexport async function verifyTurnstileToken(secret: string, token: string) {\n  const response = await fetch('https://challenges.cloudflare.com/turnstile/v0/siteverify', {\n    method: 'POST',\n    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },\n    body: new URLSearchParams({ secret, response: token }),\n  });\n\n  const data = (await response.json()) as { success: boolean };\n  if (data.success) return { error: null };\n  return { error: invalidArgument('TURNSTILE_VERIFICATION_FAILED') };\n}\n"],"mappings":";;AAYA,SAAgB,gBAAgB,QAA2B;CACzD,OAAO,EACL,OAAO;EACL,MAAM;EACN,QAAQ;EACR,SAAS;EACT,SAAS,CAAC;GAAE,SAAS;GAA4C;EAAO,CAAC;CAC3E,EACF;AACF;AAEA,SAAgB,kBAAkB,QAAgB,SAA4B;CAC5E,OAAO,EACL,OAAO;EACL,MAAM;EACN,QAAQ;EACR;EACA,SAAS,CAAC;GAAE,SAAS;GAA4C;EAAO,CAAC;CAC3E,EACF;AACF;AAMA,SAAgB,MAAuC,QAAW,MAA0B;CAC1F,MAAM,SAAS,OAAO,UAAU,IAAI;CACpC,IAAI,OAAO,SACT,OAAO;EACL,OAAO;EACP,MAAM,OAAO;CACf;CAmBF,OAAO;EAAE,OAAA,EARP,OAAO;GACL,MAAM;GACN,QAAQ;GACR,SAAS;GACT,SAAS,CAAC;IAAE,SAAS;IAA6C,iBAZ9C,OAAO,MAAM,OAAO,KAAK,EAAE,MAAM,MAAM,eAAe;KAC5E,OAAO,KAAK,KAAK,GAAG;KACpB,aAAa;KACb,QAAQ,KAAK,YAAY;KACzB,kBAAkB;MAAE,QAAQ;MAAS;KAAQ;IAC/C,EAOoF;GAAE,CAAC;EACrF,EAGW;EAAG,MAAM;CAAK;AAC7B;AAEA,eAAsB,qBAAqB,QAAgB,OAAe;CAQxE,KAAI,OADgB,MANG,MAAM,6DAA6D;EACxF,QAAQ;EACR,SAAS,EAAE,gBAAgB,oCAAoC;EAC/D,MAAM,IAAI,gBAAgB;GAAE;GAAQ,UAAU;EAAM,CAAC;CACvD,CAAC,EAAA,CAE4B,KAAK,EAAA,CACzB,SAAS,OAAO,EAAE,OAAO,KAAK;CACvC,OAAO,EAAE,OAAO,gBAAgB,+BAA+B,EAAE;AACnE"}
+{"version":3,"file":"valid.cjs","names":["invalidArgument"],"sources":["../../src/utils/valid.ts"],"sourcesContent":["import type { ZodType, output } from 'zod';\nimport type { ZodMiniType, output as outputMini } from 'zod/mini';\nimport { invalidArgument } from '../auth/respond';\n\ntype Output<S extends ZodType | ZodMiniType> = S extends ZodType ? output<S> : outputMini<S>;\n\n/** The body as JSON, or a 400 for one that is not JSON. */\nexport async function readJson(request: Request): Promise<unknown> {\n  try {\n    return await request.json();\n  } catch {\n    throw invalidArgument('INVALID_JSON', 'Request body is not valid JSON');\n  }\n}\n\n/** The body as a form, or a 400 for one that is not `application/x-www-form-urlencoded`. */\nexport async function readForm(request: Request): Promise<Record<string, string>> {\n  const type = request.headers.get('content-type')?.toLowerCase() ?? '';\n  if (!type.startsWith('application/x-www-form-urlencoded')) {\n    throw invalidArgument('INVALID_CONTENT_TYPE', 'Expected application/x-www-form-urlencoded');\n  }\n  return Object.fromEntries(new URLSearchParams(await request.text()));\n}\n\n/** `value` as `schema` reads it, or a 400 `BadRequest` naming each field that failed. */\nexport function parse<S extends ZodType | ZodMiniType>(schema: S, value: unknown): Output<S> {\n  const result = schema.safeParse(value);\n  if (result.success) return result.data as Output<S>;\n  const fieldViolations = result.error.issues.map(({ code, path, message }) => ({\n    field: path.join('.'),\n    description: message,\n    reason: code.toUpperCase(),\n    localizedMessage: { locale: 'en-US', message },\n  }));\n  throw invalidArgument('INVALID_ARGUMENT', 'Invalid request', [\n    { '@type': 'type.googleapis.com/google.rpc.BadRequest', fieldViolations },\n  ]);\n}\n\nexport async function verifyTurnstileToken(secret: string, token: string): Promise<void> {\n  const response = await fetch('https://challenges.cloudflare.com/turnstile/v0/siteverify', {\n    method: 'POST',\n    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },\n    body: new URLSearchParams({ secret, response: token }),\n  });\n  const data = (await response.json()) as { success: boolean };\n  if (!data.success) {\n    throw invalidArgument('TURNSTILE_VERIFICATION_FAILED', 'Turnstile verification failed');\n  }\n}\n"],"mappings":";;;;AAOA,eAAsB,SAAS,SAAoC;CACjE,IAAI;EACF,OAAO,MAAM,QAAQ,KAAK;CAC5B,QAAQ;EACN,MAAMA,qBAAAA,gBAAgB,gBAAgB,gCAAgC;CACxE;AACF;;AAGA,eAAsB,SAAS,SAAmD;CAEhF,IAAI,EADS,QAAQ,QAAQ,IAAI,cAAc,CAAC,EAAE,YAAY,KAAK,GAAA,CACzD,WAAW,mCAAmC,GACtD,MAAMA,qBAAAA,gBAAgB,wBAAwB,4CAA4C;CAE5F,OAAO,OAAO,YAAY,IAAI,gBAAgB,MAAM,QAAQ,KAAK,CAAC,CAAC;AACrE;;AAGA,SAAgB,MAAuC,QAAW,OAA2B;CAC3F,MAAM,SAAS,OAAO,UAAU,KAAK;CACrC,IAAI,OAAO,SAAS,OAAO,OAAO;CAClC,MAAM,kBAAkB,OAAO,MAAM,OAAO,KAAK,EAAE,MAAM,MAAM,eAAe;EAC5E,OAAO,KAAK,KAAK,GAAG;EACpB,aAAa;EACb,QAAQ,KAAK,YAAY;EACzB,kBAAkB;GAAE,QAAQ;GAAS;EAAQ;CAC/C,EAAE;CACF,MAAMA,qBAAAA,gBAAgB,oBAAoB,mBAAmB,CAC3D;EAAE,SAAS;EAA6C;CAAgB,CAC1E,CAAC;AACH;AAEA,eAAsB,qBAAqB,QAAgB,OAA8B;CAOvF,IAAI,EAAC,OADe,MALG,MAAM,6DAA6D;EACxF,QAAQ;EACR,SAAS,EAAE,gBAAgB,oCAAoC;EAC/D,MAAM,IAAI,gBAAgB;GAAE;GAAQ,UAAU;EAAM,CAAC;CACvD,CAAC,EAAA,CAC4B,KAAK,EAAA,CACxB,SACR,MAAMA,qBAAAA,gBAAgB,iCAAiC,+BAA+B;AAE1F"}

package/dist/utils/valid.d.cts

@@ -1,27 +1,12 @@
 import { ZodType, output } from "zod";
 import { ZodMiniType, output as output$1 } from "zod/mini";
-type ErrorBody = {
-  error: {
-    code: number;
-    status: string;
-    message: string;
-    details: unknown[];
-  };
-};
-export declare function invalidArgument(reason: string): ErrorBody;
-export declare function resourceExhausted(reason: string, message: string): ErrorBody;
-type Result<S extends ZodType | ZodMiniType> = {
-  error: null;
-  data: S extends ZodType ? output<S> : output$1<S>;
-} | {
-  error: ErrorBody;
-  data: null;
-};
-export declare function valid<S extends ZodType | ZodMiniType>(schema: S, json: unknown): Result<S>;
-export declare function verifyTurnstileToken(secret: string, token: string): Promise<{
-  error: null;
-} | {
-  error: ErrorBody;
-}>;
+type Output<S extends ZodType | ZodMiniType> = S extends ZodType ? output<S> : output$1<S>;
+/** The body as JSON, or a 400 for one that is not JSON. */
+export declare function readJson(request: Request): Promise<unknown>;
+/** The body as a form, or a 400 for one that is not `application/x-www-form-urlencoded`. */
+export declare function readForm(request: Request): Promise<Record<string, string>>;
+/** `value` as `schema` reads it, or a 400 `BadRequest` naming each field that failed. */
+export declare function parse<S extends ZodType | ZodMiniType>(schema: S, value: unknown): Output<S>;
+export declare function verifyTurnstileToken(secret: string, token: string): Promise<void>;
 export {};
 //# sourceMappingURL=valid.d.cts.map

package/dist/utils/valid.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"valid.d.cts","names":["outputMini"],"sources":["../../src/utils/valid.ts"],"mappings":";;KAGK;EACH;IACE;IACA;IACA;IACA;;;wBAIY,gBAAgB,iBAAiB;wBAWjC,kBAAkB,gBAAgB,kBAAkB;KAW/D,OAAO,UAAU,UAAU;EAC1B;EAAa,MAAM,UAAU,UAAU,OAAO,KAAKA,SAAW;;EAC9D,OAAO;EAAW;;wBAER,MAAM,UAAU,UAAU,aAAa,QAAQ,GAAG,gBAAgB,OAAO;wBA4BnE,qBAAqB,gBAAgB,gBAAa"}
+{"version":3,"file":"valid.d.cts","names":["outputMini"],"sources":["../../src/utils/valid.ts"],"mappings":";;KAIK,OAAO,UAAU,UAAU,eAAe,UAAU,UAAU,OAAO,KAAKA,SAAW;;wBAGpE,SAAS,SAAS,UAAU;;wBAS5B,SAAS,SAAS,UAAU,QAAQ;;wBAS1C,MAAM,UAAU,UAAU,aAAa,QAAQ,GAAG,iBAAiB,OAAO;wBAcpE,qBAAqB,gBAAgB,gBAAgB"}

package/dist/utils/valid.d.mts

@@ -1,27 +1,12 @@
 import { ZodMiniType, output } from "zod/mini";
 import { ZodType, output as output$1 } from "zod";
-type ErrorBody = {
-  error: {
-    code: number;
-    status: string;
-    message: string;
-    details: unknown[];
-  };
-};
-export declare function invalidArgument(reason: string): ErrorBody;
-export declare function resourceExhausted(reason: string, message: string): ErrorBody;
-type Result<S extends ZodType | ZodMiniType> = {
-  error: null;
-  data: S extends ZodType ? output$1<S> : output<S>;
-} | {
-  error: ErrorBody;
-  data: null;
-};
-export declare function valid<S extends ZodType | ZodMiniType>(schema: S, json: unknown): Result<S>;
-export declare function verifyTurnstileToken(secret: string, token: string): Promise<{
-  error: null;
-} | {
-  error: ErrorBody;
-}>;
+type Output<S extends ZodType | ZodMiniType> = S extends ZodType ? output$1<S> : output<S>;
+/** The body as JSON, or a 400 for one that is not JSON. */
+export declare function readJson(request: Request): Promise<unknown>;
+/** The body as a form, or a 400 for one that is not `application/x-www-form-urlencoded`. */
+export declare function readForm(request: Request): Promise<Record<string, string>>;
+/** `value` as `schema` reads it, or a 400 `BadRequest` naming each field that failed. */
+export declare function parse<S extends ZodType | ZodMiniType>(schema: S, value: unknown): Output<S>;
+export declare function verifyTurnstileToken(secret: string, token: string): Promise<void>;
 export {};
 //# sourceMappingURL=valid.d.mts.map

package/dist/utils/valid.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"valid.d.mts","names":["output","outputMini"],"sources":["../../src/utils/valid.ts"],"mappings":";;KAGK;EACH;IACE;IACA;IACA;IACA;;;wBAIY,gBAAgB,iBAAiB;wBAWjC,kBAAkB,gBAAgB,kBAAkB;KAW/D,OAAO,UAAU,UAAU;EAC1B;EAAa,MAAM,UAAU,UAAUA,SAAO,KAAKC,OAAW;;EAC9D,OAAO;EAAW;;wBAER,MAAM,UAAU,UAAU,aAAa,QAAQ,GAAG,gBAAgB,OAAO;wBA4BnE,qBAAqB,gBAAgB,gBAAa"}
+{"version":3,"file":"valid.d.mts","names":["output","outputMini"],"sources":["../../src/utils/valid.ts"],"mappings":";;KAIK,OAAO,UAAU,UAAU,eAAe,UAAU,UAAUA,SAAO,KAAKC,OAAW;;wBAGpE,SAAS,SAAS,UAAU;;wBAS5B,SAAS,SAAS,UAAU,QAAQ;;wBAS1C,MAAM,UAAU,UAAU,aAAa,QAAQ,GAAG,iBAAiB,OAAO;wBAcpE,qBAAqB,gBAAgB,gBAAgB"}

package/dist/utils/valid.mjs

@@ -1,64 +1,46 @@
+import { invalidArgument } from "../auth/respond.mjs";
 // src/utils/valid.ts
-function invalidArgument(reason) {
-	return { error: {
-		code: 400,
-		status: "INVALID_ARGUMENT",
-		message: "Invalid verification code",
-		details: [{
-			"@type": "type.googleapis.com/google.rpc.ErrorInfo",
-			reason
-		}]
-	} };
+/** The body as JSON, or a 400 for one that is not JSON. */
+async function readJson(request) {
+	try {
+		return await request.json();
+	} catch {
+		throw invalidArgument("INVALID_JSON", "Request body is not valid JSON");
+	}
 }
-function resourceExhausted(reason, message) {
-	return { error: {
-		code: 429,
-		status: "RESOURCE_EXHAUSTED",
-		message,
-		details: [{
-			"@type": "type.googleapis.com/google.rpc.ErrorInfo",
-			reason
-		}]
-	} };
+/** The body as a form, or a 400 for one that is not `application/x-www-form-urlencoded`. */
+async function readForm(request) {
+	if (!(request.headers.get("content-type")?.toLowerCase() ?? "").startsWith("application/x-www-form-urlencoded")) throw invalidArgument("INVALID_CONTENT_TYPE", "Expected application/x-www-form-urlencoded");
+	return Object.fromEntries(new URLSearchParams(await request.text()));
 }
-function valid(schema, json) {
-	const result = schema.safeParse(json);
-	if (result.success) return {
-		error: null,
-		data: result.data
-	};
-	return {
-		error: { error: {
-			code: 400,
-			status: "INVALID_ARGUMENT",
-			message: "Invalid request",
-			details: [{
-				"@type": "type.googleapis.com/google.rpc.BadRequest",
-				fieldViolations: result.error.issues.map(({ code, path, message }) => ({
-					field: path.join("."),
-					description: message,
-					reason: code.toUpperCase(),
-					localizedMessage: {
-						locale: "en-US",
-						message
-					}
-				}))
-			}]
-		} },
-		data: null
-	};
+/** `value` as `schema` reads it, or a 400 `BadRequest` naming each field that failed. */
+function parse(schema, value) {
+	const result = schema.safeParse(value);
+	if (result.success) return result.data;
+	const fieldViolations = result.error.issues.map(({ code, path, message }) => ({
+		field: path.join("."),
+		description: message,
+		reason: code.toUpperCase(),
+		localizedMessage: {
+			locale: "en-US",
+			message
+		}
+	}));
+	throw invalidArgument("INVALID_ARGUMENT", "Invalid request", [{
+		"@type": "type.googleapis.com/google.rpc.BadRequest",
+		fieldViolations
+	}]);
 }
 async function verifyTurnstileToken(secret, token) {
-	if ((await (await fetch("https://challenges.cloudflare.com/turnstile/v0/siteverify", {
+	if (!(await (await fetch("https://challenges.cloudflare.com/turnstile/v0/siteverify", {
 		method: "POST",
 		headers: { "Content-Type": "application/x-www-form-urlencoded" },
 		body: new URLSearchParams({
 			secret,
 			response: token
 		})
-	})).json()).success) return { error: null };
-	return { error: invalidArgument("TURNSTILE_VERIFICATION_FAILED") };
+	})).json()).success) throw invalidArgument("TURNSTILE_VERIFICATION_FAILED", "Turnstile verification failed");
 }
-export { invalidArgument, resourceExhausted, valid, verifyTurnstileToken };
+export { parse, readForm, readJson, verifyTurnstileToken };
 
 //# sourceMappingURL=valid.mjs.map

package/dist/utils/valid.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"valid.mjs","names":[],"sources":["../../src/utils/valid.ts"],"sourcesContent":["import type { ZodType, output } from 'zod';\nimport type { ZodMiniType, output as outputMini } from 'zod/mini';\n\ntype ErrorBody = {\n  error: {\n    code: number;\n    status: string;\n    message: string;\n    details: unknown[];\n  };\n};\n\nexport function invalidArgument(reason: string): ErrorBody {\n  return {\n    error: {\n      code: 400,\n      status: 'INVALID_ARGUMENT',\n      message: 'Invalid verification code',\n      details: [{ '@type': 'type.googleapis.com/google.rpc.ErrorInfo', reason }],\n    },\n  };\n}\n\nexport function resourceExhausted(reason: string, message: string): ErrorBody {\n  return {\n    error: {\n      code: 429,\n      status: 'RESOURCE_EXHAUSTED',\n      message,\n      details: [{ '@type': 'type.googleapis.com/google.rpc.ErrorInfo', reason }],\n    },\n  };\n}\n\ntype Result<S extends ZodType | ZodMiniType> =\n  | { error: null; data: S extends ZodType ? output<S> : outputMini<S> }\n  | { error: ErrorBody; data: null };\n\nexport function valid<S extends ZodType | ZodMiniType>(schema: S, json: unknown): Result<S> {\n  const result = schema.safeParse(json);\n  if (result.success) {\n    return {\n      error: null,\n      data: result.data as S extends ZodType ? output<S> : outputMini<S>,\n    };\n  }\n\n  const fieldViolations = result.error.issues.map(({ code, path, message }) => ({\n    field: path.join('.'),\n    description: message,\n    reason: code.toUpperCase(),\n    localizedMessage: { locale: 'en-US', message },\n  }));\n\n  const error = {\n    error: {\n      code: 400,\n      status: 'INVALID_ARGUMENT',\n      message: 'Invalid request',\n      details: [{ '@type': 'type.googleapis.com/google.rpc.BadRequest', fieldViolations }],\n    },\n  };\n\n  return { error, data: null };\n}\n\nexport async function verifyTurnstileToken(secret: string, token: string) {\n  const response = await fetch('https://challenges.cloudflare.com/turnstile/v0/siteverify', {\n    method: 'POST',\n    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },\n    body: new URLSearchParams({ secret, response: token }),\n  });\n\n  const data = (await response.json()) as { success: boolean };\n  if (data.success) return { error: null };\n  return { error: invalidArgument('TURNSTILE_VERIFICATION_FAILED') };\n}\n"],"mappings":";AAYA,SAAgB,gBAAgB,QAA2B;CACzD,OAAO,EACL,OAAO;EACL,MAAM;EACN,QAAQ;EACR,SAAS;EACT,SAAS,CAAC;GAAE,SAAS;GAA4C;EAAO,CAAC;CAC3E,EACF;AACF;AAEA,SAAgB,kBAAkB,QAAgB,SAA4B;CAC5E,OAAO,EACL,OAAO;EACL,MAAM;EACN,QAAQ;EACR;EACA,SAAS,CAAC;GAAE,SAAS;GAA4C;EAAO,CAAC;CAC3E,EACF;AACF;AAMA,SAAgB,MAAuC,QAAW,MAA0B;CAC1F,MAAM,SAAS,OAAO,UAAU,IAAI;CACpC,IAAI,OAAO,SACT,OAAO;EACL,OAAO;EACP,MAAM,OAAO;CACf;CAmBF,OAAO;EAAE,OAAA,EARP,OAAO;GACL,MAAM;GACN,QAAQ;GACR,SAAS;GACT,SAAS,CAAC;IAAE,SAAS;IAA6C,iBAZ9C,OAAO,MAAM,OAAO,KAAK,EAAE,MAAM,MAAM,eAAe;KAC5E,OAAO,KAAK,KAAK,GAAG;KACpB,aAAa;KACb,QAAQ,KAAK,YAAY;KACzB,kBAAkB;MAAE,QAAQ;MAAS;KAAQ;IAC/C,EAOoF;GAAE,CAAC;EACrF,EAGW;EAAG,MAAM;CAAK;AAC7B;AAEA,eAAsB,qBAAqB,QAAgB,OAAe;CAQxE,KAAI,OADgB,MANG,MAAM,6DAA6D;EACxF,QAAQ;EACR,SAAS,EAAE,gBAAgB,oCAAoC;EAC/D,MAAM,IAAI,gBAAgB;GAAE;GAAQ,UAAU;EAAM,CAAC;CACvD,CAAC,EAAA,CAE4B,KAAK,EAAA,CACzB,SAAS,OAAO,EAAE,OAAO,KAAK;CACvC,OAAO,EAAE,OAAO,gBAAgB,+BAA+B,EAAE;AACnE"}
+{"version":3,"file":"valid.mjs","names":[],"sources":["../../src/utils/valid.ts"],"sourcesContent":["import type { ZodType, output } from 'zod';\nimport type { ZodMiniType, output as outputMini } from 'zod/mini';\nimport { invalidArgument } from '../auth/respond';\n\ntype Output<S extends ZodType | ZodMiniType> = S extends ZodType ? output<S> : outputMini<S>;\n\n/** The body as JSON, or a 400 for one that is not JSON. */\nexport async function readJson(request: Request): Promise<unknown> {\n  try {\n    return await request.json();\n  } catch {\n    throw invalidArgument('INVALID_JSON', 'Request body is not valid JSON');\n  }\n}\n\n/** The body as a form, or a 400 for one that is not `application/x-www-form-urlencoded`. */\nexport async function readForm(request: Request): Promise<Record<string, string>> {\n  const type = request.headers.get('content-type')?.toLowerCase() ?? '';\n  if (!type.startsWith('application/x-www-form-urlencoded')) {\n    throw invalidArgument('INVALID_CONTENT_TYPE', 'Expected application/x-www-form-urlencoded');\n  }\n  return Object.fromEntries(new URLSearchParams(await request.text()));\n}\n\n/** `value` as `schema` reads it, or a 400 `BadRequest` naming each field that failed. */\nexport function parse<S extends ZodType | ZodMiniType>(schema: S, value: unknown): Output<S> {\n  const result = schema.safeParse(value);\n  if (result.success) return result.data as Output<S>;\n  const fieldViolations = result.error.issues.map(({ code, path, message }) => ({\n    field: path.join('.'),\n    description: message,\n    reason: code.toUpperCase(),\n    localizedMessage: { locale: 'en-US', message },\n  }));\n  throw invalidArgument('INVALID_ARGUMENT', 'Invalid request', [\n    { '@type': 'type.googleapis.com/google.rpc.BadRequest', fieldViolations },\n  ]);\n}\n\nexport async function verifyTurnstileToken(secret: string, token: string): Promise<void> {\n  const response = await fetch('https://challenges.cloudflare.com/turnstile/v0/siteverify', {\n    method: 'POST',\n    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },\n    body: new URLSearchParams({ secret, response: token }),\n  });\n  const data = (await response.json()) as { success: boolean };\n  if (!data.success) {\n    throw invalidArgument('TURNSTILE_VERIFICATION_FAILED', 'Turnstile verification failed');\n  }\n}\n"],"mappings":";;;AAOA,eAAsB,SAAS,SAAoC;CACjE,IAAI;EACF,OAAO,MAAM,QAAQ,KAAK;CAC5B,QAAQ;EACN,MAAM,gBAAgB,gBAAgB,gCAAgC;CACxE;AACF;;AAGA,eAAsB,SAAS,SAAmD;CAEhF,IAAI,EADS,QAAQ,QAAQ,IAAI,cAAc,CAAC,EAAE,YAAY,KAAK,GAAA,CACzD,WAAW,mCAAmC,GACtD,MAAM,gBAAgB,wBAAwB,4CAA4C;CAE5F,OAAO,OAAO,YAAY,IAAI,gBAAgB,MAAM,QAAQ,KAAK,CAAC,CAAC;AACrE;;AAGA,SAAgB,MAAuC,QAAW,OAA2B;CAC3F,MAAM,SAAS,OAAO,UAAU,KAAK;CACrC,IAAI,OAAO,SAAS,OAAO,OAAO;CAClC,MAAM,kBAAkB,OAAO,MAAM,OAAO,KAAK,EAAE,MAAM,MAAM,eAAe;EAC5E,OAAO,KAAK,KAAK,GAAG;EACpB,aAAa;EACb,QAAQ,KAAK,YAAY;EACzB,kBAAkB;GAAE,QAAQ;GAAS;EAAQ;CAC/C,EAAE;CACF,MAAM,gBAAgB,oBAAoB,mBAAmB,CAC3D;EAAE,SAAS;EAA6C;CAAgB,CAC1E,CAAC;AACH;AAEA,eAAsB,qBAAqB,QAAgB,OAA8B;CAOvF,IAAI,EAAC,OADe,MALG,MAAM,6DAA6D;EACxF,QAAQ;EACR,SAAS,EAAE,gBAAgB,oCAAoC;EAC/D,MAAM,IAAI,gBAAgB;GAAE;GAAQ,UAAU;EAAM,CAAC;CACvD,CAAC,EAAA,CAC4B,KAAK,EAAA,CACxB,SACR,MAAM,gBAAgB,iCAAiC,+BAA+B;AAE1F"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shware/security",
-  "version": "7.1.1",
+  "version": "8.0.1",
   "private": false,
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@shware/utils": "^2.0.1",
+    "@shware/utils": "^2.0.2",
     "cookie": "^2.0.1",
     "jose": "^6.2.13",
     "path-to-regexp": "^8.4.2"
@@ -62,7 +62,7 @@
     "dev": "tsc --watch",
     "build": "tsdown",
     "test": "vitest run",
-    "check-types": "tsc --noEmit",
+    "check-types": "tsc --noEmit && tsc --noEmit -p tsconfig.typetests.json",
     "lint": "oxlint --type-aware src --fix"
   }
 }