@softr/sdk 0.0.73 → 0.0.74-alpha.0

package/dist/codegen/datasource-types.js

@@ -161,7 +161,7 @@ function writeValue(shape, context) {
 		case "UPDATED_AT": return "IsoDateTime";
 		case "TIME": return "IsoTime";
 		case "DATE_RANGE": return "{ from: IsoDate; to: IsoDate }";
-		case "SELECT": return selectInput(shape.options);
+		case "SELECT": return "SelectChoiceInput";
 		case "ATTACHMENT": return "AttachmentInput";
 		case "LINKED_RECORD": return "LinkedRecordInput";
 		case "USER": return "WorkspaceUser";
@@ -208,19 +208,6 @@ function selectValue(options) {
 	if (choices === null) return "SelectChoice";
 	return union(choices.map(({ id, label }) => `{ id: ${quote(id)}; label: ${quote(label)} }`));
 }
-/**
-* A write carries the id alone. The API resolves it against the choice list and writes that
-* choice's own label, so a label sent alongside is dropped.
-*
-* The API also takes `{ label }` with no id, and a label matching nothing creates a choice.
-* The union omits that: it would make every misspelling type-check, and the cost of one is a
-* new choice in the field rather than an error.
-*/
-function selectInput(options) {
-	const choices = choiceEntries(options);
-	if (choices === null) return "SelectChoiceInput";
-	return union(choices.map(({ id }) => `{ id: ${quote(id)} }`));
-}
 function datePrecision(options) {
 	const precision = option(options, "precision");
 	return typeof precision === "string" ? precision : null;

package/dist/core/options.d.ts

@@ -1,7 +1,22 @@
-import { DatasourceAction, ReadShape } from "../action.js";
+import { ActionShape, DatasourceAction, ReadShape } from "../action.js";
 import "@tanstack/react-start/server-only";
 
 //#region src/core/options.d.ts
+/** One choice of a SELECT field, as the field holds it now. */
+type FieldChoice = {
+  id: string;
+  label: string;
+  color: string | null;
+};
+/**
+ * The choices a SELECT field holds right now, read from Softr on every call. A choice the
+ * builder adds or renames later shows up without a new build. The field must be one the
+ * action declares. Any query or mutation over the table works.
+ *
+ * @example
+ * const loadStatuses = createServerFn().handler(() => ds.choices(listProjects, 'status'))
+ */
+declare function listChoices<TShape extends ActionShape>(action: DatasourceAction<TShape>, field: keyof TShape["fields"] & string): Promise<Array<FieldChoice>>;
 /** One row a linked-record picker offers. */
 type RecordOption = {
   id: string;
@@ -33,4 +48,4 @@ declare function listOptions<TShape extends ReadShape>(query: DatasourceAction<T
   limit?: number;
 }): Promise<RecordOptions>;
 //#endregion
-export { RecordOption, RecordOptions, listOptions };
+export { FieldChoice, RecordOption, RecordOptions, listChoices, listOptions };

package/dist/core/options.js

@@ -1,9 +1,37 @@
+import { assert } from "../assertions.js";
+import { fetch } from "../fetch.js";
+import { readSessionToken } from "../auth/session.js";
 import { makeChain } from "../datasource/fields.js";
-import { listRecords } from "../datasource/record.js";
+import { describeFailure, dsUrl, listRecords, refererHeader, resolveTarget } from "../datasource/record.js";
 import "@tanstack/react-start/server-only";
 
 //#region src/core/options.ts
 /**
+* The choices a SELECT field holds right now, read from Softr on every call. A choice the
+* builder adds or renames later shows up without a new build. The field must be one the
+* action declares. Any query or mutation over the table works.
+*
+* @example
+* const loadStatuses = createServerFn().handler(() => ds.choices(listProjects, 'status'))
+*/
+async function listChoices(action, field) {
+	const { actionId, select } = resolveTarget(action, action.resource.operation);
+	const fieldId = select[field];
+	assert(fieldId, () => `action "${actionId}" declares no field "${field}"`);
+	const res = await fetch(`${dsUrl(actionId)}/metadata`, { headers: {
+		Authorization: `Bearer ${readSessionToken()}`,
+		...refererHeader()
+	} });
+	if (!res.ok) throw new Error(`datasource metadata failed for "${actionId}": ${await describeFailure(res)}`);
+	const metadataField = (await res.json()).fields.find(({ id }) => id === fieldId);
+	assert(metadataField?.type === "SELECT", () => `"${field}" on action "${actionId}" is not a SELECT field`);
+	return (metadataField.options?.choices ?? []).map(({ id, label, color }) => ({
+		id,
+		label,
+		color: color ?? null
+	}));
+}
+/**
 * The rows a linked field can point at, for a picker: each record of the query as its id and the text
 * of one field, searched on that field when a term is given, a page at a time.
 *
@@ -36,4 +64,4 @@ function labelOf(value) {
 }
 
 //#endregion
-export { listOptions };
+export { listChoices, listOptions };

package/dist/datasource/datasource.d.ts

@@ -1,5 +1,5 @@
 import { createRecord, deleteRecord, getRecord, listRecords, updateRecord } from "./record.js";
-import { listOptions } from "../core/options.js";
+import { listChoices, listOptions } from "../core/options.js";
 import { chart, metric } from "./chart.js";
 import "@tanstack/react-start/server-only";
 
@@ -13,6 +13,7 @@ declare const ds: {
   metric: typeof metric;
   chart: typeof chart;
   options: typeof listOptions;
+  choices: typeof listChoices;
 };
 //#endregion
 export { ds };

package/dist/datasource/datasource.js

@@ -1,6 +1,6 @@
 import { createRecord, deleteRecord, getRecord, listRecords, updateRecord } from "./record.js";
 import { chart, metric } from "./chart.js";
-import { listOptions } from "../core/options.js";
+import { listChoices, listOptions } from "../core/options.js";
 import "@tanstack/react-start/server-only";
 
 //#region src/datasource/datasource.ts
@@ -12,7 +12,8 @@ const ds = {
 	delete: deleteRecord,
 	metric,
 	chart,
-	options: listOptions
+	options: listOptions,
+	choices: listChoices
 };
 
 //#endregion

package/dist/datasource/fields.d.ts

@@ -19,17 +19,21 @@ type NumberChain = EmptyChain & {
   lte(value: number): ConstructableFilter;
   between(start: number, end: number): ConstructableFilter;
 };
-type ArrayChain<TMember$1 extends string> = EmptyChain & {
-  is(values: Array<TMember$1>): ConstructableFilter;
-  isOneOf(values: Array<TMember$1>): ConstructableFilter;
-  isNoneOf(values: Array<TMember$1>): ConstructableFilter;
-  hasAllOf(values: Array<TMember$1>): ConstructableFilter;
+type ArrayChain = EmptyChain & {
+  is(values: Array<string>): ConstructableFilter;
+  isOneOf(values: Array<string>): ConstructableFilter;
+  isNoneOf(values: Array<string>): ConstructableFilter;
+  hasAllOf(values: Array<string>): ConstructableFilter;
 };
-type ChoiceChain<TId$1 extends string> = EmptyChain & {
-  is(value: TId$1): ConstructableFilter;
-  isNot(value: TId$1): ConstructableFilter;
-  isOneOf(values: Array<TId$1>): ConstructableFilter;
-  isNoneOf(values: Array<TId$1>): ConstructableFilter;
+/**
+ * Compares choice ids as plain strings. A select's choices change in Studio after the build,
+ * and an id read at runtime from ds.choices has to be a valid filter value.
+ */
+type ChoiceChain = EmptyChain & {
+  is(value: string): ConstructableFilter;
+  isNot(value: string): ConstructableFilter;
+  isOneOf(values: Array<string>): ConstructableFilter;
+  isNoneOf(values: Array<string>): ConstructableFilter;
 };
 /** What DSv2 filters generically: matched whole or scanned, never against a set. */
 type GenericChain = EmptyChain & {
@@ -73,32 +77,20 @@ type AnyChain = EmptyChain & {
   between(start: number | string, end: number | string): ConstructableFilter;
   isNotBetween(start: number | string, end: number | string): ConstructableFilter;
 };
-type IdOf<TValue> = TValue extends {
-  id: infer TId extends string;
-} ? TId : string;
-/**
- * What a choice-shaped field compares against: its own ids where codegen read the choice
- * list, and any string where it did not. A linked record is the open case, and it is the
- * only thing distinguishing one from a select at the type level.
- */
-type ChoiceIds<TValue> = string extends IdOf<TValue> ? string : IdOf<TValue>;
 type TextFieldType = 'SINGLE_LINE_TEXT' | 'LONG_TEXT' | 'URL' | 'EMAIL' | 'PHONE' | 'ADDRESS' | 'RECORD_ID' | 'LOCATION' | 'TIME' | 'BUTTON';
 type NumberFieldType = 'NUMBER' | 'PERCENT' | 'CURRENCY' | 'PROGRESS' | 'RATING' | 'DURATION' | 'COUNT' | 'AUTONUMBER';
 type DateFieldType = 'DATE' | 'DATETIME' | 'CREATED_AT' | 'UPDATED_AT';
 type ChoiceFieldType = 'SELECT' | 'LINKED_RECORD' | 'CREATED_BY' | 'UPDATED_BY';
 /** The types with no single value to compare: only whether the field holds one. */
 type EmptyFieldType = 'ATTACHMENT' | 'DATE_RANGE';
-type ElementOf<TValue> = TValue extends Array<infer TMember> ? TMember : TValue;
 /**
  * The operators one alias offers, chosen from the type codegen declared for the field rather
  * than from what it reads as: a `DATETIME` and a text field both read as `string`, and only
  * the declared type tells them apart.
  *
- * `TValue` is still needed for the literal choice ids, which live on the read type and
- * nowhere else. A field with no declared type lands on the permissive chain rather than on
- * none.
+ * A field with no declared type lands on the permissive chain rather than on none.
  */
-type ChainFor<TFieldType, TValue> = [TFieldType] extends [never] ? AnyChain : TFieldType extends `${infer TBase}[]` ? TBase extends EmptyFieldType ? EmptyChain : ArrayChain<ChoiceIds<ElementOf<TValue>>> : TFieldType extends TextFieldType ? TextChain<TValue & string> : TFieldType extends NumberFieldType ? NumberChain : TFieldType extends 'USER' ? GenericChain : TFieldType extends 'CHECKBOX' ? BooleanChain : TFieldType extends DateFieldType ? DateChain : TFieldType extends ChoiceFieldType ? ChoiceChain<ChoiceIds<TValue>> : TFieldType extends EmptyFieldType ? EmptyChain : AnyChain;
+type ChainFor<TFieldType, TValue> = [TFieldType] extends [never] ? AnyChain : TFieldType extends `${infer TBase}[]` ? TBase extends EmptyFieldType ? EmptyChain : ArrayChain : TFieldType extends TextFieldType ? TextChain<TValue & string> : TFieldType extends NumberFieldType ? NumberChain : TFieldType extends 'USER' ? GenericChain : TFieldType extends 'CHECKBOX' ? BooleanChain : TFieldType extends DateFieldType ? DateChain : TFieldType extends ChoiceFieldType ? ChoiceChain : TFieldType extends EmptyFieldType ? EmptyChain : AnyChain;
 type Combinators = {
   $and(...members: Array<AnyConstructable>): ConstructableFilterGroup;
   $or(...members: Array<AnyConstructable>): ConstructableFilterGroup;

package/dist/formatting.d.ts

@@ -1,4 +1,4 @@
-import * as react0 from "react";
+import * as react2 from "react";
 import { ReactNode } from "react";
 import { z } from "zod";
 
@@ -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;
-}): react0.FunctionComponentElement<react0.ProviderProps<Scope>>;
+}): react2.FunctionComponentElement<react2.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;
-}): react0.FunctionComponentElement<react0.FragmentProps>;
+}): react2.FunctionComponentElement<react2.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_start5 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_start5.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.73";
+var version = "0.0.74-alpha.0";
 
 //#endregion
 export { version };

package/dist/pwa.d.ts

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

package/dist/server.d.ts

@@ -1,8 +1,8 @@
 import { upload } from "./core/file-upload.js";
 import { auth } from "./auth/server.js";
-import { RecordOption, RecordOptions } from "./core/options.js";
+import { FieldChoice, RecordOption, RecordOptions } from "./core/options.js";
 import { ds } from "./datasource/datasource.js";
 import { workflow } from "./core/workflow.js";
 import { integration } from "./core/integration.js";
 import "@tanstack/react-start/server-only";
-export { type RecordOption, type RecordOptions, auth, ds, integration, upload, workflow };
+export { type FieldChoice, type RecordOption, type RecordOptions, auth, ds, integration, upload, workflow };

package/package.json

@@ -1,16 +1,37 @@
 {
   "name": "@softr/sdk",
-  "version": "0.0.73",
+  "version": "0.0.74-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/record-mutations/SKILL.md

@@ -155,7 +155,7 @@ A form select for a `LINKED_RECORD` field needs its options from the linked tabl
 
 Each key of `data` accepts exactly what its field takes (see [record-queries](../record-queries/SKILL.md#typing)):
 
-- SELECT and LINKED_RECORD take `{ id }`. Not a bare string, and not the `{ id, label }` a read returns; the label is display data and a write does not accept it. A generated SELECT narrows the id to the field's own choices.
+- SELECT and LINKED_RECORD take `{ id }`. Not a bare string, and not the `{ id, label }` a read returns; the label is display data and a write does not accept it. For a form select that should follow the field's choices in Studio, read them with `ds.choices` (see [record-queries](../record-queries/SKILL.md)).
 - CHECKBOX takes a boolean. Dates take ISO strings, never `Date` instances.
 - ATTACHMENT takes `{ url }`, optionally with `filename`, `id` and `type`.
 - A multi-entry field takes an array of the value.

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

@@ -200,6 +200,12 @@ const loadProductStatuses = createServerFn()
 
 Skip this request when the options are predefined and fixed — hardcode them instead.
 
+A `SELECT` field's options are its choices, and the builder can add and rename them in Studio after the app is built. When a dropdown should follow those changes, read them with `ds.choices`. When the app means a fixed choice, such as a "Done" tab, use its id directly. A mistyped id is not caught at compile time, and a write with an id the field lacks adds it as a new choice. `ds.choices` takes any query or mutation that declares the field and answers `[{ id, label, color }]` as the field holds them now. Each `id` is what a `where` and a write take, for a filter dropdown and a form select alike:
+
+```ts
+const loadStatuses = createServerFn().handler(() => ds.choices(listProjects, 'status'))
+```
+
 A read the datasource turns down throws rather than coming back empty, and it throws a plain `Error` carrying the status, followed by the reason the datasource gives when it sends one. There is no typed predicate to narrow it with. Handle it where you would handle any other failed fetch: an `errorComponent` on the route, or a check in the handler.
 
 ## Typing

package/skills/softr-sdk/record-queries/references/filters-and-sorting.md

@@ -83,7 +83,7 @@ Every value is an ISO date string, either `'2026-01-31'` or a full timestamp. A
 | `.isOneOf(values)` / `.isNoneOf(values)` | Any of / none of |
 | `.isEmpty()` / `.isNotEmpty()` | No value / has a value |
 
-Values are choice ids, never labels. A generated SELECT narrows the argument to the field's own choice ids, so a label or a typo is a type error. A LINKED_RECORD compares against the linked record's id.
+Values are choice ids, never labels. A SELECT takes any choice id as a string, so a filter dropdown can pass the ids `ds.choices` returns. A label still matches nothing. A LINKED_RECORD compares against the linked record's id.
 
 ### Multi-value fields