@tapi-dev/sdk 0.1.34 → 0.1.36

package/dist/types.d.ts

@@ -3,20 +3,20 @@ export type RunStatus = "queued" | "running" | "waiting_for_input" | "completed"
 export interface TapiClientOptions {
     baseUrl: string;
     apiKey: string;
+    tappId: string;
     projectId?: string;
     dev?: boolean;
     fetch?: typeof fetch;
     localControlUrl?: string;
     webSocket?: LocalWebSocketConstructor;
 }
-export interface WebsiteApiRunRequest {
+export interface ServiceRunRequest {
+    queueId: string;
     inputs?: Record<string, unknown | LateInput<unknown>>;
     runtime?: RuntimeRunOptions;
     priority?: number;
-    runnerId?: string;
     idempotencyKey?: string;
     site?: string;
-    sitemapId?: string;
 }
 export interface CloudRunOptions {
     windows?: boolean;
@@ -33,23 +33,23 @@ export interface CloudRunPaymentOptions {
     successUrl?: string;
     cancelUrl?: string;
 }
-export interface WebsiteApiCloudQuoteRequest {
+export interface ServiceCloudQuoteRequest {
     inputs?: Array<Record<string, unknown>>;
     cloud?: CloudRunOptions;
     user?: CloudRunUser;
+    runtime?: RuntimeRunOptions;
     site?: string;
 }
-export interface WebsiteApiCloudBatchRequest {
+export interface ServiceCloudBatchRequest {
     inputs: Array<Record<string, unknown>>;
+    queueId: string;
     cloud?: CloudRunOptions;
     user?: CloudRunUser;
+    runtime?: RuntimeRunOptions;
     payment?: CloudRunPaymentOptions;
     site?: string;
     idempotencyKey?: string;
 }
-export type ServiceRunRequest = WebsiteApiRunRequest;
-export type ServiceCloudQuoteRequest = WebsiteApiCloudQuoteRequest;
-export type ServiceCloudBatchRequest = WebsiteApiCloudBatchRequest;
 export interface CloudRunQuote {
     inputCount: number;
     windows: boolean;
@@ -71,8 +71,9 @@ export interface CloudRunQuote {
 export interface CloudBatchRun {
     id: string;
     status: RunStatus | "payment_required" | "provisioning";
-    apiName?: string;
-    requestKey?: string;
+    serviceName: string;
+    serviceKey: string;
+    serviceRun?: string;
     site?: string;
     inputCount?: number;
     completedCount?: number;
@@ -138,7 +139,7 @@ export interface CloudCreditCheckout {
     paymentProvider: "stripe" | string;
     paymentProviderEnabled: boolean;
 }
-export interface WebsiteApiInputContract {
+export interface ServiceInputContract {
     key: string;
     label?: string;
     type?: string;
@@ -149,62 +150,58 @@ export interface WebsiteApiInputContract {
     default?: unknown;
     [key: string]: unknown;
 }
-export interface WebsiteApiOutputContract {
+export interface ServiceOutputContract {
     key: string;
     type?: string;
     [key: string]: unknown;
 }
-export interface WebsiteApiOperation {
+export interface ServiceOperation {
     name: string;
-    namespace: string;
-    operation: string;
+    serviceName: string;
+    serviceKey: string;
+    serviceRun?: string;
     site?: string;
-    sitemapId?: string;
     version?: string;
     status?: string;
-    publishedAt?: string | null;
     deviceMode?: "desktop" | "mobile" | string;
     runtime?: RuntimeRunOptions | Record<string, unknown>;
-    inputs: WebsiteApiInputContract[];
-    outputs?: WebsiteApiOutputContract[];
+    inputs: ServiceInputContract[];
+    outputs?: ServiceOutputContract[];
     inputSchema?: Record<string, unknown>;
     outputSchema?: Record<string, unknown>;
     [key: string]: unknown;
 }
-export interface WebsiteApiTriggerSchedule {
+export interface ServiceTriggerSchedule {
     intervalSeconds?: number;
     cron?: string;
     [key: string]: unknown;
 }
-export interface WebsiteApiTriggerCreateRequest {
+export interface ServiceTriggerCreateRequest {
     name: string;
-    serviceRun?: string;
-    service?: string;
-    apiRequest?: string;
+    serviceRun: string;
     enabled?: boolean;
-    schedule?: WebsiteApiTriggerSchedule;
+    schedule?: ServiceTriggerSchedule;
     inputs?: Record<string, unknown>;
     runtime?: RuntimeRunOptions;
-    runnerId?: string;
+    queueId: string;
     priority?: number;
     site?: string;
-    sitemapId?: string;
 }
-export interface WebsiteApiTriggerUpdateRequest {
+export interface ServiceTriggerUpdateRequest {
     enabled: boolean;
 }
-export interface WebsiteApiTrigger {
+export interface ServiceTrigger {
     id: string;
     name: string;
-    apiRequest: string;
-    apiName: string;
-    requestKey: string;
+    serviceRun: string;
+    serviceName: string;
+    serviceKey: string;
     site?: string;
     enabled: boolean;
-    schedule?: WebsiteApiTriggerSchedule | Record<string, unknown>;
+    schedule?: ServiceTriggerSchedule | Record<string, unknown>;
     inputs?: Record<string, unknown>;
     runtime?: RuntimeRunOptions | Record<string, unknown>;
-    runnerId?: string;
+    queueId?: string;
     priority?: number;
     lastRun?: TapiRun | Record<string, unknown> | null;
     lastError?: string;
@@ -214,39 +211,43 @@ export interface WebsiteApiTrigger {
     updatedAt?: string;
     [key: string]: unknown;
 }
-export interface WebsiteApiTriggerList {
-    triggers: WebsiteApiTrigger[];
+export interface ServiceTriggerList {
+    triggers: ServiceTrigger[];
 }
-export interface WebsiteApiTriggerRunResult {
+export interface ServiceTriggerRunResult {
     success: boolean;
-    trigger: WebsiteApiTrigger;
+    trigger: ServiceTrigger;
     run: TapiRun | Record<string, unknown>;
 }
 export interface TapiRun {
     id: string;
     status: RunStatus;
-    apiName?: string;
-    requestKey?: string;
+    serviceName: string;
+    serviceKey: string;
+    serviceRun?: string;
+    tappId?: string;
+    queueId?: string;
+    runnerId?: string;
+    slotIndex?: number;
+    deviceId?: string;
     result?: Record<string, unknown> | null;
     error?: Record<string, unknown> | null;
     runtime?: RuntimeRunOptions | Record<string, unknown> | null;
-    waitingInput?: WebsiteApiWaitingInput | null;
-    pendingInputs?: WebsiteApiWaitingInput[];
+    waitingInput?: ServiceWaitingInput | null;
+    pendingInputs?: ServiceWaitingInput[];
     createdAt?: string;
     updatedAt?: string;
     [key: string]: unknown;
 }
-export type ServiceInputContract = WebsiteApiInputContract;
-export type ServiceOutputContract = WebsiteApiOutputContract;
-export type ServiceOperation = WebsiteApiOperation;
 export type TapiDevSessionStatus = "queued" | "running" | "waiting_for_input" | "awaiting_takeover" | "needs_developer_attention" | "completed" | "failed" | "cancelled" | string;
 export interface TapiDevSession {
     id: string;
     projectId: string;
     sitemap: string;
     site?: string;
-    apiName: string;
-    requestKey: string;
+    serviceName: string;
+    serviceKey: string;
+    serviceRun?: string;
     status: TapiDevSessionStatus;
     stateId?: number | null;
     stateLabel?: string;
@@ -269,7 +270,7 @@ export interface TapiDevSessionsList {
     projectId: string;
     groups: TapiDevSessionGroup[];
 }
-export interface WebsiteApiWaitingInput {
+export interface ServiceWaitingInput {
     key: string;
     label?: string;
     stateId?: number;
@@ -318,6 +319,7 @@ export interface RuntimeProfile {
     [key: string]: unknown;
 }
 export interface RuntimeRunOptions {
+    owner?: "service_run";
     profileRef?: string;
     destroyOnRelease?: boolean;
     [key: string]: unknown;
@@ -378,24 +380,23 @@ export interface SdkCatalogRequest {
     status: string;
     operation?: string;
     sdkName?: string;
-    sitemapId?: string;
     deviceMode?: "desktop" | "mobile" | string;
     runtime?: RuntimeRunOptions | Record<string, unknown>;
-    inputs?: WebsiteApiInputContract[];
+    inputs?: ServiceInputContract[];
     inputSchema?: Record<string, unknown>;
     outputSchema?: Record<string, unknown>;
     responseSchema?: Record<string, unknown>;
     [key: string]: unknown;
 }
-export interface SdkCatalogApi {
+export interface SdkCatalogService {
     name: string;
-    version: string;
+    serviceName: string;
+    version?: string;
     site?: string;
-    sitemapId?: string;
     requests: SdkCatalogRequest[];
     [key: string]: unknown;
 }
 export interface SdkCatalog {
-    apis: SdkCatalogApi[];
+    services: SdkCatalogService[];
     [key: string]: unknown;
 }

package/dist/workspace.d.ts

@@ -1,10 +1,5 @@
 export declare const TAPI_WORKSPACE_DIR = ".tapi";
 export declare const TAPI_WORKSPACE_CONFIG = "project.json";
-export interface TapiGeneratedConfig {
-    catalog?: string;
-    typescript?: string;
-    [key: string]: unknown;
-}
 export interface TapiServicesConfig {
     catalog?: string;
     typescript?: string;
@@ -16,7 +11,6 @@ export interface TapiWorkspaceConfig {
     projectSlug?: string;
     apiBaseUrl?: string;
     services?: TapiServicesConfig;
-    generated?: TapiGeneratedConfig;
     [key: string]: unknown;
 }
 export interface TapiWorkspace {

package/dist/workspace.js

@@ -3,6 +3,7 @@ import { mkdir, writeFile } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 export const TAPI_WORKSPACE_DIR = ".tapi";
 export const TAPI_WORKSPACE_CONFIG = "project.json";
+const RETIRED_SERVICE_HELPER_CONFIG_KEY = "gener" + "ated";
 export function findWorkspaceConfigPath(startDir = process.cwd()) {
     let current = resolve(startDir);
     while (true) {
@@ -52,15 +53,17 @@ export function readWorkspaceConfig(configPath) {
     const projectSlug = optionalProjectValue(parsed.projectSlug, "projectSlug");
     const apiBaseUrl = typeof parsed.apiBaseUrl === "string" && parsed.apiBaseUrl.trim() ? parsed.apiBaseUrl.trim() : undefined;
     const services = isRecord(parsed.services) ? { ...parsed.services } : undefined;
-    const generated = isRecord(parsed.generated) ? { ...parsed.generated } : undefined;
+    if (Object.prototype.hasOwnProperty.call(parsed, RETIRED_SERVICE_HELPER_CONFIG_KEY)) {
+        throw new Error(`Tapi workspace config at ${configPath} uses retired service helper config. Remove '${RETIRED_SERVICE_HELPER_CONFIG_KEY}' and use 'services' instead.`);
+    }
+    const config = { ...parsed };
     return {
-        ...parsed,
+        ...config,
         version: 1,
         projectId,
         ...(projectSlug ? { projectSlug } : {}),
         ...(apiBaseUrl ? { apiBaseUrl } : {}),
         ...(services ? { services } : {}),
-        ...(generated ? { generated } : {}),
     };
 }
 export async function writeWorkspaceConfig(options) {
@@ -78,7 +81,6 @@ export async function writeWorkspaceConfig(options) {
         ...(options.apiBaseUrl ? { apiBaseUrl: options.apiBaseUrl } : {}),
         services: {
             catalog: ".tapi/services/catalog.json",
-            typescript: "src/tapi.services.ts",
         },
     };
     await mkdir(dirname(configPath), { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapi-dev/sdk",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",