@softr/sdk 0.0.78-alpha.2 → 0.0.78

package/dist/action.d.ts

@@ -264,38 +264,5 @@ type CommentsDefinition<TId extends string> = {
  * const thread = await comments.list(orderComments, { recordId })
  */
 declare function defineComments<const TId extends string>(definition: CommentsDefinition<TId>): CommentsAction<TId>;
-type AiResource = {
-  type: "AI";
-  model: string;
-};
-type AiAction<TId extends string = string> = Action<AiResource> & {
-  id: TId;
-};
-type AiDefinition<TId extends string> = {
-  id: TId;
-  model: string;
-  permissions: ActionPermissions;
-};
-/**
- * Declares an AI action: a model call run by Softr on its own provider keys and billed to the
- * workspace's AI credits, so nothing has to be connected. `model` is the id of a model from
- * Softr's AI catalog, chosen when the app is built: read the catalog with the `list_ai_models`
- * tool and copy the id exactly. An id outside the catalog is refused when the action is saved.
- *
- * Every call spends the workspace's credits, so keep the audience to signed-in users unless a
- * public page really needs the call.
- *
- * Pass the returned object to `ai.generate()` or `ai.stream()` at runtime.
- *
- * @example
- * const summarizeDeal = defineAiAction({
- *   id: "summarizeDeal",
- *   model: "anthropic-claude-sonnet-4-6",
- *   permissions: { userGroupTypes: ["LOGGED_IN_USERS"] },
- * })
- *
- * const answer = await ai.generate(summarizeDeal, { system: "...", prompt: facts })
- */
-declare function defineAiAction<const TId extends string>(definition: AiDefinition<TId>): AiAction<TId>;
 //#endregion
-export { ActionData, ActionPermissions, ActionRecord, ActionShape, AiAction, CommentsAction, DatasourceAction, FieldTypeOf, IntegrationAction, ReadOf, ReadShape, SoftrDatasources, WorkflowAction, defineAiAction, defineComments, defineIntegration, defineMutation, defineQuery, defineWorkflow };
+export { ActionData, ActionPermissions, ActionRecord, ActionShape, CommentsAction, DatasourceAction, FieldTypeOf, IntegrationAction, ReadOf, ReadShape, SoftrDatasources, WorkflowAction, defineComments, defineIntegration, defineMutation, defineQuery, defineWorkflow };

package/dist/action.js

@@ -81,17 +81,6 @@ function isDatasourceAction(value) {
 	const resource = candidate.resource;
 	return typeof candidate.id === "string" && typeof resource === "object" && resource !== null && resource.type === "DATASOURCE";
 }
-function defineAiAction(definition) {
-	const { id, model, permissions } = definition;
-	return {
-		id,
-		resource: {
-			type: "AI",
-			model
-		},
-		permissions
-	};
-}
 
 //#endregion
-export { defineAiAction, defineComments, defineIntegration, defineMutation, defineQuery, defineWorkflow, isDatasourceAction };
+export { defineComments, defineIntegration, defineMutation, defineQuery, defineWorkflow, isDatasourceAction };

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