@softr/sdk 0.0.29 → 0.0.30-alpha.0

package/dist/core/integration.d.ts

@@ -1,5 +1,22 @@
 //#region src/core/integration.d.ts
-declare function integrationFetch(datasourceId: string, input: RequestInfo | URL, init?: RequestInit): Promise<Response>;
+interface IntegrationFetchOptions {
+  dataSourceId: string;
+  url: string;
+  method?: string;
+  headers?: Record<string, string>;
+  body?: string;
+  queryParams?: Record<string, string>;
+  signal?: AbortSignal;
+}
+declare function integrationFetch({
+  dataSourceId,
+  url: rawUrl,
+  method,
+  headers,
+  body,
+  queryParams,
+  signal
+}: IntegrationFetchOptions): Promise<Response>;
 declare const integration: {
   fetch: typeof integrationFetch;
 };

package/dist/core/integration.js

@@ -2,28 +2,28 @@ import { readSessionToken } from "../auth/session.js";
 import { dsUrl } from "../datasource/record.js";
 
 //#region src/core/integration.ts
-async function integrationFetch(datasourceId, input, init) {
-	const req = new Request(input, init);
-	if (req.signal.aborted) throw req.signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
-	const reqHeaders = {};
-	new Headers(req.headers).forEach((value, key) => {
-		reqHeaders[key] = value;
-	});
+async function integrationFetch({ dataSourceId, url: rawUrl, method = "GET", headers = {}, body, queryParams, signal }) {
+	if (signal?.aborted) throw signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
+	let url = rawUrl;
+	if (queryParams && Object.keys(queryParams).length > 0) {
+		const params = new URLSearchParams(queryParams);
+		url += (rawUrl.includes("?") ? "&" : "?") + params.toString();
+	}
+	const upperMethod = method.toUpperCase();
 	const payload = {
-		method: req.method,
-		url: req.url,
-		headers: reqHeaders
+		method: upperMethod,
+		url,
+		headers
 	};
-	const method = req.method.toUpperCase();
-	if (method !== "GET" && method !== "HEAD" && req.body !== null) payload.body = await req.clone().text();
-	return fetch(`${dsUrl(datasourceId)}/proxy`, {
+	if (upperMethod !== "GET" && upperMethod !== "HEAD" && body !== void 0) payload.body = body;
+	return fetch(`${dsUrl(dataSourceId)}/proxy`, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
 			"Authorization": `Bearer ${readSessionToken()}`
 		},
 		body: JSON.stringify(payload),
-		signal: req.signal
+		signal
 	});
 }
 const integration = { fetch: integrationFetch };

package/dist/package.js

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

package/package.json

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

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

@@ -2,11 +2,11 @@
 name: integrations
 description: >-
   Call a third-party service connected to the app as an integration:
-  integration.fetch from @softr/sdk/server, reading the datasource id and
-  integration type from the "Attached data sources" prompt section, looking up
-  the base URL from the reference table by integrationType, and constructing the
-  full API URL from base URL plus the path and query params the model knows from
-  training. Check res.ok before res.json().
+  integration.fetch({ dataSourceId, url, method, queryParams, body }) from
+  @softr/sdk/server, reading the datasource id and integration type from the
+  "Attached data sources" prompt section, looking up the base URL from the
+  reference table by integrationType, constructing the URL path, and passing
+  query params as an object. Check res.ok before res.json().
 metadata:
   type: sub-skill
   library: softr-sdk
@@ -34,23 +34,28 @@ When the user attaches integrations to the chat, they appear in the `## Attached
 - "Gmail" — database `<databaseId>`, integration `<integrationId>`, type `GMAIL`
 ```
 
-Use `databaseId` as the first argument to `integration.fetch` — that is the `database` coordinate, not the `integration` one. The `integration` value is the OAuth connection identifier; do not pass it to `integration.fetch`. Use `integrationType` (e.g. `GMAIL`) to look up the base URL from the reference table below — then construct the full URL by appending the path and query parameters your training knows for that API.
+Use `databaseId` as `dataSourceId` in the options object passed to `integration.fetch` — that is the `database` coordinate, not the `integration` one. The `integration` value is the OAuth connection identifier; do not pass it to `integration.fetch`. Use `integrationType` (e.g. `GMAIL`) to look up the base URL from the reference table below — then construct the full URL path and pass query parameters as the `queryParams` object.
 
 ## Core pattern
 
 ```ts
 const getCalendarEvents = createServerFn().handler(async () => {
-  const now = new Date().toISOString()
-  const res = await integration.fetch(
-    '25d60213-ef4f-4fa0-b094-a46931b2d120',
-    `https://www.googleapis.com/calendar/v3/calendars/primary/events?timeMin=${encodeURIComponent(now)}&singleEvents=true&orderBy=startTime&maxResults=10`,
-  )
+  const res = await integration.fetch({
+    dataSourceId: '25d60213-ef4f-4fa0-b094-a46931b2d120',
+    url: 'https://www.googleapis.com/calendar/v3/calendars/primary/events',
+    queryParams: {
+      timeMin: new Date().toISOString(),
+      singleEvents: 'true',
+      orderBy: 'startTime',
+      maxResults: '10',
+    },
+  })
   if (!res.ok) throw new Error(`Integration request failed: ${res.status} ${await res.text()}`)
   return res.json()
 })
 ```
 
-The id (`25d60213-…`) is the `databaseId` from the attached data sources section — the `database` coordinate, not the `integration` one. The base URL (`https://www.googleapis.com`) is looked up from the reference table below by matching `integrationType` (`GOOGLE_CALENDAR`). The path and query params come from your knowledge of the Google Calendar REST API.
+`dataSourceId` is the `databaseId` from the attached data sources section — the `database` coordinate, not the `integration` one. The base URL (`https://www.googleapis.com`) is looked up from the reference table below by matching `integrationType` (`GOOGLE_CALENDAR`). The path and query params come from your knowledge of the Google Calendar REST API.
 
 ## POST request
 
@@ -58,21 +63,19 @@ The id (`25d60213-…`) is the `databaseId` from the attached data sources secti
 const sendSlackMessage = createServerFn({ method: 'POST' })
   .validator((data: { channel: string; text: string }) => data)
   .handler(async ({ data }) => {
-    const res = await integration.fetch(
-      'a1b2c3d4-e5f6-7890-abcd-ef1234567890',
-      'https://slack.com/api/chat.postMessage',
-      {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ channel: data.channel, text: data.text }),
-      },
-    )
+    const res = await integration.fetch({
+      dataSourceId: 'a1b2c3d4-e5f6-7890-abcd-ef1234567890',
+      url: 'https://slack.com/api/chat.postMessage',
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ channel: data.channel, text: data.text }),
+    })
     if (!res.ok) throw new Error(`Slack error: ${res.status} ${await res.text()}`)
     return res.json()
   })
 ```
 
-`integration.fetch` accepts the same `RequestInit` options as the native `fetch`. Do not pass `Authorization` headers — Softr injects the integration's credentials automatically.
+Do not add an `Authorization` key to `headers` — Softr injects the integration's credentials automatically.
 
 ## Base URLs by integration type