@softr/sdk 0.0.49-alpha.0 → 0.0.50-alpha.0

package/dist/auth/platform.js

@@ -1,5 +1,5 @@
-import { fetch } from "../fetch.js";
 import { panic } from "../assertions.js";
+import { fetch } from "../fetch.js";
 import { permissionsSchema } from "./permissions.js";
 import { sessionConfig } from "./config.js";
 import { userSchema } from "./user.js";

package/dist/cli.js

@@ -1,26 +1,50 @@
 #!/usr/bin/env node
 import { version } from "./package.js";
+import { requireDefined } from "./assertions.js";
 import { fetchSoftrEnvInput, metadataSourceFromEnv } from "./codegen/fetch-metadata.js";
 import { renderSoftrEnv } from "./codegen/softr-env.js";
 import { writeDatasourceDocs } from "./codegen/write-datasource-docs.js";
 import { writeFileSync } from "node:fs";
 import path from "node:path";
+import { parseArgs } from "node:util";
 
 //#region src/cli.ts
 const OUTPUT = "softr-env.d.ts";
 const DOCS_DIR = "docs/datasources";
-async function generate() {
+async function generate({ json }) {
+	if (json) console.info = console.error;
 	const input = await fetchSoftrEnvInput(metadataSourceFromEnv());
 	writeFileSync(path.resolve(process.cwd(), OUTPUT), renderSoftrEnv(input, version), "utf8");
-	console.log(`[softr] wrote ${OUTPUT} (${input.datasources.length} datasources)`);
-	writeDatasourceDocs(input.datasources, path.resolve(process.cwd(), DOCS_DIR));
-	console.log(`[softr] wrote ${DOCS_DIR} (${input.datasources.length} datasources)`);
+	const docFiles = writeDatasourceDocs(input.datasources, path.resolve(process.cwd(), DOCS_DIR));
+	const report = {
+		types: OUTPUT,
+		docsIndex: `${DOCS_DIR}/README.md`,
+		datasources: input.datasources.map(({ id, name }) => ({
+			id,
+			name,
+			doc: `${DOCS_DIR}/${requireDefined(docFiles.get(id))}`
+		}))
+	};
+	if (json) {
+		process.stdout.write(`${JSON.stringify(report)}\n`);
+		return;
+	}
+	console.log(`[softr] wrote ${report.types}`);
+	console.log(`[softr] wrote ${report.docsIndex}`);
+	for (const datasource of report.datasources) console.log(`[softr] wrote ${datasource.doc} for ${datasource.name} (${datasource.id})`);
 }
-const [command] = process.argv.slice(2);
-if (command === "generate") await generate();
+const { positionals, values } = parseArgs({
+	allowPositionals: true,
+	options: { json: {
+		type: "boolean",
+		default: false
+	} }
+});
+const [command] = positionals;
+if (command === "generate") await generate({ json: values.json });
 else {
 	console.error(command ? `softr-sdk: unknown command '${command}'` : "softr-sdk: no command given");
-	console.error("usage: softr-sdk generate");
+	console.error("usage: softr-sdk generate [--json]");
 	process.exit(1);
 }
 

package/dist/codegen/fetch-metadata.js

@@ -1,5 +1,5 @@
-import { fetch } from "../fetch.js";
 import { panic } from "../assertions.js";
+import { fetch } from "../fetch.js";
 
 //#region src/codegen/fetch-metadata.ts
 function metadataSourceFromEnv(env = process.env) {

package/dist/codegen/write-datasource-docs.js

@@ -18,6 +18,7 @@ function writeDatasourceDocs(datasources, docsDir) {
 	mkdirSync(docsDir, { recursive: true });
 	writeFileSync(path.join(docsDir, "README.md"), renderDatasourceIndex(datasources, context), "utf8");
 	for (const datasource of datasources) writeFileSync(path.join(docsDir, requireDefined(context.fileNames.get(datasource.id))), renderDatasourceDoc(datasource, context), "utf8");
+	return context.fileNames;
 }
 
 //#endregion

package/dist/core/workflow.js

@@ -1,5 +1,5 @@
-import { fetch } from "../fetch.js";
 import { panic } from "../assertions.js";
+import { fetch } from "../fetch.js";
 import { sessionConfig } from "../auth/config.js";
 import { readSessionToken } from "../auth/session.js";
 import { platformApiUrl } from "../auth/platform.js";

package/dist/datasource/chart.js

@@ -1,5 +1,5 @@
-import { fetch } from "../fetch.js";
 import { assert, panic } from "../assertions.js";
+import { fetch } from "../fetch.js";
 import { readUserTimezone } from "../cookies.js";
 import { readSessionToken } from "../auth/session.js";
 import { INTERNAL_KIND, buildFilterCriteria, buildOrderBy, dealiasFilterCriteria } from "./filter.js";

package/dist/datasource/record.js

@@ -1,5 +1,5 @@
-import { fetch } from "../fetch.js";
 import { assert, panic } from "../assertions.js";
+import { fetch } from "../fetch.js";
 import { readUserTimezone } from "../cookies.js";
 import { readSessionToken } from "../auth/session.js";
 import { isDatasourceAction } from "../action.js";

package/dist/default-error-overlay.js

@@ -17,6 +17,7 @@ function isAgentTurnRunning() {
 function DefaultErrorOverlay({ error, reset }) {
 	if (process.env.NODE_ENV === "production") return /* @__PURE__ */ jsx("div", {
 		style: s.overlay,
+		"data-softr-error-overlay": "error",
 		children: /* @__PURE__ */ jsxs("div", {
 			style: s.card,
 			children: [
@@ -39,24 +40,32 @@ function DefaultErrorOverlay({ error, reset }) {
 }
 function DevView({ error, reset }) {
 	const running = useSyncExternalStore(subscribeToAgentTurn, isAgentTurnRunning, () => false);
-	const caughtDuringTurn = useRef(running);
+	const [caughtDuringTurn, setCaughtDuringTurn] = useState(running);
 	const router = useRouter();
 	useEffect(() => {
 		if (running) {
-			caughtDuringTurn.current = true;
+			setCaughtDuringTurn(true);
 			return;
 		}
-		if (!caughtDuringTurn.current) return;
-		const timer = setTimeout(() => void router.invalidate().then(() => reset?.()), 1e3);
+		if (!caughtDuringTurn) return;
+		const showError = () => setCaughtDuringTurn(false);
+		const timer = setTimeout(() => {
+			router.invalidate().then(() => {
+				reset?.();
+				showError();
+			}, showError);
+		}, 1e3);
 		return () => clearTimeout(timer);
 	}, [
 		running,
+		caughtDuringTurn,
 		reset,
 		router
 	]);
-	if (running) return /* @__PURE__ */ jsx(UpdatingView, {});
+	if (running || caughtDuringTurn) return /* @__PURE__ */ jsx(UpdatingView, {});
 	return /* @__PURE__ */ jsx("div", {
 		style: s.overlay,
+		"data-softr-error-overlay": "error",
 		children: /* @__PURE__ */ jsxs("div", {
 			style: s.card,
 			children: [
@@ -88,6 +97,7 @@ function DevView({ error, reset }) {
 function UpdatingView() {
 	return /* @__PURE__ */ jsx("div", {
 		style: s.overlay,
+		"data-softr-error-overlay": "updating",
 		children: /* @__PURE__ */ jsxs("div", {
 			style: s.card,
 			children: [/* @__PURE__ */ jsx("div", {
@@ -339,7 +349,7 @@ const s = {
 		border: "1px solid var(--input, oklch(0.922 0 0))",
 		borderRadius: "var(--radius, 0.625rem)",
 		background: "var(--input-fill, oklch(1 0 0))",
-		color: "var(--primary-foreground, oklch(0.985 0 0))",
+		color: "var(--foreground, oklch(0.145 0 0))",
 		fontFamily: "inherit",
 		fontSize: "0.875rem",
 		fontWeight: 500,

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_start2 from "@tanstack/react-start";
 
 //#region src/mcp.d.ts
 
@@ -37,6 +37,6 @@ type SoftrMcpOptions = {
  *   ],
  * }))
  */
-declare function softrMcpMiddleware(options?: SoftrMcpOptions): _tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>;
+declare function softrMcpMiddleware(options?: SoftrMcpOptions): _tanstack_react_start2.RequestMiddlewareAfterServer<{}, undefined, undefined>;
 //#endregion
 export { softrMcpMiddleware };

package/dist/mcp.js

@@ -1,5 +1,5 @@
-import { fetch } from "./fetch.js";
 import { assert } from "./assertions.js";
+import { fetch } from "./fetch.js";
 import { sessionConfig } from "./auth/config.js";
 import { readSessionToken, withSessionToken } from "./auth/session.js";
 import { makePlatform, platformApiUrl } from "./auth/platform.js";
@@ -226,10 +226,10 @@ async function platformSession(accessToken) {
 		ok: false,
 		refused: response.status === 401 || response.status === 403
 	};
-	const parsed = z.object({ jwt: z.string() }).safeParse(await response.json().catch(() => null));
+	const parsed = z.object({ sessionJwt: z.string() }).safeParse(await response.json().catch(() => null));
 	return parsed.success ? {
 		ok: true,
-		sessionToken: parsed.data.jwt
+		sessionToken: parsed.data.sessionJwt
 	} : {
 		ok: false,
 		refused: false

package/dist/package.js

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

package/package.json

@@ -1,16 +1,37 @@
 {
   "name": "@softr/sdk",
-  "version": "0.0.49-alpha.0",
+  "version": "0.0.50-alpha.0",
   "type": "module",
   "exports": {
-    ".": { "types": "./dist/index.d.ts", "import": "./dist/index.js" },
-    "./client": { "types": "./dist/client.d.ts", "import": "./dist/client.js" },
-    "./server": { "types": "./dist/server.d.ts", "import": "./dist/server.js" },
-    "./vite": { "types": "./dist/vite.d.ts", "import": "./dist/vite.js" }
-  },
-  "bin": { "softr-sdk": "./dist/cli.js" },
-  "files": ["dist", "schema", "skills", "!skills/_artifacts"],
-  "publishConfig": { "access": "public" },
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./client": {
+      "types": "./dist/client.d.ts",
+      "import": "./dist/client.js"
+    },
+    "./server": {
+      "types": "./dist/server.d.ts",
+      "import": "./dist/server.js"
+    },
+    "./vite": {
+      "types": "./dist/vite.d.ts",
+      "import": "./dist/vite.js"
+    }
+  },
+  "bin": {
+    "softr-sdk": "./dist/cli.js"
+  },
+  "files": [
+    "dist",
+    "schema",
+    "skills",
+    "!skills/_artifacts"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "build": "tsdown",
     "test": "node --import ./src/test-utils/setup.ts --test",
@@ -42,7 +63,9 @@
       "optional": true
     }
   },
-  "keywords": ["tanstack-intent"],
+  "keywords": [
+    "tanstack-intent"
+  ],
   "intent": {
     "version": 1,
     "repo": "@softr/sdk",

package/skills/softr-sdk/SKILL.md

@@ -11,7 +11,7 @@ description: >-
 metadata:
   type: core
   library: softr-sdk
-  library_version: 0.0.49-alpha.0
+  library_version: 0.0.50
 ---
 
 # Softr SDK core

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

@@ -16,7 +16,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.49-alpha.0
+  library_version: 0.0.50
 ---
 
 **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.49-alpha.0
+  library_version: 0.0.50
 ---
 
 **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

@@ -4,12 +4,11 @@ description: >-
   Read the signed-in Softr visitor: useCurrentUser and the User type,
   context.user in a route's beforeLoad, and context.user inside a server
   function handler, where Start types it from the app's registered request
-  middleware. Covers the null guest and the SoftrUserGroups module augmentation
-  that narrows group ids to your own.
+  middleware. Covers the null guest.
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.49-alpha.0
+  library_version: 0.0.50
 ---
 
 # The current user
@@ -84,22 +83,6 @@ const getMyInvoices = createServerFn().handler(async ({ context }) => {
 
 `context.user` is typed. Start derives a handler's context from the app's registered request middleware as well as the server function's own, so there is nothing to import and nothing to cast.
 
-### Narrowing group ids to your own
-
-```ts
-// src/softr.d.ts
-declare module '@softr/sdk' {
-  interface SoftrUserGroups {
-    ids:
-      | '00000000-0000-0000-0000-00000000000a'
-      | '00000000-0000-0000-0000-00000000000b'
-  }
-}
-export {}
-```
-
-With this declaration, `user.userGroupIds` and every `userGroupIds` the SDK accepts narrow to those ids, and a typo stops compiling. Without it they are plain `string`.
-
 ## References
 
 - [routes-and-visibility/SKILL.md](../routes-and-visibility/SKILL.md): `isAuthorized` narrows `context.user` while applying the route's rule

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

@@ -10,7 +10,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.49-alpha.0
+  library_version: 0.0.50
 ---
 
 **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/integrations/SKILL.md

@@ -4,13 +4,13 @@ description: >-
   Call a third-party service connected to the app as an integration:
   defineIntegration from @softr/sdk declares the action with its integrationId,
   the one HTTP method and endpoint url it allows, and permissions;
-  integration.createFetcher from @softr/sdk/server binds it and returns a fetcher
-  function you call with optional params, query, headers, and body. Check res.ok
-  before res.json().
+  integration.createFetcher from @softr/sdk/server binds it and returns a
+  fetcher function you call with optional params, query, headers, and body.
+  Check res.ok before res.json().
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.49-alpha.0
+  library_version: 0.0.50
 ---
 
 **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.49-alpha.0
+  library_version: 0.0.50
 ---
 
 **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/record-mutations/SKILL.md

@@ -11,7 +11,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.49-alpha.0
+  library_version: 0.0.50
 ---
 
 **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.49-alpha.0
+  library_version: 0.0.50
 ---
 
 **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/region-visibility/SKILL.md

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

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

@@ -5,15 +5,14 @@ description: >-
   with ALL_USERS, LOGGED_IN_USERS or NON_LOGGED_IN_USERS, userGroupIds, and the
   ways to apply a rule: guardRoute and assertRouteAccess in a route,
   isAuthorized and checkAccess anywhere. Covers per-reason overrides, the
-  redirect and throw strategies, rendering an access error with
-  isAccessError, isUnauthenticatedError, isForbiddenError and
-  isAlreadyAuthenticatedError, guarding a layout, and the lint rule that requires a
-  declaration alongside the rules that reject a duplicate, computed or
-  root-level one.
+  redirect and throw strategies, rendering an access error with isAccessError,
+  isUnauthenticatedError, isForbiddenError and isAlreadyAuthenticatedError,
+  guarding a layout, and the lint rule that requires a declaration alongside the
+  rules that reject a duplicate, computed or root-level one.
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.49-alpha.0
+  library_version: 0.0.50
 ---
 
 **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.49-alpha.0
+  library_version: 0.0.50
 ---
 
 **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.