@softr/sdk 0.0.13 → 0.0.15

package/dist/client.d.ts

@@ -1,3 +1 @@
-import { useUserTimezone } from "./client/timezone.js";
-import "@tanstack/react-start/client-only";
-export { useUserTimezone };
+import "@tanstack/react-start/client-only";

package/dist/client.js

@@ -1,4 +1,3 @@
-import { useUserTimezone } from "./client/timezone.js";
 import "@tanstack/react-start/client-only";
 
-export { useUserTimezone };
+export {  };

package/dist/core/datasource.js

@@ -1,18 +1,25 @@
 import { buildFilterCriteria, buildOrderBy, dealiasFilterCriteria, dealiasOrderBy } from "./query.js";
+import { panic } from "../assertions.js";
 import { readUserTimezone } from "../cookies.js";
+import { sessionConfig } from "../auth/config.js";
 import { readSessionToken } from "../auth/session.js";
 
 //#region src/core/datasource.ts
 const MAX_RECORD_COUNT = 100;
 const COUNT_CNT = "COUNT_CNT";
-const BASE_URL = () => (import.meta.env.VITE_SOFTR_BASE_URL ?? "").replace(/\/$/, "");
+const dsUrl = (datasourceId) => {
+	const datasourceApiUrl = process.env.SOFTR_DATASOURCE_API_URL || "https://datasource-api-staging12.softr.io";
+	if (!datasourceApiUrl) panic("SOFTR_DATASOURCE_API_URL is not set.");
+	const { applicationId } = sessionConfig();
+	return `${withoutTrailingSlash(datasourceApiUrl)}/v1/datasource/vibe/applications/${applicationId}/datasources/${datasourceId}`;
+};
 async function listRecords(datasourceId, options = {}) {
 	const { select, where, orderBy } = options;
 	const count = Math.min(options.limit ?? 20, MAX_RECORD_COUNT);
 	const offset = options.offset ?? null;
 	const filterCriteria = where ? dealiasFilterCriteria(buildFilterCriteria(where), select ?? {}) : {};
 	const sortingOption = orderBy ? dealiasOrderBy(buildOrderBy(orderBy), select ?? {}) : void 0;
-	const res = await fetch(`${BASE_URL()}/api/datasources/${datasourceId}/records`, {
+	const res = await fetch(`${dsUrl(datasourceId)}/records`, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -44,7 +51,7 @@ async function listRecords(datasourceId, options = {}) {
 async function getRecord(datasourceId, options) {
 	if (options.id !== void 0) {
 		if (!options.id) throw new Error(`Softr datasource get: id must not be empty`);
-		const res = await fetch(`${BASE_URL()}/api/datasources/${datasourceId}/records/${options.id}`, {
+		const res = await fetch(`${dsUrl(datasourceId)}/records/${options.id}`, {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/json",
@@ -65,32 +72,42 @@ async function getRecord(datasourceId, options) {
 	})).records[0] ?? null;
 }
 async function createRecord(datasourceId, options) {
-	const res = await fetch(`${BASE_URL()}/api/datasources/${datasourceId}/records`, {
+	const rawFields = options.select ? dealiasData(options.data, options.select) : options.data;
+	const res = await fetch(`${dsUrl(datasourceId)}/records/new`, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
 			"Authorization": `Bearer ${readSessionToken()}`
 		},
-		body: JSON.stringify({ fields: options.fields })
+		body: JSON.stringify({ fields: rawFields })
 	});
 	if (!res.ok) throw new Error(`Softr datasource create failed for "${datasourceId}": ${res.status}`);
-	return (await res.json()).record;
+	const record = await res.json();
+	return options.select ? {
+		id: record.id,
+		fields: aliasFields(record.fields, options.select)
+	} : record;
 }
 async function updateRecord(datasourceId, options) {
 	if (!options.id) throw new Error(`Softr datasource update: id must not be empty`);
-	const res = await fetch(`${BASE_URL()}/api/datasources/${datasourceId}/records/${options.id}`, {
+	const rawFields = options.select ? dealiasData(options.data, options.select) : options.data;
+	const res = await fetch(`${dsUrl(datasourceId)}/records/${options.id}`, {
 		method: "PATCH",
 		headers: {
 			"Content-Type": "application/json",
 			"Authorization": `Bearer ${readSessionToken()}`
 		},
-		body: JSON.stringify({ fields: options.fields })
+		body: JSON.stringify({ fields: rawFields })
 	});
 	if (!res.ok) throw new Error(`Softr datasource update failed for "${datasourceId}": ${res.status}`);
-	return (await res.json()).record;
+	const record = await res.json();
+	return options.select ? {
+		id: record.id,
+		fields: aliasFields(record.fields, options.select)
+	} : record;
 }
 async function deleteRecord(datasourceId, id) {
-	const res = await fetch(`${BASE_URL()}/api/datasources/${datasourceId}/records/${id}`, {
+	const res = await fetch(`${dsUrl(datasourceId)}/records/${id}`, {
 		method: "DELETE",
 		headers: { "Authorization": `Bearer ${readSessionToken()}` }
 	});
@@ -100,7 +117,7 @@ async function getMetric(datasourceId, options) {
 	const { select, where, aggregation, field } = options;
 	const fieldId = field ? select?.[field] ?? field : void 0;
 	const filterCriteria = where ? dealiasFilterCriteria(buildFilterCriteria(where), select ?? {}) : {};
-	const res = await fetch(`${BASE_URL()}/api/datasources/${datasourceId}/chartMetricData`, {
+	const res = await fetch(`${dsUrl(datasourceId)}/metric/data`, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -139,7 +156,7 @@ async function getChartData(datasourceId, options) {
 		field: field ? select?.[field] ?? field : void 0,
 		aggregation
 	}));
-	const res = await fetch(`${BASE_URL()}/api/datasources/${datasourceId}/chartData`, {
+	const res = await fetch(`${dsUrl(datasourceId)}/chart`, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -182,6 +199,11 @@ function aliasFields(fields, aliases) {
 	for (const [alias, fieldId] of Object.entries(aliases)) result[alias] = fields[fieldId];
 	return result;
 }
+function dealiasData(data, select) {
+	const result = {};
+	for (const [alias, value] of Object.entries(data)) result[select[alias] ?? alias] = value;
+	return result;
+}
 const ds = {
 	list: listRecords,
 	get: getRecord,
@@ -191,6 +213,9 @@ const ds = {
 	metric: getMetric,
 	chartData: getChartData
 };
+function withoutTrailingSlash(url) {
+	return url.replace(/\/+$/, "");
+}
 
 //#endregion
 export { ds };

package/dist/index.d.ts

@@ -5,4 +5,5 @@ import { Permissions } from "./auth/permissions.js";
 import { SoftrContext } from "./auth/context.js";
 import { AccessBehaviour, AccessCheck, AccessError, AccessReason, RouteVisibility, VisibilityHandle, defineVisibility, isAccessError, isAlreadySignedInError, isForbiddenError, isUnauthenticatedError } from "./routes/visibility.js";
 import { getSoftrContext, initialSoftrContext, softrAuthMiddleware, useCurrentUser, usePermissions } from "./auth/isomorphic.js";
-export { type AccessBehaviour, type AccessCheck, type AccessError, type AccessReason, type AggregationFunction, type ChartDataOptions, type ChartDataResult, type CreateOptions, type DatasourcePermissions, type GetOptions, type ListOptions, type ListResult, type MetricOptions, type MetricResult, type Permissions, type RouteVisibility, type SoftrContext, type SoftrMe, type SoftrPermissions, type SoftrRecord, type SoftrUser, type SoftrUserGroupId, type SoftrUserGroups, type UpdateOptions, type User, type VisibilityHandle, defineVisibility, getSoftrContext, initialSoftrContext, isAccessError, isAlreadySignedInError, isForbiddenError, isUnauthenticatedError, q, softrAuthMiddleware, useCurrentUser, usePermissions };
+import { useUserTimezone } from "./timezone.js";
+export { type AccessBehaviour, type AccessCheck, type AccessError, type AccessReason, type AggregationFunction, type ChartDataOptions, type ChartDataResult, type CreateOptions, type DatasourcePermissions, type GetOptions, type ListOptions, type ListResult, type MetricOptions, type MetricResult, type Permissions, type RouteVisibility, type SoftrContext, type SoftrMe, type SoftrPermissions, type SoftrRecord, type SoftrUser, type SoftrUserGroupId, type SoftrUserGroups, type UpdateOptions, type User, type VisibilityHandle, defineVisibility, getSoftrContext, initialSoftrContext, isAccessError, isAlreadySignedInError, isForbiddenError, isUnauthenticatedError, q, softrAuthMiddleware, useCurrentUser, usePermissions, useUserTimezone };

package/dist/index.js

@@ -1,5 +1,6 @@
 import { q } from "./core/query.js";
 import { defineVisibility, isAccessError, isAlreadySignedInError, isForbiddenError, isUnauthenticatedError } from "./routes/visibility.js";
 import { getSoftrContext, initialSoftrContext, softrAuthMiddleware, useCurrentUser, usePermissions } from "./auth/isomorphic.js";
+import { useUserTimezone } from "./timezone.js";
 
-export { defineVisibility, getSoftrContext, initialSoftrContext, isAccessError, isAlreadySignedInError, isForbiddenError, isUnauthenticatedError, q, softrAuthMiddleware, useCurrentUser, usePermissions };
+export { defineVisibility, getSoftrContext, initialSoftrContext, isAccessError, isAlreadySignedInError, isForbiddenError, isUnauthenticatedError, q, softrAuthMiddleware, useCurrentUser, usePermissions, useUserTimezone };

package/dist/timezone.d.ts

@@ -0,0 +1,4 @@
+//#region src/timezone.d.ts
+declare function useUserTimezone(): void;
+//#endregion
+export { useUserTimezone };

package/dist/{client/timezone.js → timezone.js}

@@ -1,6 +1,6 @@
 import { useEffect } from "react";
 
-//#region src/client/timezone.ts
+//#region src/timezone.ts
 function useUserTimezone() {
 	useEffect(() => {
 		document.cookie = `user-timezone=${Intl.DateTimeFormat().resolvedOptions().timeZone}; path=/`;

package/dist/types.d.ts

@@ -95,11 +95,21 @@ interface ChartDataResult {
   executionTimestamp: Date;
 }
 interface CreateOptions {
-  fields: Record<string, unknown>;
+  /**
+   * Maps human-readable aliases to Softr field IDs.
+   * When provided, `data` keys are interpreted as aliases.
+   */
+  select?: Record<string, string>;
+  data: Record<string, unknown>;
 }
 interface UpdateOptions {
   id: string;
-  fields: Record<string, unknown>;
+  /**
+   * Maps human-readable aliases to Softr field IDs.
+   * When provided, `data` keys are interpreted as aliases.
+   */
+  select?: Record<string, string>;
+  data: Record<string, unknown>;
 }
 //#endregion
 export { AggregationFunction, ChartDataOptions, ChartDataResult, CreateOptions, DatasourcePermissions, GetOptions, ListOptions, ListResult, MetricOptions, MetricResult, SoftrMe, SoftrPermissions, SoftrRecord, SoftrUser, UpdateOptions };

package/package.json

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

package/dist/client/timezone.d.ts

@@ -1,4 +0,0 @@
-//#region src/client/timezone.d.ts
-declare function useUserTimezone(): void;
-//#endregion
-export { useUserTimezone };