@contentgrowth/content-auth 0.4.8 → 0.4.9

package/dist/backend/index.js

@@ -9,7 +9,7 @@ import {
   normalizeEmail,
   schema_exports,
   verifyTurnstile
-} from "../chunk-WI4UHTAT.js";
+} from "../chunk-52ZT54FA.js";
 import "../chunk-R5U7XKVJ.js";
 export {
   Hono,

package/dist/{chunk-WI4UHTAT.js → chunk-52ZT54FA.js}

@@ -147,206 +147,92 @@ var createAdditionalColumns = (additionalFields) => {
   });
   return columns;
 };
-var createUsersTable = (tableName = "users", fields, additionalFields) => {
-  const idCol = text(fields?.id || "id").primaryKey();
-  const nameCol = text(fields?.name || "name").notNull();
-  const emailCol = text(fields?.email || "email").notNull().unique();
-  const emailVerifiedCol = integer(fields?.emailVerified || "emailVerified", { mode: "boolean" }).notNull();
-  const imageCol = text(fields?.image || "image");
-  const createdAtCol = integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull();
-  const updatedAtCol = integer(fields?.updatedAt || "updatedAt", { mode: "timestamp" }).notNull();
-  return sqliteTable(tableName, {
-    id: idCol,
-    [fields?.id || "id"]: idCol,
-    name: nameCol,
-    [fields?.name || "name"]: nameCol,
-    email: emailCol,
-    [fields?.email || "email"]: emailCol,
-    emailVerified: emailVerifiedCol,
-    [fields?.emailVerified || "emailVerified"]: emailVerifiedCol,
-    image: imageCol,
-    [fields?.image || "image"]: imageCol,
-    createdAt: createdAtCol,
-    [fields?.createdAt || "createdAt"]: createdAtCol,
-    updatedAt: updatedAtCol,
-    [fields?.updatedAt || "updatedAt"]: updatedAtCol,
-    ...createAdditionalColumns(additionalFields)
-  });
-};
-var createSessionsTable = (tableName = "sessions", usersTableOrFn = users, fields, userPkField = "id", additionalFields) => {
+var createUsersTable = (tableName = "users", fields, additionalFields) => sqliteTable(tableName, {
+  id: text(fields?.id || "id").primaryKey(),
+  [fields?.name || "name"]: text(fields?.name || "name").notNull(),
+  [fields?.email || "email"]: text(fields?.email || "email").notNull().unique(),
+  [fields?.emailVerified || "emailVerified"]: integer(fields?.emailVerified || "emailVerified", { mode: "boolean" }).notNull(),
+  [fields?.image || "image"]: text(fields?.image || "image"),
+  [fields?.createdAt || "createdAt"]: integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull(),
+  [fields?.updatedAt || "updatedAt"]: integer(fields?.updatedAt || "updatedAt", { mode: "timestamp" }).notNull(),
+  ...createAdditionalColumns(additionalFields)
+});
+var createSessionsTable = (tableName = "sessions", usersTableOrFn = users, fields, additionalFields) => {
   const usersTable = typeof usersTableOrFn === "function" ? usersTableOrFn() : usersTableOrFn;
-  const idCol = text(fields?.id || "id").primaryKey();
-  const expiresAtCol = integer(fields?.expiresAt || "expiresAt", { mode: "timestamp" }).notNull();
-  const tokenCol = text(fields?.token || "token").notNull().unique();
-  const createdAtCol = integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull();
-  const updatedAtCol = integer(fields?.updatedAt || "updatedAt", { mode: "timestamp" }).notNull();
-  const ipAddressCol = text(fields?.ipAddress || "ipAddress");
-  const userAgentCol = text(fields?.userAgent || "userAgent");
-  const userIdCol = text(fields?.userId || "userId").notNull().references(() => usersTable[userPkField] || usersTable.id, { onDelete: "cascade" });
-  const activeOrganizationIdCol = text(fields?.activeOrganizationId || "activeOrganizationId");
   return sqliteTable(tableName, {
-    id: idCol,
-    [fields?.id || "id"]: idCol,
-    expiresAt: expiresAtCol,
-    [fields?.expiresAt || "expiresAt"]: expiresAtCol,
-    token: tokenCol,
-    [fields?.token || "token"]: tokenCol,
-    createdAt: createdAtCol,
-    [fields?.createdAt || "createdAt"]: createdAtCol,
-    updatedAt: updatedAtCol,
-    [fields?.updatedAt || "updatedAt"]: updatedAtCol,
-    ipAddress: ipAddressCol,
-    [fields?.ipAddress || "ipAddress"]: ipAddressCol,
-    userAgent: userAgentCol,
-    [fields?.userAgent || "userAgent"]: userAgentCol,
-    userId: userIdCol,
-    [fields?.userId || "userId"]: userIdCol,
-    activeOrganizationId: activeOrganizationIdCol,
-    [fields?.activeOrganizationId || "activeOrganizationId"]: activeOrganizationIdCol,
+    id: text(fields?.id || "id").primaryKey(),
+    [fields?.expiresAt || "expiresAt"]: integer(fields?.expiresAt || "expiresAt", { mode: "timestamp" }).notNull(),
+    [fields?.token || "token"]: text(fields?.token || "token").notNull().unique(),
+    [fields?.createdAt || "createdAt"]: integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull(),
+    [fields?.updatedAt || "updatedAt"]: integer(fields?.updatedAt || "updatedAt", { mode: "timestamp" }).notNull(),
+    [fields?.ipAddress || "ipAddress"]: text(fields?.ipAddress || "ipAddress"),
+    [fields?.userAgent || "userAgent"]: text(fields?.userAgent || "userAgent"),
+    [fields?.userId || "userId"]: text(fields?.userId || "userId").notNull().references(() => usersTable.id, { onDelete: "cascade" }),
+    [fields?.activeOrganizationId || "activeOrganizationId"]: text(fields?.activeOrganizationId || "activeOrganizationId"),
     ...createAdditionalColumns(additionalFields)
   });
 };
-var createAccountsTable = (tableName = "accounts", usersTableOrFn = users, fields, userPkField = "id", additionalFields) => {
+var createAccountsTable = (tableName = "accounts", usersTableOrFn = users, fields, additionalFields) => {
   const usersTable = typeof usersTableOrFn === "function" ? usersTableOrFn() : usersTableOrFn;
-  const idCol = text(fields?.id || "id").primaryKey();
-  const accountIdCol = text(fields?.accountId || "accountId").notNull();
-  const providerIdCol = text(fields?.providerId || "providerId").notNull();
-  const userIdCol = text(fields?.userId || "userId").notNull().references(() => usersTable[userPkField] || usersTable.id, { onDelete: "cascade" });
-  const accessTokenCol = text(fields?.accessToken || "accessToken");
-  const refreshTokenCol = text(fields?.refreshToken || "refreshToken");
-  const idTokenCol = text(fields?.idToken || "idToken");
-  const accessTokenExpiresAtCol = integer(fields?.accessTokenExpiresAt || "accessTokenExpiresAt", { mode: "timestamp" });
-  const refreshTokenExpiresAtCol = integer(fields?.refreshTokenExpiresAt || "refreshTokenExpiresAt", { mode: "timestamp" });
-  const scopeCol = text(fields?.scope || "scope");
-  const passwordCol = text(fields?.password || "password");
-  const createdAtCol = integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull();
-  const updatedAtCol = integer(fields?.updatedAt || "updatedAt", { mode: "timestamp" }).notNull();
   return sqliteTable(tableName, {
-    id: idCol,
-    [fields?.id || "id"]: idCol,
-    accountId: accountIdCol,
-    [fields?.accountId || "accountId"]: accountIdCol,
-    providerId: providerIdCol,
-    [fields?.providerId || "providerId"]: providerIdCol,
-    userId: userIdCol,
-    [fields?.userId || "userId"]: userIdCol,
-    accessToken: accessTokenCol,
-    [fields?.accessToken || "accessToken"]: accessTokenCol,
-    refreshToken: refreshTokenCol,
-    [fields?.refreshToken || "refreshToken"]: refreshTokenCol,
-    idToken: idTokenCol,
-    [fields?.idToken || "idToken"]: idTokenCol,
-    accessTokenExpiresAt: accessTokenExpiresAtCol,
-    [fields?.accessTokenExpiresAt || "accessTokenExpiresAt"]: accessTokenExpiresAtCol,
-    refreshTokenExpiresAt: refreshTokenExpiresAtCol,
-    [fields?.refreshTokenExpiresAt || "refreshTokenExpiresAt"]: refreshTokenExpiresAtCol,
-    scope: scopeCol,
-    [fields?.scope || "scope"]: scopeCol,
-    password: passwordCol,
-    [fields?.password || "password"]: passwordCol,
-    createdAt: createdAtCol,
-    [fields?.createdAt || "createdAt"]: createdAtCol,
-    updatedAt: updatedAtCol,
-    [fields?.updatedAt || "updatedAt"]: updatedAtCol,
+    id: text(fields?.id || "id").primaryKey(),
+    [fields?.accountId || "accountId"]: text(fields?.accountId || "accountId").notNull(),
+    [fields?.providerId || "providerId"]: text(fields?.providerId || "providerId").notNull(),
+    [fields?.userId || "userId"]: text(fields?.userId || "userId").notNull().references(() => usersTable.id, { onDelete: "cascade" }),
+    [fields?.accessToken || "accessToken"]: text(fields?.accessToken || "accessToken"),
+    [fields?.refreshToken || "refreshToken"]: text(fields?.refreshToken || "refreshToken"),
+    [fields?.idToken || "idToken"]: text(fields?.idToken || "idToken"),
+    [fields?.accessTokenExpiresAt || "accessTokenExpiresAt"]: integer(fields?.accessTokenExpiresAt || "accessTokenExpiresAt", { mode: "timestamp" }),
+    [fields?.refreshTokenExpiresAt || "refreshTokenExpiresAt"]: integer(fields?.refreshTokenExpiresAt || "refreshTokenExpiresAt", { mode: "timestamp" }),
+    [fields?.scope || "scope"]: text(fields?.scope || "scope"),
+    [fields?.password || "password"]: text(fields?.password || "password"),
+    [fields?.createdAt || "createdAt"]: integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull(),
+    [fields?.updatedAt || "updatedAt"]: integer(fields?.updatedAt || "updatedAt", { mode: "timestamp" }).notNull(),
     ...createAdditionalColumns(additionalFields)
   });
 };
-var createVerificationsTable = (tableName = "verifications", fields, additionalFields) => {
-  const idCol = text(fields?.id || "id").primaryKey();
-  const identifierCol = text(fields?.identifier || "identifier").notNull();
-  const valueCol = text(fields?.value || "value").notNull();
-  const expiresAtCol = integer(fields?.expiresAt || "expiresAt", { mode: "timestamp" }).notNull();
-  const createdAtCol = integer(fields?.createdAt || "createdAt", { mode: "timestamp" });
-  const updatedAtCol = integer(fields?.updatedAt || "updatedAt", { mode: "timestamp" });
-  return sqliteTable(tableName, {
-    id: idCol,
-    [fields?.id || "id"]: idCol,
-    identifier: identifierCol,
-    [fields?.identifier || "identifier"]: identifierCol,
-    value: valueCol,
-    [fields?.value || "value"]: valueCol,
-    expiresAt: expiresAtCol,
-    [fields?.expiresAt || "expiresAt"]: expiresAtCol,
-    createdAt: createdAtCol,
-    [fields?.createdAt || "createdAt"]: createdAtCol,
-    updatedAt: updatedAtCol,
-    [fields?.updatedAt || "updatedAt"]: updatedAtCol,
-    ...createAdditionalColumns(additionalFields)
-  });
-};
-var createOrganizationsTable = (tableName = "organizations", fields, additionalFields) => {
-  const idCol = text(fields?.id || "id").primaryKey();
-  const nameCol = text(fields?.name || "name").notNull();
-  const slugCol = text(fields?.slug || "slug").unique();
-  const logoCol = text(fields?.logo || "logo");
-  const createdAtCol = integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull();
-  const metadataCol = text(fields?.metadata || "metadata");
-  return sqliteTable(tableName, {
-    id: idCol,
-    [fields?.id || "id"]: idCol,
-    name: nameCol,
-    [fields?.name || "name"]: nameCol,
-    slug: slugCol,
-    [fields?.slug || "slug"]: slugCol,
-    logo: logoCol,
-    [fields?.logo || "logo"]: logoCol,
-    createdAt: createdAtCol,
-    [fields?.createdAt || "createdAt"]: createdAtCol,
-    metadata: metadataCol,
-    [fields?.metadata || "metadata"]: metadataCol,
-    ...createAdditionalColumns(additionalFields)
-  });
-};
-var createMembersTable = (tableName = "members", organizationsTableOrFn = organizations, usersTableOrFn = users, fields, userPkField = "id", additionalFields) => {
+var createVerificationsTable = (tableName = "verifications", fields, additionalFields) => sqliteTable(tableName, {
+  id: text(fields?.id || "id").primaryKey(),
+  [fields?.identifier || "identifier"]: text(fields?.identifier || "identifier").notNull(),
+  [fields?.value || "value"]: text(fields?.value || "value").notNull(),
+  [fields?.expiresAt || "expiresAt"]: integer(fields?.expiresAt || "expiresAt", { mode: "timestamp" }).notNull(),
+  [fields?.createdAt || "createdAt"]: integer(fields?.createdAt || "createdAt", { mode: "timestamp" }),
+  [fields?.updatedAt || "updatedAt"]: integer(fields?.updatedAt || "updatedAt", { mode: "timestamp" }),
+  ...createAdditionalColumns(additionalFields)
+});
+var createOrganizationsTable = (tableName = "organizations", fields, additionalFields) => sqliteTable(tableName, {
+  id: text(fields?.id || "id").primaryKey(),
+  [fields?.name || "name"]: text(fields?.name || "name").notNull(),
+  [fields?.slug || "slug"]: text(fields?.slug || "slug").unique(),
+  [fields?.logo || "logo"]: text(fields?.logo || "logo"),
+  [fields?.createdAt || "createdAt"]: integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull(),
+  [fields?.metadata || "metadata"]: text(fields?.metadata || "metadata"),
+  ...createAdditionalColumns(additionalFields)
+});
+var createMembersTable = (tableName = "members", organizationsTableOrFn = organizations, usersTableOrFn = users, fields, additionalFields) => {
   const organizationsTable = typeof organizationsTableOrFn === "function" ? organizationsTableOrFn() : organizationsTableOrFn;
   const usersTable = typeof usersTableOrFn === "function" ? usersTableOrFn() : usersTableOrFn;
-  const idCol = text(fields?.id || "id").primaryKey();
-  const organizationIdCol = text(fields?.organizationId || "organizationId").notNull().references(() => organizationsTable[fields?.organizationId || "id"] || organizationsTable.id, { onDelete: "cascade" });
-  const userIdCol = text(fields?.userId || "userId").notNull().references(() => usersTable[userPkField] || usersTable.id, { onDelete: "cascade" });
-  const roleCol = text(fields?.role || "role").notNull();
-  const createdAtCol = integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull();
   return sqliteTable(tableName, {
-    id: idCol,
-    [fields?.id || "id"]: idCol,
-    organizationId: organizationIdCol,
-    [fields?.organizationId || "organizationId"]: organizationIdCol,
-    userId: userIdCol,
-    [fields?.userId || "userId"]: userIdCol,
-    role: roleCol,
-    [fields?.role || "role"]: roleCol,
-    createdAt: createdAtCol,
-    [fields?.createdAt || "createdAt"]: createdAtCol,
+    id: text(fields?.id || "id").primaryKey(),
+    [fields?.organizationId || "organizationId"]: text(fields?.organizationId || "organizationId").notNull().references(() => organizationsTable.id, { onDelete: "cascade" }),
+    [fields?.userId || "userId"]: text(fields?.userId || "userId").notNull().references(() => usersTable.id, { onDelete: "cascade" }),
+    [fields?.role || "role"]: text(fields?.role || "role").notNull(),
+    [fields?.createdAt || "createdAt"]: integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull(),
     ...createAdditionalColumns(additionalFields)
   });
 };
-var createInvitationsTable = (tableName = "invitations", organizationsTableOrFn = organizations, usersTableOrFn = users, fields, userPkField = "id", additionalFields) => {
+var createInvitationsTable = (tableName = "invitations", organizationsTableOrFn = organizations, usersTableOrFn = users, fields, additionalFields) => {
   const organizationsTable = typeof organizationsTableOrFn === "function" ? organizationsTableOrFn() : organizationsTableOrFn;
   const usersTable = typeof usersTableOrFn === "function" ? usersTableOrFn() : usersTableOrFn;
-  const idCol = text(fields?.id || "id").primaryKey();
-  const organizationIdCol = text(fields?.organizationId || "organizationId").notNull().references(() => organizationsTable[fields?.organizationId || "id"] || organizationsTable.id, { onDelete: "cascade" });
-  const emailCol = text(fields?.email || "email").notNull();
-  const roleCol = text(fields?.role || "role");
-  const statusCol = text(fields?.status || "status").notNull();
-  const expiresAtCol = integer(fields?.expiresAt || "expiresAt", { mode: "timestamp" }).notNull();
-  const inviterIdCol = text(fields?.inviterId || "inviterId").notNull().references(() => usersTable[userPkField] || usersTable.id, { onDelete: "cascade" });
-  const createdAtCol = integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull();
   return sqliteTable(tableName, {
-    id: idCol,
-    [fields?.id || "id"]: idCol,
-    organizationId: organizationIdCol,
-    [fields?.organizationId || "organizationId"]: organizationIdCol,
-    email: emailCol,
-    [fields?.email || "email"]: emailCol,
-    role: roleCol,
-    [fields?.role || "role"]: roleCol,
-    status: statusCol,
-    [fields?.status || "status"]: statusCol,
-    expiresAt: expiresAtCol,
-    [fields?.expiresAt || "expiresAt"]: expiresAtCol,
-    inviterId: inviterIdCol,
-    [fields?.inviterId || "inviterId"]: inviterIdCol,
-    createdAt: createdAtCol,
-    [fields?.createdAt || "createdAt"]: createdAtCol,
+    id: text(fields?.id || "id").primaryKey(),
+    [fields?.organizationId || "organizationId"]: text(fields?.organizationId || "organizationId").notNull().references(() => organizationsTable.id, { onDelete: "cascade" }),
+    [fields?.email || "email"]: text(fields?.email || "email").notNull(),
+    [fields?.role || "role"]: text(fields?.role || "role"),
+    [fields?.status || "status"]: text(fields?.status || "status").notNull(),
+    [fields?.expiresAt || "expiresAt"]: integer(fields?.expiresAt || "expiresAt", { mode: "timestamp" }).notNull(),
+    [fields?.inviterId || "inviterId"]: text(fields?.inviterId || "inviterId").notNull().references(() => usersTable.id, { onDelete: "cascade" }),
+    [fields?.createdAt || "createdAt"]: integer(fields?.createdAt || "createdAt", { mode: "timestamp" }).notNull(),
     ...createAdditionalColumns(additionalFields)
   });
 };
@@ -496,14 +382,13 @@ var createAuth = (config) => {
   const orgTableName = schemaMapping?.organization?.tableName || "organizations";
   const memberTableName = schemaMapping?.member?.tableName || "members";
   const invitationTableName = schemaMapping?.invitation?.tableName || "invitations";
-  const userPkField = schemaMapping?.user?.fields?.id || "id";
   const usersTable = createUsersTable(userTableName, schemaMapping?.user?.fields, schemaMapping?.user?.additionalFields);
   const organizationsTable = createOrganizationsTable(orgTableName, schemaMapping?.organization?.fields, schemaMapping?.organization?.additionalFields);
-  const sessionsTable = createSessionsTable(sessionTableName, usersTable, schemaMapping?.session?.fields, userPkField, schemaMapping?.session?.additionalFields);
-  const accountsTable = createAccountsTable(accountTableName, usersTable, schemaMapping?.account?.fields, userPkField, schemaMapping?.account?.additionalFields);
+  const sessionsTable = createSessionsTable(sessionTableName, usersTable, schemaMapping?.session?.fields, schemaMapping?.session?.additionalFields);
+  const accountsTable = createAccountsTable(accountTableName, usersTable, schemaMapping?.account?.fields, schemaMapping?.account?.additionalFields);
   const verificationsTable = createVerificationsTable(verificationTableName, schemaMapping?.verification?.fields, schemaMapping?.verification?.additionalFields);
-  const membersTable = createMembersTable(memberTableName, organizationsTable, usersTable, schemaMapping?.member?.fields, userPkField, schemaMapping?.member?.additionalFields);
-  const invitationsTable = createInvitationsTable(invitationTableName, organizationsTable, usersTable, schemaMapping?.invitation?.fields, userPkField, schemaMapping?.invitation?.additionalFields);
+  const membersTable = createMembersTable(memberTableName, organizationsTable, usersTable, schemaMapping?.member?.fields, schemaMapping?.member?.additionalFields);
+  const invitationsTable = createInvitationsTable(invitationTableName, organizationsTable, usersTable, schemaMapping?.invitation?.fields, schemaMapping?.invitation?.additionalFields);
   const userKey = schemaMapping?.user?.tableName || "user";
   const sessionKey = schemaMapping?.session?.tableName || "session";
   const accountKey = schemaMapping?.account?.tableName || "account";

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   normalizeEmail,
   schema_exports,
   verifyTurnstile
-} from "./chunk-WI4UHTAT.js";
+} from "./chunk-52ZT54FA.js";
 import {
   AuthForm,
   CreateOrganizationForm,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@contentgrowth/content-auth",
-    "version": "0.4.8",
+    "version": "0.4.9",
     "description": "Better Auth wrapper with UI components for Cloudflare Workers & Pages. Includes custom schema mapping, Turnstile bot protection, and email normalization.",
     "type": "module",
     "main": "./dist/index.js",