@softr/sdk 0.0.68-props.0 → 0.0.68-props.1

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/isomorphic.d.ts

@@ -2,9 +2,9 @@ import { User } from "./user.js";
 import { Formatting } from "../formatting.js";
 import { Permissions } from "./permissions.js";
 import { SoftrContext } from "./context.js";
-import * as react0 from "react";
+import * as react6 from "react";
 import { ReactNode } from "react";
-import * as _tanstack_react_start0 from "@tanstack/react-start";
+import * as _tanstack_react_start1 from "@tanstack/react-start";
 
 //#region src/auth/isomorphic.d.ts
 
@@ -21,7 +21,7 @@ import * as _tanstack_react_start0 from "@tanstack/react-start";
  *   requestMiddleware: [softrAuthMiddleware()],
  * }))
  */
-declare function softrAuthMiddleware(): _tanstack_react_start0.RequestMiddlewareAfterServer<{}, readonly [_tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>, _tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>], {
+declare function softrAuthMiddleware(): _tanstack_react_start1.RequestMiddlewareAfterServer<{}, readonly [_tanstack_react_start1.RequestMiddlewareAfterServer<{}, undefined, undefined>, _tanstack_react_start1.RequestMiddlewareAfterServer<{}, undefined, undefined>], {
   user: User | null;
   permissions: Permissions;
   formatting: Formatting;
@@ -35,7 +35,7 @@ declare function softrAuthMiddleware(): _tanstack_react_start0.RequestMiddleware
  *   beforeLoad: async () => await getSoftrContext(),
  * })
  */
-declare const getSoftrContext: _tanstack_react_start0.OptionalFetcher<undefined, undefined, Promise<SoftrContext>>;
+declare const getSoftrContext: _tanstack_react_start1.OptionalFetcher<undefined, undefined, Promise<SoftrContext>>;
 /**
  * The context to hand `createRouter`, before any request has resolved one.
  *
@@ -83,7 +83,7 @@ type AuthOptions = {
  *   staleTime: 60_000,
  * })
  */
-declare const getAuthSettings: _tanstack_react_start0.OptionalFetcher<undefined, undefined, Promise<AuthOptions>>;
+declare const getAuthSettings: _tanstack_react_start1.OptionalFetcher<undefined, undefined, Promise<AuthOptions>>;
 /**
  * Makes the auth options readable with {@link useAuthSettings} anywhere below.
  *
@@ -103,7 +103,7 @@ declare function AuthSettingsProvider({
 }: {
   value: AuthOptions;
   children?: ReactNode;
-}): react0.JSX.Element;
+}): react6.JSX.Element;
 /**
  * Which ways in this app offers. Requires an {@link AuthSettingsProvider}
  * above it.

package/dist/cli.js

@@ -1,13 +1,13 @@
 #!/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 { writeIfChanged } from "./codegen/write-if-changed.js";
 import { writeDatasourceDocs } from "./codegen/write-datasource-docs.js";
-import { loadSoftrConfig } from "./softr-config.schema.js";
 import { rmSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { parseArgs } from "node:util";
@@ -76,7 +76,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

@@ -33,8 +33,7 @@ function renderUserPropertiesDoc(users, context) {
 	return [
 		"# User properties",
 		"",
-		`Users datasource: ${displayName(users.name) || users.tableId}  `,
-		`Datasource ID: ${users.datasourceId}` + (registered === void 0 ? "" : `  \nRegistered as: [${datasourceLabel(registered)}](./datasources/${requireDefined(context.fileNames.get(registered.id))}) (${registered.id})`),
+		`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.",
 		"",

package/dist/codegen/fetch-metadata.js

@@ -1,5 +1,6 @@
-import { assert, panic } from "../assertions.js";
+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) {
@@ -31,21 +32,15 @@ async function fetchSoftrEnvInput(source, aliases) {
 	}));
 	let users = null;
 	if (Object.keys(aliases).length > 0) {
-		const { payload } = await apiFetch(`${studioApiUrl}/v1/applications/${applicationId}`, token);
-		const connection = payload.user_connection?.datasource ?? panic("softr.json declares user.properties, but this app has no users table.");
-		const metadata = await apiFetch(`${datasourceApiUrl}/v1/datasource/${applicationId}/${connection.integration_id}/metadata`, token, {
-			datasourceType: connection.datasource_integration_type,
-			resourceIdentifier: { keys: connection.resource_identifier.keys }
-		});
+		const metadata = await apiFetch(`${datasourceApiUrl}/v1/datasource/vibe/studio/applications/${applicationId}/datasources/user-connection/metadata`, token, () => panic("softr.json declares user.properties, but this app has no users table."));
 		users = {
-			datasourceId: connection.id,
 			tableId: metadata.id,
 			name: metadata.name,
 			properties: {}
 		};
 		for (const [alias, fieldId] of Object.entries(aliases)) {
-			const field = metadata.fields.find(({ id }) => id === fieldId) ?? panic(`softr.json user.properties.${alias} names "${fieldId}", which is not a field of the users table.`);
-			assert(field.type !== "ATTACHMENT" && field.type !== "LONG_TEXT" && !(field.allowMultipleEntries && (field.type === "LINKED_RECORD" || field.type === "LOOKUP")), `softr.json user.properties.${alias} names "${field.name}", a ${field.allowMultipleEntries ? "multiple " : ""}${field.type} field, which can be too big to read with the signed-in user. Remove it, and read it with defineQuery on the users table instead.`);
+			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.`);
+			if (field.type === "ATTACHMENT" || field.type === "LONG_TEXT" || field.allowMultipleEntries && (field.type === "LINKED_RECORD" || field.type === "LOOKUP")) panicConfig(`softr.json user.properties.${alias} names "${field.name}", a ${field.allowMultipleEntries ? "multiple " : ""}${field.type} field, which can be too big to read with the signed-in user. Remove it, and read it with defineQuery on the users table instead.`);
 			users.properties[alias] = field;
 		}
 	}
@@ -55,16 +50,12 @@ async function fetchSoftrEnvInput(source, aliases) {
 		users
 	};
 }
-async function apiFetch(url, token, body) {
-	const response = await fetch(url, {
-		method: body === void 0 ? "GET" : "POST",
-		headers: {
-			accept: "application/json",
-			...body === void 0 ? {} : { "content-type": "application/json" },
-			Authorization: `Bearer ${token}`
-		},
-		body: body === void 0 ? void 0 : JSON.stringify(body)
-	}).catch(() => panic(`Could not reach ${url}`));
+async function apiFetch(url, token, notFound = () => panic(`${url} answered 404`)) {
+	const response = await fetch(url, { headers: {
+		accept: "application/json",
+		Authorization: `Bearer ${token}`
+	} }).catch(() => panic(`Could not reach ${url}`));
+	if (response.status === 404) return notFound();
 	if (!response.ok) panic(`${url} answered ${response.status}`);
 	return await response.json();
 }

package/dist/default-error-overlay.d.ts

@@ -1,4 +1,4 @@
-import * as react6 from "react";
+import * as react5 from "react";
 
 //#region src/default-error-overlay.d.ts
 type Props = {
@@ -8,6 +8,6 @@ type Props = {
 declare function DefaultErrorOverlay({
   error,
   reset
-}: Props): react6.JSX.Element;
+}: Props): react5.JSX.Element;
 //#endregion
 export { DefaultErrorOverlay };

package/dist/formatting.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import * as react2 from "react";
+import * as react0 from "react";
 import { ReactNode } from "react";
 
 //#region src/formatting.d.ts
@@ -94,7 +94,7 @@ declare function FormattingScope({
   /** A BCP 47 locale, such as `de-DE`. It drops the app's fixed date format inside the scope. */
   locale?: string;
   children?: ReactNode;
-}): react2.FunctionComponentElement<react2.ProviderProps<Scope>>;
+}): react0.FunctionComponentElement<react0.ProviderProps<Scope>>;
 /**
  * A date in the app's format, safe to render on the server. A timestamp whose
  * zone is not known yet renders `fallback` until the browser supplies it, so
@@ -115,6 +115,6 @@ declare function FormattedDate({
   time?: boolean;
   /** What renders while the visitor's zone is unknown. */
   fallback?: ReactNode;
-}): react2.FunctionComponentElement<react2.FragmentProps>;
+}): react0.FunctionComponentElement<react0.FragmentProps>;
 //#endregion
 export { DateOptions, DateParts, DateSeparator, DateValue, FixedDateFormat, FormattedDate, Formatting, FormattingScope, WeekDay, formatDate, formatDateTime, formatNumber, useFormatting };

package/dist/mcp.d.ts

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

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.0.68-props.0";
+var version = "0.0.68-props.1";
 
 //#endregion
 export { version };

package/dist/pwa.d.ts

@@ -1,4 +1,4 @@
-import * as react0 from "react";
+import * as react3 from "react";
 import "@tanstack/react-start";
 
 //#region src/pwa.d.ts
@@ -23,7 +23,7 @@ import "@tanstack/react-start";
  *   )
  * }
  */
-declare function SoftrPwaHead(): react0.FunctionComponentElement<react0.FragmentProps>;
+declare function SoftrPwaHead(): react3.FunctionComponentElement<react3.FragmentProps>;
 type PwaPlatform = "ios" | "android" | "desktop";
 type PwaInstall = {
   available: false;

package/dist/softr-config.schema.js

@@ -1,10 +1,17 @@
-import { assert, panic } from "./assertions.js";
+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({
@@ -44,18 +51,18 @@ const SoftrConfigSchema = z.object({
 });
 function loadSoftrConfig(root) {
 	const file = path.join(root, SOFTR_CONFIG_FILE);
-	assert(existsSync(file), `${SOFTR_CONFIG_FILE} is missing from ${root}`);
+	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) {
-		panic(`${SOFTR_CONFIG_FILE} is not valid JSON: ${error instanceof Error ? error.message : error}`);
+		panicConfig(`${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)}`);
+	if (!result.success) panicConfig(`${SOFTR_CONFIG_FILE} does not match the schema:\n\n${z.prettifyError(result.error)}`);
 	return result.data;
 }
 
 //#endregion
-export { SOFTR_CONFIG_FILE, loadSoftrConfig };
+export { SOFTR_CONFIG_FILE, SoftrConfigError, loadSoftrConfig, panicConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softr/sdk",
-  "version": "0.0.68-props.0",
+  "version": "0.0.68-props.1",
   "type": "module",
   "exports": {
     ".": {

package/skills/softr-sdk/SKILL.md

@@ -12,7 +12,7 @@ description: >-
 metadata:
   type: core
   library: softr-sdk
-  library_version: 0.0.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 # Softr SDK core

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

@@ -19,7 +19,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 **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

@@ -12,7 +12,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 **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/current-user/SKILL.md

@@ -10,7 +10,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 # The current user

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

@@ -10,7 +10,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 **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

@@ -10,7 +10,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 # Dates, times and numbers

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

@@ -10,7 +10,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 **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.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 **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.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 # Installing the app

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

@@ -11,7 +11,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 **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

@@ -13,7 +13,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 **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.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 **Boundary.** `Audience` and `defineVisibility` come from `@softr/sdk` and work anywhere.

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

@@ -13,7 +13,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 **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.68-props.0
+  library_version: 0.0.68-props.1
 ---
 
 **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.