@softr/sdk 0.0.33 → 0.0.35-alpha.0

package/dist/action.d.ts

@@ -200,25 +200,25 @@ type WorkflowDefinition<TId extends string> = {
 declare function defineWorkflow<const TId extends string>(definition: WorkflowDefinition<TId>): WorkflowAction<TId>;
 type IntegrationResource = {
   type: "INTEGRATION";
-  datasourceId: string;
+  integrationId: string;
 };
 type IntegrationAction<TId extends string = string> = Action<IntegrationResource> & {
   id: TId;
 };
 type IntegrationDefinition<TId extends string> = {
   id: TId;
-  datasourceId: string;
+  integrationId: string;
   permissions: ActionPermissions;
 };
 /**
- * Declares an integration: which connected data source to call through, and who may call it.
+ * Declares an integration: which workspace integration to call through, and who may call it.
  *
  * Pass the returned object to `integration.createFetcher()` to get a bound fetcher.
  *
  * @example
  * const googleCalendar = defineIntegration({
  *   id: "googleCalendar",
- *   datasourceId: "25d60213-ef4f-4fa0-b094-a46931b2d120",
+ *   integrationId: "25d60213-ef4f-4fa0-b094-a46931b2d120",
  *   permissions: { userGroup: "LOGGED_IN_USERS" },
  * })
  *

package/dist/action.js

@@ -38,12 +38,12 @@ function defineWorkflow(definition) {
 	};
 }
 function defineIntegration(definition) {
-	const { id, datasourceId, permissions } = definition;
+	const { id, integrationId, permissions } = definition;
 	return {
 		id,
 		resource: {
 			type: "INTEGRATION",
-			datasourceId
+			integrationId
 		},
 		permissions
 	};

package/dist/core/integration.js

@@ -12,7 +12,7 @@ async function integrationFetch(action, url, { method = "GET", headers = {}, bod
 		headers
 	};
 	if (upperMethod !== "GET" && upperMethod !== "HEAD" && body !== void 0) payload.body = body;
-	return fetch(`${dsUrl(action.resource.datasourceId)}/proxy`, {
+	return fetch(`${dsUrl(action.id)}/proxy`, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",

package/dist/datasource/chart.js

@@ -191,9 +191,9 @@ function mapChartRows(columns, data) {
 	});
 }
 async function executeChart(query, state) {
-	const { datasourceId, select } = resolveTarget(query, "read");
+	const { actionId, select } = resolveTarget(query, "read");
 	const { body, columns } = buildChartRequest(state, select);
-	const res = await fetch(`${dsUrl(datasourceId)}/chart/data`, {
+	const res = await fetch(`${dsUrl(actionId)}/chart/data`, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -202,7 +202,7 @@ async function executeChart(query, state) {
 		},
 		body: JSON.stringify(body)
 	});
-	if (!res.ok) throw new Error(`Softr datasource chart failed for "${datasourceId}": ${res.status}`);
+	if (!res.ok) throw new Error(`Softr datasource chart failed for action "${actionId}": ${res.status}`);
 	const payload = await res.json();
 	return {
 		data: mapChartRows(columns, payload.data),
@@ -264,9 +264,9 @@ function readMetricValue(responseKey, data) {
 	return row[responseKey];
 }
 async function executeMetric(query, handle, filters) {
-	const { datasourceId, select } = resolveTarget(query, "read");
+	const { actionId, select } = resolveTarget(query, "read");
 	const { body, responseKey } = buildMetricRequest(handle, filters, select);
-	const res = await fetch(`${dsUrl(datasourceId)}/chart/data`, {
+	const res = await fetch(`${dsUrl(actionId)}/chart/data`, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -275,7 +275,7 @@ async function executeMetric(query, handle, filters) {
 		},
 		body: JSON.stringify(body)
 	});
-	if (!res.ok) throw new Error(`Softr datasource metric failed for "${datasourceId}": ${res.status}`);
+	if (!res.ok) throw new Error(`Softr datasource metric failed for action "${actionId}": ${res.status}`);
 	const payload = await res.json();
 	return {
 		value: readMetricValue(responseKey, payload.data),

package/dist/datasource/record.js

@@ -8,12 +8,12 @@ import { andAll, makeFieldSet, makeSortSet } from "./fields.js";
 
 //#region src/datasource/record.ts
 const MAX_RECORD_COUNT = 100;
-const dsUrl = (datasourceId) => {
+const dsUrl = (actionId) => {
 	const datasourceApiUrl = process.env.SOFTR_DATASOURCE_API_URL;
 	if (!datasourceApiUrl) panic("SOFTR_DATASOURCE_API_URL is not set.");
 	const applicationId = process.env.SOFTR_APPLICATION_ID;
 	if (!applicationId) panic("SOFTR_APPLICATION_ID is not set.");
-	return `${withoutTrailingSlash(datasourceApiUrl)}/v1/datasource/vibe/applications/${applicationId}/datasources/${datasourceId}`;
+	return `${withoutTrailingSlash(datasourceApiUrl)}/v1/datasource/vibe/applications/${applicationId}/actions/${actionId}`;
 };
 /**
 * Queries a list of records from the datasource.
@@ -65,12 +65,12 @@ function listRecords(query) {
 	return builder;
 }
 async function executeList(query, args) {
-	const { datasourceId, select } = resolveTarget(query, "read");
+	const { actionId, select } = resolveTarget(query, "read");
 	const count = Math.min(args.limit ?? 20, MAX_RECORD_COUNT);
 	const offset = args.offset ?? null;
 	const filterCriteria = args.filters.length ? dealiasFilterCriteria(buildFilterCriteria(andAll(args.filters)), select) : {};
 	const sortingOption = args.orderBy.length ? dealiasOrderBy(buildOrderBy(args.orderBy), select) : void 0;
-	const res = await fetch(`${dsUrl(datasourceId)}/records`, {
+	const res = await fetch(`${dsUrl(actionId)}/records`, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -87,7 +87,7 @@ async function executeList(query, args) {
 			}
 		})
 	});
-	if (!res.ok) throw new Error(`Softr datasource list failed for "${datasourceId}": ${res.status}`);
+	if (!res.ok) throw new Error(`Softr datasource list failed for "${actionId}": ${res.status}`);
 	const payload = await res.json();
 	const nextOffset = payload.offset < payload.total ? payload.offset : null;
 	return {
@@ -139,9 +139,9 @@ function getRecord(query, options) {
 }
 async function executeGet(query, id, filters) {
 	assert(id, "a record id must not be empty");
-	const { datasourceId, select } = resolveTarget(query, "read");
+	const { actionId, select } = resolveTarget(query, "read");
 	const filterCriteria = filters.length ? dealiasFilterCriteria(buildFilterCriteria(andAll(filters)), select) : {};
-	const res = await fetch(`${dsUrl(datasourceId)}/records/${id}`, {
+	const res = await fetch(`${dsUrl(actionId)}/records/${id}`, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -153,7 +153,7 @@ async function executeGet(query, id, filters) {
 			filterCriteria
 		})
 	});
-	if (!res.ok) throw new Error(`Softr datasource get failed for "${datasourceId}": ${res.status}`);
+	if (!res.ok) throw new Error(`Softr datasource get failed for action "${actionId}": ${res.status}`);
 	const contentLength = res.headers.get("Content-Length");
 	if (contentLength && parseInt(contentLength, 10) === 0) return null;
 	const record = await res.json();
@@ -171,10 +171,10 @@ async function executeGet(query, id, filters) {
 * })
 */
 async function createRecord(action, options) {
-	const { datasourceId, select } = resolveTarget(action, "create");
+	const { actionId, select } = resolveTarget(action, "create");
 	const data = options.data;
 	const rawFields = dealiasData(data, select);
-	const res = await fetch(`${dsUrl(datasourceId)}/records/new`, {
+	const res = await fetch(`${dsUrl(actionId)}/records/new`, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -182,7 +182,7 @@ async function createRecord(action, options) {
 		},
 		body: JSON.stringify({ fields: rawFields })
 	});
-	if (!res.ok) throw new Error(`Softr datasource create failed for "${datasourceId}": ${res.status}`);
+	if (!res.ok) throw new Error(`Softr datasource create failed for action "${actionId}": ${res.status}`);
 	const record = await res.json();
 	return {
 		id: record.id,
@@ -200,10 +200,10 @@ async function createRecord(action, options) {
 */
 async function updateRecord(action, options) {
 	if (!options.id) throw new Error(`Softr datasource update: id must not be empty`);
-	const { datasourceId, select } = resolveTarget(action, "update");
+	const { actionId, select } = resolveTarget(action, "update");
 	const data = options.data;
 	const rawFields = dealiasData(data, select);
-	const res = await fetch(`${dsUrl(datasourceId)}/records/${options.id}`, {
+	const res = await fetch(`${dsUrl(actionId)}/records/${options.id}`, {
 		method: "PATCH",
 		headers: {
 			"Content-Type": "application/json",
@@ -211,7 +211,7 @@ async function updateRecord(action, options) {
 		},
 		body: JSON.stringify({ fields: rawFields })
 	});
-	if (!res.ok) throw new Error(`Softr datasource update failed for "${datasourceId}": ${res.status}`);
+	if (!res.ok) throw new Error(`Softr datasource update failed for action "${actionId}": ${res.status}`);
 	const record = await res.json();
 	return {
 		id: record.id,
@@ -225,12 +225,12 @@ async function updateRecord(action, options) {
 * await ds.delete(removePost, { id: "record-id" })
 */
 async function deleteRecord(action, options) {
-	const { datasourceId } = resolveTarget(action, "delete");
-	const res = await fetch(`${dsUrl(datasourceId)}/records/${options.id}`, {
+	const { actionId } = resolveTarget(action, "delete");
+	const res = await fetch(`${dsUrl(actionId)}/records/${options.id}`, {
 		method: "DELETE",
 		headers: { Authorization: `Bearer ${readSessionToken()}` }
 	});
-	if (!res.ok) throw new Error(`Softr datasource delete failed for "${datasourceId}": ${res.status}`);
+	if (!res.ok) throw new Error(`Softr datasource delete failed for action "${actionId}": ${res.status}`);
 }
 function resolveTarget(subject, operation) {
 	const declaredBy = operation === "read" ? "defineQuery" : "defineMutation";
@@ -238,7 +238,7 @@ function resolveTarget(subject, operation) {
 	const action = subject;
 	assert(action.resource.operation === operation, () => `action "${action.id}" is declared as ${action.resource.operation}, not ${operation}`);
 	return {
-		datasourceId: action.resource.datasourceId,
+		actionId: action.id,
 		select: action.resource.fields ?? {}
 	};
 }

package/dist/package.js

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

package/package.json

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

package/skills/softr-sdk/SKILL.md

@@ -11,7 +11,7 @@ description: >-
 metadata:
   type: core
   library: softr-sdk
-  library_version: 0.0.33
+  library_version: 0.0.35-alpha.0
 ---
 
 # 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.33
+  library_version: 0.0.35-alpha.0
 ---
 
 **Boundary.** `auth` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build. `defineVisibility`, the hooks and every type come from `@softr/sdk`. The app is already wired (`src/start.ts`, `src/router.tsx`, `src/routes/__root.tsx`); never add a second registration. Load the core `softr-sdk` skill only if you are unsure this is the right sub-skill.

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.33
+  library_version: 0.0.35-alpha.0
 ---
 
 **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. The app is already wired (`src/start.ts`, `src/router.tsx`, `src/routes/__root.tsx`); never add a second registration. Load the core `softr-sdk` skill only if you are unsure this is the right sub-skill.

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

@@ -10,7 +10,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.33
+  library_version: 0.0.35-alpha.0
 ---
 
 **Boundary.** `useCurrentUser`, `usePermissions` and every type come from `@softr/sdk` and work anywhere; `ds` and `auth` live on `@softr/sdk/server` and run only inside a `createServerFn` handler. The app is already wired — `src/start.ts` registers `softrAuthMiddleware`, `src/routes/__root.tsx` publishes the visitor as route context — never add a second registration. Load the core `softr-sdk` skill only if you are unsure this is the right sub-skill.

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

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

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

@@ -2,14 +2,14 @@
 name: integrations
 description: >-
   Call a third-party service connected to the app as an integration:
-  defineIntegration from @softr/sdk declares the action with its datasourceId
+  defineIntegration from @softr/sdk declares the action with its integrationId
   and permissions; integration.createFetcher from @softr/sdk/server binds it and
   returns a fetcher function you call with url, optional method, headers, and
   body. Check res.ok before res.json().
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.33
+  library_version: 0.0.35-alpha.0
 ---
 
 **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. Load the core `softr-sdk` skill only if you are unsure this is the right sub-skill.
@@ -34,14 +34,14 @@ When the user attaches integrations to the chat, they appear in the `## Attached
 - "Gmail" — database `<databaseId>`, integration `<integrationId>`, type `GMAIL`
 ```
 
-Use `databaseId` as `datasourceId` in `defineIntegration` — that is the `database` coordinate, not the `integration` one. The `integration` value is the OAuth connection identifier; do not pass it anywhere. Use `integrationType` (e.g. `GMAIL`) to look up the base URL from the reference table below — then construct the full URL path, including any query parameters, directly in the `url` string.
+Pass the `integration` value as `integrationId` in `defineIntegration`. The `database` value is the table coordinate; integrations do not use it, so do not pass it anywhere. Use `integrationType` (e.g. `GMAIL`) to look up the base URL from the reference table below — then construct the full URL path, including any query parameters, directly in the `url` string.
 
 ## Declare the integration action
 
 ```ts
 const googleCalendar = defineIntegration({
   id: 'googleCalendar',
-  datasourceId: '25d60213-ef4f-4fa0-b094-a46931b2d120',
+  integrationId: '25d60213-ef4f-4fa0-b094-a46931b2d120',
   permissions: { userGroup: 'LOGGED_IN_USERS' },
 })
 ```
@@ -71,7 +71,7 @@ Include query parameters directly in the `url` string — there is no separate `
 ```ts
 const slackDs = defineIntegration({
   id: 'slack',
-  datasourceId: 'a1b2c3d4-e5f6-7890-abcd-ef1234567890',
+  integrationId: 'a1b2c3d4-e5f6-7890-abcd-ef1234567890',
   permissions: { userGroup: 'LOGGED_IN_USERS' },
 })
 

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

@@ -11,7 +11,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.33
+  library_version: 0.0.35-alpha.0
 ---
 
 **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. The app is already wired (`src/start.ts`, `src/router.tsx`, `src/routes/__root.tsx`); never add a second registration. Load the core `softr-sdk` skill only if you are unsure this is the right sub-skill.

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

@@ -12,7 +12,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.33
+  library_version: 0.0.35-alpha.0
 ---
 
 **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. The app is already wired (`src/start.ts`, `src/router.tsx`, `src/routes/__root.tsx`); never add a second registration. Load the core `softr-sdk` skill only if you are unsure this is the right sub-skill.

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

@@ -12,7 +12,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.33
+  library_version: 0.0.35-alpha.0
 ---
 
 **Boundary.** `defineVisibility`, the error predicates and every type come from `@softr/sdk` and work anywhere; `ds` and `auth` live on `@softr/sdk/server` and run only inside a `createServerFn` handler. The app is already wired — `src/start.ts` registers `softrAuthMiddleware`, `src/routes/__root.tsx` publishes the visitor as route context — never add a second registration. Load the core `softr-sdk` skill only if you are unsure this is the right sub-skill.

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

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.33
+  library_version: 0.0.35-alpha.0
 ---
 
 **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. Load the core `softr-sdk` skill only if you are unsure this is the right sub-skill.