@softr/sdk 0.0.78-alpha.2 → 0.0.79-alpha.0

package/dist/action.d.ts

@@ -265,7 +265,7 @@ type CommentsDefinition<TId extends string> = {
  */
 declare function defineComments<const TId extends string>(definition: CommentsDefinition<TId>): CommentsAction<TId>;
 type AiResource = {
-  type: "AI";
+  type: "SOFTR_AI";
   model: string;
 };
 type AiAction<TId extends string = string> = Action<AiResource> & {

package/dist/action.js

@@ -86,7 +86,7 @@ function defineAiAction(definition) {
 	return {
 		id,
 		resource: {
-			type: "AI",
+			type: "SOFTR_AI",
 			model
 		},
 		permissions

package/dist/assertions.js

@@ -59,4 +59,4 @@ function throwAtCaller(f, ex) {
 }
 
 //#endregion
-export { assert, panic, requireDefined, softAssert };
+export { assert, panic, requireDefined, softAssert, throwAtCaller };

package/dist/auth/methods/profile.d.ts

@@ -2,7 +2,7 @@ import { User } from "../user.js";
 import { AuthError, Result } from "./utils.js";
 
 //#region src/auth/methods/profile.d.ts
-
+type Profile = Pick<User, "id" | "email" | "fullName" | "userGroupIds" | "avatarUrl" | "avatarEditable">;
 /**
  * Changes the signed-in visitor's own name, photo, or both. A field left out
  * stays as it is. {@link removeAvatar} removes the photo.
@@ -10,7 +10,7 @@ import { AuthError, Result } from "./utils.js";
  * The photo can change only where `user.avatarEditable` is true. Elsewhere a
  * photo answers `avatarNotSupported`, so hide the photo controls instead.
  *
- * Answers with the visitor as they are now. The page keeps showing what it
+ * Answers with the visitor as they are now, without `properties`. The page keeps showing what it
  * loaded until its route context loads again, so call `router.invalidate()`
  * after a success.
  *
@@ -21,15 +21,15 @@ import { AuthError, Result } from "./utils.js";
 declare function updateProfile(changes: {
   fullName?: string;
   avatar?: File;
-}): Promise<Result<User, AuthError>>;
+}): Promise<Result<Profile, AuthError>>;
 /**
  * Removes the signed-in visitor's own photo. Like {@link updateProfile}, it
  * works only where `user.avatarEditable` is true, and answers with the visitor
- * as they are now.
+ * as they are now, without `properties`.
  *
  * @example
  * const result = await auth.removeAvatar()
  */
-declare function removeAvatar(): Promise<Result<User, AuthError>>;
+declare function removeAvatar(): Promise<Result<Profile, AuthError>>;
 //#endregion
 export { removeAvatar, updateProfile };

package/dist/auth/methods/profile.js

@@ -12,7 +12,7 @@ import { authError } from "./utils.js";
 * The photo can change only where `user.avatarEditable` is true. Elsewhere a
 * photo answers `avatarNotSupported`, so hide the photo controls instead.
 *
-* Answers with the visitor as they are now. The page keeps showing what it
+* Answers with the visitor as they are now, without `properties`. The page keeps showing what it
 * loaded until its route context loads again, so call `router.invalidate()`
 * after a success.
 *
@@ -32,7 +32,7 @@ async function updateProfile(changes) {
 /**
 * Removes the signed-in visitor's own photo. Like {@link updateProfile}, it
 * works only where `user.avatarEditable` is true, and answers with the visitor
-* as they are now.
+* as they are now, without `properties`.
 *
 * @example
 * const result = await auth.removeAvatar()

package/dist/auth/platform.d.ts

@@ -1,4 +1,3 @@
-import "./user.js";
 import "./context.js";
 import { z } from "zod";
 

package/dist/auth/platform.js

@@ -2,7 +2,7 @@ import { assert, panic } from "../assertions.js";
 import { fetch } from "../fetch.js";
 import { permissionsSchema } from "./permissions.js";
 import { sessionConfig } from "./config.js";
-import { userSchema } from "./user.js";
+import { softrConfig } from "../softr-config.js";
 import { z } from "zod";
 
 //#region src/auth/platform.ts
@@ -33,10 +33,32 @@ const authSettingsSchema = z.object({
 	sso: z.object({ type: z.enum(["SAML", "OPEN_ID"]).nullable() }).nullable()
 });
 function makePlatform(applicationId) {
+	const aliases = Object.entries(softrConfig().user?.properties ?? {});
+	const withAttributes = aliases.length > 0 ? "?includeAttributes=true" : "";
+	const profileSchema = z.object({
+		id: z.string(),
+		email: z.string(),
+		fullName: z.string(),
+		userGroupIds: z.array(z.string()),
+		avatarUrl: z.string().nullable().default(null),
+		avatarEditable: z.boolean().default(false)
+	});
+	const userSchema = profileSchema.extend({ attributes: z.record(z.string(), z.unknown()).optional() }).transform(({ attributes,...identity }) => {
+		const properties = {};
+		for (const [alias, field] of aliases) {
+			assert(attributes !== void 0, "The signed-in user came back without their properties.");
+			assert(Object.hasOwn(attributes, field), `softr.json user.properties.${alias} names the field "${field}", which the users table does not have.`);
+			properties[alias] = attributes[field];
+		}
+		return {
+			...identity,
+			properties
+		};
+	});
 	return {
 		authSettings: () => request(`/v1/vibe/applications/${applicationId}/users/auth-settings`, { method: "GET" }, authSettingsSchema),
 		session: async (token) => {
-			const result = await request(`/v1/vibe/applications/${applicationId}/users/session`, {
+			const result = await request(`/v1/vibe/applications/${applicationId}/users/session${withAttributes}`, {
 				method: "GET",
 				token
 			}, z.object({
@@ -46,7 +68,7 @@ function makePlatform(applicationId) {
 			if (result.status === 404) panic(`Application ${applicationId} not found. Check SOFTR_APPLICATION_ID.`);
 			return result;
 		},
-		tokens: (credentials) => request(`/v1/vibe/applications/${applicationId}/users/tokens`, {
+		tokens: (credentials) => request(`/v1/vibe/applications/${applicationId}/users/tokens${withAttributes}`, {
 			method: "POST",
 			json: credentials
 		}, z.object({
@@ -69,7 +91,7 @@ function makePlatform(applicationId) {
 			method: "POST",
 			json: { email }
 		}, z.null()),
-		signInWithCode: (credentials) => request(`/v1/vibe/applications/${applicationId}/users/tokens/with-code`, {
+		signInWithCode: (credentials) => request(`/v1/vibe/applications/${applicationId}/users/tokens/with-code${withAttributes}`, {
 			method: "POST",
 			json: credentials
 		}, z.object({
@@ -88,7 +110,7 @@ function makePlatform(applicationId) {
 				challengeToken: z.string()
 			}).nullish()
 		})),
-		signInWithGoogle: (body) => request(`/v1/vibe/applications/${applicationId}/users/tokens/with-google`, {
+		signInWithGoogle: (body) => request(`/v1/vibe/applications/${applicationId}/users/tokens/with-google${withAttributes}`, {
 			method: "POST",
 			json: body
 		}, z.object({
@@ -107,7 +129,7 @@ function makePlatform(applicationId) {
 				challengeToken: z.string()
 			}).nullish()
 		})),
-		signInWithMagicLink: (body) => request(`/v1/vibe/applications/${applicationId}/users/tokens/with-magic-link`, {
+		signInWithMagicLink: (body) => request(`/v1/vibe/applications/${applicationId}/users/tokens/with-magic-link${withAttributes}`, {
 			method: "POST",
 			json: body
 		}, z.object({
@@ -134,7 +156,7 @@ function makePlatform(applicationId) {
 			method: "POST",
 			json: body
 		}, z.object({ email: z.string() })),
-		setPassword: (body) => request(`/v1/vibe/applications/${applicationId}/users/set-password`, {
+		setPassword: (body) => request(`/v1/vibe/applications/${applicationId}/users/set-password${withAttributes}`, {
 			method: "POST",
 			json: body
 		}, z.object({
@@ -157,7 +179,7 @@ function makePlatform(applicationId) {
 			method: "POST",
 			json: body
 		}, z.null()),
-		signUpWithCode: (body) => request(`/v1/vibe/applications/${applicationId}/users/sign-up/with-code`, {
+		signUpWithCode: (body) => request(`/v1/vibe/applications/${applicationId}/users/sign-up/with-code${withAttributes}`, {
 			method: "POST",
 			json: body
 		}, z.object({
@@ -176,7 +198,7 @@ function makePlatform(applicationId) {
 				challengeToken: z.string()
 			}).nullish()
 		})),
-		signUpWithPassword: (body) => request(`/v1/vibe/applications/${applicationId}/users/sign-up/with-password`, {
+		signUpWithPassword: (body) => request(`/v1/vibe/applications/${applicationId}/users/sign-up/with-password${withAttributes}`, {
 			method: "POST",
 			json: body
 		}, z.object({
@@ -202,7 +224,7 @@ function makePlatform(applicationId) {
 			otpauthUri: z.string(),
 			qrPngBase64: z.string()
 		})),
-		authenticatorSetupComplete: (token, code) => request(`/v1/vibe/applications/${applicationId}/users/authenticator/setup/complete`, {
+		authenticatorSetupComplete: (token, code) => request(`/v1/vibe/applications/${applicationId}/users/authenticator/setup/complete${withAttributes}`, {
 			method: "POST",
 			token,
 			json: { code }
@@ -214,7 +236,7 @@ function makePlatform(applicationId) {
 			}),
 			backupCodes: z.array(z.string())
 		})),
-		authenticatorSetupDismiss: (token) => request(`/v1/vibe/applications/${applicationId}/users/authenticator/setup/dismiss`, {
+		authenticatorSetupDismiss: (token) => request(`/v1/vibe/applications/${applicationId}/users/authenticator/setup/dismiss${withAttributes}`, {
 			method: "POST",
 			token
 		}, z.object({
@@ -233,7 +255,7 @@ function makePlatform(applicationId) {
 				challengeToken: z.string()
 			}).nullish()
 		})),
-		authenticatorVerify: (token, body) => request(`/v1/vibe/applications/${applicationId}/users/authenticator/totp/verify`, {
+		authenticatorVerify: (token, body) => request(`/v1/vibe/applications/${applicationId}/users/authenticator/totp/verify${withAttributes}`, {
 			method: "POST",
 			token,
 			json: body
@@ -271,11 +293,11 @@ function makePlatform(applicationId) {
 			method: "PATCH",
 			token,
 			form
-		}, userSchema),
+		}, profileSchema),
 		removeAvatar: (token) => request(`/v1/vibe/applications/${applicationId}/users/me/profile/avatar`, {
 			method: "DELETE",
 			token
-		}, userSchema),
+		}, profileSchema),
 		signOut: (token) => request(`/v1/applications/${applicationId}/users/sign-out`, {
 			method: "POST",
 			token

package/dist/auth/session.js

@@ -2,10 +2,10 @@ import { readRequestCookies, serializeCookie, writeCookies } from "../cookies.js
 import { permissionsSchema } from "./permissions.js";
 import { sessionConfig } from "./config.js";
 import { userSchema } from "./user.js";
+import { z } from "zod";
 import { createCipheriv, createDecipheriv, createHash, randomBytes } from "node:crypto";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { getRequestProtocol } from "@tanstack/react-start/server";
-import { z } from "zod";
 
 //#region src/auth/session.ts
 const SESSION_TOKEN = "session_token";

package/dist/auth/user.d.ts

@@ -13,6 +13,12 @@ interface SoftrUserGroups {}
 type SoftrUserGroupId = SoftrUserGroups extends {
   ids: infer Id extends string;
 } ? Id : string;
+/**
+ * The fields of the visitor's row that softr.json declares under
+ * `user.properties`, keyed by their aliases. The app's generated types declare
+ * it.
+ */
+interface SoftrUserProperties {}
 /** The signed-in visitor. */
 type User = {
   id: string;
@@ -23,6 +29,7 @@ type User = {
   avatarUrl: string | null;
   /** Whether `auth.updateProfile` can change their photo in this app. */
   avatarEditable: boolean;
+  properties: SoftrUserProperties;
 };
 //#endregion
-export { SoftrUserGroupId, SoftrUserGroups, User };
+export { SoftrUserGroupId, SoftrUserGroups, SoftrUserProperties, User };

package/dist/auth/user.js

@@ -7,7 +7,8 @@ const userSchema = z.object({
 	fullName: z.string(),
 	userGroupIds: z.array(z.string()),
 	avatarUrl: z.string().nullable().default(null),
-	avatarEditable: z.boolean().default(false)
+	avatarEditable: z.boolean().default(false),
+	properties: z.record(z.string(), z.unknown())
 });
 
 //#endregion

package/dist/cli.js

@@ -1,13 +1,15 @@
 #!/usr/bin/env node
 import { version } from "./package.js";
 import { requireDefined } from "./assertions.js";
+import { SoftrConfigError, loadSoftrConfig } from "./softr-config.schema.js";
 import { fetchSoftrEnvInput, metadataSourceFromEnv } from "./codegen/fetch-metadata.js";
+import { renderUserPropertiesDoc } from "./codegen/datasource-docs.js";
 import { renderUserGroupsDoc } from "./codegen/user-groups.js";
 import { renderSoftrEnv } from "./codegen/softr-env.js";
 import { renderSoftrFields } from "./codegen/softr-fields.js";
 import { writeIfChanged } from "./codegen/write-if-changed.js";
 import { writeDatasourceDocs } from "./codegen/write-datasource-docs.js";
-import { writeFileSync } from "node:fs";
+import { rmSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { parseArgs } from "node:util";
 
@@ -16,9 +18,10 @@ const OUTPUT = "softr-env.d.ts";
 const FIELDS_OUTPUT = "src/softr-fields.ts";
 const DOCS_DIR = "docs/datasources";
 const USER_GROUPS_DOC = "docs/user-groups.md";
+const USER_PROPERTIES_DOC = "docs/user-properties.md";
 async function generate({ json }) {
 	if (json) console.info = console.error;
-	const input = await fetchSoftrEnvInput(metadataSourceFromEnv());
+	const input = await fetchSoftrEnvInput(metadataSourceFromEnv(), loadSoftrConfig(process.cwd()).user?.properties ?? {});
 	writeFileSync(path.resolve(process.cwd(), OUTPUT), renderSoftrEnv(input, version), "utf8");
 	const report = writeDocs(input);
 	report.docs.push({
@@ -33,18 +36,30 @@ async function generate({ json }) {
 	printReport(report);
 }
 function writeDocs(input) {
+	if (input.users === null) rmSync(path.resolve(process.cwd(), USER_PROPERTIES_DOC), { force: true });
 	const datasourceDocs = writeDatasourceDocs(input.datasources, path.resolve(process.cwd(), DOCS_DIR));
 	return {
 		types: OUTPUT,
-		docs: [{
-			subject: "datasources",
-			path: `${DOCS_DIR}/README.md`,
-			changed: datasourceDocs.changed
-		}, {
-			subject: "user groups",
-			path: USER_GROUPS_DOC,
-			changed: writeIfChanged(path.resolve(process.cwd(), USER_GROUPS_DOC), renderUserGroupsDoc(input.userGroups))
-		}],
+		docs: [
+			{
+				subject: "datasources",
+				path: `${DOCS_DIR}/README.md`,
+				changed: datasourceDocs.changed
+			},
+			{
+				subject: "user groups",
+				path: USER_GROUPS_DOC,
+				changed: writeIfChanged(path.resolve(process.cwd(), USER_GROUPS_DOC), renderUserGroupsDoc(input.userGroups))
+			},
+			...input.users === null ? [] : [{
+				subject: "user properties",
+				path: USER_PROPERTIES_DOC,
+				changed: writeIfChanged(path.resolve(process.cwd(), USER_PROPERTIES_DOC), renderUserPropertiesDoc(input.users, {
+					datasources: new Map(input.datasources.map((d) => [d.id, d])),
+					fileNames: datasourceDocs.fileNames
+				}))
+			}]
+		],
 		datasources: input.datasources.map(({ id, name }) => ({
 			id,
 			name,
@@ -68,7 +83,18 @@ const { positionals, values } = parseArgs({
 	} }
 });
 const [command] = positionals;
-if (command === "generate") await generate({ json: values.json });
+if (command === "generate") try {
+	await generate({ json: values.json });
+} catch (error) {
+	if (!values.json) throw error;
+	const kind = error instanceof SoftrConfigError ? "softr-config" : "other";
+	const message = error instanceof Error ? error.message : String(error);
+	process.stdout.write(`${JSON.stringify({ error: {
+		kind,
+		message
+	} })}\n`);
+	process.exit(1);
+}
 else {
 	console.error(command ? `softr-sdk: unknown command '${command}'` : "softr-sdk: no command given");
 	console.error("usage: softr-sdk generate [--json]");

package/dist/codegen/datasource-docs.js

@@ -18,6 +18,97 @@ function renderDatasourceDoc(datasource, context) {
 		...renderExamples(datasource, context.datasources)
 	].join("\n");
 }
+function renderUserPropertiesDoc(users, context) {
+	const aliases = Object.entries(users.properties);
+	assert(aliases.length > 0, "Expected user properties to document, but got none");
+	const [first] = requireDefined(aliases[0]);
+	const registered = linkedDatasource(users.tableId, context.datasources);
+	const types = /* @__PURE__ */ new Set();
+	const sampled = aliases.filter(([, field]) => {
+		const type = fieldTypeLiteral(field);
+		if (types.has(type)) return false;
+		types.add(type);
+		return true;
+	});
+	return [
+		"# User properties",
+		"",
+		`Users datasource: ${displayName(users.name) || users.tableId}` + (registered === void 0 ? "" : `  \nRegistered as: [${datasourceLabel(registered)}](./datasources/${requireDefined(context.fileNames.get(registered.id))}) (${registered.id})`),
+		"",
+		"> This document is generated automatically when softr.json's `user.properties` or the users table changes.",
+		"",
+		"Each alias below is declared in softr.json under `user.properties`, and read as `user.properties.<alias>`.",
+		"",
+		"## Field reference",
+		"",
+		...aliases.flatMap(([alias, field]) => {
+			const linkedId = option(field.options, "linkedTableId");
+			const linked = typeof linkedId === "string" ? linkedDatasource(linkedId, context.datasources) : void 0;
+			return [
+				`### ${alias}`,
+				"",
+				`- Field: ${displayName(field.name)}`,
+				`- ID: ${field.id}`,
+				`- Type: ${fieldTypeLiteral(field).slice(1, -1)}`,
+				...optionLines(field),
+				...choiceLines(field),
+				...typeof linkedId !== "string" ? [] : linked === void 0 ? [`- Links to: ${linkedId}, not registered`] : [`- Links to: [${datasourceLabel(linked)}](./datasources/${requireDefined(context.fileNames.get(linked.id))}) (${linked.id})`],
+				""
+			];
+		}),
+		"## Read shape",
+		"",
+		"In a component:",
+		"",
+		"```tsx",
+		"import { useCurrentUser } from '@softr/sdk'",
+		"",
+		"const user = useCurrentUser()",
+		"if (user === null) return null",
+		"",
+		...sampled.map(([alias, field]) => `user.properties.${alias} // ${fieldTypeLiteral(field).slice(1, -1)}`),
+		"```",
+		"",
+		"In a route's `beforeLoad`, to send a visitor elsewhere. It guards navigation only, not data:",
+		"",
+		"```tsx",
+		"import { createFileRoute, redirect } from '@tanstack/react-router'",
+		"import { assertRouteAccess, defineVisibility } from '@softr/sdk'",
+		"",
+		"const visibility = defineVisibility({ userGroupTypes: ['LOGGED_IN_USERS'] })",
+		"",
+		"export const Route = createFileRoute('/example')({",
+		"  beforeLoad: (opts) => {",
+		"    assertRouteAccess(visibility, opts)",
+		`    if (opts.context.user.properties.${first} == null) throw redirect({ to: '/' })`,
+		"  },",
+		"})",
+		"```",
+		"",
+		"In a server function, called from a route's `loader`. The handler checks the visitor itself:",
+		"",
+		"```tsx",
+		"import { createFileRoute } from '@tanstack/react-router'",
+		"import { createServerFn } from '@tanstack/react-start'",
+		"",
+		`const get${pascalCase(first)} = createServerFn().handler(async ({ context }) => {`,
+		"  if (!context.user) throw new Error('Not signed in')",
+		`  return context.user.properties.${first}`,
+		"})",
+		"",
+		"export const Route = createFileRoute('/example')({",
+		`  loader: () => get${pascalCase(first)}(),`,
+		"  component: Example,",
+		"})",
+		"",
+		"function Example() {",
+		`  const ${first} = Route.useLoaderData()`,
+		"  // ...",
+		"}",
+		"```",
+		""
+	].join("\n");
+}
 /** Two trailing spaces are a markdown hard break, which keeps the block one paragraph. */
 function summary(datasource, context) {
 	const lines = [`Datasource ID: ${datasource.id}`];
@@ -315,4 +406,4 @@ function words(value) {
 }
 
 //#endregion
-export { DOC_NOTE, renderDatasourceDoc, renderDatasourceIndex };
+export { DOC_NOTE, renderDatasourceDoc, renderDatasourceIndex, renderUserPropertiesDoc };

package/dist/codegen/datasource-types.js

@@ -238,6 +238,21 @@ function linkedRecord(options, context) {
 	if (linked === void 0 || linked.primaryFieldId === "") return "LinkedRecord";
 	return `LinkedRecord<NonNullable<${`${nameOf(linked.id, context)}Read[${quote(linked.primaryFieldId)}]`}>>`;
 }
+/** `SoftrUserProperties`, each alias typed as its field reads. */
+function renderUserProperties(properties, datasources) {
+	const context = {
+		datasources: byId(datasources),
+		names: typeNames(datasources)
+	};
+	return [
+		"interface SoftrUserProperties {",
+		...Object.entries(properties).map(([alias, field]) => indent(readMember({
+			...field,
+			id: alias
+		}, context))),
+		"}"
+	].join("\n");
+}
 function renderRegistry(datasources, context) {
 	return [
 		"interface SoftrDatasources {",
@@ -481,4 +496,4 @@ function indent(block) {
 }
 
 //#endregion
-export { choiceEntries, fieldTypeLiteral, isWritable, linkedDatasource, option, readExample, renderDatasourceTypes, resolvedShape, scalarExample, underlyingType };
+export { choiceEntries, fieldTypeLiteral, isWritable, linkedDatasource, option, readExample, renderDatasourceTypes, renderUserProperties, resolvedShape, scalarExample, underlyingType };

package/dist/codegen/fetch-metadata.js

@@ -1,5 +1,6 @@
 import { panic } from "../assertions.js";
 import { fetch } from "../fetch.js";
+import { panicConfig } from "../softr-config.schema.js";
 
 //#region src/codegen/fetch-metadata.ts
 function metadataSourceFromEnv(env = process.env) {
@@ -17,20 +18,35 @@ function metadataSourceFromEnv(env = process.env) {
 		token: env.SOFTR_STUDIO_TOKEN
 	};
 }
-async function fetchSoftrEnvInput(source) {
+async function fetchSoftrEnvInput(source, aliases) {
 	const { studioApiUrl, datasourceApiUrl, applicationId, token } = source;
 	const [registered, userGroups] = await Promise.all([apiFetch(`${studioApiUrl}/v1/applications/${applicationId}/datasources`, token), apiFetch(`${studioApiUrl}/v1/applications/${applicationId}/access-control/user-groups`, token)]);
+	const datasources = await Promise.all(registered.map(async ({ name, datasource }) => {
+		const metadata = await apiFetch(`${datasourceApiUrl}/v1/datasource/vibe/studio/applications/${applicationId}/datasources/${datasource.id}/metadata`, token);
+		return {
+			...metadata,
+			id: datasource.id,
+			tableId: metadata.id,
+			name
+		};
+	}));
+	let users = null;
+	if (Object.keys(aliases).length > 0) {
+		const metadata = await apiFetch(`${datasourceApiUrl}/v1/datasource/vibe/studio/applications/${applicationId}/user-connection/metadata`, token);
+		users = {
+			tableId: metadata.id,
+			name: metadata.name,
+			properties: {}
+		};
+		for (const [alias, fieldId] of Object.entries(aliases)) {
+			const field = metadata.fields.find(({ id }) => id === fieldId) ?? panicConfig(`softr.json user.properties.${alias} names "${fieldId}", which is not a field of the users table.`);
+			users.properties[alias] = field;
+		}
+	}
 	return {
-		datasources: await Promise.all(registered.map(async ({ name, datasource }) => {
-			const metadata = await apiFetch(`${datasourceApiUrl}/v1/datasource/vibe/studio/applications/${applicationId}/datasources/${datasource.id}/metadata`, token);
-			return {
-				...metadata,
-				id: datasource.id,
-				tableId: metadata.id,
-				name
-			};
-		})),
-		userGroups
+		datasources,
+		userGroups,
+		users
 	};
 }
 async function apiFetch(url, token) {

package/dist/codegen/softr-env.js

@@ -1,4 +1,4 @@
-import { renderDatasourceTypes } from "./datasource-types.js";
+import { renderDatasourceTypes, renderUserProperties } from "./datasource-types.js";
 import { renderUserGroups } from "./user-groups.js";
 
 //#region src/codegen/softr-env.ts
@@ -15,6 +15,7 @@ function renderSoftrEnv(input, sdkVersion) {
 		indent(interfaces),
 		"",
 		indent(renderUserGroups(input.userGroups)),
+		...input.users === null ? [] : ["", indent(renderUserProperties(input.users.properties, input.datasources))],
 		"}",
 		""
 	].join("\n");

package/dist/cookies.js

@@ -1,3 +1,4 @@
+import { softAssert } from "./assertions.js";
 import { getRequestHeader, getResponseHeaders, setResponseHeader } from "@tanstack/react-start/server";
 
 //#region src/cookies.ts
@@ -42,9 +43,16 @@ const USER_TIMEZONE_COOKIE = "user-timezone";
 function readUserTimezone() {
 	return readRequestCookies()[USER_TIMEZONE_COOKIE] ?? null;
 }
+/** What browsers keep of one cookie's name and value. They drop a larger one silently. */
+const COOKIE_MAX_BYTES = 4096;
 function writeCookies(cookies) {
-	if (cookies.length === 0) return;
-	setResponseHeader("Set-Cookie", [...getResponseHeaders().getSetCookie(), ...cookies]);
+	const written = cookies.filter((cookie) => {
+		const size = cookie.split(";")[0].length;
+		softAssert(size <= COOKIE_MAX_BYTES, () => `The ${cookie.slice(0, cookie.indexOf("="))} cookie is ${size} bytes, over the ${COOKIE_MAX_BYTES} a browser keeps. It was not written.`);
+		return size <= COOKIE_MAX_BYTES;
+	});
+	if (written.length === 0) return;
+	setResponseHeader("Set-Cookie", [...getResponseHeaders().getSetCookie(), ...written]);
 }
 
 //#endregion

package/dist/formatting.d.ts

@@ -1,6 +1,6 @@
+import { z } from "zod";
 import * as react0 from "react";
 import { ReactNode } from "react";
-import { z } from "zod";
 
 //#region src/formatting.d.ts
 type FixedDateFormat = "FRIENDLY" | "DD-MM-YYYY" | "MM-DD-YYYY" | "YYYY-MM-DD";

package/dist/formatting.js

@@ -1,6 +1,6 @@
 import { logger } from "./logger.js";
-import { Fragment, createContext, createElement, useContext, useMemo, useSyncExternalStore } from "react";
 import { z } from "zod";
+import { Fragment, createContext, createElement, useContext, useMemo, useSyncExternalStore } from "react";
 import { rootRouteId, useRouteContext } from "@tanstack/react-router";
 
 //#region src/formatting.ts

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { SoftrUserGroupId, SoftrUserGroups, User } from "./auth/user.js";
+import { SoftrUserGroupId, SoftrUserGroups, SoftrUserProperties, User } from "./auth/user.js";
 import { ActionPermissions, SoftrDatasources, defineAiAction, defineComments, defineIntegration, defineMutation, defineQuery, defineWorkflow } from "./action.js";
 import { FileAttachment } from "./core/file-upload.js";
 import { FileItem, useFileUpload } from "./core/use-file-upload.js";
@@ -19,4 +19,4 @@ import { useUserTimezone } from "./timezone.js";
 import { PwaInstall, PwaPlatform, SoftrPwaHead, usePwaInstall } from "./pwa.js";
 import { DefaultErrorOverlay } from "./default-error-overlay.js";
 import { Audience } from "./route/audience.js";
-export { type ActionPermissions, type AiAnswer, type AiFile, type AiGenerateInit, type AiMessage, type AiUsage, Audience, type AuthOptions, type AuthSettings, AuthSettingsProvider, type CommentAttachmentInput, type CommentMention, type CommentThread, type CommentView, type DateOptions, type DateParts, type DateSeparator, type DateValue, DefaultErrorOverlay, type FieldShape, type FileAttachment, type FileItem, type FixedDateFormat, FormattedDate, type Formatting, FormattingScope, type Page, type PageSettings, type PwaInstall, type PwaPlatform, type SoftrContext, type SoftrDatasources, type SoftrFieldRegistry, SoftrPwaHead, type SoftrUserGroupId, type SoftrUserGroups, type User, type WeekDay, assertRouteAccess, checkAccess, defineAiAction, defineComments, defineIntegration, defineMutation, definePage, defineQuery, defineVisibility, defineWorkflow, fieldShape, formatDate, formatDateTime, formatDuration, formatField, formatNumber, formatValue, getAuthSettings, getSoftrContext, guardRoute, initialSoftrContext, isAccessError, isAlreadyAuthenticatedError, isAuthorized, isForbiddenError, isUnauthenticatedError, pageHead, registerSoftrFields, softrAuthMiddleware, softrMcpMiddleware, toReturnPath, useAuthSettings, useCurrentUser, useFileUpload, useFormatting, useOverrides, usePwaInstall, useUserTimezone };
+export { type ActionPermissions, type AiAnswer, type AiFile, type AiGenerateInit, type AiMessage, type AiUsage, Audience, type AuthOptions, type AuthSettings, AuthSettingsProvider, type CommentAttachmentInput, type CommentMention, type CommentThread, type CommentView, type DateOptions, type DateParts, type DateSeparator, type DateValue, DefaultErrorOverlay, type FieldShape, type FileAttachment, type FileItem, type FixedDateFormat, FormattedDate, type Formatting, FormattingScope, type Page, type PageSettings, type PwaInstall, type PwaPlatform, type SoftrContext, type SoftrDatasources, type SoftrFieldRegistry, SoftrPwaHead, type SoftrUserGroupId, type SoftrUserGroups, type SoftrUserProperties, type User, type WeekDay, assertRouteAccess, checkAccess, defineAiAction, defineComments, defineIntegration, defineMutation, definePage, defineQuery, defineVisibility, defineWorkflow, fieldShape, formatDate, formatDateTime, formatDuration, formatField, formatNumber, formatValue, getAuthSettings, getSoftrContext, guardRoute, initialSoftrContext, isAccessError, isAlreadyAuthenticatedError, isAuthorized, isForbiddenError, isUnauthenticatedError, pageHead, registerSoftrFields, softrAuthMiddleware, softrMcpMiddleware, toReturnPath, useAuthSettings, useCurrentUser, useFileUpload, useFormatting, useOverrides, usePwaInstall, useUserTimezone };

package/dist/mcp.d.ts

@@ -1,5 +1,5 @@
 import { DatasourceAction } from "./action.js";
-import * as _tanstack_react_start0 from "@tanstack/react-start";
+import * as _tanstack_react_start5 from "@tanstack/react-start";
 
 //#region src/mcp.d.ts
 
@@ -31,6 +31,6 @@ type SoftrMcpOptions = {
  *   ],
  * }))
  */
-declare function softrMcpMiddleware(options?: SoftrMcpOptions): _tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>;
+declare function softrMcpMiddleware(options?: SoftrMcpOptions): _tanstack_react_start5.RequestMiddlewareAfterServer<{}, undefined, undefined>;
 //#endregion
 export { softrMcpMiddleware };

package/dist/mcp.js

@@ -2,12 +2,12 @@ import { assert } from "./assertions.js";
 import { fetch } from "./fetch.js";
 import { sessionConfig } from "./auth/config.js";
 import { readSessionToken, withSessionToken } from "./auth/session.js";
+import { softrConfig } from "./softr-config.js";
 import { makePlatform, platformApiUrl } from "./auth/platform.js";
 import { isDatasourceAction } from "./action.js";
-import { softrConfig } from "./softr-config.js";
 import { ds } from "./datasource/datasource.js";
-import { createMiddleware } from "@tanstack/react-start";
 import { z } from "zod";
+import { createMiddleware } from "@tanstack/react-start";
 
 //#region src/mcp.ts
 const MCP_PATH = "/_softr/mcp";

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.0.78-alpha.2";
+var version = "0.0.79-alpha.0";
 
 //#endregion
 export { version };

package/dist/pwa.js

@@ -2,9 +2,9 @@ import { logger } from "./logger.js";
 import { fetch } from "./fetch.js";
 import { sessionConfig } from "./auth/config.js";
 import { platformApiUrl } from "./auth/platform.js";
+import { z } from "zod";
 import { Fragment, createElement, useEffect, useState } from "react";
 import { createMiddleware } from "@tanstack/react-start";
-import { z } from "zod";
 
 //#region src/pwa.ts
 const MANIFEST_PATH = "/manifest.webmanifest";

package/dist/route/route.js

@@ -1,6 +1,6 @@
 import { panic } from "../assertions.js";
-import { ACCESS_REASONS, checkRule } from "./visibility.js";
 import { softrConfig } from "../softr-config.js";
+import { ACCESS_REASONS, checkRule } from "./visibility.js";
 import { redirect } from "@tanstack/react-router";
 
 //#region src/route/route.ts

package/dist/softr-config.schema.js

@@ -1,6 +1,17 @@
+import { throwAtCaller } from "./assertions.js";
+import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
 import { z } from "zod";
 
 //#region src/softr-config.schema.ts
+const SOFTR_CONFIG_FILE = "softr.json";
+/** The cause is in softr.json, so the app's author can fix it. */
+var SoftrConfigError = class extends Error {
+	name = "SoftrConfigError";
+};
+function panicConfig(message) {
+	throwAtCaller(panicConfig, new SoftrConfigError(message));
+}
 const AccessBehaviour = z.union([
 	z.string(),
 	z.object({
@@ -9,32 +20,49 @@ const AccessBehaviour = z.union([
 	}),
 	z.object({ strategy: z.literal("throw") })
 ], { error: "must be a path like \"/login\", { \"strategy\": \"redirect\", \"to\": \"/login\" } or { \"strategy\": \"throw\" }" });
-const AppPath = z.string().refine((path) => path.startsWith("/") && !path.includes("?") && !path.includes("#") && new URL(path, "https://app.invalid").origin === "https://app.invalid", { error: "must be a path on this app like \"/login\", with no \"?\" or \"#\"" });
-const SoftrConfigSchema = z.object({ auth: z.strictObject({
-	routes: z.strictObject({
-		login: z.strictObject({
-			path: AppPath,
-			redirectParam: z.string()
+const AppPath = z.string().refine((path$1) => path$1.startsWith("/") && !path$1.includes("?") && !path$1.includes("#") && new URL(path$1, "https://app.invalid").origin === "https://app.invalid", { error: "must be a path on this app like \"/login\", with no \"?\" or \"#\"" });
+const SoftrConfigSchema = z.object({
+	auth: z.strictObject({
+		routes: z.strictObject({
+			login: z.strictObject({
+				path: AppPath,
+				redirectParam: z.string()
+			}),
+			resetPassword: z.strictObject({
+				path: AppPath,
+				tokenParam: z.string()
+			}),
+			acceptInvitation: z.strictObject({
+				path: AppPath,
+				tokenParam: z.string()
+			}),
+			magicLink: z.strictObject({
+				path: AppPath,
+				tokenParam: z.string()
+			})
 		}),
-		resetPassword: z.strictObject({
-			path: AppPath,
-			tokenParam: z.string()
-		}),
-		acceptInvitation: z.strictObject({
-			path: AppPath,
-			tokenParam: z.string()
-		}),
-		magicLink: z.strictObject({
-			path: AppPath,
-			tokenParam: z.string()
+		guard: z.strictObject({
+			unauthenticated: AccessBehaviour,
+			forbidden: AccessBehaviour,
+			alreadyAuthenticated: AccessBehaviour
 		})
 	}),
-	guard: z.strictObject({
-		unauthenticated: AccessBehaviour,
-		forbidden: AccessBehaviour,
-		alreadyAuthenticated: AccessBehaviour
-	})
-}) });
+	user: z.strictObject({ properties: z.record(z.string(), z.string()) }).optional()
+});
+function loadSoftrConfig(root) {
+	const file = path.join(root, SOFTR_CONFIG_FILE);
+	if (!existsSync(file)) panicConfig(`${SOFTR_CONFIG_FILE} is missing from ${root}`);
+	const source = readFileSync(file, "utf8");
+	let parsed;
+	try {
+		parsed = JSON.parse(source);
+	} catch (error) {
+		panicConfig(`${SOFTR_CONFIG_FILE} is not valid JSON: ${error instanceof Error ? error.message : error}`);
+	}
+	const result = SoftrConfigSchema.safeParse(parsed);
+	if (!result.success) panicConfig(`${SOFTR_CONFIG_FILE} does not match the schema:\n\n${z.prettifyError(result.error)}`);
+	return result.data;
+}
 
 //#endregion
-export { SoftrConfigSchema };
+export { SOFTR_CONFIG_FILE, SoftrConfigError, loadSoftrConfig, panicConfig };

package/dist/vite.js

@@ -1,12 +1,8 @@
-import { assert, panic } from "./assertions.js";
-import { SoftrConfigSchema } from "./softr-config.schema.js";
-import { existsSync, readFileSync } from "node:fs";
+import { SOFTR_CONFIG_FILE, loadSoftrConfig } from "./softr-config.schema.js";
 import path from "node:path";
-import { z } from "zod";
 import { pathToFileURL } from "node:url";
 
 //#region src/vite.ts
-const SOFTR_CONFIG_FILE = "softr.json";
 function softr() {
 	return [softrConfig(), editEngine()];
 }
@@ -27,20 +23,6 @@ function softrConfig() {
 		}
 	};
 }
-function loadSoftrConfig(root) {
-	const file = path.join(root, SOFTR_CONFIG_FILE);
-	assert(existsSync(file), `${SOFTR_CONFIG_FILE} is missing from ${root}`);
-	const source = readFileSync(file, "utf8");
-	let parsed;
-	try {
-		parsed = JSON.parse(source);
-	} catch (error) {
-		panic(`${SOFTR_CONFIG_FILE} is not valid JSON: ${error instanceof Error ? error.message : error}`);
-	}
-	const result = SoftrConfigSchema.safeParse(parsed);
-	if (!result.success) panic(`${SOFTR_CONFIG_FILE} does not match the schema:\n\n${z.prettifyError(result.error)}`);
-	return result.data;
-}
 /**
 * The edit engine is provided by the pod runtime rather than an app dependency: it is never in the
 * app's `package.json` and never in its `node_modules`. The pod points `SOFTR_EDIT_ENGINE_DIR` at

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softr/sdk",
-  "version": "0.0.78-alpha.2",
+  "version": "0.0.79-alpha.0",
   "type": "module",
   "exports": {
     ".": { "types": "./dist/index.d.ts", "import": "./dist/index.js" },

package/schema/softr.schema.json

@@ -54,6 +54,19 @@
       },
       "required": ["routes", "guard"],
       "additionalProperties": false
+    },
+    "user": {
+      "type": "object",
+      "description": "The signed-in user.",
+      "properties": {
+        "properties": {
+          "type": "object",
+          "description": "Fields of the users table the app reads as user.properties, keyed by the name the app uses. Each value is a field id. No other field leaves the server.",
+          "additionalProperties": { "type": "string" }
+        }
+      },
+      "required": ["properties"],
+      "additionalProperties": false
     }
   },
   "required": ["auth"],

package/skills/softr-sdk/SKILL.md

@@ -8,7 +8,7 @@ description: >-
 metadata:
   type: core
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 # Softr SDK core

package/skills/softr-sdk/ai/SKILL.md

@@ -12,7 +12,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.78-alpha.2
+  library_version: 0.0.79-alpha.0
 ---
 
 **Boundary.** `ai` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build. `defineAiAction` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/auth/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 **Boundary.** `auth` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build.

package/skills/softr-sdk/charts-and-metrics/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 **Boundary.** `ds` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler or a server-side route hook — importing it into a component fails the build. `defineQuery` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/comments/SKILL.md

@@ -8,7 +8,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 **Boundary.** `comments` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler. Importing it into a component fails the build. `useCommentComposer` lives on `@softr/sdk/client` and runs in components. `defineComments` comes from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/current-user/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 # The current user

package/skills/softr-sdk/file-uploads/SKILL.md

@@ -7,7 +7,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 **Boundary.** `upload` lives on `@softr/sdk/server` and runs inside server functions. `useFileUpload` and `FileItem` live on `@softr/sdk` and run in components. `FileAttachment` comes from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/formatting/SKILL.md

@@ -8,7 +8,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 # Dates, times and numbers

package/skills/softr-sdk/integrations/SKILL.md

@@ -7,7 +7,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 **Boundary.** `integration` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build. `defineIntegration` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/mcp/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 **Boundary.** `softrMcpMiddleware` lives on `@softr/sdk` and is registered once, in `src/start.ts`. The actions you hand it are the same `defineQuery` / `defineMutation` values the app's own pages use — declared wherever they already live, not duplicated for MCP.

package/skills/softr-sdk/pwa/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 # Installing the app

package/skills/softr-sdk/record-mutations/SKILL.md

@@ -8,7 +8,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 **Boundary.** `ds` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build. `defineMutation` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/record-queries/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 **Boundary.** `ds` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler or a server-side route hook — importing it into a component fails the build. The same holds for any helper that calls `ds`: declare it inside the handler. A function at module level that calls `ds` keeps the server-only import in the browser bundle, and every page stops loading until it moves. `defineQuery` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/region-visibility/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 **Boundary.** `Audience` and `defineVisibility` come from `@softr/sdk` and work anywhere.

package/skills/softr-sdk/routes-and-visibility/SKILL.md

@@ -8,7 +8,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 **Boundary.** `defineVisibility`, the access functions and the error predicates come from `@softr/sdk` and work anywhere.

package/skills/softr-sdk/workflows/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.77
+  library_version: 0.0.78
 ---
 
 **Boundary.** `workflow` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build. `defineWorkflow` and every type come from `@softr/sdk` and can be imported anywhere.