@cedarjs/api 9.0.0-canary.1784 → 9.0.0-canary.3124

package/dist/signedTokens/signedTokens.d.ts

@@ -0,0 +1,99 @@
+import type { SignOptions } from 'jsonwebtoken';
+/**
+ * Name of the environment variable that holds the default secret used to
+ * sign and verify tokens when no `secret` option is passed.
+ */
+export declare const SIGNED_TOKEN_SECRET_ENV_VAR = "SIGNED_TOKEN_SECRET";
+/**
+ * Machine-readable reason a `SignedTokenError` was thrown. Use it to tell an
+ * expired link apart from a tampered one without matching on the message.
+ */
+export type SignedTokenErrorCode = 'MISSING_SECRET' | 'MISSING_PURPOSE' | 'MISSING_TOKEN' | 'SIGN_FAILED' | 'INVALID' | 'EXPIRED' | 'PURPOSE_MISMATCH';
+/**
+ * Thrown by `createSignedToken` and `verifySignedToken` whenever a token
+ * cannot be created or cannot be trusted. Verification never returns `null`
+ * or `false` for a bad token; it always throws so a missing check cannot
+ * silently pass.
+ */
+export declare class SignedTokenError extends Error {
+    code: SignedTokenErrorCode;
+    constructor(code: SignedTokenErrorCode, message: string, cause?: unknown);
+}
+/**
+ * How long a token stays valid. A number is a count of seconds. A string is
+ * a duration such as `'10m'`, `'2h'`, or `'7 days'`.
+ */
+export type SignedTokenExpiresIn = NonNullable<SignOptions['expiresIn']>;
+export interface CreateSignedTokenOptions<TPayload extends object> {
+    /**
+     * The claims to carry inside the token. Serialized as JSON, so only
+     * JSON-compatible values survive the round trip (a `Date` comes back as a
+     * string).
+     */
+    payload: TPayload;
+    /**
+     * What the token is for, such as `'google-oauth-state'` or
+     * `'email-confirmation'`. A token only verifies when the same purpose is
+     * passed to `verifySignedToken`, so a token minted for one flow cannot be
+     * replayed in another.
+     */
+    purpose: string;
+    /** How long the token stays valid. See `SignedTokenExpiresIn`. */
+    expiresIn: SignedTokenExpiresIn;
+    /**
+     * The secret to sign with. Defaults to the `SIGNED_TOKEN_SECRET`
+     * environment variable. There is no built-in fallback: when neither is set
+     * a `SignedTokenError` with code `MISSING_SECRET` is thrown.
+     */
+    secret?: string;
+}
+export interface VerifySignedTokenOptions {
+    /** The purpose the token must have been created with. */
+    purpose: string;
+    /**
+     * The secret to verify with. Defaults to the `SIGNED_TOKEN_SECRET`
+     * environment variable. There is no built-in fallback: when neither is set
+     * a `SignedTokenError` with code `MISSING_SECRET` is thrown.
+     */
+    secret?: string;
+}
+/**
+ * Creates a compact, URL-safe token that carries `payload`, is bound to
+ * `purpose`, expires after `expiresIn`, and is signed so it can only have
+ * come from this application.
+ *
+ * Use it wherever a value has to leave the server and come back untouched:
+ * OAuth `state`, email confirmation and password-set links, unsubscribe
+ * links, or short-lived capability tokens.
+ *
+ * @example
+ *
+ *    const state = createSignedToken({
+ *      payload: { organizationId, userId },
+ *      purpose: 'google-oauth-state',
+ *      expiresIn: '10m',
+ *    })
+ */
+export declare function createSignedToken<TPayload extends object>({ payload, purpose, expiresIn, secret, }: CreateSignedTokenOptions<TPayload>): string;
+/**
+ * Verifies a token created by `createSignedToken` and returns its payload.
+ *
+ * Throws a `SignedTokenError` when the token is missing, was signed with a
+ * different secret, has been tampered with, has expired, or was created for
+ * a different `purpose`. The error's `code` says which.
+ *
+ * The token argument accepts `null` and `undefined` on purpose so a value
+ * read straight from a query string or a header can be passed in as-is. A
+ * missing token is a verification failure, never a skipped check.
+ *
+ * @example
+ *
+ *    const { organizationId, userId } = verifySignedToken<{
+ *      organizationId: string
+ *      userId: string
+ *    }>(event.queryStringParameters?.state, {
+ *      purpose: 'google-oauth-state',
+ *    })
+ */
+export declare function verifySignedToken<TPayload extends object = Record<string, unknown>>(token: string | null | undefined, { purpose, secret }: VerifySignedTokenOptions): TPayload;
+//# sourceMappingURL=signedTokens.d.ts.map

package/dist/signedTokens/signedTokens.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"signedTokens.d.ts","sourceRoot":"","sources":["../../src/signedTokens/signedTokens.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE/C;;;GAGG;AACH,eAAO,MAAM,2BAA2B,wBAAwB,CAAA;AAEhE;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAC5B,gBAAgB,GAChB,iBAAiB,GACjB,eAAe,GACf,aAAa,GACb,SAAS,GACT,SAAS,GACT,kBAAkB,CAAA;AAEtB;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,IAAI,EAAE,oBAAoB,CAAA;gBAEd,IAAI,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO;CAKzE;AAED;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAA;AAExE,MAAM,WAAW,wBAAwB,CAAC,QAAQ,SAAS,MAAM;IAC/D;;;;OAIG;IACH,OAAO,EAAE,QAAQ,CAAA;IACjB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAA;IACf,kEAAkE;IAClE,SAAS,EAAE,oBAAoB,CAAA;IAC/B;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,yDAAyD;IACzD,OAAO,EAAE,MAAM,CAAA;IACf;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAiED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,SAAS,MAAM,EAAE,EACzD,OAAO,EACP,OAAO,EACP,SAAS,EACT,MAAM,GACP,EAAE,wBAAwB,CAAC,QAAQ,CAAC,GAAG,MAAM,CAkB7C;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAEjD,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAChC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,wBAAwB,GAC5C,QAAQ,CA2CV"}

package/dist/signedTokens/signedTokens.js

@@ -0,0 +1,100 @@
+import jwt from "jsonwebtoken";
+const SIGNED_TOKEN_SECRET_ENV_VAR = "SIGNED_TOKEN_SECRET";
+class SignedTokenError extends Error {
+  code;
+  constructor(code, message, cause) {
+    super(message, cause === void 0 ? void 0 : { cause });
+    this.name = "SignedTokenError";
+    this.code = code;
+  }
+}
+const ALGORITHM = "HS256";
+function resolveSecret(secret, action) {
+  const resolved = secret ?? process.env[SIGNED_TOKEN_SECRET_ENV_VAR];
+  if (typeof resolved === "string" && resolved.length > 0) {
+    return resolved;
+  }
+  throw new SignedTokenError(
+    "MISSING_SECRET",
+    `Cannot ${action} a signed token because no secret is configured. Set the ${SIGNED_TOKEN_SECRET_ENV_VAR} environment variable (generate a value with \`yarn cedar generate secret\`), or pass the \`secret\` option explicitly.`
+  );
+}
+function assertPurpose(purpose) {
+  if (typeof purpose === "string" && purpose.length > 0) {
+    return;
+  }
+  throw new SignedTokenError(
+    "MISSING_PURPOSE",
+    "A signed token needs a non-empty `purpose` string, such as 'google-oauth-state' or 'email-confirmation'. The purpose is what stops a token created for one flow from verifying in another."
+  );
+}
+function isSignedTokenClaims(claims) {
+  if (typeof claims !== "object" || claims === null) {
+    return false;
+  }
+  if (!("payload" in claims) || !("purpose" in claims) || !("exp" in claims)) {
+    return false;
+  }
+  return typeof claims.payload === "object" && claims.payload !== null && typeof claims.purpose === "string" && typeof claims.exp === "number";
+}
+function createSignedToken({
+  payload,
+  purpose,
+  expiresIn,
+  secret
+}) {
+  assertPurpose(purpose);
+  const resolvedSecret = resolveSecret(secret, "create");
+  try {
+    return jwt.sign({ payload, purpose }, resolvedSecret, {
+      algorithm: ALGORITHM,
+      expiresIn
+    });
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    throw new SignedTokenError(
+      "SIGN_FAILED",
+      `Could not create signed token: ${message}`,
+      e
+    );
+  }
+}
+function verifySignedToken(token, { purpose, secret }) {
+  assertPurpose(purpose);
+  const resolvedSecret = resolveSecret(secret, "verify");
+  if (typeof token !== "string" || token.length === 0) {
+    throw new SignedTokenError("MISSING_TOKEN", "No signed token was provided.");
+  }
+  let claims;
+  try {
+    claims = jwt.verify(token, resolvedSecret, { algorithms: [ALGORITHM] });
+  } catch (e) {
+    if (e instanceof jwt.TokenExpiredError) {
+      throw new SignedTokenError("EXPIRED", "The signed token has expired.", e);
+    }
+    throw new SignedTokenError(
+      "INVALID",
+      "The signed token is invalid or was not created by this application.",
+      e
+    );
+  }
+  if (!isSignedTokenClaims(claims)) {
+    throw new SignedTokenError(
+      "INVALID",
+      "The signed token is invalid or was not created by this application."
+    );
+  }
+  if (claims.purpose !== purpose) {
+    throw new SignedTokenError(
+      "PURPOSE_MISMATCH",
+      `The signed token was created for purpose '${claims.purpose}' but was verified with purpose '${purpose}'.`
+    );
+  }
+  return claims.payload;
+}
+export {
+  SIGNED_TOKEN_SECRET_ENV_VAR,
+  SignedTokenError,
+  createSignedToken,
+  verifySignedToken
+};

package/dist/transforms.d.ts

@@ -17,6 +17,7 @@ export declare const parseLambdaEventBody: (event: APIGatewayProxyEvent) => any;
  * see readme here: https://github.com/ardatan/whatwg-node/tree/master/packages/server#aws-lambda
  */
 export declare const parseFetchEventBody: (event: Request) => Promise<any>;
+export declare const requestToBaseEvent: (request: Request) => Promise<APIGatewayProxyEvent>;
 export declare const isFetchApiRequest: (event: Request | APIGatewayProxyEvent) => event is Request;
 /**
  *

package/dist/transforms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transforms.d.ts","sourceRoot":"","sources":["../src/transforms.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAKtD,MAAM,WAAW,cAAc,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACzD,QAAQ,EAAE,KAAK,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,GAAG,CAAA;CACX;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAI,OAAO,oBAAoB,QAU/D,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAU,OAAO,OAAO,iBAQvD,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,OAAO,OAAO,GAAG,oBAAoB,KACpC,KAAK,IAAI,OAcX,CAAA;AAaD;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,oBAAoB,GAAG,OAAO,GACpC,OAAO,CAAC,cAAc,CAAC,CAkBzB;AAID;;;;GAIG;AACH,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,0CAcvE,CAAA"}
+{"version":3,"file":"transforms.d.ts","sourceRoot":"","sources":["../src/transforms.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAKtD,MAAM,WAAW,cAAc,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACzD,QAAQ,EAAE,KAAK,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,GAAG,CAAA;CACX;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAI,OAAO,oBAAoB,QAU/D,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAU,OAAO,OAAO,iBAQvD,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,SAAS,OAAO,KACf,OAAO,CAAC,oBAAoB,CAgE9B,CAAA;AAoCD,eAAO,MAAM,iBAAiB,GAC5B,OAAO,OAAO,GAAG,oBAAoB,KACpC,KAAK,IAAI,OAcX,CAAA;AAaD;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,oBAAoB,GAAG,OAAO,GACpC,OAAO,CAAC,cAAc,CAAC,CAkBzB;AAID;;;;GAIG;AACH,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,0CAcvE,CAAA"}

package/dist/transforms.js

@@ -16,6 +16,86 @@ const parseFetchEventBody = async (event) => {
   const body = await event.text();
   return body ? JSON.parse(body) : {};
 };
+const requestToBaseEvent = async (request) => {
+  const url = new URL(request.url);
+  const bodyText = await request.clone().text();
+  const queryStringParameters = {};
+  url.searchParams.forEach((value, key) => {
+    queryStringParameters[key] = value;
+  });
+  const headers = Object.fromEntries(request.headers.entries());
+  if (!headers["x-forwarded-proto"]) {
+    headers["x-forwarded-proto"] = url.protocol.replace(":", "");
+  }
+  const event = {
+    headers,
+    body: bodyText || null,
+    httpMethod: request.method,
+    path: url.pathname,
+    queryStringParameters,
+    isBase64Encoded: false,
+    multiValueHeaders: toMultiValueHeaders(request.headers),
+    multiValueQueryStringParameters: toMultiValueQueryStringParameters(url),
+    pathParameters: null,
+    stageVariables: null,
+    resource: url.pathname,
+    requestContext: {
+      accountId: "cedar",
+      apiId: "cedar",
+      authorizer: void 0,
+      protocol: "HTTP/1.1",
+      identity: {
+        accessKey: null,
+        accountId: null,
+        apiKey: null,
+        apiKeyId: null,
+        caller: null,
+        clientCert: null,
+        cognitoAuthenticationProvider: null,
+        cognitoAuthenticationType: null,
+        cognitoIdentityId: null,
+        cognitoIdentityPoolId: null,
+        principalOrgId: null,
+        sourceIp: "",
+        user: null,
+        userAgent: request.headers.get("user-agent"),
+        userArn: null
+      },
+      path: url.pathname,
+      stage: "",
+      requestId: "cedar-request",
+      requestTimeEpoch: Date.now(),
+      resourceId: "cedar",
+      resourcePath: url.pathname,
+      httpMethod: request.method
+    }
+  };
+  return event;
+};
+function toMultiValueHeaders(headers) {
+  const values = /* @__PURE__ */ new Map();
+  for (const [name, value] of headers.entries()) {
+    const existing = values.get(name) ?? [];
+    existing.push(value);
+    values.set(name, existing);
+  }
+  if (values.size === 0) {
+    return {};
+  }
+  return Object.fromEntries(values.entries());
+}
+function toMultiValueQueryStringParameters(url) {
+  const values = /* @__PURE__ */ new Map();
+  for (const [name, value] of url.searchParams.entries()) {
+    const existing = values.get(name) ?? [];
+    existing.push(value);
+    values.set(name, existing);
+  }
+  if (values.size === 0) {
+    return null;
+  }
+  return Object.fromEntries(values.entries());
+}
 const isFetchApiRequest = (event) => {
   if (event.constructor.name === "Request" || event.constructor.name === PonyfillRequest.name) {
     return true;
@@ -66,5 +146,6 @@ export {
   normalizeRequest,
   parseFetchEventBody,
   parseLambdaEventBody,
-  removeNulls
+  removeNulls,
+  requestToBaseEvent
 };

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,aAAa,CAAA;AAEvC;;;;GAIG;AAEH,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAAA;AAE1D,KAAK,aAAa,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,CAAA;AAG7D,KAAK,iCAAiC,CACpC,OAAO,SAAS,SAAS,EACzB,IAAI,SAAS,SAAS,IACpB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAA;AAGvC,KAAK,2CAA2C,CAC9C,OAAO,SAAS,SAAS,EACzB,IAAI,SAAS,SAAS,IACpB;KACD,CAAC,IAAI,MAAM,iCAAiC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAC1D,iCAAiC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GACnD,IAAI;CACT,CAAA;AAGD,KAAK,iCAAiC,CACpC,OAAO,SAAS,SAAS,EACzB,IAAI,SAAS,SAAS,IACpB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAA;AAGvC,KAAK,mBAAmB,CACtB,OAAO,SAAS,SAAS,EACzB,IAAI,SAAS,SAAS,IACpB,2CAA2C,CAAC,OAAO,EAAE,IAAI,CAAC,GAC5D,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAE9B,MAAM,MAAM,qBAAqB,CAAC,CAAC,EAAE,gBAAgB,IAAI;KAEtD,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,gBAAgB,GAC9C,GAAG,GACH,KAAK,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC;CAC7D,GAAG;KAED,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,gBAAgB,GAAG,KAAK,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;CAC1E,CAAA;AAID,MAAM,MAAM,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,IAAI,SAAS,SAAS,EACtB,gBAAgB,IACd,CAAC,CAAC,OAAO,CACX,mBAAmB,CAAC,OAAO,EAAE,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,GACzE,iCAAiC,CAC/B,OAAO,EACP,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAC9C,CACJ,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,aAAa,CAAA;AAEvC;;;;GAIG;AAEH,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,CAAA;AAE1D,KAAK,aAAa,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,CAAA;AAG7D,KAAK,iCAAiC,CACpC,OAAO,SAAS,SAAS,EACzB,IAAI,SAAS,SAAS,IACpB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAA;AAGvC,KAAK,2CAA2C,CAC9C,OAAO,SAAS,SAAS,EACzB,IAAI,SAAS,SAAS,IACpB;KACD,CAAC,IAAI,MAAM,iCAAiC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAC5D,iCAAiC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;CAC7D,CAAA;AAGD,KAAK,iCAAiC,CACpC,OAAO,SAAS,SAAS,EACzB,IAAI,SAAS,SAAS,IACpB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAA;AAGvC,KAAK,mBAAmB,CACtB,OAAO,SAAS,SAAS,EACzB,IAAI,SAAS,SAAS,IACpB,2CAA2C,CAAC,OAAO,EAAE,IAAI,CAAC,GAC5D,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAE9B,MAAM,MAAM,qBAAqB,CAAC,CAAC,EAAE,gBAAgB,IAAI;KAGrD,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,gBAAgB,GAAG,GAAG,GAAG,KAAK,CAChE,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC;CACpD,GAAG;KAED,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,gBAAgB,GAAG,KAAK,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;CAC1E,CAAA;AAID,MAAM,MAAM,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,IAAI,SAAS,SAAS,EACtB,gBAAgB,IACd,CAAC,CAAC,OAAO,CACX,mBAAmB,CAAC,OAAO,EAAE,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,GACzE,iCAAiC,CAC/B,OAAO,EACP,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAC9C,CACJ,CAAA"}

package/dist/validations/validations.d.ts

@@ -1,4 +1,3 @@
-import { PrismaClient } from '@prisma/client';
 type WithOptionalMessage<T = Record<string, unknown>> = T & {
     /**
      * A message to be shown if the validation fails.
@@ -134,9 +133,21 @@ interface CustomValidatorOptions extends WithOptionalMessage {
      */
     with: () => void;
 }
-interface UniquenessValidatorOptions extends WithOptionalMessage {
-    db?: PrismaClient;
+interface UniquenessValidatorOptions<TDb extends UniquenessDb = UniquenessDb> extends WithOptionalMessage {
+    db?: TDb;
 }
+type UniquenessWhere = Record<'AND' | 'NOT', Record<string, unknown>[]>;
+export type UniquenessTransactionClient = Record<string, {
+    findFirst: (args: {
+        where: UniquenessWhere;
+    }) => Promise<unknown>;
+}>;
+interface UniquenessDb {
+    $transaction: (...args: any[]) => Promise<any>;
+}
+type TxClientOf<TDb extends UniquenessDb> = TDb extends {
+    $transaction: (callback: (tx: infer TTx) => any, ...args: any[]) => any;
+} ? TTx : never;
 interface ValidationRecipe {
     /**
      * Requires that a field NOT be present, meaning it must be `null` or `undefined`.
@@ -195,8 +206,10 @@ interface ValidationRecipe {
      */
     presence?: boolean | PresenceValidatorOptions;
     /**
-     * Run a custom validation function which should either throw or return nothing.
-     * If the function throws an error, the error message will be used as the validation error associated with the field.
+     * Run a custom validation function which should either throw or return
+     * nothing.
+     * If the function throws an error, the error message will be used as the
+     * validation error associated with the field.
      */
     custom?: CustomValidatorOptions;
 }
@@ -210,13 +223,13 @@ interface ValidationWithMessagesRecipe extends ValidationRecipe {
     length?: WithRequiredMessage<LengthValidatorOptions>;
     numericality?: WithRequiredMessage<NumericalityValidatorOptions>;
     presence?: WithRequiredMessage<PresenceValidatorOptions>;
-    custom?: WithRequiredMessage<CustomValidatorOptions>;
+    custom?: CustomValidatorOptions;
 }
 export declare function validate(value: unknown, labelOrRecipe: ValidationWithMessagesRecipe, recipe?: never): void;
 export declare function validate(value: unknown, labelOrRecipe: string, recipe: ValidationRecipe): void;
 export declare const validateWithSync: (func: () => void) => void;
 export declare const validateWith: (func: () => Promise<any>) => Promise<void>;
-export declare function validateUniqueness(model: string, fields: Record<string, unknown>, optionsOrCallback: (tx: PrismaClient) => Promise<any>, callback: never): Promise<any>;
-export declare function validateUniqueness(model: string, fields: Record<string, unknown>, optionsOrCallback: UniquenessValidatorOptions, callback?: (tx: PrismaClient) => Promise<any>): Promise<any>;
+export declare function validateUniqueness<TDb extends UniquenessDb = UniquenessDb>(model: string, fields: Record<string, unknown>, optionsOrCallback: (tx: TxClientOf<TDb>) => Promise<any>, callback?: never): Promise<any>;
+export declare function validateUniqueness<TDb extends UniquenessDb = UniquenessDb>(model: string, fields: Record<string, unknown>, optionsOrCallback: UniquenessValidatorOptions<TDb>, callback?: (tx: TxClientOf<TDb>) => Promise<any>): Promise<any>;
 export {};
 //# sourceMappingURL=validations.d.ts.map

package/dist/validations/validations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validations.d.ts","sourceRoot":"","sources":["../../src/validations/validations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validations.d.ts","sourceRoot":"","sources":["../../src/validations/validations.ts"],"names":[],"mappings":"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"}

package/dist/validations/validations.js

@@ -1,4 +1,3 @@
-import { PrismaClient } from "@prisma/client";
 import pascalcase from "pascalcase";
 import * as ValidationErrors from "./errors.js";
 const VALIDATORS = {
@@ -223,9 +222,8 @@ const fieldsToString = (fields) => {
   return output.join(", ");
 };
 const validationError = (type, name, options, substitutions = {}) => {
-  const errorClassName = `${pascalcase(
-    type
-  )}ValidationError`;
+  const pascalType = pascalcase(type);
+  const errorClassName = `${pascalType}ValidationError`;
   const ErrorClass = ValidationErrors[errorClassName];
   const errorMessage = typeof options === "object" ? options.message : void 0;
   throw new ErrorClass(name, errorMessage, substitutions);
@@ -243,9 +241,11 @@ function validate(value, labelOrRecipe, recipe) {
   if (typeof labelOrRecipe === "object") {
     label = "";
     validationRecipe = labelOrRecipe;
-  } else {
+  } else if (recipe) {
     label = labelOrRecipe;
     validationRecipe = recipe;
+  } else {
+    throw new Error("invalid options");
   }
   for (const [validator, options] of Object.entries(validationRecipe)) {
     if (typeof options === "undefined") {
@@ -274,19 +274,21 @@ async function validateUniqueness(model, fields, optionsOrCallback, callback) {
   const { $self, $scope, ...rest } = fields;
   let options = {};
   let validCallback;
-  let db = null;
   if (typeof optionsOrCallback === "function") {
     validCallback = optionsOrCallback;
-  } else {
+  } else if (callback) {
     options = optionsOrCallback;
     validCallback = callback;
-  }
-  if (options.db) {
-    const { db: customDb, ...restOptions } = options;
-    options = restOptions;
-    db = customDb;
   } else {
-    db = new PrismaClient();
+    throw new Error("validateUniqueness requires a callback function");
+  }
+  const { db: _db, ...restOptions } = options;
+  const db = options.db;
+  options = restOptions;
+  if (!db) {
+    throw new Error(
+      "validateUniqueness could not resolve a Prisma `db` instance. Pass `{ db }` in options, or ensure `src/lib/db` exports `db`"
+    );
   }
   const where = {
     AND: [rest],
@@ -301,7 +303,7 @@ async function validateUniqueness(model, fields, optionsOrCallback, callback) {
   return await db.$transaction(async (tx) => {
     const found = await tx[model].findFirst({ where });
     if (found) {
-      validationError("uniqueness", fieldsToString(fields), options);
+      validationError("uniqueness", fieldsToString(rest), options);
     }
     return validCallback(tx);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/api",
-  "version": "9.0.0-canary.1784+baa47810a",
+  "version": "9.0.0-canary.3124",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -10,112 +10,98 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": {
+      "default": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/index.d.ts",
-        "default": "./dist/cjs/index.js"
       }
     },
     "./package.json": "./package.json",
+    "./runtime": {
+      "default": {
+        "types": "./dist/runtime.d.ts",
+        "default": "./dist/runtime.js"
+      }
+    },
     "./auth": {
-      "import": {
+      "default": {
         "types": "./dist/auth/index.d.ts",
         "default": "./dist/auth/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/auth/index.d.ts",
-        "default": "./dist/cjs/auth/index.js"
       }
     },
     "./cache": {
-      "import": {
+      "default": {
         "types": "./dist/cache/index.d.ts",
         "default": "./dist/cache/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/cache/index.d.ts",
-        "default": "./dist/cjs/cache/index.js"
       }
     },
     "./logger": {
-      "import": {
+      "default": {
         "types": "./dist/logger/index.d.ts",
         "default": "./dist/logger/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/logger/index.d.ts",
-        "default": "./dist/cjs/logger/index.js"
       }
     },
     "./webhooks": {
-      "import": {
+      "default": {
         "types": "./dist/webhooks/index.d.ts",
         "default": "./dist/webhooks/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/webhooks/index.d.ts",
-        "default": "./dist/cjs/webhooks/index.js"
       }
     }
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "bin": {
-    "cedar": "./dist/cjs/bins/cedar.js",
-    "cedarjs": "./dist/cjs/bins/cedar.js",
-    "cfw": "./dist/cjs/bins/cfw.js",
-    "redwood": "./dist/cjs/bins/redwood.js",
-    "rw": "./dist/cjs/bins/redwood.js",
-    "tsc": "./dist/cjs/bins/tsc.js"
+    "cedar": "./dist/bins/cedar.js",
+    "cedarjs": "./dist/bins/cedar.js",
+    "cfw": "./dist/bins/cfw.js",
+    "redwood": "./dist/bins/redwood.js",
+    "rw": "./dist/bins/redwood.js",
+    "tsc": "./dist/bins/tsc.js"
   },
   "files": [
     "dist/",
     "package.json"
   ],
   "scripts": {
-    "build": "tsx ./build.mts && yarn build:types",
+    "build": "node ./build.mts && yarn build:types",
     "build:pack": "yarn pack -o cedarjs-api.tgz",
-    "build:types": "tsc --build --verbose ./tsconfig.build.json ./tsconfig.cjs.json",
+    "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx\" --ignore dist --exec \"yarn build\"",
-    "check:attw": "yarn rw-fwtools-attw",
+    "check:attw": "yarn cedar-fwtools-attw",
     "check:package": "concurrently npm:check:attw yarn:publint",
     "prepublishOnly": "NODE_ENV=production yarn build",
     "test": "vitest run",
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@prisma/client": "6.19.2",
+    "@prisma/client": "7.10.0",
     "@whatwg-node/fetch": "0.10.13",
     "cookie": "1.1.1",
     "humanize-string": "2.1.0",
     "jsonwebtoken": "9.0.3",
     "pascalcase": "1.0.0",
-    "pino": "9.7.0",
+    "picoquery": "2.5.0",
+    "pino": "10.3.1",
     "title-case": "3.0.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "9.0.0-canary.1784",
-    "@types/aws-lambda": "8.10.160",
+    "@cedarjs/framework-tools": "9.0.0-canary.3124",
+    "@types/aws-lambda": "8.10.163",
     "@types/jsonwebtoken": "9.0.10",
     "@types/memjs": "1",
     "@types/pascalcase": "1.0.3",
     "@types/split2": "4.2.3",
-    "concurrently": "9.2.1",
+    "concurrently": "9.2.4",
     "memjs": "1.3.2",
-    "publint": "0.3.17",
-    "redis": "5.10.0",
+    "publint": "0.3.24",
+    "redis": "6.2.1",
     "split2": "4.2.0",
     "ts-toolbelt": "9.6.0",
-    "tsx": "4.21.0",
     "typescript": "5.9.3",
-    "vitest": "3.2.4"
+    "vitest": "4.1.11"
   },
   "peerDependencies": {
     "memjs": "1.3.2",
-    "redis": "5.10.0"
+    "redis": "6.2.1"
   },
   "peerDependenciesMeta": {
     "memjs": {
@@ -125,8 +111,11 @@
       "optional": true
     }
   },
+  "engines": {
+    "node": ">=24"
+  },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "baa47810a7defb73de27fdf513b815d679509b5e"
+  "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 Cedar
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.